refactor: Properly compile the @vendure/common package

admin-ui/tsconfig.json

@@ -24,7 +24,7 @@
       "esnext.asynciterable"
     ],
     "paths": {
-      "shared/*": ["../packages/common/*"]
+      "shared/*": ["../packages/common/lib/*"]
     }
   }
 }

packages/common/.gitignore

@@ -0,0 +1 @@
+lib

packages/common/package.json

@@ -3,7 +3,15 @@
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
+  "scripts": {
+    "build": "rimraf dist && tsc -p ./tsconfig.build.json"
+  },
+  "files": ["./lib"],
   "dependencies": {
-    "@types/jest": "^24.0.11"
+    "@types/jest": "^24.0.11",
+    "typescript": "^3.3.4000"
+  },
+  "devDependencies": {
+    "rimraf": "^2.6.3"
   }
 }

packages/common/tsconfig.build.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./lib"
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts"
+  ]
+}

packages/common/yarn.lock

@@ -0,0 +1,99 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/jest-diff@*":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
+  integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
+
+"@types/jest@^24.0.11":
+  version "24.0.11"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.11.tgz#1f099bea332c228ea6505a88159bfa86a5858340"
+  integrity sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==
+  dependencies:
+    "@types/jest-diff" "*"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+rimraf@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+typescript@^3.3.4000:
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

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

@@ -4,7 +4,7 @@ import {
     GetAdministrator,
     GetAdministrators,
     UpdateAdministrator,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 import path from 'path';
 
 import {

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

@@ -5,8 +5,8 @@ import {
     LoginMutationArgs,
     Permission,
     UpdateProductMutationArgs,
-} from '@vendure/common/generated-types';
-import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '@vendure/common/shared-constants';
+} from '@vendure/common/lib/generated-types';
+import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '@vendure/common/lib/shared-constants';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 import path from 'path';

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

@@ -14,8 +14,8 @@ import {
     UpdateCollection,
     UpdateProduct,
     UpdateProductVariants,
-} from '@vendure/common/generated-types';
-import { ROOT_COLLECTION_NAME } from '@vendure/common/shared-constants';
+} from '@vendure/common/lib/generated-types';
+import { ROOT_COLLECTION_NAME } from '@vendure/common/lib/shared-constants';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

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

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

@@ -5,7 +5,7 @@ import {
     GetCountryList,
     LanguageCode,
     UpdateCountry,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,5 +1,5 @@
-import { CreateCustomerAddress, DeletionResult, GetCustomer, GetCustomerList, UpdateCustomer } from '@vendure/common/generated-types';
-import { omit } from '@vendure/common/omit';
+import { CreateCustomerAddress, DeletionResult, GetCustomer, GetCustomerList, UpdateCustomer } from '@vendure/common/lib/generated-types';
+import { omit } from '@vendure/common/lib/omit';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -7,7 +7,7 @@ import {
     UpdateCollection,
     UpdateProduct,
     UpdateTaxRate,
-} from '@vendure/common/generated-types';
+} from ''@vendure/common/lib/$1'generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,4 +1,4 @@
-import { CreateFacet, LanguageCode } from '@vendure/common/generated-types';
+import { CreateFacet, LanguageCode } from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -12,7 +12,7 @@ import {
     UpdateFacetValues,
     UpdateProduct,
     UpdateProductVariants,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,4 +1,4 @@
-import { LanguageCode } from '@vendure/common/generated-types';
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 
 import { InitialData } from '../../src/data-import';
 

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

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

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

@@ -1,5 +1,5 @@
 /* tslint:disable:no-non-null-assertion */
-import { GetCustomerList, GetOrder, GetOrderList } from '@vendure/common/generated-types';
+import { GetCustomerList, GetOrder, GetOrderList } from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,4 +1,4 @@
-import { LanguageCode } from '@vendure/common/generated-types';
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -12,8 +12,8 @@ import {
     SortOrder,
     UpdateProduct,
     UpdateProductVariants,
-} from '@vendure/common/generated-types';
-import { omit } from '@vendure/common/omit';
+} from '@vendure/common/lib/generated-types';
+import { omit } from '@vendure/common/lib/omit';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -7,8 +7,8 @@ import {
     GetPromotionList,
     Promotion,
     UpdatePromotion,
-} from '@vendure/common/generated-types';
-import { pick } from '@vendure/common/pick';
+} from '@vendure/common/lib/generated-types';
+import { pick } from '@vendure/common/lib/pick';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,6 +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 { CreateRole, GetRole, GetRoles, Permission, Role, UpdateRole } from '@vendure/common/lib/generated-types';
+import { omit } from '@vendure/common/lib/omit';
+import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from '@vendure/common/lib/shared-constants';
 import path from 'path';
 
 import { CREATE_ROLE, GET_ROLE, GET_ROLES, UPDATE_ROLE } from '../../../admin-ui/src/app/data/definitions/administrator-definitions';

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

