Explorar el Código

refactor(server): Update shared types & utils to use alias

Relates to #5
Michael Bromley hace 7 años
padre
commit
3a3d43708e
Se han modificado 51 ficheros con 68 adiciones y 69 borrados
  1. 1 1
      server/dev-config.ts
  2. 1 1
      server/mock-data/mock-data-client.service.ts
  3. 2 2
      server/src/api/common/id-codec.ts
  4. 1 1
      server/src/api/customer/customer.resolver.ts
  5. 1 1
      server/src/api/facet/facet.resolver.ts
  6. 1 1
      server/src/api/product/product.resolver.ts
  7. 1 2
      server/src/app.module.ts
  8. 1 2
      server/src/bootstrap.ts
  9. 1 1
      server/src/common/build-list-query.ts
  10. 1 1
      server/src/common/create-translatable.ts
  11. 2 2
      server/src/common/parse-filter-params.ts
  12. 1 1
      server/src/common/parse-sort-params.spec.ts
  13. 1 1
      server/src/common/parse-sort-params.ts
  14. 1 1
      server/src/common/update-translatable.ts
  15. 1 1
      server/src/config/entity-id-strategy/entity-id-strategy.ts
  16. 1 1
      server/src/config/merge-config.ts
  17. 1 1
      server/src/config/vendure-config.ts
  18. 1 2
      server/src/entity/address/address.entity.ts
  19. 1 1
      server/src/entity/administrator/administrator.entity.ts
  20. 1 1
      server/src/entity/base/base.entity.ts
  21. 2 2
      server/src/entity/custom-entity-fields.ts
  22. 2 2
      server/src/entity/customer/customer.entity.ts
  23. 1 1
      server/src/entity/facet-value/facet-value-translation.entity.ts
  24. 2 1
      server/src/entity/facet-value/facet-value.dto.ts
  25. 1 1
      server/src/entity/facet-value/facet-value.entity.ts
  26. 1 1
      server/src/entity/facet/facet-translation.entity.ts
  27. 1 1
      server/src/entity/facet/facet.entity.ts
  28. 1 1
      server/src/entity/graphql-custom-fields.spec.ts
  29. 2 2
      server/src/entity/graphql-custom-fields.ts
  30. 2 2
      server/src/entity/product-option-group/product-option-group-translation.entity.ts
  31. 2 2
      server/src/entity/product-option-group/product-option-group.entity.ts
  32. 2 2
      server/src/entity/product-option/product-option-translation.entity.ts
  33. 2 2
      server/src/entity/product-option/product-option.entity.ts
  34. 2 1
      server/src/entity/product-variant/create-product-variant.dto.ts
  35. 2 2
      server/src/entity/product-variant/product-variant-translation.entity.ts
  36. 1 1
      server/src/entity/product-variant/product-variant.entity.ts
  37. 2 2
      server/src/entity/product/product-translation.entity.ts
  38. 2 2
      server/src/entity/product/product.entity.ts
  39. 2 2
      server/src/entity/user/user.entity.ts
  40. 2 2
      server/src/locale/locale-types.ts
  41. 1 1
      server/src/locale/translation-updater.ts
  42. 1 1
      server/src/service/config.service.ts
  43. 1 1
      server/src/service/customer.service.ts
  44. 1 1
      server/src/service/facet-value.service.ts
  45. 1 1
      server/src/service/facet.service.ts
  46. 1 1
      server/src/service/product-option-group.service.ts
  47. 1 1
      server/src/service/product-option.service.ts
  48. 1 1
      server/src/service/product-variant.service.spec.ts
  49. 2 2
      server/src/service/product-variant.service.ts
  50. 1 1
      server/src/service/product.service.ts
  51. 1 1
      server/src/testing/connection.mock.ts

+ 1 - 1
server/dev-config.ts

@@ -1,4 +1,4 @@
-import { API_PATH, API_PORT } from '../shared/shared-constants';
+import { API_PATH, API_PORT } from 'shared/shared-constants';
 
 import { VendureConfig } from './src/config/vendure-config';
 

+ 1 - 1
server/mock-data/mock-data-client.service.ts

@@ -6,9 +6,9 @@ import {
     CreateProductOptionGroupVariables,
 } from 'shared/generated-types';
 import { LanguageCode } from 'shared/generated-types';
