From 568e4b2f4a28e8d401be52173b93ae473a2be46a Mon Sep 17 00:00:00 2001
From: Michael Bromley <michael@michaelbromley.co.uk>
Date: Fri, 20 Aug 2021 16:52:04 +0200
Subject: [PATCH] fix(core): Fix incorrect common import paths

---
 packages/core/src/entity/fulfillment/fulfillment.entity.ts  | 2 +-
 packages/core/src/plugin/dynamic-plugin-api.module.ts       | 4 ++--
 packages/core/src/plugin/plugin-metadata.ts                 | 3 +--
 packages/core/src/service/services/order-testing.service.ts | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/entity/fulfillment/fulfillment.entity.ts b/packages/core/src/entity/fulfillment/fulfillment.entity.ts
index f178ceb6d2..94f97802d4 100644
--- a/packages/core/src/entity/fulfillment/fulfillment.entity.ts
+++ b/packages/core/src/entity/fulfillment/fulfillment.entity.ts
@@ -1,6 +1,6 @@
+import { DeepPartial } from '@vendure/common/lib/shared-types';
 import { Column, Entity, ManyToMany, OneToMany } from 'typeorm';
 
-import { DeepPartial } from '../../../../common/lib/shared-types';
 import { HasCustomFields } from '../../config/custom-field/custom-field-types';
 import { FulfillmentState } from '../../service/helpers/fulfillment-state-machine/fulfillment-state';
 import { VendureEntity } from '../base/base.entity';
diff --git a/packages/core/src/plugin/dynamic-plugin-api.module.ts b/packages/core/src/plugin/dynamic-plugin-api.module.ts
index 4c6215a045..c828b4a313 100644
--- a/packages/core/src/plugin/dynamic-plugin-api.module.ts
+++ b/packages/core/src/plugin/dynamic-plugin-api.module.ts
@@ -1,7 +1,7 @@
 import { DynamicModule } from '@nestjs/common';
+import { Type } from '@vendure/common/lib/shared-types';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 
-import { Type } from '../../../common/lib/shared-types';
-import { notNullOrUndefined } from '../../../common/lib/shared-utils';
 import { getConfig } from '../config/config-helpers';
 
 import { getModuleMetadata, graphQLResolversFor, isDynamicModule } from './plugin-metadata';
diff --git a/packages/core/src/plugin/plugin-metadata.ts b/packages/core/src/plugin/plugin-metadata.ts
index 0537eea320..e12eec7101 100644
--- a/packages/core/src/plugin/plugin-metadata.ts
+++ b/packages/core/src/plugin/plugin-metadata.ts
@@ -1,8 +1,7 @@
 import { DynamicModule } from '@nestjs/common';
 import { MODULE_METADATA } from '@nestjs/common/constants';
 import { Type } from '@vendure/common/lib/shared-types';
-
-import { notNullOrUndefined } from '../../../common/lib/shared-utils';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 
 import { APIExtensionDefinition, PluginConfigurationFn } from './vendure-plugin';
 
diff --git a/packages/core/src/service/services/order-testing.service.ts b/packages/core/src/service/services/order-testing.service.ts
index 17433f7c44..0d04cd4eaf 100644
--- a/packages/core/src/service/services/order-testing.service.ts
+++ b/packages/core/src/service/services/order-testing.service.ts
@@ -7,8 +7,8 @@ import {
     TestShippingMethodQuote,
     TestShippingMethodResult,
 } from '@vendure/common/lib/generated-types';
+import { ID } from '@vendure/common/lib/shared-types';
 
-import { ID } from '../../../../common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
 import { grossPriceOf, netPriceOf } from '../../common/tax-utils';
 import { ConfigService } from '../../config/config.service';