Browse Source

fix(core): Fix incorrect import paths

Michael Bromley 6 years ago
parent
commit
663fbd8120

+ 5 - 2
packages/core/src/config/custom-field/custom-field-types.ts

@@ -8,7 +8,7 @@ import {
     LocalizedString,
     StringCustomFieldConfig as GraphQLStringCustomFieldConfig,
 } from '@vendure/common/lib/generated-types';
-import { CustomFieldsObject, CustomFieldType } from '@vendure/common/src/shared-types';
+import { CustomFieldsObject, CustomFieldType } from '@vendure/common/lib/shared-types';
 
 // prettier-ignore
 export type DefaultValueType<T extends CustomFieldType> =
@@ -38,7 +38,10 @@ export type TypedCustomFieldConfig<T extends CustomFieldType, C extends CustomFi
     validate?: (value: DefaultValueType<T>) => string | LocalizedString[] | void;
 };
 export type StringCustomFieldConfig = TypedCustomFieldConfig<'string', GraphQLStringCustomFieldConfig>;
-export type LocaleStringCustomFieldConfig = TypedCustomFieldConfig<'localeString', GraphQLLocaleStringCustomFieldConfig>;
+export type LocaleStringCustomFieldConfig = TypedCustomFieldConfig<
+    'localeString',
+    GraphQLLocaleStringCustomFieldConfig
+>;
 export type IntCustomFieldConfig = TypedCustomFieldConfig<'int', GraphQLIntCustomFieldConfig>;
 export type FloatCustomFieldConfig = TypedCustomFieldConfig<'float', GraphQLFloatCustomFieldConfig>;
 export type BooleanCustomFieldConfig = TypedCustomFieldConfig<'boolean', GraphQLBooleanCustomFieldConfig>;

+ 2 - 7
packages/core/src/entity/validate-custom-fields-config.ts

@@ -1,4 +1,4 @@
-import { Type } from '@vendure/common/src/shared-types';
+import { Type } from '@vendure/common/lib/shared-types';
 import { getMetadataArgsStorage } from 'typeorm';
 
 import { CustomFieldConfig, CustomFields } from '../config/custom-field/custom-field-types';
@@ -112,12 +112,7 @@ function getAllColumnNames(entity: Type<any>): string[] {
     const relationColumns = metadata.filterRelations(entity);
     const embeddedColumns = metadata.filterEmbeddeds(entity);
     const baseColumns = metadata.filterColumns(VendureEntity);
-    return [
-        ...ownColumns,
-        ...relationColumns,
-        ...embeddedColumns,
-        ...baseColumns,
-    ].map(c => c.propertyName);
+    return [...ownColumns, ...relationColumns, ...embeddedColumns, ...baseColumns].map(c => c.propertyName);
 }
 
 /**

+ 1 - 1
packages/create/src/create-vendure-app.ts

@@ -29,7 +29,7 @@ let projectName: string | undefined;
 
 // Set the environment variable which can then be used to
 // conditionally modify behaviour of core or plugins.
-const createEnvVar: import('@vendure/common/src/shared-constants').CREATING_VENDURE_APP =
+const createEnvVar: import('@vendure/common/lib/shared-constants').CREATING_VENDURE_APP =
     'CREATING_VENDURE_APP';
 process.env[createEnvVar] = 'true';