Przeglądaj źródła

refactor(server): Remove ts path mapping for shared files

Relates to #44, see https://github.com/vendure-ecommerce/vendure/issues/44#issuecomment-444552271

Reverts the work done in #5 (on the server at least)
Michael Bromley 7 lat temu
rodzic
commit
61a2f947c1
100 zmienionych plików z 215 dodań i 214 usunięć
  1. 2 1
      server/dev-config.ts
  2. 1 1
      server/e2e/administrator.e2e-spec.ts
  3. 10 10
      server/e2e/auth.e2e-spec.ts
  4. 1 1
      server/e2e/config/test-config.ts
  5. 1 1
      server/e2e/order.e2e-spec.ts
  6. 10 10
      server/e2e/product-category.e2e-spec.ts
  7. 2 2
      server/e2e/product.e2e-spec.ts
  8. 2 2
      server/e2e/promotion.e2e-spec.ts
  9. 3 3
      server/e2e/role.e2e-spec.ts
  10. 1 1
      server/mock-data/get-default-channel-token.ts
  11. 19 19
      server/mock-data/mock-data.service.ts
  12. 1 1
      server/mock-data/populate.ts
  13. 2 2
      server/mock-data/simple-graphql-client.ts
  14. 1 1
      server/nodemon-debug.json
  15. 3 4
      server/package.json
  16. 1 1
      server/src/api/common/id-codec.service.ts
  17. 1 1
      server/src/api/common/id-codec.ts
  18. 1 1
      server/src/api/common/request-context.service.ts
  19. 2 2
      server/src/api/common/request-context.ts
  20. 1 1
      server/src/api/config/graphql-custom-fields.spec.ts
  21. 2 2
      server/src/api/config/graphql-custom-fields.ts
  22. 2 1
      server/src/api/decorators/allow.decorator.ts
  23. 1 1
      server/src/api/middleware/asset-interceptor.ts
  24. 2 3
      server/src/api/middleware/auth-guard.ts
  25. 3 3
      server/src/api/resolvers/administrator.resolver.ts
  26. 3 3
      server/src/api/resolvers/asset.resolver.ts
  27. 2 2
      server/src/api/resolvers/auth.resolver.ts
  28. 2 2
      server/src/api/resolvers/channel.resolver.ts
  29. 3 3
      server/src/api/resolvers/country.resolver.ts
  30. 2 2
      server/src/api/resolvers/customer-group.resolver.ts
  31. 3 3
      server/src/api/resolvers/customer.resolver.ts
  32. 3 3
      server/src/api/resolvers/facet.resolver.ts
  33. 1 1
      server/src/api/resolvers/import.resolver.ts
  34. 3 3
      server/src/api/resolvers/order.resolver.ts
  35. 3 3
      server/src/api/resolvers/payment-method.resolver.ts
  36. 3 3
      server/src/api/resolvers/product-category.resolver.ts
  37. 2 2
      server/src/api/resolvers/product-option.resolver.ts
  38. 3 3
      server/src/api/resolvers/product.resolver.ts
  39. 3 3
      server/src/api/resolvers/promotion.resolver.ts
  40. 3 3
      server/src/api/resolvers/role.resolver.ts
  41. 3 3
      server/src/api/resolvers/shipping-method.resolver.ts
  42. 2 2
      server/src/api/resolvers/tax-category.resolver.ts
  43. 3 3
      server/src/api/resolvers/tax-rate.resolver.ts
  44. 2 2
      server/src/api/resolvers/zone.resolver.ts
  45. 2 1
      server/src/bootstrap.ts
  46. 1 1
      server/src/common/constants.ts
  47. 1 1
      server/src/common/error/errors.ts
  48. 1 1
      server/src/common/types/adjustment-source.ts
  49. 2 2
      server/src/common/types/locale-types.ts
  50. 2 2
      server/src/common/utils.ts
  51. 2 1
      server/src/config/asset-naming-strategy/default-asset-naming-strategy.ts
  52. 1 1
      server/src/config/common/config-args.ts
  53. 2 2
      server/src/config/config.service.ts
  54. 3 3
      server/src/config/default-config.ts
  55. 2 2
      server/src/config/email/email-options.ts
  56. 1 1
      server/src/config/entity-id-strategy/entity-id-strategy.ts
  57. 1 1
      server/src/config/merge-config.ts
  58. 1 1
      server/src/config/payment-method/payment-method-handler.ts
  59. 1 1
      server/src/config/promotion/promotion-action.ts
  60. 1 1
      server/src/config/promotion/promotion-condition.ts
  61. 1 1
      server/src/config/shipping-method/shipping-calculator.ts
  62. 1 1
      server/src/config/shipping-method/shipping-eligibility-checker.ts
  63. 2 2
      server/src/config/vendure-config.ts
  64. 1 1
      server/src/data-import/providers/importer/importer.ts
  65. 2 3
      server/src/email/default-email-types.ts
  66. 1 1
      server/src/email/email-context.ts
  67. 2 2
      server/src/email/email-sender.ts
  68. 1 1
      server/src/email/preview/email-contexts.ts
  69. 1 1
      server/src/entity/address/address.entity.ts
  70. 1 1
      server/src/entity/administrator/administrator.entity.ts
  71. 3 3
      server/src/entity/asset/asset.entity.ts
  72. 1 1
      server/src/entity/base/base.entity.ts
  73. 2 2
      server/src/entity/channel/channel.entity.ts
  74. 2 2
      server/src/entity/country/country-translation.entity.ts
  75. 1 1
      server/src/entity/country/country.entity.ts
  76. 2 2
      server/src/entity/custom-entity-fields.ts
  77. 1 1
      server/src/entity/customer-group/customer-group.entity.ts
  78. 2 2
      server/src/entity/customer/customer.entity.ts
  79. 2 2
      server/src/entity/facet-value/facet-value-translation.entity.ts
  80. 1 1
      server/src/entity/facet-value/facet-value.entity.ts
  81. 2 2
      server/src/entity/facet/facet-translation.entity.ts
  82. 1 1
      server/src/entity/facet/facet.entity.ts
  83. 2 2
      server/src/entity/order-item/order-item.entity.ts
  84. 2 2
      server/src/entity/order-line/order-line.entity.ts
  85. 2 2
      server/src/entity/order/order.entity.ts
  86. 2 2
      server/src/entity/payment-method/payment-method.entity.ts
  87. 1 1
      server/src/entity/payment/payment.entity.ts
  88. 2 2
      server/src/entity/product-category/product-category-translation.entity.ts
  89. 1 1
      server/src/entity/product-category/product-category.entity.ts
  90. 3 3
      server/src/entity/product-option-group/product-option-group-translation.entity.ts
  91. 2 2
      server/src/entity/product-option-group/product-option-group.entity.ts
  92. 3 3
      server/src/entity/product-option/product-option-translation.entity.ts
  93. 2 2
      server/src/entity/product-option/product-option.entity.ts
  94. 1 1
      server/src/entity/product-variant/product-variant-price.entity.ts
  95. 3 3
      server/src/entity/product-variant/product-variant-translation.entity.ts
  96. 1 1
      server/src/entity/product-variant/product-variant.entity.ts
  97. 2 2
      server/src/entity/product/product-translation.entity.ts
  98. 1 1
      server/src/entity/product/product.entity.ts
  99. 2 2
      server/src/entity/promotion/promotion.entity.ts
  100. 2 2
      server/src/entity/role/role.entity.ts