+import { ID } from 'shared/shared-types';
 
 import { CREATE_PRODUCT_OPTION_GROUP } from '../../admin-ui/src/app/data/mutations/product-mutations';
-import { ID } from '../../shared/shared-types';
 import { PasswordService } from '../src/auth/password.service';
 import { VendureConfig } from '../src/config/vendure-config';
 import { CreateAddressDto } from '../src/entity/address/address.dto';

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

@@ -1,7 +1,7 @@
-import { ID } from '../../../../shared/shared-types';
-import { VendureEntity } from '../../entity/base/base.entity';
+import { ID } from 'shared/shared-types';
 
 import { EntityIdStrategy } from '../../config/entity-id-strategy/entity-id-strategy';
+import { VendureEntity } from '../../entity/base/base.entity';
 
 /**
  * This service is responsible for encoding/decoding entity IDs according to the configured EntityIdStrategy.

+ 1 - 1
server/src/api/customer/customer.resolver.ts

@@ -1,6 +1,6 @@
 import { Mutation, Query, ResolveProperty, Resolver } from '@nestjs/graphql';
+import { PaginatedList } from 'shared/shared-types';
 
-import { PaginatedList } from '../../../../shared/shared-types';
 import { Address } from '../../entity/address/address.entity';
 import { Customer } from '../../entity/customer/customer.entity';
 import { CustomerService } from '../../service/customer.service';

+ 1 - 1
server/src/api/facet/facet.resolver.ts

@@ -1,6 +1,6 @@
 import { Mutation, Query, Resolver } from '@nestjs/graphql';
+import { PaginatedList } from 'shared/shared-types';
 
-import { PaginatedList } from '../../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { CreateFacetValueDto, UpdateFacetValueDto } from '../../entity/facet-value/facet-value.dto';
 import { FacetValue } from '../../entity/facet-value/facet-value.entity';

+ 1 - 1
server/src/api/product/product.resolver.ts

@@ -1,6 +1,6 @@
 import { Mutation, Query, Resolver } from '@nestjs/graphql';
+import { ID, PaginatedList } from 'shared/shared-types';
 
-import { ID, PaginatedList } from '../../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { assertFound } from '../../common/utils';
 import { UpdateProductVariantDto } from '../../entity/product-variant/create-product-variant.dto';

+ 1 - 2
server/src/app.module.ts

@@ -4,8 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { graphiqlExpress, graphqlExpress } from 'apollo-server-express';
 import { GraphQLDateTime } from 'graphql-iso-date';
 import * as GraphQLJSON from 'graphql-type-json';
-
-import { CustomFields } from '../../shared/shared-types';
+import { CustomFields } from 'shared/shared-types';
 
 import { AdministratorResolver } from './api/administrator/administrator.resolver';
 import { AuthController } from './api/auth/auth.controller';

+ 1 - 2
server/src/bootstrap.ts

@@ -1,6 +1,5 @@
 import { NestFactory } from '@nestjs/core';
-
-import { Type } from '../../shared/shared-types';
+import { Type } from 'shared/shared-types';
 
 import { getConfig, setConfig, VendureConfig } from './config/vendure-config';
 import { VendureEntity } from './entity/base/base.entity';

+ 1 - 1
server/src/common/build-list-query.ts

@@ -1,7 +1,7 @@
+import { Type } from 'shared/shared-types';
 import { Connection, SelectQueryBuilder } from 'typeorm';
 import { FindOptionsUtils } from 'typeorm/find-options/FindOptionsUtils';
 
-import { Type } from '../../../shared/shared-types';
 import { VendureEntity } from '../entity/base/base.entity';
 
 import { ListQueryOptions } from './common-types';

+ 1 - 1
server/src/common/create-translatable.ts

@@ -1,6 +1,6 @@
+import { Type } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { Type } from '../../../shared/shared-types';
 import { ProductOptionTranslation } from '../entity/product-option/product-option-translation.entity';
 import { Translatable, TranslatedInput, Translation } from '../locale/locale-types';
 

+ 2 - 2
server/src/common/parse-filter-params.ts

@@ -1,8 +1,8 @@
+import { Type } from 'shared/shared-types';
+import { assertNever } from 'shared/shared-utils';
 import { Connection } from 'typeorm';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 
-import { Type } from '../../../shared/shared-types';
-import { assertNever } from '../../../shared/shared-utils';
 import { VendureEntity } from '../entity/base/base.entity';
 import { I18nError } from '../i18n/i18n-error';
 

+ 1 - 1
server/src/common/parse-sort-params.spec.ts

@@ -1,7 +1,7 @@
+import { Type } from 'shared/shared-types';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 import { RelationMetadata } from 'typeorm/metadata/RelationMetadata';
 
-import { Type } from '../../../shared/shared-types';
 import { ProductTranslation } from '../entity/product/product-translation.entity';
 import { Product } from '../entity/product/product.entity';
 import { I18nError } from '../i18n/i18n-error';

+ 1 - 1
server/src/common/parse-sort-params.ts

@@ -1,7 +1,7 @@
+import { Type } from 'shared/shared-types';
 import { Connection, OrderByCondition } from 'typeorm';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 
-import { Type } from '../../../shared/shared-types';
 import { VendureEntity } from '../entity/base/base.entity';
 import { I18nError } from '../i18n/i18n-error';
 

+ 1 - 1
server/src/common/update-translatable.ts

@@ -1,6 +1,6 @@
+import { ID, Type } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID, Type } from '../../../shared/shared-types';
 import { Translatable, TranslatedInput, Translation } from '../locale/locale-types';
 import { TranslationUpdaterService } from '../locale/translation-updater.service';
 

+ 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/vendure-config.ts

@@ -1,8 +1,8 @@
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { LanguageCode } from 'shared/generated-types';
+import { CustomFields, DeepPartial } from 'shared/shared-types';
 import { ConnectionOptions } from 'typeorm';
 
-import { CustomFields, DeepPartial } from '../../../shared/shared-types';
 import { ReadOnlyRequired } from '../common/common-types';
 
 import { AutoIncrementIdStrategy } from './entity-id-strategy/auto-increment-id-strategy';

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

@@ -1,7 +1,6 @@
+import { DeepPartial, HasCustomFields } from 'shared/shared-types';
 import { Column, Entity, ManyToOne } from 'typeorm';
 
-import { DeepPartial } from '../../../../shared/shared-types';
-import { 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';
 

+ 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 { getConfig } from '../../config/vendure-config';
 
 const primaryKeyType = getConfig().entityIdStrategy.primaryKeyType as any;

+ 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';

+ 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, 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';

+ 1 - 1
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 { DeepPartial } from '../../../../shared/shared-types';
 import { Translation } from '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetValueFieldsTranslation } from '../custom-entity-fields';

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

@@ -1,4 +1,5 @@
-import { ID } from '../../../../shared/shared-types';
+import { ID } from 'shared/shared-types';
+
 import { TranslatedInput } from '../../locale/locale-types';
 
 import { FacetValue } from './facet-value.entity';

+ 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 '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetValueFields } from '../custom-entity-fields';

+ 1 - 1
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 { DeepPartial, HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../locale/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 '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFacetFields } from '../custom-entity-fields';

+ 1 - 1
server/src/entity/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/entity/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 - 2
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 { DeepPartial } from '../../../../shared/shared-types';
-import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../locale/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 '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionGroupFields } from '../custom-entity-fields';

+ 2 - 2
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 { DeepPartial } from '../../../../shared/shared-types';
-import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../locale/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 '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductOptionFields } from '../custom-entity-fields';

+ 2 - 1
server/src/entity/product-variant/create-product-variant.dto.ts

@@ -1,4 +1,5 @@
-import { ID } from '../../../../shared/shared-types';
+import { ID } from 'shared/shared-types';
+
 import { TranslatedInput } from '../../locale/locale-types';
 
 import { ProductVariant } from './product-variant.entity';

+ 2 - 2
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 { DeepPartial } from '../../../../shared/shared-types';
-import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation } from '../../locale/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 '../../locale/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,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 { DeepPartial } from '../../../../shared/shared-types';
-import { HasCustomFields } from '../../../../shared/shared-types';
 import { Translation, TranslationInput } from '../../locale/locale-types';
 import { VendureEntity } from '../base/base.entity';
 import { CustomProductFieldsTranslation } from '../custom-entity-fields';

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

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

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

@@ -1,7 +1,7 @@
+import { DeepPartial } from 'shared/shared-types';
+import { HasCustomFields } from 'shared/shared-types';
 import { Column, Entity } from 'typeorm';
 
-import { DeepPartial } from '../../../../shared/shared-types';
-import { HasCustomFields } from '../../../../shared/shared-types';
 import { Role } from '../../auth/role';
 import { VendureEntity } from '../base/base.entity';
 import { CustomUserFields } from '../custom-entity-fields';

+ 2 - 2
server/src/locale/locale-types.ts

@@ -1,7 +1,7 @@
 import { LanguageCode } from 'shared/generated-types';
+import { ID } from 'shared/shared-types';
+import { CustomFieldsObject } from 'shared/shared-types';
 
-import { ID } from '../../../shared/shared-types';
-import { CustomFieldsObject } from '../../../shared/shared-types';
 import { UnwrappedArray } from '../common/common-types';
 import { VendureEntity } from '../entity/base/base.entity';
 

+ 1 - 1
server/src/locale/translation-updater.ts

@@ -1,6 +1,6 @@
+import { DeepPartial, Type } from 'shared/shared-types';
 import { EntityManager } from 'typeorm';
 
-import { DeepPartial, Type } from '../../../shared/shared-types';
 import { foundIn, not } from '../common/utils';
 
 import { Translatable, Translation, TranslationInput } from './locale-types';

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

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

+ 1 - 1
server/src/service/customer.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
+import { ID, PaginatedList } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID, PaginatedList } from '../../../shared/shared-types';
 import { PasswordService } from '../auth/password.service';
 import { Role } from '../auth/role';
 import { buildListQuery } from '../common/build-list-query';

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

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
 import { LanguageCode } from 'shared/generated-types';
+import { ID } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID } from '../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';
 import { createTranslatable } from '../common/create-translatable';
 import { updateTranslatable } from '../common/update-translatable';

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

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
 import { LanguageCode } from 'shared/generated-types';
+import { ID, PaginatedList } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID, PaginatedList } from '../../../shared/shared-types';
 import { buildListQuery } from '../common/build-list-query';
 import { ListQueryOptions } from '../common/common-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';

+ 1 - 1
server/src/service/product-option-group.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
 import { LanguageCode } from 'shared/generated-types';
+import { ID } from 'shared/shared-types';
 import { Connection, FindManyOptions, Like } from 'typeorm';
 
-import { ID } from '../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';
 import { createTranslatable } from '../common/create-translatable';
 import { updateTranslatable } from '../common/update-translatable';

+ 1 - 1
server/src/service/product-option.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
 import { LanguageCode } from 'shared/generated-types';
+import { ID } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID } from '../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';
 import { createTranslatable } from '../common/create-translatable';
 import { assertFound } from '../common/utils';

+ 1 - 1
server/src/service/product-variant.service.spec.ts

@@ -1,8 +1,8 @@
 import { Test } from '@nestjs/testing';
 import { LanguageCode } from 'shared/generated-types';
+import { DeepPartial } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { DeepPartial } from '../../../shared/shared-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';
 import { ProductOption } from '../entity/product-option/product-option.entity';
 import { ProductVariantTranslation } from '../entity/product-variant/product-variant-translation.entity';

+ 2 - 2
server/src/service/product-variant.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
+import { ID } from 'shared/shared-types';
+import { generateAllCombinations } from 'shared/shared-utils';
 import { Connection } from 'typeorm';
 
-import { ID } from '../../../shared/shared-types';
-import { generateAllCombinations } from '../../../shared/shared-utils';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';
 import { createTranslatable } from '../common/create-translatable';
 import { updateTranslatable } from '../common/update-translatable';

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

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/typeorm';
 import { LanguageCode } from 'shared/generated-types';
+import { ID, PaginatedList } from 'shared/shared-types';
 import { Connection } from 'typeorm';
 
-import { ID, PaginatedList } from '../../../shared/shared-types';
 import { buildListQuery } from '../common/build-list-query';
 import { ListQueryOptions } from '../common/common-types';
 import { DEFAULT_LANGUAGE_CODE } from '../common/constants';

+ 1 - 1
server/src/testing/connection.mock.ts

@@ -1,6 +1,6 @@
 import { AbstractRepository, EntityManager, Repository } from 'typeorm';
 
-import { Type } from '../../../shared/shared-types';
+import { Type } from 'shared/shared-types';
 
 import { MockClass } from './testing-types';