refactor: Move shared into @vendure/common package

package.json

@@ -17,8 +17,11 @@
     "prepush": "yarn test:all && cd admin-ui && yarn build --prod",
     "dev-server": "ts-node packages/dev-server/index",
     "test:all": "cd admin-ui && yarn test --watch=false --browsers=ChromeHeadlessCI --progress=false && cd ../server && yarn test && yarn test:e2e",
+    "test:common": "jest --config packages/common/jest.config.js",
     "test:server": "jest --config packages/core/jest.config.js",
-    "test:e2e": "jest --config packages/core/e2e/config/jest-e2e.json --runInBand"
+    "test:e2e": "jest --config packages/core/e2e/config/jest-e2e.json --runInBand",
+    "test:admin-ui": "jest --config packages/core/e2e/config/jest-e2e.json --runInBand",
+    "build": "cd packages/core && yarn build"
   },
   "devDependencies": {
     "@types/graphql": "^14.0.5",

packages/common/README.md

@@ -0,0 +1,3 @@
+# @vendure/common
+
+This package contains a set of common utility functions and TypeScript types used by multiple Vendure packages. It is not intended to be directly depended upon by an end-user project.

packages/common/jest.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+    coverageDirectory: "coverage",
+    moduleFileExtensions: [
+        "js",
+        "json",
+        "ts",
+    ],
+    preset: "ts-jest",
+    rootDir: __dirname,
+    transform: {
+        "^.+\\.(t|j)s$": "ts-jest",
+    },
+};

shared/omit.ts → packages/common/omit.ts