+ 2 - 1
server/dev-config.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
-import { API_PATH, API_PORT } from 'shared/shared-constants';
+
+import { API_PATH, API_PORT } from '../shared/shared-constants';
 
 import { fakePalPaymentHandler } from './src/config/payment-method/fakepal-payment-method-config';
 import { gripePaymentHandler } from './src/config/payment-method/gripe-payment-method-config';

+ 1 - 1
server/e2e/administrator.e2e-spec.ts

@@ -4,7 +4,7 @@ import {
     GetAdministrator,
     GetAdministrators,
     UpdateAdministrator,
-} from 'shared/generated-types';
+} from '../../shared/generated-types';
 
 import {
     CREATE_ADMINISTRATOR,

+ 10 - 10
server/e2e/auth.e2e-spec.ts

@@ -1,15 +1,5 @@
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
-import {
-    CreateAdministrator,
-    CreateProductMutationArgs,
-    CreateRole,
-    LoginMutationArgs,
-    Permission,
-    RegisterCustomerInput,
-    UpdateProductMutationArgs,
-} from 'shared/generated-types';
-import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from 'shared/shared-constants';
 
 import {
     CREATE_ADMINISTRATOR,
@@ -21,6 +11,16 @@ import {
     GET_PRODUCT_LIST,
     UPDATE_PRODUCT,
 } from '../../admin-ui/src/app/data/definitions/product-definitions';
+import {
+    CreateAdministrator,
+    CreateProductMutationArgs,
+    CreateRole,
+    LoginMutationArgs,
+    Permission,
+    RegisterCustomerInput,
+    UpdateProductMutationArgs,
+} from '../../shared/generated-types';
+import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '../../shared/shared-constants';
 import { NoopEmailGenerator } from '../src/config/email/noop-email-generator';
 import { defaultEmailTypes } from '../src/email/default-email-types';
 

+ 1 - 1
server/e2e/config/test-config.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
-import { API_PATH } from 'shared/shared-constants';
 
+import { 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';
 

+ 1 - 1
server/e2e/order.e2e-spec.ts

@@ -1,7 +1,7 @@
 import gql from 'graphql-tag';
-import { CreateAddressInput, GetCustomerList } from 'shared/generated-types';
 
 import { GET_CUSTOMER_LIST } from '../../admin-ui/src/app/data/definitions/customer-definitions';
+import { CreateAddressInput, GetCustomerList } from '../../shared/generated-types';
 import { PaymentMethodHandler } from '../src/config/payment-method/payment-method-handler';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

+ 10 - 10
server/e2e/product-category.e2e-spec.ts

@@ -1,14 +1,4 @@
 import gql from 'graphql-tag';
-import {
-    CreateProductCategory,
-    GetAssetList,
-    GetProductCategory,
-    LanguageCode,
-    MoveProductCategory,
-    ProductCategory,
-    UpdateProductCategory,
-} from 'shared/generated-types';
-import { ROOT_CATEGORY_NAME } from 'shared/shared-constants';
 
 import {
     CREATE_PRODUCT_CATEGORY,
@@ -17,6 +7,16 @@ import {
     MOVE_PRODUCT_CATEGORY,
     UPDATE_PRODUCT_CATEGORY,
 } from '../../admin-ui/src/app/data/definitions/product-definitions';
+import {
+    CreateProductCategory,
+    GetAssetList,
+    GetProductCategory,
+    LanguageCode,
+    MoveProductCategory,
+    ProductCategory,
+    UpdateProductCategory,
+} from '../../shared/generated-types';
+import { ROOT_CATEGORY_NAME } from '../../shared/shared-constants';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';
 import { TestClient } from './test-client';

+ 2 - 2
server/e2e/product.e2e-spec.ts

@@ -11,8 +11,8 @@ import {
     SortOrder,
     UpdateProduct,
     UpdateProductVariants,
-} from 'shared/generated-types';
-import { omit } from 'shared/omit';
+} from '../../shared/generated-types';
+import { omit } from '../../shared/omit';
 
 import {
     ADD_OPTION_GROUP_TO_PRODUCT,

+ 2 - 2
server/e2e/promotion.e2e-spec.ts

@@ -5,8 +5,8 @@ import {
     GetPromotionList,
     Promotion,
     UpdatePromotion,
-} from 'shared/generated-types';
-import { pick } from 'shared/pick';
+} from '../../shared/generated-types';
+import { pick } from '../../shared/pick';
 
 import {
     CREATE_PROMOTION,

+ 3 - 3
server/e2e/role.e2e-spec.ts

@@ -1,6 +1,6 @@
-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 { 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 {
     CREATE_ROLE,

+ 1 - 1
server/mock-data/get-default-channel-token.ts

@@ -1,6 +1,6 @@
-import { DEFAULT_CHANNEL_CODE } from 'shared/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

+ 19 - 19
server/mock-data/mock-data.service.ts

@@ -2,6 +2,24 @@ import * as faker from 'faker/locale/en_GB';
 import * as fs from 'fs-extra';
 import gql from 'graphql-tag';
 import * as path from 'path';
+
+import { CREATE_FACET } from '../../admin-ui/src/app/data/definitions/facet-definitions';
+import {
+    ADD_OPTION_GROUP_TO_PRODUCT,
+    CREATE_PRODUCT,
+    CREATE_PRODUCT_OPTION_GROUP,
+    GENERATE_PRODUCT_VARIANTS,
+    UPDATE_PRODUCT_VARIANTS,
+} from '../../admin-ui/src/app/data/definitions/product-definitions';
+import {
+    CREATE_CHANNEL,
+    CREATE_COUNTRY,
+    CREATE_TAX_RATE,
+    CREATE_ZONE,
+    GET_CHANNELS,
+    UPDATE_CHANNEL,
+} from '../../admin-ui/src/app/data/definitions/settings-definitions';
+import { CREATE_SHIPPING_METHOD } from '../../admin-ui/src/app/data/definitions/shipping-definitions';
 import {
     AddOptionGroupToProduct,
     Asset,
@@ -25,25 +43,7 @@ import {
     UpdateChannel,
     UpdateProductVariants,
     Zone,
-} from 'shared/generated-types';
-
-import { CREATE_FACET } from '../../admin-ui/src/app/data/definitions/facet-definitions';
-import {
-    ADD_OPTION_GROUP_TO_PRODUCT,
-    CREATE_PRODUCT,
-    CREATE_PRODUCT_OPTION_GROUP,
-    GENERATE_PRODUCT_VARIANTS,
-    UPDATE_PRODUCT_VARIANTS,
-} from '../../admin-ui/src/app/data/definitions/product-definitions';
-import {
-    CREATE_CHANNEL,
-    CREATE_COUNTRY,
-    CREATE_TAX_RATE,
-    CREATE_ZONE,
-    GET_CHANNELS,
-    UPDATE_CHANNEL,
-} from '../../admin-ui/src/app/data/definitions/settings-definitions';
-import { CREATE_SHIPPING_METHOD } from '../../admin-ui/src/app/data/definitions/shipping-definitions';
+} from '../../shared/generated-types';
 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';

+ 1 - 1
server/mock-data/populate.ts

@@ -1,6 +1,6 @@
 import { INestApplication } from '@nestjs/common';
-import { Channel } from 'shared/generated-types';
 
+import { Channel } from '../../shared/generated-types';
 import { VendureBootstrapFunction } from '../src/bootstrap';
 import { setConfig, VendureConfig } from '../src/config/vendure-config';
 

+ 2 - 2
server/mock-data/simple-graphql-client.ts

@@ -3,10 +3,10 @@ import { GraphQLClient } from 'graphql-request';
 import gql from 'graphql-tag';
 import { print } from 'graphql/language/printer';
 import { Curl } from 'node-libcurl';
-import { CreateAssets, ImportInfo } from 'shared/generated-types';
-import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from 'shared/shared-constants';
 
 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/vendure-config';
 
 import { createUploadPostData } from './create-upload-post-data';

+ 1 - 1
server/nodemon-debug.json

@@ -2,5 +2,5 @@
   "watch": ["src", "index-dev.ts"],
   "ext": "ts",
   "ignore": ["src/**/*.spec.ts", "mock-data/**/*"],
-  "exec": "node --inspect=5858 -r ts-node/register -r tsconfig-paths/register index-dev.ts"
+  "exec": "node --inspect=5858 -r ts-node/register index-dev.ts"
 }

+ 3 - 4
server/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "license": "MIT",
   "scripts": {
-    "populate": "node -r ts-node/register -r tsconfig-paths/register mock-data/populate-cli.ts",
+    "populate": "node -r ts-node/register mock-data/populate-cli.ts",
     "start:dev": "nodemon --config nodemon-debug.json",
     "lint": "tslint --project tsconfig.json -c tslint.json",
     "test": "jest --runInBand",
@@ -14,7 +14,7 @@
     "test:e2e": "jest --config ./e2e/config/jest-e2e.json --runInBand",
     "test:e2e:watch": "jest --config ./e2e/config/jest-e2e.json --watch --runInBand",
     "build": "rimraf dist && tsc -p tsconfig.build.json && gulp",
-    "generate-email-preview": "node -r ts-node/register -r tsconfig-paths/register src/email/preview/generate-email-preview.ts"
+    "generate-email-preview": "node -r ts-node/register src/email/preview/generate-email-preview.ts"
   },
   "main": "dist/index.js",
   "files": [
@@ -83,8 +83,7 @@
     "opn": "^5.4.0",
     "rimraf": "^2.6.2",
     "sql.js": "^0.5.0",
-    "ts-jest": "~23.10.4",
-    "tsconfig-paths": "^3.7.0"
+    "ts-jest": "~23.10.4"
   },
   "jest": {
     "moduleFileExtensions": [

+ 1 - 1
server/src/api/common/id-codec.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { ID } from 'shared/shared-types';
 
+import { ID } from '../../../../shared/shared-types';
 import { ConfigService } from '../../config/config.service';
 
 import { IdCodec } from './id-codec';

+ 1 - 1
server/src/api/common/id-codec.ts

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

+ 1 - 1
server/src/api/common/request-context.service.ts

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

+ 2 - 2
server/src/api/common/request-context.ts

@@ -1,5 +1,5 @@
-import { LanguageCode } from 'shared/generated-types';
-import { ID } from 'shared/shared-types';
+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';

+ 1 - 1
server/src/api/config/graphql-custom-fields.spec.ts

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

+ 2 - 2
server/src/api/config/graphql-custom-fields.ts

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

+ 2 - 1
server/src/api/decorators/allow.decorator.ts

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

+ 1 - 1
server/src/api/middleware/asset-interceptor.ts

@@ -2,8 +2,8 @@ import { ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Type } from 'shared/shared-types';
 
+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';

+ 2 - 3
server/src/api/middleware/auth-guard.ts

@@ -2,13 +2,12 @@ import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { Request, Response } from 'express';
-import { Permission } from 'shared/generated-types';
 
+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';
 import { AuthService } from '../../service/services/auth.service';
-
-import { ForbiddenError } from '../../common/error/errors';
 import { extractAuthToken } from '../common/extract-auth-token';
 import { REQUEST_CONTEXT_KEY, RequestContextService } from '../common/request-context.service';
 import { setAuthToken } from '../common/set-auth-token';

+ 3 - 3
server/src/api/resolvers/administrator.resolver.ts

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

+ 3 - 3
server/src/api/resolvers/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 '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { Asset } from '../../entity/asset/asset.entity';
 import { AssetService } from '../../service/services/asset.service';
 import { Allow } from '../decorators/allow.decorator';

+ 2 - 2
server/src/api/resolvers/auth.resolver.ts

@@ -1,5 +1,6 @@
 import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql';
 import { Request, Response } from 'express';
+
 import {
     LoginMutationArgs,
     LoginResult,
@@ -7,8 +8,7 @@ import {
     RefreshCustomerVerificationMutationArgs,
     RegisterCustomerAccountMutationArgs,
     VerifyCustomerAccountMutationArgs,
-} from 'shared/generated-types';
-
+} from '../../../../shared/generated-types';
 import { VerificationTokenError } from '../../common/error/errors';
 import { ConfigService } from '../../config/config.service';
 import { User } from '../../entity/user/user.entity';

+ 2 - 2
server/src/api/resolvers/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 '../../../../shared/generated-types';
 import { Channel } from '../../entity/channel/channel.entity';
 import { ChannelService } from '../../service/services/channel.service';
 import { RequestContext } from '../common/request-context';

+ 3 - 3
server/src/api/resolvers/country.resolver.ts

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

+ 2 - 2
server/src/api/resolvers/customer-group.resolver.ts

@@ -1,4 +1,5 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+
 import {
     AddCustomersToGroupMutationArgs,
     CreateCustomerGroupMutationArgs,
@@ -6,8 +7,7 @@ import {
     Permission,
     RemoveCustomersFromGroupMutationArgs,
     UpdateCustomerGroupMutationArgs,
-} from 'shared/generated-types';
-
+} from '../../../../shared/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';

+ 3 - 3
server/src/api/resolvers/customer.resolver.ts

@@ -1,4 +1,5 @@
 import { Args, Mutation, Parent, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+
 import {
     CreateCustomerAddressMutationArgs,
     CreateCustomerMutationArgs,
@@ -7,9 +8,8 @@ import {
     Permission,
     UpdateCustomerAddressMutationArgs,
     UpdateCustomerMutationArgs,
-} from 'shared/generated-types';
-import { PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { idsAreEqual } from '../../common/utils';
 import { Address } from '../../entity/address/address.entity';
 import { Customer } from '../../entity/customer/customer.entity';

+ 3 - 3
server/src/api/resolvers/facet.resolver.ts

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

+ 1 - 1
server/src/api/resolvers/import.resolver.ts

@@ -1,6 +1,6 @@
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
-import { ImportInfo, ImportProductsMutationArgs, Permission } from 'shared/generated-types';
 
+import { ImportInfo, ImportProductsMutationArgs, Permission } from '../../../../shared/generated-types';
 import {
     ImportParser,
     ParsedProductWithVariants,

+ 3 - 3
server/src/api/resolvers/order.resolver.ts

@@ -1,5 +1,6 @@
 import { Args, Mutation, Parent, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
 import * as ms from 'ms';
+
 import {
     AddItemToOrderMutationArgs,
     AddPaymentToOrderMutationArgs,
@@ -14,9 +15,8 @@ import {
     SetOrderShippingMethodMutationArgs,
     ShippingMethodQuote,
     TransitionOrderToStateMutationArgs,
-} from 'shared/generated-types';
-import { PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { ForbiddenError, InternalServerError } from '../../common/error/errors';
 import { Order } from '../../entity/order/order.entity';
 import { OrderState } from '../../service/helpers/order-state-machine/order-state';

+ 3 - 3
server/src/api/resolvers/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 '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/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';

+ 3 - 3
server/src/api/resolvers/product-category.resolver.ts

@@ -1,4 +1,5 @@
 import { Args, Mutation, Parent, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+
 import {
     CreateProductCategoryMutationArgs,
     MoveProductCategoryMutationArgs,
@@ -6,9 +7,8 @@ import {
     ProductCategoriesQueryArgs,
     ProductCategoryQueryArgs,
     UpdateProductCategoryMutationArgs,
-} from 'shared/generated-types';
-import { PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { Translated } from '../../common/types/locale-types';
 import { FacetValue } from '../../entity/facet-value/facet-value.entity';
 import { ProductCategory } from '../../entity/product-category/product-category.entity';

+ 2 - 2
server/src/api/resolvers/product-option.resolver.ts

@@ -1,12 +1,12 @@
 import { Args, Mutation, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+
 import {
     CreateProductOptionGroupMutationArgs,
     Permission,
     ProductOptionGroupQueryArgs,
     ProductOptionGroupsQueryArgs,
     UpdateProductOptionGroupMutationArgs,
-} from 'shared/generated-types';
-
+} 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';

+ 3 - 3
server/src/api/resolvers/product.resolver.ts

@@ -1,4 +1,5 @@
 import { Args, Mutation, Parent, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+
 import {
     AddOptionGroupToProductMutationArgs,
     CreateProductMutationArgs,
@@ -9,9 +10,8 @@ import {
     RemoveOptionGroupFromProductMutationArgs,
     UpdateProductMutationArgs,
     UpdateProductVariantsMutationArgs,
-} from 'shared/generated-types';
-import { ID, PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { ID, PaginatedList } from '../../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { EntityNotFoundError } from '../../common/error/errors';
 import { Translated } from '../../common/types/locale-types';

+ 3 - 3
server/src/api/resolvers/promotion.resolver.ts

@@ -1,13 +1,13 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+
 import {
     CreatePromotionMutationArgs,
     Permission,
     PromotionQueryArgs,
     PromotionsQueryArgs,
     UpdatePromotionMutationArgs,
-} from 'shared/generated-types';
-import { PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { Promotion } from '../../entity/promotion/promotion.entity';
 import { PromotionService } from '../../service/services/promotion.service';
 import { RequestContext } from '../common/request-context';

+ 3 - 3
server/src/api/resolvers/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 '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/shared-types';
 import { Role } from '../../entity/role/role.entity';
 import { RoleService } from '../../service/services/role.service';
 import { Allow } from '../decorators/allow.decorator';

+ 3 - 3
server/src/api/resolvers/shipping-method.resolver.ts

@@ -1,4 +1,5 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+
 import {
     AdjustmentOperation,
     CreateShippingMethodMutationArgs,
@@ -6,9 +7,8 @@ import {
     ShippingMethodQueryArgs,
     ShippingMethodsQueryArgs,
     UpdateShippingMethodMutationArgs,
-} from 'shared/generated-types';
-import { PaginatedList } from 'shared/shared-types';
-
+} from '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/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';

+ 2 - 2
server/src/api/resolvers/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 '../../../../shared/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';

+ 3 - 3
server/src/api/resolvers/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 '../../../../shared/generated-types';
+import { PaginatedList } from '../../../../shared/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';

+ 2 - 2
server/src/api/resolvers/zone.resolver.ts

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

+ 2 - 1
server/src/bootstrap.ts

@@ -1,8 +1,9 @@
 import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { Type } from 'shared/shared-types';
 import { EntitySubscriberInterface } from 'typeorm';
 
+import { Type } from '../../shared/shared-types';
+
 import { ReadOnlyRequired } from './common/types/common-types';
 import { getConfig, setConfig, VendureConfig } from './config/vendure-config';
 import { VendureEntity } from './entity/base/base.entity';

+ 1 - 1
server/src/common/constants.ts

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

+ 1 - 1
server/src/common/error/errors.ts

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

+ 1 - 1
server/src/common/types/adjustment-source.ts

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

+ 2 - 2
server/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 '../../../../shared/generated-types';
+import { CustomFieldsObject, ID } from '../../../../shared/shared-types';
 
 import { TranslatableRelationsKeys } from '../../service/helpers/utils/translate-entity';
 

+ 2 - 2
server/src/common/utils.ts

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

+ 2 - 1
server/src/config/asset-naming-strategy/default-asset-naming-strategy.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
-import { normalizeString } from 'shared/normalize-string';
+
+import { normalizeString } from '../../../../shared/normalize-string';
 
 import { AssetNamingStrategy } from './asset-naming-strategy';
 

+ 1 - 1
server/src/config/common/config-args.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 /**
  * Certain entities allow arbitrary configuration arguments to be specified which can then

+ 2 - 2
server/src/config/config.service.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { RequestHandler } from 'express';
-import { LanguageCode } from 'shared/generated-types';
-import { CustomFields } from 'shared/shared-types';
 import { ConnectionOptions } from 'typeorm';
 
+import { LanguageCode } from '../../../shared/generated-types';
+import { CustomFields } from '../../../shared/shared-types';
 import { ReadOnlyRequired } from '../common/types/common-types';
 
 import { EntityIdStrategy } from './entity-id-strategy/entity-id-strategy';

+ 3 - 3
server/src/config/default-config.ts

@@ -1,6 +1,6 @@
-import { LanguageCode } from 'shared/generated-types';
-import { API_PATH, API_PORT } from 'shared/shared-constants';
-import { CustomFields } from 'shared/shared-types';
+import { LanguageCode } from '../../../shared/generated-types';
+import { API_PATH, API_PORT } from '../../../shared/shared-constants';
+import { CustomFields } from '../../../shared/shared-types';
 
 import { ReadOnlyRequired } from '../common/types/common-types';
 

+ 2 - 2
server/src/config/email/email-options.ts

@@ -1,5 +1,5 @@
-import { LanguageCode } from 'shared/generated-types';
-import { Type } from 'shared/shared-types';
+import { LanguageCode } from '../../../../shared/generated-types';
+import { Type } from '../../../../shared/shared-types';
 
 import { EmailContext, GeneratedEmailContext } from '../../email/email-context';
 import { VendureEvent } from '../../event-bus/vendure-event';

+ 1 - 1
server/src/config/entity-id-strategy/entity-id-strategy.ts

@@ -1,4 +1,4 @@
-import { ID } from 'shared/shared-types';
+import { ID } from '../../../../shared/shared-types';
 
 export type PrimaryKeyType = 'increment' | 'uuid';
 

+ 1 - 1
server/src/config/merge-config.ts

@@ -1,4 +1,4 @@
-import { DeepPartial } from 'shared/shared-types';
+import { DeepPartial } from '../../../shared/shared-types';
 
 import { VendureConfig } from './vendure-config';
 

+ 1 - 1
server/src/config/payment-method/payment-method-handler.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 import { StateMachineConfig } from '../../common/finite-state-machine';
 import { Order } from '../../entity/order/order.entity';

+ 1 - 1
server/src/config/promotion/promotion-action.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';

+ 1 - 1
server/src/config/promotion/promotion-condition.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 import { Order } from '../../entity/order/order.entity';
 import { argsArrayToHash, ConfigArgs, ConfigArgValues } from '../common/config-args';

+ 1 - 1
server/src/config/shipping-method/shipping-calculator.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 import { Order } from '../../entity/order/order.entity';
 import { argsArrayToHash, ConfigArgs, ConfigArgValues } from '../common/config-args';

+ 1 - 1
server/src/config/shipping-method/shipping-eligibility-checker.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from 'shared/generated-types';
+import { ConfigArg } from '../../../../shared/generated-types';
 
 import { Order } from '../../entity/order/order.entity';
 import { argsArrayToHash, ConfigArgs, ConfigArgValues } from '../common/config-args';

+ 2 - 2
server/src/config/vendure-config.ts

@@ -1,10 +1,10 @@
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { RequestHandler } from 'express';
 import { Observable } from 'rxjs';
-import { LanguageCode } from 'shared/generated-types';
-import { CustomFields, DeepPartial } from 'shared/shared-types';
 import { ConnectionOptions } from 'typeorm';
 
+import { LanguageCode } from '../../../shared/generated-types';
+import { CustomFields, DeepPartial } from '../../../shared/shared-types';
 import { Transitions } from '../common/finite-state-machine';
 import { ReadOnlyRequired } from '../common/types/common-types';
 import { Order } from '../entity/order/order.entity';

+ 1 - 1
server/src/data-import/providers/importer/importer.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { normalizeString } from 'shared/normalize-string';
 
+import { normalizeString } from '../../../../../shared/normalize-string';
 import { RequestContext } from '../../../api/common/request-context';
 import { ConfigService } from '../../../config/config.service';
 import { Asset } from '../../../entity/asset/asset.entity';

+ 2 - 3
server/src/email/default-email-types.ts

@@ -1,9 +1,8 @@
 import * as path from 'path';
-import { LanguageCode } from 'shared/generated-types';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
+import { LanguageCode } from '../../../shared/generated-types';
+import { DEFAULT_CHANNEL_CODE } from '../../../shared/shared-constants';
 import { configEmailType, EmailTypes } from '../config/email/email-options';
-
 import { AccountRegistrationEvent } from '../event-bus/events/account-registration-event';
 import { OrderStateTransitionEvent } from '../event-bus/events/order-state-transition-event';
 

+ 1 - 1
server/src/email/email-context.ts

@@ -1,4 +1,4 @@
-import { LanguageCode } from 'shared/generated-types';
+import { LanguageCode } from '../../../shared/generated-types';
 
 import { VendureEvent } from '../event-bus/vendure-event';
 

+ 2 - 2
server/src/email/email-sender.ts

@@ -4,10 +4,10 @@ import { createTransport } from 'nodemailer';
 import { default as Mail } from 'nodemailer/lib/mailer';
 import SMTPTransport from 'nodemailer/lib/smtp-transport';
 import * as path from 'path';
-import { normalizeString } from 'shared/normalize-string';
-import { assertNever } from 'shared/shared-utils';
 import { Stream } from 'stream';
 
+import { normalizeString } from '../../../shared/normalize-string';
+import { assertNever } from '../../../shared/shared-utils';
 import { EmailTransportOptions, FileTransportOptions } from '../config/email/email-transport-options';
 
 import { GeneratedEmailContext } from './email-context';

+ 1 - 1
server/src/email/preview/email-contexts.ts

@@ -1,4 +1,4 @@
-import { LanguageCode } from 'shared/generated-types';
+import { LanguageCode } from '../../../../shared/generated-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import { Channel } from '../../entity/channel/channel.entity';

+ 1 - 1
server/src/entity/address/address.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomAddressFields } from '../custom-entity-fields';
 import { Customer } from '../customer/customer.entity';

+ 1 - 1
server/src/entity/administrator/administrator.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, JoinColumn, OneToOne } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
 import { VendureEntity } from '../base/base.entity';
 import { User } from '../user/user.entity';
 

+ 3 - 3
server/src/entity/asset/asset.entity.ts

@@ -1,8 +1,8 @@
-import { AssetType } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, JoinColumn, OneToMany, OneToOne } from 'typeorm';
 
+import { AssetType } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { Address } from '../address/address.entity';
 import { VendureEntity } from '../base/base.entity';
 import { CustomCustomerFields } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/base/base.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, ID } from 'shared/shared-types';
 import { CreateDateColumn, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
 
+import { DeepPartial, ID } from '../../../../shared/shared-types';
 import { primaryKeyType } from '../../config/vendure-config';
 
 const keyType = primaryKeyType();

+ 2 - 2
server/src/entity/channel/channel.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { VendureEntity } from '../base/base.entity';
 import { Zone } from '../zone/zone.entity';
 

+ 2 - 2
server/src/entity/country/country-translation.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 

+ 1 - 1
server/src/entity/country/country.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, OneToMany } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 

+ 2 - 2
server/src/entity/custom-entity-fields.ts

@@ -1,7 +1,7 @@
-import { CustomFieldConfig, CustomFields, CustomFieldType, Type } from 'shared/shared-types';
-import { assertNever } from 'shared/shared-utils';
 import { Column, ColumnType, Connection, ConnectionOptions, Entity, getConnection } from 'typeorm';
 
+import { CustomFieldConfig, CustomFields, CustomFieldType, Type } from '../../../shared/shared-types';
+import { assertNever } from '../../../shared/shared-utils';
 import { VendureConfig } from '../config/vendure-config';
 
 import { VendureEntity } from './base/base.entity';

+ 1 - 1
server/src/entity/customer-group/customer-group.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToMany } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
 import { VendureEntity } from '../base/base.entity';
 import { Customer } from '../customer/customer.entity';
 

+ 2 - 2
server/src/entity/customer/customer.entity.ts

@@ -1,7 +1,7 @@
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, JoinColumn, JoinTable, ManyToMany, OneToMany, OneToOne } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { Address } from '../address/address.entity';
 import { VendureEntity } from '../base/base.entity';
 import { CustomCustomerFields } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/facet-value/facet-value-translation.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetValueFieldsTranslation } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/facet-value/facet-value.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetValueFields } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/facet/facet-translation.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetFieldsTranslation } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/facet/facet.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, OneToMany } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetFields } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/order-item/order-item.entity.ts

@@ -1,7 +1,7 @@
-import { Adjustment, AdjustmentType } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { Adjustment, AdjustmentType } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { Calculated } from '../../common/calculated-decorator';
 import { VendureEntity } from '../base/base.entity';
 import { OrderLine } from '../order-line/order-line.entity';

+ 2 - 2
server/src/entity/order-line/order-line.entity.ts

@@ -1,7 +1,7 @@
-import { Adjustment, AdjustmentType } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
 
+import { Adjustment, AdjustmentType } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { Calculated } from '../../common/calculated-decorator';
 import { Asset } from '../asset/asset.entity';
 import { VendureEntity } from '../base/base.entity';

+ 2 - 2
server/src/entity/order/order.entity.ts

@@ -1,7 +1,7 @@
-import { Adjustment, AdjustmentType, ShippingAddress } from 'shared/generated-types';
-import { DeepPartial, ID } from 'shared/shared-types';
 import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany } from 'typeorm';
 
+import { Adjustment, AdjustmentType, ShippingAddress } from '../../../../shared/generated-types';
+import { DeepPartial, ID } from '../../../../shared/shared-types';
 import { Calculated } from '../../common/calculated-decorator';
 import { idType } from '../../config/vendure-config';
 import { OrderState } from '../../service/helpers/order-state-machine/order-state';

+ 2 - 2
server/src/entity/payment-method/payment-method.entity.ts

@@ -1,7 +1,7 @@
-import { ConfigArg } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity } from 'typeorm';
 
+import { ConfigArg } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { UserInputError } from '../../common/error/errors';
 import { getConfig } from '../../config/vendure-config';
 import { VendureEntity } from '../base/base.entity';

+ 1 - 1
server/src/entity/payment/payment.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
 import { PaymentState } from '../../service/helpers/payment-state-machine/payment-state';
 import { VendureEntity } from '../base/base.entity';
 import { Order } from '../order/order.entity';

+ 2 - 2
server/src/entity/product-category/product-category-translation.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductCategoryFieldsTranslation } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/product-category/product-category.entity.ts

@@ -1,4 +1,3 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import {
     Column,
     Entity,
@@ -11,6 +10,7 @@ import {
     TreeParent,
 } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { ChannelAware } from '../../common/types/common-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { Asset } from '../asset/asset.entity';

+ 3 - 3
server/src/entity/product-option-group/product-option-group-translation.entity.ts

@@ -1,8 +1,8 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionGroupFieldsTranslation } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/product-option-group/product-option-group.entity.ts

@@ -1,7 +1,7 @@
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, OneToMany } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionGroupFields } from '../custom-entity-fields';

+ 3 - 3
server/src/entity/product-option/product-option-translation.entity.ts

@@ -1,8 +1,8 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionFieldsTranslation } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/product-option/product-option.entity.ts

@@ -1,7 +1,7 @@
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionFields } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/product-variant/product-variant-price.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { DeepPartial } from '../../../../shared/shared-types';
 import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';
 

+ 3 - 3
server/src/entity/product-variant/product-variant-translation.entity.ts

@@ -1,8 +1,8 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
-import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
+import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductVariantFieldsTranslation } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/product-variant/product-variant.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductVariantFields } from '../custom-entity-fields';

+ 2 - 2
server/src/entity/product/product-translation.entity.ts

@@ -1,7 +1,7 @@
-import { LanguageCode } from 'shared/generated-types';
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
+import { LanguageCode } from '../../../../shared/generated-types';
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../common/types/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductFieldsTranslation } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/product/product.entity.ts

@@ -1,6 +1,6 @@
-import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany } from 'typeorm';
 
+import { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { ChannelAware } from '../../common/types/common-types';
 import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { Asset } from '../asset/asset.entity';

+ 2 - 2
server/src/entity/promotion/promotion.entity.ts

@@ -1,7 +1,7 @@
-import { Adjustment, AdjustmentOperation, AdjustmentType } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, JoinTable, ManyToMany } from 'typeorm';
 
+import { Adjustment, AdjustmentOperation, AdjustmentType } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { AdjustmentSource } from '../../common/types/adjustment-source';
 import { ChannelAware } from '../../common/types/common-types';
 import { PromotionItemAction, PromotionOrderAction } from '../../config/promotion/promotion-action';

+ 2 - 2
server/src/entity/role/role.entity.ts

@@ -1,7 +1,7 @@
-import { Permission } from 'shared/generated-types';
-import { DeepPartial } from 'shared/shared-types';
 import { Column, Entity, JoinTable, ManyToMany } from 'typeorm';
 
+import { Permission } from '../../../../shared/generated-types';
+import { DeepPartial } from '../../../../shared/shared-types';
 import { ChannelAware } from '../../common/types/common-types';
 import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików