chore: Tidy up deep imports from core

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

@@ -1,9 +1,6 @@
 /* tslint:disable:no-non-null-assertion */
 import { ROOT_COLLECTION_NAME } from '@vendure/common/lib/shared-constants';
-import {
-    facetValueCollectionFilter,
-    variantNameCollectionFilter,
-} from '@vendure/core/dist/config/collection/default-collection-filters';
+import { facetValueCollectionFilter, variantNameCollectionFilter } from '@vendure/core';
 import { createTestEnvironment } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';

packages/core/e2e/custom-fields.e2e-spec.ts

@@ -1,6 +1,5 @@
 import { LanguageCode } from '@vendure/common/lib/generated-types';
-import { mergeConfig } from '@vendure/core';
-import { CustomFields } from '@vendure/core/dist/config/custom-field/custom-field-types';
+import { CustomFields, mergeConfig } from '@vendure/core';
 import { createTestEnvironment } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';

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

@@ -1,7 +1,6 @@
 /* tslint:disable:no-non-null-assertion */
 import { pick } from '@vendure/common/lib/pick';
-import { DefaultSearchPlugin, mergeConfig } from '@vendure/core';
-import { facetValueCollectionFilter } from '@vendure/core/dist/config/collection/default-collection-filters';
+import { DefaultSearchPlugin, facetValueCollectionFilter, mergeConfig } from '@vendure/core';
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN, SimpleGraphQLClient } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';

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

@@ -4,6 +4,7 @@ import { Permission } from '@vendure/common/lib/generated-shop-types';
 import { LanguageCode } from '@vendure/common/lib/generated-types';
 import {
     Allow,
+    ConfigModule,
     ConfigService,
     InternalServerError,
     OnVendureBootstrap,
@@ -12,7 +13,6 @@ import {
     OnVendureWorkerClose,
     VendurePlugin,
 } from '@vendure/core';
-import { ConfigModule } from '@vendure/core/dist/config/config.module';
 import gql from 'graphql-tag';
 
 export class TestPluginWithAllLifecycleHooks

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

@@ -1,5 +1,5 @@
 /* tslint:disable:no-non-null-assertion */
-import { facetValueCollectionFilter } from '@vendure/core/dist/config/collection/default-collection-filters';
+import { facetValueCollectionFilter } from '@vendure/core';
 import { createTestEnvironment } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';

packages/dev-server/load-testing/load-test-config.ts

@@ -1,6 +1,7 @@
 /* tslint:disable:no-console */
 import { AssetServerPlugin } from '@vendure/asset-server-plugin';
 import {
+    defaultConfig,
     DefaultLogger,
     DefaultSearchPlugin,
     examplePaymentHandler,
@@ -8,7 +9,6 @@ import {
     mergeConfig,
     VendureConfig,
 } from '@vendure/core';
-import { defaultConfig } from '@vendure/core/dist/config/default-config';
 import path from 'path';
 
 export function getMysqlConnectionOptions(count: number) {

packages/dev-server/populate-dev-server.ts

@@ -1,8 +1,7 @@
 // tslint:disable-next-line:no-reference
 /// <reference path="../core/typings.d.ts" />
-import { bootstrap, mergeConfig, VendureConfig } from '@vendure/core';
+import { bootstrap, defaultConfig, mergeConfig } from '@vendure/core';
 import { populate } from '@vendure/core/cli/populate';
-import { defaultConfig } from '@vendure/core/dist/config/default-config';
 import { clearAllTables, populateCustomers } from '@vendure/testing';
 import path from 'path';
 

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

@@ -1,8 +1,7 @@
 /* tslint:disable:no-non-null-assertion */
 import { SortOrder } from '@vendure/common/lib/generated-types';
 import { pick } from '@vendure/common/lib/pick';
-import { DefaultLogger, LogLevel, mergeConfig } from '@vendure/core';
-import { facetValueCollectionFilter } from '@vendure/core/dist/config/collection/default-collection-filters';
+import { DefaultLogger, facetValueCollectionFilter, LogLevel, mergeConfig } from '@vendure/core';
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN, SimpleGraphQLClient } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';

packages/testing/src/config/test-config.ts

@@ -1,9 +1,12 @@
 import { Transport } from '@nestjs/microservices';
 import { ADMIN_API_PATH, SHOP_API_PATH } from '@vendure/common/lib/shared-constants';
-import { DefaultAssetNamingStrategy, NoopLogger, VendureConfig } from '@vendure/core';
-import { defaultConfig } from '@vendure/core/dist/config/default-config';
-import { mergeConfig } from '@vendure/core/dist/config/merge-config';
-import path from 'path';
+import {
+    DefaultAssetNamingStrategy,
+    defaultConfig,
+    mergeConfig,
+    NoopLogger,
+    VendureConfig,
+} from '@vendure/core';
 
 import { TestingAssetPreviewStrategy } from './testing-asset-preview-strategy';
 import { TestingAssetStorageStrategy } from './testing-asset-storage-strategy';