@@ -45,7 +45,7 @@ function isObject(input: any): input is object {
 /**
  * When running in the Node environment, there is no native File object.
  */
-function isFileObject(input): boolean {
+function isFileObject(input: any): boolean {
     if (typeof File === 'undefined') {
         return false;
     } else {

packages/common/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@vendure/common",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@types/jest": "^24.0.11"
+  }
+}

shared/shared-utils.spec.ts → packages/common/shared-utils.spec.ts

@@ -1,5 +1,3 @@
-/// <reference types="../packages/core/node_modules/@types/jest" />
-
 import { generateAllCombinations } from './shared-utils';
 
 describe('generateAllCombinations()', () => {

packages/common/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "skipLibCheck": true,
+    "lib": ["es2017", "esnext.asynciterable"],
+    "allowSyntheticDefaultImports": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es2017",
+    "strict": true,
+    "strictPropertyInitialization": false,
+    "sourceMap": true,
+    "newLine": "LF"
+  }
+}

packages/common/tslint.json

@@ -0,0 +1,5 @@
+{
+    "extends": [
+        "../../tslint.json"
+    ]
+}

packages/core/build/gulpfile.ts

@@ -8,7 +8,7 @@ import { initialData } from '../mock-data/data-sources/initial-data';
 // tslint:disable:no-console
 
 function copySchemas() {
-    return src(['../src/**/*.graphql']).pipe(dest('../dist/server/src'));
+    return src(['../src/**/*.graphql']).pipe(dest('../dist'));
 }
 
 function copyEmailTemplates() {
@@ -16,7 +16,7 @@ function copyEmailTemplates() {
 }
 
 function copyI18nMessages() {
-    return src(['../src/i18n/messages/**/*']).pipe(dest('../dist/server/src/i18n/messages'));
+    return src(['../src/i18n/messages/**/*']).pipe(dest('../dist/i18n/messages'));
 }
 
 function copyCliAssets() {
@@ -43,7 +43,7 @@ function buildAdminUi() {
     return exec(
         'yarn build --prod=true',
         {
-            cwd: path.join(__dirname, '../../admin-ui'),
+            cwd: path.join(__dirname, '../../../admin-ui'),
         },
         error => {
             if (error) {
@@ -54,7 +54,7 @@ function buildAdminUi() {
 }
 
 function copyAdminUi() {
-    return src(['../../admin-ui/dist/vendure-admin/**/*']).pipe(dest('../dist/admin-ui'));
+    return src(['../../../admin-ui/dist/vendure-admin/**/*']).pipe(dest('../dist/admin-ui'));
 }
 
 function buildAndCopyAdminUi() {
@@ -69,5 +69,5 @@ export const build = parallel(
     copyCliImages,
     copyCliProductData,
     copyCliInitialData,
-    series(buildAdminUi, copyAdminUi),
+    // series(buildAdminUi, copyAdminUi),
 );

packages/core/e2e/administrator.e2e-spec.ts

@@ -1,3 +1,10 @@
+import {
+    Administrator,
+    CreateAdministrator,
+    GetAdministrator,
+    GetAdministrators,
+    UpdateAdministrator,
+} from '@vendure/common/generated-types';
 import path from 'path';
 
 import {
@@ -6,13 +13,6 @@ import {
     GET_ADMINISTRATORS,
     UPDATE_ADMINISTRATOR,
 } from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
-import {
-    Administrator,
-    CreateAdministrator,
-    GetAdministrator,
-    GetAdministrators,
-    UpdateAdministrator,
-} from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/auth.e2e-spec.ts

@@ -1,3 +1,12 @@
+import {
+    CreateAdministrator,
+    CreateProductMutationArgs,
+    CreateRole,
+    LoginMutationArgs,
+    Permission,
+    UpdateProductMutationArgs,
+} from '@vendure/common/generated-types';
+import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '@vendure/common/shared-constants';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -12,15 +21,6 @@ import {
     GET_PRODUCT_LIST,
     UPDATE_PRODUCT,
 } from '../../../admin-ui/src/app/data/definitions/product-definitions';
-import {
-    CreateAdministrator,
-    CreateProductMutationArgs,
-    CreateRole,
-    LoginMutationArgs,
-    Permission,
-    UpdateProductMutationArgs,
-} from '../../../shared/generated-types';
-import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '../../../shared/shared-constants';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/collection.e2e-spec.ts

@@ -1,19 +1,4 @@
 /* tslint:disable:no-non-null-assertion */
-import gql from 'graphql-tag';
-import path from 'path';
-
-import {
-    CREATE_COLLECTION,
-    GET_COLLECTION,
-    MOVE_COLLECTION,
-    UPDATE_COLLECTION,
-} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
-import { FACET_VALUE_FRAGMENT } from '../../../admin-ui/src/app/data/definitions/facet-definitions';
-import {
-    GET_ASSET_LIST,
-    UPDATE_PRODUCT,
-    UPDATE_PRODUCT_VARIANTS,
-} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     Collection,
     ConfigArgType,
@@ -29,8 +14,23 @@ import {
     UpdateCollection,
     UpdateProduct,
     UpdateProductVariants,
-} from '../../../shared/generated-types';
-import { ROOT_COLLECTION_NAME } from '../../../shared/shared-constants';
+} from '@vendure/common/generated-types';
+import { ROOT_COLLECTION_NAME } from '@vendure/common/shared-constants';
+import gql from 'graphql-tag';
+import path from 'path';
+
+import {
+    CREATE_COLLECTION,
+    GET_COLLECTION,
+    MOVE_COLLECTION,
+    UPDATE_COLLECTION,
+} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
+import { FACET_VALUE_FRAGMENT } from '../../../admin-ui/src/app/data/definitions/facet-definitions';
+import {
+    GET_ASSET_LIST,
+    UPDATE_PRODUCT,
+    UPDATE_PRODUCT_VARIANTS,
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import { facetValueCollectionFilter } from '../src/config/collection/default-collection-filters';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/config/jest-e2e.json

@@ -1,8 +1,5 @@
 {
   "moduleFileExtensions": ["js", "json", "ts"],
-  "moduleNameMapper": {
-    "shared/(.*)": "<rootDir>/../../../shared/$1.ts"
-  },
   "rootDir": "../",
   "testRegex": ".e2e-spec.ts$",
   "transform": {

packages/core/e2e/config/test-config.ts

@@ -1,6 +1,6 @@
+import { ADMIN_API_PATH, SHOP_API_PATH } from '@vendure/common/shared-constants';
 import path from 'path';
 
-import { ADMIN_API_PATH, SHOP_API_PATH } from '../../../../shared/shared-constants';
 import { DefaultAssetNamingStrategy } from '../../src/config/asset-naming-strategy/default-asset-naming-strategy';
 import { VendureConfig } from '../../src/config/vendure-config';
 

packages/core/e2e/country.e2e-spec.ts

@@ -1,3 +1,11 @@
+import {
+    CreateCountry,
+    DeletionResult,
+    GetCountry,
+    GetCountryList,
+    LanguageCode,
+    UpdateCountry,
+} from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -7,14 +15,6 @@ import {
     GET_COUNTRY_LIST,
     UPDATE_COUNTRY,
 } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
-import {
-    CreateCountry,
-    DeletionResult,
-    GetCountry,
-    GetCountryList,
-    LanguageCode,
-    UpdateCountry,
-} from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/customer.e2e-spec.ts

@@ -1,3 +1,12 @@
+import {
+    CreateCustomerAddress,
+    DeletionResult,
+    GetCustomer,
+    GetCustomerList,
+    UpdateCustomer,
+    UpdateCustomerAddress,
+} from '@vendure/common/generated-types';
+import { omit } from '@vendure/common/omit';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -8,15 +17,6 @@ import {
     UPDATE_CUSTOMER,
     UPDATE_CUSTOMER_ADDRESS,
 } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
-import {
-    CreateCustomerAddress,
-    DeletionResult,
-    GetCustomer,
-    GetCustomerList,
-    UpdateCustomer,
-    UpdateCustomerAddress,
-} from '../../../shared/generated-types';
-import { omit } from '../../../shared/omit';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient, TestShopClient } from './test-client';

packages/core/e2e/default-search-plugin.e2e-spec.ts

@@ -1,12 +1,3 @@
-import gql from 'graphql-tag';
-import path from 'path';
-
-import {
-    CREATE_COLLECTION,
-    UPDATE_COLLECTION,
-} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
-import { SEARCH_PRODUCTS, UPDATE_PRODUCT } from '../../../admin-ui/src/app/data/definitions/product-definitions';
-import { UPDATE_TAX_RATE } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import {
     ConfigArgType,
     CreateCollection,
@@ -16,7 +7,16 @@ import {
     UpdateCollection,
     UpdateProduct,
     UpdateTaxRate,
-} from '../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+import gql from 'graphql-tag';
+import path from 'path';
+
+import {
+    CREATE_COLLECTION,
+    UPDATE_COLLECTION,
+} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
+import { SEARCH_PRODUCTS, UPDATE_PRODUCT } from '../../../admin-ui/src/app/data/definitions/product-definitions';
+import { UPDATE_TAX_RATE } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import { SimpleGraphQLClient } from '../mock-data/simple-graphql-client';
 import { facetValueCollectionFilter } from '../src/config/collection/default-collection-filters';
 import { DefaultSearchPlugin } from '../src/plugin/default-search-plugin/default-search-plugin';

packages/core/e2e/entity-id-strategy.e2e-spec.ts

@@ -1,8 +1,8 @@
+import { CreateFacet, LanguageCode } from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
 import { CREATE_FACET } from '../../../admin-ui/src/app/data/definitions/facet-definitions';
-import { CreateFacet, LanguageCode } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestShopClient } from './test-client';

packages/core/e2e/facet.e2e-spec.ts

@@ -1,3 +1,18 @@
+import {
+    CreateFacet,
+    CreateFacetValues,
+    DeletionResult,
+    FacetWithValues,
+    GetFacetList,
+    GetFacetWithValues,
+    GetProductList,
+    GetProductWithVariants,
+    LanguageCode,
+    UpdateFacet,
+    UpdateFacetValues,
+    UpdateProduct,
+    UpdateProductVariants,
+} from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -15,21 +30,6 @@ import {
     UPDATE_PRODUCT,
     UPDATE_PRODUCT_VARIANTS,
 } from '../../../admin-ui/src/app/data/definitions/product-definitions';
-import {
-    CreateFacet,
-    CreateFacetValues,
-    DeletionResult,
-    FacetWithValues,
-    GetFacetList,
-    GetFacetWithValues,
-    GetProductList,
-    GetProductWithVariants,
-    LanguageCode,
-    UpdateFacet,
-    UpdateFacetValues,
-    UpdateProduct,
-    UpdateProductVariants,
-} from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/fixtures/e2e-initial-data.ts

@@ -1,4 +1,5 @@
-import { LanguageCode } from '../../../../shared/generated-types';
+import { LanguageCode } from '@vendure/common/generated-types';
+
 import { InitialData } from '../../src/data-import';
 
 export const initialData: InitialData = {

packages/core/e2e/fixtures/test-plugins.ts

@@ -1,7 +1,7 @@
 import { Query, Resolver } from '@nestjs/graphql';
+import { LanguageCode } from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 
-import { LanguageCode } from '../../../../shared/generated-types';
 import { APIExtensionDefinition, InjectorFn, VendureConfig, VendurePlugin } from '../../src/config';
 import { ConfigService } from '../../src/config/config.service';
 

packages/core/e2e/order.e2e-spec.ts

@@ -1,10 +1,10 @@
 /* tslint:disable:no-non-null-assertion */
+import { GetCustomerList, GetOrder, GetOrderList } from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
 import { GET_CUSTOMER_LIST } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
 import { GET_ORDER, GET_ORDERS_LIST } from '../../../admin-ui/src/app/data/definitions/order-definitions';
-import { GetCustomerList, GetOrder, GetOrderList } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient, TestShopClient } from './test-client';

packages/core/e2e/plugin.e2e-spec.ts

@@ -1,7 +1,7 @@
+import { LanguageCode } from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
-import { LanguageCode } from '../../../shared/generated-types';
 import { ConfigService } from '../src/config/config.service';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/product.e2e-spec.ts

@@ -1,17 +1,3 @@
-import gql from 'graphql-tag';
-import path from 'path';
-
-import {
-    ADD_OPTION_GROUP_TO_PRODUCT,
-    CREATE_PRODUCT,
-    GENERATE_PRODUCT_VARIANTS,
-    GET_ASSET_LIST,
-    GET_PRODUCT_LIST,
-    GET_PRODUCT_WITH_VARIANTS,
-    REMOVE_OPTION_GROUP_FROM_PRODUCT,
-    UPDATE_PRODUCT,
-    UPDATE_PRODUCT_VARIANTS,
-} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     AddOptionGroupToProduct,
     CreateProduct,
@@ -26,8 +12,22 @@ import {
     SortOrder,
     UpdateProduct,
     UpdateProductVariants,
-} from '../../../shared/generated-types';
-import { omit } from '../../../shared/omit';
+} from '@vendure/common/generated-types';
+import { omit } from '@vendure/common/omit';
+import gql from 'graphql-tag';
+import path from 'path';
+
+import {
+    ADD_OPTION_GROUP_TO_PRODUCT,
+    CREATE_PRODUCT,
+    GENERATE_PRODUCT_VARIANTS,
+    GET_ASSET_LIST,
+    GET_PRODUCT_LIST,
+    GET_PRODUCT_WITH_VARIANTS,
+    REMOVE_OPTION_GROUP_FROM_PRODUCT,
+    UPDATE_PRODUCT,
+    UPDATE_PRODUCT_VARIANTS,
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/promotion.e2e-spec.ts

@@ -1,3 +1,14 @@
+import {
+    ConfigArgType,
+    CreatePromotion,
+    DeletionResult,
+    GetAdjustmentOperations,
+    GetPromotion,
+    GetPromotionList,
+    Promotion,
+    UpdatePromotion,
+} from '@vendure/common/generated-types';
+import { pick } from '@vendure/common/pick';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -8,17 +19,6 @@ import {
     GET_PROMOTION_LIST,
     UPDATE_PROMOTION,
 } from '../../../admin-ui/src/app/data/definitions/promotion-definitions';
-import {
-    ConfigArgType,
-    CreatePromotion,
-    DeletionResult,
-    GetAdjustmentOperations,
-    GetPromotion,
-    GetPromotionList,
-    Promotion,
-    UpdatePromotion,
-} from '../../../shared/generated-types';
-import { pick } from '../../../shared/pick';
 import { PromotionAction, PromotionOrderAction } from '../src/config/promotion/promotion-action';
 import { PromotionCondition } from '../src/config/promotion/promotion-condition';
 

packages/core/e2e/role.e2e-spec.ts

@@ -1,3 +1,6 @@
+import { CreateRole, GetRole, GetRoles, Permission, Role, UpdateRole } from '@vendure/common/generated-types';
+import { omit } from '@vendure/common/omit';
+import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from '@vendure/common/shared-constants';
 import path from 'path';
 
 import {
@@ -6,9 +9,6 @@ import {
     GET_ROLES,
     UPDATE_ROLE,
 } from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
-import { CreateRole, GetRole, GetRoles, Permission, Role, UpdateRole } from '../../../shared/generated-types';
-import { omit } from '../../../shared/omit';
-import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from '../../../shared/shared-constants';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/e2e/shop-auth.e2e-spec.ts

@@ -1,4 +1,6 @@
 /* tslint:disable:no-non-null-assertion */
+import { RegisterCustomerInput } from '@vendure/common/generated-shop-types';
+import { CreateAdministrator, CreateRole, GetCustomer, Permission } from '@vendure/common/generated-types';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -8,8 +10,6 @@ import {
     CREATE_ROLE,
 } from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
 import { GET_CUSTOMER } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
-import { RegisterCustomerInput } from '../../../shared/generated-shop-types';
-import { CreateAdministrator, CreateRole, GetCustomer, Permission } from '../../../shared/generated-types';
 import { NoopEmailGenerator } from '../src/config/email/noop-email-generator';
 import { defaultEmailTypes } from '../src/email/default-email-types';
 

packages/core/e2e/shop-customer.e2e-spec.ts

@@ -1,4 +1,10 @@
 /* tslint:disable:no-non-null-assertion */
+import {
+    CreateAddressInput,
+    UpdateAddressInput,
+    UpdateCustomerInput,
+} from '@vendure/common/generated-shop-types';
+import { AttemptLogin, GetCustomer } from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -7,12 +13,6 @@ import {
     CUSTOMER_FRAGMENT,
     GET_CUSTOMER,
 } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
-import {
-    CreateAddressInput,
-    UpdateAddressInput,
-    UpdateCustomerInput,
-} from '../../../shared/generated-shop-types';
-import { AttemptLogin, GetCustomer } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient, TestShopClient } from './test-client';

packages/core/e2e/shop-order.e2e-spec.ts

@@ -1,4 +1,11 @@
 /* tslint:disable:no-non-null-assertion */
+import {
+    CreateAddressInput,
+    GetCountryList,
+    GetCustomer,
+    GetCustomerList,
+    UpdateCountry,
+} from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -10,13 +17,6 @@ import {
     GET_COUNTRY_LIST,
     UPDATE_COUNTRY,
 } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
-import {
-    CreateAddressInput,
-    GetCountryList,
-    GetCustomer,
-    GetCustomerList,
-    UpdateCountry,
-} from '../../../shared/generated-types';
 import { PaymentMethodHandler } from '../src/config/payment-method/payment-method-handler';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/test-server.ts

@@ -1,11 +1,11 @@
 import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
+import { Omit } from '@vendure/common/omit';
 import fs from 'fs';
 import path from 'path';
 import { ConnectionOptions } from 'typeorm';
 import { SqljsConnectionOptions } from 'typeorm/driver/sqljs/SqljsConnectionOptions';
 
-import { Omit } from '../../../shared/omit';
 import { populate, PopulateOptions } from '../mock-data/populate';
 import { preBootstrapConfig, runPluginOnBootstrapMethods } from '../src/bootstrap';
 import { Mutable } from '../src/common/types/common-types';

packages/core/e2e/zone.e2e-spec.ts

@@ -1,3 +1,12 @@
+import {
+    AddMembersToZone,
+    CreateZone,
+    DeletionResult,
+    GetCountryList,
+    GetZone,
+    RemoveMembersFromZone,
+    UpdateZone,
+} from '@vendure/common/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 
@@ -9,15 +18,6 @@ import {
     REMOVE_MEMBERS_FROM_ZONE,
     UPDATE_ZONE,
 } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
-import {
-    AddMembersToZone,
-    CreateZone,
-    DeletionResult,
-    GetCountryList,
-    GetZone,
-    RemoveMembersFromZone,
-    UpdateZone,
-} from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestAdminClient } from './test-client';

packages/core/jest.config.js

@@ -5,15 +5,11 @@ module.exports = {
         "json",
         "ts",
     ],
-    moduleNameMapper: {
-        "shared/(.*)": "<rootDir>/../../shared/$1.ts",
-    },
     preset: "ts-jest",
     rootDir: __dirname,
     roots: [
         "<rootDir>/src",
-        "<rootDir>/../../shared",
-        "<rootDir>../../mock-data",
+        "<rootDir>/mock-data",
     ],
     transform: {
         "^.+\\.(t|j)s$": "ts-jest",

packages/core/mock-data/data-sources/initial-data.ts

@@ -1,4 +1,5 @@
-import { LanguageCode } from '../../../../shared/generated-types';
+import { LanguageCode } from '@vendure/common/generated-types';
+
 import { InitialData } from '../../src/data-import';
 
 export const initialData: InitialData = {
@@ -73,7 +74,7 @@ export const initialData: InitialData = {
         { name: 'Congo (Democratic Republic of the)', code: 'CD', zone: 'Africa' },
         { name: 'Cook Islands', code: 'CK', zone: 'Oceania' },
         { name: 'Costa Rica', code: 'CR', zone: 'Americas' },
-        { name: "Côte d'Ivoire", code: 'CI', zone: 'Africa' },
+        { name: 'Côte d\'Ivoire', code: 'CI', zone: 'Africa' },
         { name: 'Croatia', code: 'HR', zone: 'Europe' },
         { name: 'Cuba', code: 'CU', zone: 'Americas' },
         { name: 'Curaçao', code: 'CW', zone: 'Americas' },
@@ -137,11 +138,11 @@ export const initialData: InitialData = {
         { name: 'Kazakhstan', code: 'KZ', zone: 'Asia' },
         { name: 'Kenya', code: 'KE', zone: 'Africa' },
         { name: 'Kiribati', code: 'KI', zone: 'Oceania' },
-        { name: "Korea (Democratic People's Republic of)", code: 'KP', zone: 'Asia' },
+        { name: 'Korea (Democratic People\'s Republic of)', code: 'KP', zone: 'Asia' },
         { name: 'Korea (Republic of)', code: 'KR', zone: 'Asia' },
         { name: 'Kuwait', code: 'KW', zone: 'Asia' },
         { name: 'Kyrgyzstan', code: 'KG', zone: 'Asia' },
-        { name: "Lao People's Democratic Republic", code: 'LA', zone: 'Asia' },
+        { name: 'Lao People\'s Democratic Republic', code: 'LA', zone: 'Asia' },
         { name: 'Latvia', code: 'LV', zone: 'Europe' },
         { name: 'Lebanon', code: 'LB', zone: 'Asia' },
         { name: 'Lesotho', code: 'LS', zone: 'Africa' },

packages/core/mock-data/get-default-channel-token.ts

@@ -1,6 +1,6 @@
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/shared-constants';
 import { ConnectionOptions, getConnection } from 'typeorm';
 
-import { DEFAULT_CHANNEL_CODE } from '../../../shared/shared-constants';
 import { Channel } from '../src/entity/channel/channel.entity';
 
 // tslint:disable:no-console

packages/core/mock-data/mock-data.service.ts

@@ -1,8 +1,3 @@
-import faker from 'faker/locale/en_GB';
-import gql from 'graphql-tag';
-
-import { CREATE_CHANNEL } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
-import { CREATE_SHIPPING_METHOD } from '../../../admin-ui/src/app/data/definitions/shipping-definitions';
 import {
     Channel,
     CreateAddressInput,
@@ -12,7 +7,12 @@ import {
     CurrencyCode,
     LanguageCode,
     ProductVariant,
-} from '../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+import faker from 'faker/locale/en_GB';
+import gql from 'graphql-tag';
+
+import { CREATE_CHANNEL } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
+import { CREATE_SHIPPING_METHOD } from '../../../admin-ui/src/app/data/definitions/shipping-definitions';
 import { defaultShippingCalculator } from '../src/config/shipping-method/default-shipping-calculator';
 import { defaultShippingEligibilityChecker } from '../src/config/shipping-method/default-shipping-eligibility-checker';
 import { Customer } from '../src/entity/customer/customer.entity';

packages/core/mock-data/populate.ts

@@ -1,9 +1,9 @@
 /* tslint:disable:no-console */
 import { INestApplication } from '@nestjs/common';
+import { LanguageCode } from '@vendure/common/generated-types';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { LanguageCode } from '../../../shared/generated-types';
 import { VendureBootstrapFunction } from '../src/bootstrap';
 import { setConfig } from '../src/config/config-helpers';
 import { VendureConfig } from '../src/config/vendure-config';

packages/core/mock-data/simple-graphql-client.ts

@@ -1,3 +1,5 @@
+import { CreateAssets, ImportInfo } from '@vendure/common/generated-types';
+import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '@vendure/common/shared-constants';
 import { DocumentNode } from 'graphql';
 import { GraphQLClient } from 'graphql-request';
 import gql from 'graphql-tag';
@@ -5,8 +7,6 @@ import { print } from 'graphql/language/printer';
 import { Curl } from 'node-libcurl';
 
 import { CREATE_ASSETS } from '../../../admin-ui/src/app/data/definitions/product-definitions';
-import { CreateAssets, ImportInfo } from '../../../shared/generated-types';
-import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '../../../shared/shared-constants';
 import { getConfig } from '../src/config/config-helpers';
 
 import { createUploadPostData } from './create-upload-post-data';

packages/core/package.json

@@ -24,8 +24,8 @@
     "build": "rimraf dist && tsc -p ./build/tsconfig.build.json && tsc -p ./build/tsconfig.cli.json && gulp -f ./build/gulpfile.ts build",
     "publish:alpha": "yarn build && npm publish --access public --tag alpha"
   },
-  "main": "dist/server/src/index.js",
-  "types": "dist/server/src/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
     "vendure": "dist/cli/vendure-cli.js"
   },
@@ -40,6 +40,7 @@
     "@nestjs/testing": "^6.0.2",
     "@nestjs/typeorm": "^6.0.0",
     "@types/progress": "^2.0.3",
+    "@vendure/common": "^1.0.0",
     "apollo-server-express": "^2.4.0",
     "bcrypt": "^3.0.3",
     "body-parser": "^1.18.3",

packages/core/src/api/common/id-codec.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-
 import {
     ConfigArgType,
     ConfigurableOperation,
     ConfigurableOperationInput,
-} from '../../../../../shared/generated-types';
-import { ID } from '../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { ID } from '@vendure/common/shared-types';
+
 import { ConfigService } from '../../config/config.service';
 
 import { IdCodec } from './id-codec';

packages/core/src/api/common/id-codec.ts

@@ -1,4 +1,4 @@
-import { ID } from '../../../../../shared/shared-types';
+import { ID } from '@vendure/common/shared-types';
 
 import { EntityIdStrategy } from '../../config/entity-id-strategy/entity-id-strategy';
 import { VendureEntity } from '../../entity/base/base.entity';

packages/core/src/api/common/request-context.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
+import { LanguageCode, Permission } from '@vendure/common/generated-types';
 import { Request } from 'express';
 
-import { LanguageCode, Permission } from '../../../../../shared/generated-types';
 import { idsAreEqual } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { Channel } from '../../entity/channel/channel.entity';

packages/core/src/api/common/request-context.ts

@@ -1,7 +1,7 @@
+import { LanguageCode } from '@vendure/common/generated-types';
+import { ID } from '@vendure/common/shared-types';
 import i18next from 'i18next';
 
-import { LanguageCode } from '../../../../../shared/generated-types';
-import { ID } from '../../../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { Channel } from '../../entity/channel/channel.entity';
 import { AuthenticatedSession } from '../../entity/session/authenticated-session.entity';

packages/core/src/api/config/generate-list-options.spec.ts

@@ -1,6 +1,6 @@
 import { buildSchema, printType } from 'graphql';
 
-import { CustomFields } from '../../../../../shared/shared-types';
+import { CustomFields } from '@vendure/common/shared-types';
 
 import { generateListOptions } from './generate-list-options';
 // tslint:disable:no-non-null-assertion

packages/core/src/api/config/graphql-custom-fields.spec.ts

@@ -1,6 +1,6 @@
 import { printSchema } from 'graphql';
 
-import { CustomFields } from '../../../../../shared/shared-types';
+import { CustomFields } from '@vendure/common/shared-types';
 
 import { addGraphQLCustomFields } from './graphql-custom-fields';
 

packages/core/src/api/config/graphql-custom-fields.ts

@@ -1,7 +1,7 @@
 import { buildSchema, extendSchema, GraphQLSchema, parse } from 'graphql';
 
-import { CustomFieldConfig, CustomFields, CustomFieldType } from '../../../../../shared/shared-types';
-import { assertNever } from '../../../../../shared/shared-utils';
+import { CustomFieldConfig, CustomFields, CustomFieldType } from '@vendure/common/shared-types';
+import { assertNever } from '@vendure/common/shared-utils';
 
 /**
  * Given a CustomFields config object, generates an SDL string extending the built-in

packages/core/src/api/decorators/allow.decorator.ts

@@ -1,6 +1,6 @@
 import { SetMetadata } from '@nestjs/common';
 
-import { Permission } from '../../../../../shared/generated-types';
+import { Permission } from '@vendure/common/generated-types';
 
 export const PERMISSIONS_METADATA_KEY = '__permissions__';
 

packages/core/src/api/middleware/asset-interceptor.ts

@@ -1,9 +1,9 @@
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
+import { Type } from '@vendure/common/shared-types';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { Type } from '../../../../../shared/shared-types';
 import { AssetStorageStrategy } from '../../config/asset-storage-strategy/asset-storage-strategy';
 import { ConfigService } from '../../config/config.service';
 import { Asset } from '../../entity/asset/asset.entity';

packages/core/src/api/middleware/auth-guard.ts

@@ -1,9 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { GqlExecutionContext } from '@nestjs/graphql';
+import { Permission } from '@vendure/common/generated-types';
 import { Request, Response } from 'express';
 
-import { Permission } from '../../../../../shared/generated-types';
 import { ForbiddenError } from '../../common/error/errors';
 import { ConfigService } from '../../config/config.service';
 import { Session } from '../../entity/session/session.entity';

packages/core/src/api/resolvers/admin/administrator.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     AdministratorList,
     AdministratorQueryArgs,
@@ -8,8 +7,9 @@ import {
     CreateAdministratorMutationArgs,
     Permission,
     UpdateAdministratorMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Administrator } from '../../../entity/administrator/administrator.entity';
 import { AdministratorService } from '../../../service/services/administrator.service';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/asset.resolver.ts

@@ -1,12 +1,12 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     AssetQueryArgs,
     AssetsQueryArgs,
     CreateAssetsMutationArgs,
     Permission,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Asset } from '../../../entity/asset/asset.entity';
 import { AssetService } from '../../../service/services/asset.service';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/auth.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { LoginMutationArgs, LoginResult, Permission } from '@vendure/common/generated-types';
 import { Request, Response } from 'express';
 
-import { LoginMutationArgs, LoginResult, Permission } from '../../../../../../shared/generated-types';
 import { ConfigService } from '../../../config/config.service';
 import { AuthService } from '../../../service/services/auth.service';
 import { ChannelService } from '../../../service/services/channel.service';

packages/core/src/api/resolvers/admin/channel.resolver.ts

@@ -1,11 +1,11 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     ChannelQueryArgs,
     CreateChannelMutationArgs,
     Permission,
     UpdateChannelMutationArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { Channel } from '../../../entity/channel/channel.entity';
 import { ChannelService } from '../../../service/services/channel.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/collection.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CollectionQueryArgs,
     CollectionsQueryArgs,
@@ -8,8 +7,9 @@ import {
     MoveCollectionMutationArgs,
     Permission,
     UpdateCollectionMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Translated } from '../../../common/types/locale-types';
 import { Collection } from '../../../entity/collection/collection.entity';
 import { CollectionService } from '../../../service/services/collection.service';
@@ -101,5 +101,5 @@ export class CollectionResolver {
             this.idCodecService.encodeConfigurableOperation(collection.filters);
         }
         return collection;
-    };
+    }
 }

packages/core/src/api/resolvers/admin/country.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CountriesQueryArgs,
     CountryQueryArgs,
@@ -8,8 +7,9 @@ import {
     DeletionResponse,
     Permission,
     UpdateCountryMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Translated } from '../../../common/types/locale-types';
 import { Country } from '../../../entity/country/country.entity';
 import { CountryService } from '../../../service/services/country.service';

packages/core/src/api/resolvers/admin/customer-group.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     AddCustomersToGroupMutationArgs,
     CreateCustomerGroupMutationArgs,
@@ -7,7 +6,8 @@ import {
     Permission,
     RemoveCustomersFromGroupMutationArgs,
     UpdateCustomerGroupMutationArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { CustomerGroup } from '../../../entity/customer-group/customer-group.entity';
 import { CustomerGroupService } from '../../../service/services/customer-group.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/customer.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateCustomerAddressMutationArgs,
     CreateCustomerMutationArgs,
@@ -11,8 +10,9 @@ import {
     Permission,
     UpdateCustomerAddressMutationArgs,
     UpdateCustomerMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Address } from '../../../entity/address/address.entity';
 import { Customer } from '../../../entity/customer/customer.entity';
 import { CustomerService } from '../../../service/services/customer.service';

packages/core/src/api/resolvers/admin/facet.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateFacetMutationArgs,
     CreateFacetValuesMutationArgs,
@@ -11,8 +10,9 @@ import {
     Permission,
     UpdateFacetMutationArgs,
     UpdateFacetValuesMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { DEFAULT_LANGUAGE_CODE } from '../../../common/constants';
 import { EntityNotFoundError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';

packages/core/src/api/resolvers/admin/global-settings.resolver.ts

@@ -1,6 +1,6 @@
 import { Args, Mutation, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+import { Permission, UpdateGlobalSettingsMutationArgs } from '@vendure/common/generated-types';
 
-import { Permission, UpdateGlobalSettingsMutationArgs } from '../../../../../../shared/generated-types';
 import { VendureConfig } from '../../../config';
 import { ConfigService } from '../../../config/config.service';
 import { GlobalSettingsService } from '../../../service/services/global-settings.service';

packages/core/src/api/resolvers/admin/import.resolver.ts

@@ -1,6 +1,6 @@
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { ImportInfo, ImportProductsMutationArgs, Permission } from '@vendure/common/generated-types';
 
-import { ImportInfo, ImportProductsMutationArgs, Permission } from '../../../../../../shared/generated-types';
 import { Importer } from '../../../data-import/providers/importer/importer';
 import { RequestContext } from '../../common/request-context';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/order.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Query, Resolver } from '@nestjs/graphql';
+import { OrderQueryArgs, OrdersQueryArgs, Permission } from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
 
-import { OrderQueryArgs, OrdersQueryArgs, Permission } from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
 import { Order } from '../../../entity/order/order.entity';
 import { OrderService } from '../../../service/services/order.service';
 import { ShippingMethodService } from '../../../service/services/shipping-method.service';

packages/core/src/api/resolvers/admin/payment-method.resolver.ts

@@ -1,12 +1,12 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     PaymentMethodQueryArgs,
     PaymentMethodsQueryArgs,
     Permission,
     UpdatePaymentMethodMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { PaymentMethod } from '../../../entity/payment-method/payment-method.entity';
 import { PaymentMethodService } from '../../../service/services/payment-method.service';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/product-option.resolver.ts

@@ -1,12 +1,12 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateProductOptionGroupMutationArgs,
     Permission,
     ProductOptionGroupQueryArgs,
     ProductOptionGroupsQueryArgs,
     UpdateProductOptionGroupMutationArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { Translated } from '../../../common/types/locale-types';
 import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';
 import { ProductOptionGroupService } from '../../../service/services/product-option-group.service';

packages/core/src/api/resolvers/admin/product.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     AddOptionGroupToProductMutationArgs,
     CreateProductMutationArgs,
@@ -12,8 +11,9 @@ import {
     RemoveOptionGroupFromProductMutationArgs,
     UpdateProductMutationArgs,
     UpdateProductVariantsMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Translated } from '../../../common/types/locale-types';
 import { assertFound } from '../../../common/utils';
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';

packages/core/src/api/resolvers/admin/promotion.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreatePromotionMutationArgs,
     DeletePromotionMutationArgs,
@@ -8,8 +7,9 @@ import {
     PromotionQueryArgs,
     PromotionsQueryArgs,
     UpdatePromotionMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Promotion } from '../../../entity/promotion/promotion.entity';
 import { PromotionService } from '../../../service/services/promotion.service';
 import { IdCodecService } from '../../common/id-codec.service';
@@ -83,5 +83,5 @@ export class PromotionResolver {
             this.idCodecService.encodeConfigurableOperation(collection.actions);
         }
         return collection;
-    };
+    }
 }

packages/core/src/api/resolvers/admin/role.resolver.ts

@@ -1,13 +1,13 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateRoleMutationArgs,
     Permission,
     RoleQueryArgs,
     RolesQueryArgs,
     UpdateRoleMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { Role } from '../../../entity/role/role.entity';
 import { RoleService } from '../../../service/services/role.service';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/search.resolver.ts

@@ -1,7 +1,7 @@
 import { Mutation, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+import { Permission, SearchResponse } from '@vendure/common/generated-types';
+import { Omit } from '@vendure/common/omit';
 
-import { Permission, SearchResponse } from '../../../../../../shared/generated-types';
-import { Omit } from '../../../../../../shared/omit';
 import { InternalServerError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';
 import { FacetValue } from '../../../entity';

packages/core/src/api/resolvers/admin/shipping-method.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     ConfigurableOperation,
     CreateShippingMethodMutationArgs,
@@ -7,8 +6,9 @@ import {
     ShippingMethodQueryArgs,
     ShippingMethodsQueryArgs,
     UpdateShippingMethodMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { ShippingMethod } from '../../../entity/shipping-method/shipping-method.entity';
 import { ShippingMethodService } from '../../../service/services/shipping-method.service';
 import { Allow } from '../../decorators/allow.decorator';

packages/core/src/api/resolvers/admin/tax-category.resolver.ts

@@ -1,11 +1,11 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateTaxCategoryMutationArgs,
     Permission,
     TaxCategoryQueryArgs,
     UpdateTaxCategoryMutationArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { TaxCategory } from '../../../entity/tax-category/tax-category.entity';
 import { TaxCategoryService } from '../../../service/services/tax-category.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/tax-rate.resolver.ts

@@ -1,13 +1,13 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CreateTaxRateMutationArgs,
     Permission,
     TaxRateQueryArgs,
     TaxRatesQueryArgs,
     UpdateTaxRateMutationArgs,
-} from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { TaxRate } from '../../../entity/tax-rate/tax-rate.entity';
 import { TaxRateService } from '../../../service/services/tax-rate.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/zone.resolver.ts

@@ -1,5 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
 import {
     AddMembersToZoneMutationArgs,
     CreateZoneMutationArgs,
@@ -9,7 +8,8 @@ import {
     RemoveMembersFromZoneMutationArgs,
     UpdateZoneMutationArgs,
     ZoneQueryArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { Zone } from '../../../entity/zone/zone.entity';
 import { ZoneService } from '../../../service/services/zone.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/base/base-auth.resolver.ts

@@ -1,6 +1,6 @@
+import { LoginMutationArgs, LoginResult } from '@vendure/common/generated-types';
 import { Request, Response } from 'express';
 
-import { LoginMutationArgs, LoginResult } from '../../../../../../shared/generated-types';
 import { InternalServerError } from '../../../common/error/errors';
 import { ConfigService } from '../../../config/config.service';
 import { User } from '../../../entity/user/user.entity';

packages/core/src/api/resolvers/entity/collection-entity.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Parent, ResolveProperty, Resolver } from '@nestjs/graphql';
+import { CollectionBreadcrumb, ProductVariantListOptions } from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
 
-import { CollectionBreadcrumb, ProductVariantListOptions } from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
 import { Translated } from '../../../common/types/locale-types';
 import { Collection, ProductVariant } from '../../../entity';
 import { CollectionService } from '../../../service/services/collection.service';

packages/core/src/api/resolvers/entity/customer-entity.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Parent, ResolveProperty, Resolver } from '@nestjs/graphql';
+import { OrdersCustomerArgs } from '@vendure/common/generated-types';
+import { PaginatedList } from '@vendure/common/shared-types';
 
-import { OrdersCustomerArgs } from '../../../../../../shared/generated-types';
-import { PaginatedList } from '../../../../../../shared/shared-types';
 import { Address } from '../../../entity/address/address.entity';
 import { Customer } from '../../../entity/customer/customer.entity';
 import { Order } from '../../../entity/order/order.entity';

packages/core/src/api/resolvers/entity/product-option-group-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { ResolveProperty, Resolver } from '@nestjs/graphql';
+import { Permission } from '@vendure/common/generated-types';
 
-import { Permission } from '../../../../../../shared/generated-types';
 import { Translated } from '../../../common/types/locale-types';
 import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';
 import { ProductOption } from '../../../entity/product-option/product-option.entity';

packages/core/src/api/resolvers/shop/shop-auth.resolver.ts

@@ -1,6 +1,4 @@
 import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql';
-import { Request, Response } from 'express';
-
 import {
     LoginMutationArgs,
     LoginResult,
@@ -11,7 +9,9 @@ import {
     ResetPasswordMutationArgs,
     UpdateCustomerPasswordMutationArgs,
     VerifyCustomerAccountMutationArgs,
-} from '../../../../../shared/generated-shop-types';
+} from '@vendure/common/generated-shop-types';
+import { Request, Response } from 'express';
+
 import { PasswordResetTokenError, VerificationTokenError } from '../../../common/error/errors';
 import { ConfigService } from '../../../config/config.service';
 import { AuthService } from '../../../service/services/auth.service';

packages/core/src/api/resolvers/shop/shop-customer.resolver.ts

@@ -1,12 +1,12 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-
-import { DeleteCustomerAddressMutationArgs } from '../../../../../shared/generated-shop-types';
+import { DeleteCustomerAddressMutationArgs } from '@vendure/common/generated-shop-types';
 import {
     CreateCustomerAddressMutationArgs,
     Permission,
     UpdateCustomerAddressMutationArgs,
     UpdateCustomerMutationArgs,
-} from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-types';
+
 import { ForbiddenError, InternalServerError } from '../../../common/error/errors';
 import { idsAreEqual } from '../../../common/utils';
 import { Address, Customer } from '../../../entity';

packages/core/src/api/resolvers/shop/shop-order.resolver.ts

@@ -1,6 +1,4 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import ms from 'ms';
-
 import {
     AddItemToOrderMutationArgs,
     AddPaymentToOrderMutationArgs,
@@ -14,8 +12,10 @@ import {
     SetOrderShippingMethodMutationArgs,
     ShippingMethodQuote,
     TransitionOrderToStateMutationArgs,
-} from '../../../../../shared/generated-shop-types';
-import { CountriesQueryArgs } from '../../../../../../shared/generated-types';
+} from '@vendure/common/generated-shop-types';
+import { CountriesQueryArgs } from '@vendure/common/generated-types';
+import ms from 'ms';
+
 import { ForbiddenError, InternalServerError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';
 import { idsAreEqual } from '../../../common/utils';

packages/core/src/api/resolvers/shop/shop-products.resolver.ts

@@ -1,14 +1,14 @@
 import { Args, Query, Resolver } from '@nestjs/graphql';
-
 import {
     CollectionQueryArgs,
     CollectionsQueryArgs,
     ProductQueryArgs,
     SearchResponse,
-} from '../../../../../shared/generated-shop-types';
-import { ProductsQueryArgs } from '../../../../../shared/generated-shop-types';
-import { Omit } from '../../../../../../shared/omit';
-import { PaginatedList } from '../../../../../../shared/shared-types';
+} from '@vendure/common/generated-shop-types';
+import { ProductsQueryArgs } from '@vendure/common/generated-shop-types';
+import { Omit } from '@vendure/common/omit';
+import { PaginatedList } from '@vendure/common/shared-types';
+
 import { InternalServerError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';
 import { Collection } from '../../../entity/collection/collection.entity';

packages/core/src/bootstrap.ts

@@ -2,7 +2,7 @@ import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import { EntitySubscriberInterface } from 'typeorm';
 
-import { Type } from '../../../shared/shared-types';
+import { Type } from '@vendure/common/shared-types';
 
 import { InternalServerError } from './common/error/errors';
 import { ReadOnlyRequired } from './common/types/common-types';

packages/core/src/common/configurable-operation.ts

@@ -1,5 +1,5 @@
 // prettier-ignore
-import { ConfigArg, ConfigArgType, ConfigurableOperation } from '../../../../shared/generated-types';
+import { ConfigArg, ConfigArgType, ConfigurableOperation } from '@vendure/common/generated-types';
 
 import { InternalServerError } from './error/errors';
 

packages/core/src/common/constants.ts

@@ -1,3 +1,3 @@
-import { LanguageCode } from '../../../../shared/generated-types';
+import { LanguageCode } from '@vendure/common/generated-types';
 
 export const DEFAULT_LANGUAGE_CODE = LanguageCode.en;

packages/core/src/common/error/errors.ts

@@ -1,4 +1,4 @@
-import { ID } from '../../../../../shared/shared-types';
+import { ID } from '@vendure/common/shared-types';
 
 import { coreEntitiesMap } from '../../entity/entities';
 import { I18nError } from '../../i18n/i18n-error';

packages/core/src/common/types/adjustment-source.ts

@@ -1,4 +1,4 @@
-import { Adjustment, AdjustmentType } from '../../../../../shared/generated-types';
+import { Adjustment, AdjustmentType } from '@vendure/common/generated-types';
 
 import { VendureEntity } from '../../entity/base/base.entity';
 

packages/core/src/common/types/locale-types.ts

@@ -1,5 +1,5 @@
-import { LanguageCode } from '../../../../../shared/generated-types';
-import { CustomFieldsObject, ID } from '../../../../../shared/shared-types';
+import { LanguageCode } from '@vendure/common/generated-types';
+import { CustomFieldsObject, ID } from '@vendure/common/shared-types';
 
 import { TranslatableRelationsKeys } from '../../service/helpers/utils/translate-entity';
 

packages/core/src/common/utils.ts

@@ -1,5 +1,5 @@
-import { AssetType } from '../../../../shared/generated-types';
-import { ID } from '../../../../shared/shared-types';
+import { AssetType } from '@vendure/common/generated-types';
+import { ID } from '@vendure/common/shared-types';
 
 /**
  * Takes a predicate function and returns a negated version.