@@ -1,6 +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 { RegisterCustomerInput } from '@vendure/common/lib/generated-shop-types';
+import { CreateAdministrator, CreateRole, GetCustomer, Permission } from '@vendure/common/lib/generated-types';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 import path from 'path';

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

@@ -1,6 +1,6 @@
 /* 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 { CreateAddressInput, UpdateAddressInput, UpdateCustomerInput } from '@vendure/common/lib/generated-shop-types';
+import { AttemptLogin, GetCustomer } from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,5 +1,5 @@
 /* tslint:disable:no-non-null-assertion */
-import { CreateAddressInput, GetCountryList, GetCustomer, GetCustomerList, UpdateCountry } from '@vendure/common/generated-types';
+import { CreateAddressInput, GetCountryList, GetCustomer, GetCustomerList, UpdateCountry } from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

packages/core/e2e/test-server.ts

@@ -1,6 +1,6 @@
 import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { Omit } from '@vendure/common/omit';
+import { Omit } from '@vendure/common/lib/omit';
 import fs from 'fs';
 import path from 'path';
 import { ConnectionOptions } from 'typeorm';

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

@@ -6,7 +6,7 @@ import {
     GetZone,
     RemoveMembersFromZone,
     UpdateZone,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 import gql from 'graphql-tag';
 import path from 'path';
 

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

@@ -1,4 +1,4 @@
-import { LanguageCode } from '@vendure/common/generated-types';
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 
 import { InitialData } from '../../src/data-import';
 

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

@@ -1,4 +1,4 @@
-import { DEFAULT_CHANNEL_CODE } from '@vendure/common/shared-constants';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { ConnectionOptions, getConnection } from 'typeorm';
 
 import { Channel } from '../src/entity/channel/channel.entity';

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

@@ -7,7 +7,7 @@ import {
     CurrencyCode,
     LanguageCode,
     ProductVariant,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 import faker from 'faker/locale/en_GB';
 import gql from 'graphql-tag';
 

packages/core/mock-data/populate-for-testing.ts

@@ -1,6 +1,6 @@
 /* tslint:disable:no-console */
 import { INestApplication } from '@nestjs/common';
-import { LanguageCode } from '@vendure/common/generated-types';
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 import fs from 'fs-extra';
 
 import { VendureBootstrapFunction } from '../src/bootstrap';

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

@@ -1,5 +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 { CreateAssets, ImportInfo } from '@vendure/common/lib/generated-types';
+import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '@vendure/common/lib/shared-constants';
 import { DocumentNode } from 'graphql';
 import { GraphQLClient } from 'graphql-request';
 import gql from 'graphql-tag';

packages/core/package.json

@@ -68,7 +68,6 @@
     "prompts": "^2.0.1",
     "reflect-metadata": "^0.1.12",
     "rxjs": "^6.3.3",
-    "sharp": "^0.21.1",
     "typeorm": "0.2.15",
     "typescript": "^3.2.4"
   },
@@ -94,7 +93,6 @@
     "@types/node": "^10.12.18",
     "@types/nodemailer": "^4.6.5",
     "@types/prompts": "^1.2.0",
-    "@types/sharp": "^0.21.0",
     "faker": "^4.1.0",
     "graphql-request": "^1.8.2",
     "gulp": "^4.0.0",

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

@@ -3,8 +3,8 @@ import {
     ConfigArgType,
     ConfigurableOperation,
     ConfigurableOperationInput,
-} from '@vendure/common/generated-types';
-import { ID } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { ID } from '@vendure/common/lib/shared-types';
 
 import { ConfigService } from '../../config/config.service';
 

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

@@ -1,4 +1,4 @@
-import { ID } from '@vendure/common/shared-types';
+import { ID } from '@vendure/common/lib/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,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { LanguageCode, Permission } from '@vendure/common/generated-types';
+import { LanguageCode, Permission } from '@vendure/common/lib/generated-types';
 import { Request } from 'express';
 
 import { idsAreEqual } from '../../common/utils';

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

@@ -1,5 +1,5 @@
-import { LanguageCode } from '@vendure/common/generated-types';
-import { ID } from '@vendure/common/shared-types';
+import { LanguageCode } from '@vendure/common/lib/generated-types';
+import { ID } from '@vendure/common/lib/shared-types';
 import i18next from 'i18next';
 
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';

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

@@ -1,6 +1,6 @@
 import { buildSchema, printType } from 'graphql';
 
-import { CustomFields } from '@vendure/common/shared-types';
+import { CustomFields } from '@vendure/common/lib/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 '@vendure/common/shared-types';
+import { CustomFields } from '@vendure/common/lib/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 '@vendure/common/shared-types';
-import { assertNever } from '@vendure/common/shared-utils';
+import { CustomFieldConfig, CustomFields, CustomFieldType } from '@vendure/common/lib/shared-types';
+import { assertNever } from '@vendure/common/lib/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 '@vendure/common/generated-types';
+import { Permission } from '@vendure/common/lib/generated-types';
 
 export const PERMISSIONS_METADATA_KEY = '__permissions__';
 

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

@@ -1,6 +1,6 @@
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
-import { Type } from '@vendure/common/shared-types';
+import { Type } from '@vendure/common/lib/shared-types';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 

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

@@ -1,7 +1,7 @@
 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 { Permission } from '@vendure/common/lib/generated-types';
 import { Request, Response } from 'express';
 
 import { ForbiddenError } from '../../common/error/errors';

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

@@ -7,8 +7,8 @@ import {
     CreateAdministratorMutationArgs,
     Permission,
     UpdateAdministratorMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Administrator } from '../../../entity/administrator/administrator.entity';
 import { AdministratorService } from '../../../service/services/administrator.service';

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

@@ -4,8 +4,8 @@ import {
     AssetsQueryArgs,
     CreateAssetsMutationArgs,
     Permission,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Asset } from '../../../entity/asset/asset.entity';
 import { AssetService } from '../../../service/services/asset.service';

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

@@ -1,5 +1,5 @@
 import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql';
-import { LoginMutationArgs, LoginResult, Permission } from '@vendure/common/generated-types';
+import { LoginMutationArgs, LoginResult, Permission } from '@vendure/common/lib/generated-types';
 import { Request, Response } from 'express';
 
 import { ConfigService } from '../../../config/config.service';

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

@@ -4,7 +4,7 @@ import {
     CreateChannelMutationArgs,
     Permission,
     UpdateChannelMutationArgs,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 
 import { Channel } from '../../../entity/channel/channel.entity';
 import { ChannelService } from '../../../service/services/channel.service';

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

@@ -7,8 +7,8 @@ import {
     MoveCollectionMutationArgs,
     Permission,
     UpdateCollectionMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Translated } from '../../../common/types/locale-types';
 import { Collection } from '../../../entity/collection/collection.entity';

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

@@ -7,8 +7,8 @@ import {
     DeletionResponse,
     Permission,
     UpdateCountryMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Translated } from '../../../common/types/locale-types';
 import { Country } from '../../../entity/country/country.entity';

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

@@ -6,7 +6,7 @@ import {
     Permission,
     RemoveCustomersFromGroupMutationArgs,
     UpdateCustomerGroupMutationArgs,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 
 import { CustomerGroup } from '../../../entity/customer-group/customer-group.entity';
 import { CustomerGroupService } from '../../../service/services/customer-group.service';

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

@@ -10,8 +10,8 @@ import {
     Permission,
     UpdateCustomerAddressMutationArgs,
     UpdateCustomerMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Address } from '../../../entity/address/address.entity';
 import { Customer } from '../../../entity/customer/customer.entity';

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

@@ -10,8 +10,8 @@ import {
     Permission,
     UpdateFacetMutationArgs,
     UpdateFacetValuesMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { DEFAULT_LANGUAGE_CODE } from '../../../common/constants';
 import { EntityNotFoundError } from '../../../common/error/errors';

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

@@ -1,5 +1,5 @@
 import { Args, Mutation, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
-import { Permission, UpdateGlobalSettingsMutationArgs } from '@vendure/common/generated-types';
+import { Permission, UpdateGlobalSettingsMutationArgs } from '@vendure/common/lib/generated-types';
 
 import { VendureConfig } from '../../../config';
 import { ConfigService } from '../../../config/config.service';

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

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

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

@@ -1,6 +1,6 @@
 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 '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Order } from '../../../entity/order/order.entity';
 import { OrderService } from '../../../service/services/order.service';

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

@@ -4,8 +4,8 @@ import {
     PaymentMethodsQueryArgs,
     Permission,
     UpdatePaymentMethodMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { PaymentMethod } from '../../../entity/payment-method/payment-method.entity';
 import { PaymentMethodService } from '../../../service/services/payment-method.service';

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

@@ -5,7 +5,7 @@ import {
     ProductOptionGroupQueryArgs,
     ProductOptionGroupsQueryArgs,
     UpdateProductOptionGroupMutationArgs,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 
 import { Translated } from '../../../common/types/locale-types';
 import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';

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

@@ -11,8 +11,8 @@ import {
     RemoveOptionGroupFromProductMutationArgs,
     UpdateProductMutationArgs,
     UpdateProductVariantsMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Translated } from '../../../common/types/locale-types';
 import { assertFound } from '../../../common/utils';

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

@@ -7,8 +7,8 @@ import {
     PromotionQueryArgs,
     PromotionsQueryArgs,
     UpdatePromotionMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Promotion } from '../../../entity/promotion/promotion.entity';
 import { PromotionService } from '../../../service/services/promotion.service';

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

@@ -5,8 +5,8 @@ import {
     RoleQueryArgs,
     RolesQueryArgs,
     UpdateRoleMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Role } from '../../../entity/role/role.entity';
 import { RoleService } from '../../../service/services/role.service';

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

@@ -1,6 +1,6 @@
 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 '@vendure/common/lib/generated-types';
+import { Omit } from '@vendure/common/lib/omit';
 
 import { InternalServerError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';

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

@@ -6,8 +6,8 @@ import {
     ShippingMethodQueryArgs,
     ShippingMethodsQueryArgs,
     UpdateShippingMethodMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { ShippingMethod } from '../../../entity/shipping-method/shipping-method.entity';
 import { ShippingMethodService } from '../../../service/services/shipping-method.service';

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

@@ -4,7 +4,7 @@ import {
     Permission,
     TaxCategoryQueryArgs,
     UpdateTaxCategoryMutationArgs,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 
 import { TaxCategory } from '../../../entity/tax-category/tax-category.entity';
 import { TaxCategoryService } from '../../../service/services/tax-category.service';

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

@@ -5,8 +5,8 @@ import {
     TaxRateQueryArgs,
     TaxRatesQueryArgs,
     UpdateTaxRateMutationArgs,
-} from '@vendure/common/generated-types';
-import { PaginatedList } from '@vendure/common/shared-types';
+} from '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { TaxRate } from '../../../entity/tax-rate/tax-rate.entity';
 import { TaxRateService } from '../../../service/services/tax-rate.service';

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

@@ -8,7 +8,7 @@ import {
     RemoveMembersFromZoneMutationArgs,
     UpdateZoneMutationArgs,
     ZoneQueryArgs,
-} from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-types';
 
 import { Zone } from '../../../entity/zone/zone.entity';
 import { ZoneService } from '../../../service/services/zone.service';

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

@@ -1,4 +1,4 @@
-import { LoginMutationArgs, LoginResult } from '@vendure/common/generated-types';
+import { LoginMutationArgs, LoginResult } from '@vendure/common/lib/generated-types';
 import { Request, Response } from 'express';
 
 import { InternalServerError } from '../../../common/error/errors';

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

@@ -1,6 +1,6 @@
 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 '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Translated } from '../../../common/types/locale-types';
 import { Collection, ProductVariant } from '../../../entity';

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

@@ -1,6 +1,6 @@
 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 '@vendure/common/lib/generated-types';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { Address } from '../../../entity/address/address.entity';
 import { Customer } from '../../../entity/customer/customer.entity';

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

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

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

@@ -9,7 +9,7 @@ import {
     ResetPasswordMutationArgs,
     UpdateCustomerPasswordMutationArgs,
     VerifyCustomerAccountMutationArgs,
-} from '@vendure/common/generated-shop-types';
+} from '@vendure/common/lib/generated-shop-types';
 import { Request, Response } from 'express';
 
 import { PasswordResetTokenError, VerificationTokenError } from '../../../common/error/errors';

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

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

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

@@ -12,8 +12,8 @@ import {
     SetOrderShippingMethodMutationArgs,
     ShippingMethodQuote,
     TransitionOrderToStateMutationArgs,
-} from '@vendure/common/generated-shop-types';
-import { CountriesQueryArgs } from '@vendure/common/generated-types';
+} from '@vendure/common/lib/generated-shop-types';
+import { CountriesQueryArgs } from '@vendure/common/lib/generated-types';
 import ms from 'ms';
 
 import { ForbiddenError, InternalServerError } from '../../../common/error/errors';

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

@@ -4,10 +4,10 @@ import {
     CollectionsQueryArgs,
     ProductQueryArgs,
     SearchResponse,
-} 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';
+} from '@vendure/common/lib/generated-shop-types';
+import { ProductsQueryArgs } from '@vendure/common/lib/generated-shop-types';
+import { Omit } from '@vendure/common/lib/omit';
+import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { InternalServerError } from '../../../common/error/errors';
 import { Translated } from '../../../common/types/locale-types';

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 '@vendure/common/shared-types';
+import { Type } from '@vendure/common/lib/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 '@vendure/common/generated-types';
+import { ConfigArg, ConfigArgType, ConfigurableOperation } from '@vendure/common/lib/generated-types';
 
 import { InternalServerError } from './error/errors';
 

packages/core/src/common/constants.ts

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

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

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

packages/core/src/common/index.ts

@@ -0,0 +1 @@
+export * from './utils';

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

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

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

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

packages/core/src/common/utils.ts

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

packages/core/src/config/asset-naming-strategy/default-asset-naming-strategy.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { normalizeString } from '@vendure/common/normalize-string';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
 
 import { AssetNamingStrategy } from './asset-naming-strategy';
 

packages/core/src/config/collection/collection-filter.ts

@@ -1,4 +1,4 @@
-import { ConfigArg, ConfigArgType } from '@vendure/common/generated-types';
+import { ConfigArg, ConfigArgType } from '@vendure/common/lib/generated-types';
 import { SelectQueryBuilder } from 'typeorm';
 
 import {

packages/core/src/config/collection/default-collection-filters.ts

@@ -1,6 +1,6 @@
 import { Brackets } from 'typeorm';
 
-import { ConfigArgType } from '@vendure/common/generated-types';
+import { ConfigArgType } from '@vendure/common/lib/generated-types';
 
 import { CollectionFilter } from './collection-filter';