From 0c233984a6e9d718659c119b65a95d6c38d36b0c Mon Sep 17 00:00:00 2001 From: Ghislain B Date: Tue, 1 Dec 2020 09:33:51 -0500 Subject: [PATCH] fix(core): properly export Enums, Interfaces, Services & Utilities (#184) --- packages/common/src/enums/enums.index.ts | 2 ++ packages/common/src/index.ts | 13 ++++++------- packages/vanilla-bundle/src/index.ts | 8 +------- test/cypress.json | 1 + 4 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 packages/common/src/enums/enums.index.ts diff --git a/packages/common/src/enums/enums.index.ts b/packages/common/src/enums/enums.index.ts new file mode 100644 index 000000000..8fc42d54a --- /dev/null +++ b/packages/common/src/enums/enums.index.ts @@ -0,0 +1,2 @@ +import * as Enums from './index'; +export { Enums }; diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 7e261aa9e..f1cb5b952 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,5 +1,9 @@ import 'multiple-select-modified'; +import * as BackendUtilities from './services/backend-utilities'; +import * as ServiceUtilities from './services/utilities'; +import * as SortUtilities from './sortComparers/sortUtilities'; + // Public classes. export * from './constants'; export * from './global-grid-options'; @@ -22,14 +26,9 @@ export * from './grouping-formatters/index'; export * from './grouping-formatters/groupingFormatters.index'; export * from './sortComparers/index'; export * from './sortComparers/sortComparers.index'; - -import * as Enums from './enums/index'; -import * as Interfaces from './interfaces/index'; -import * as BackendUtilities from './services/backend-utilities'; -import * as ServiceUtilities from './services/utilities'; -import * as SortUtilities from './sortComparers/sortUtilities'; +export * from './services/index'; +export { Enums } from './enums/enums.index'; const Utilities = { ...BackendUtilities, ...ServiceUtilities, ...SortUtilities }; -export { Enums, Interfaces }; export { Utilities }; export { SlickgridConfig } from './slickgrid-config'; diff --git a/packages/vanilla-bundle/src/index.ts b/packages/vanilla-bundle/src/index.ts index 375c28dd4..a643b82db 100644 --- a/packages/vanilla-bundle/src/index.ts +++ b/packages/vanilla-bundle/src/index.ts @@ -24,13 +24,7 @@ if (typeof window !== 'undefined') { export { BindingService }; export { Aggregators, Editors, Enums, Filters, Formatters, GroupTotalFormatters, SortComparers, Utilities }; -export { SlickCompositeEditorComponent, SlickEmptyWarningComponent, SlickVanillaGridBundle }; // export the custom components & interface +export { SlickCompositeEditorComponent, SlickEmptyWarningComponent, SlickVanillaGridBundle }; // export the custom components & interfaces export { Slicker }; export * from './interfaces/index'; export * from './services/index'; - -// re-export all Enums & Interfaces into the Vanilla Grid Bundle, so that we can import any of the models from Package/common or Vanilla Bundle -// for example, we can import Column from the Common Package OR the Vanilla-bundle Package -// import { Column } from '@slickgrid-universal/common'; OR import { Column } from '@slickgrid-universal/vanilla-bundle'; -export * from '@slickgrid-universal/common/dist/commonjs/enums/index'; -export * from '@slickgrid-universal/common/dist/commonjs/interfaces/index'; diff --git a/test/cypress.json b/test/cypress.json index 110f252a5..0487e6b1a 100644 --- a/test/cypress.json +++ b/test/cypress.json @@ -1,6 +1,7 @@ { "baseUrl": "http://localhost:8888", "baseExampleUrl": "http://localhost:8888/#", + "runMode": 2, "video": false, "viewportWidth": 1000, "viewportHeight": 950,