Tree Shaking: Support devextreme with esm modules (#443)

DevExpress · Feb 16, 2021 · 4a85e54 · 4a85e54
1 parent 22e072b
commit 4a85e54
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/packages/devextreme-vue-generator/src/helpers.ts b/packages/devextreme-vue-generator/src/helpers.ts
@@ -1,4 +1,4 @@
-import * as dasherize from "dasherize";
+import dasherize from "dasherize";
 import { extname as getPathExtension } from "path";
 
 export function removeExtension(path: string) {

diff --git a/packages/devextreme-vue/src/core/component.ts b/packages/devextreme-vue/src/core/component.ts
@@ -1,7 +1,7 @@
 import { ComponentPublicInstance, defineComponent, h, VNode } from "vue";
 
-import * as CreateCallback from "devextreme/core/utils/callbacks";
-import * as events from "devextreme/events";
+import CreateCallback from "devextreme/core/utils/callbacks";
+import { triggerHandler } from "devextreme/events";
 
 import { defaultSlots, getChildren, getComponentInstance, getComponentProps, getVModelValue, VMODEL_NAME } from "./vue-helper";
 
@@ -111,7 +111,7 @@ function initBaseComponent() {
             const thisComponent = this as any as IBaseComponent;
             const instance = thisComponent.$_instance;
             if (instance) {
-                events.triggerHandler(this.$el, DX_REMOVE_EVENT);
+                triggerHandler(this.$el, DX_REMOVE_EVENT);
                 instance.dispose();
             }
         },

diff --git a/packages/devextreme-vue/src/core/templates-manager.ts b/packages/devextreme-vue/src/core/templates-manager.ts
@@ -4,8 +4,8 @@ import {
     mountTemplate
 } from "./templates-discovering";
 
-import * as domAdapter from "devextreme/core/dom_adapter";
-import * as events from "devextreme/events";
+import domAdapter from "devextreme/core/dom_adapter";
+import { one } from "devextreme/events";
 import { DX_REMOVE_EVENT, DX_TEMPLATE_WRAPPER_CLASS } from "./constants";
 import { allKeysAreEqual } from "./helpers";
 
@@ -85,12 +85,12 @@ class TemplatesManager {
                     const removalListener = document.createElement(container.nodeName === "TABLE" ? "tbody" : "span");
                     removalListener.style.display = "none";
                     container.appendChild(removalListener);
-                    events.one(
+                    one(
                         removalListener,
                         DX_REMOVE_EVENT,
                         mountedTemplate.$.appContext.app.unmount.bind(mountedTemplate));
                 } else {
-                    events.one(
+                    one(
                         element,
                         DX_REMOVE_EVENT,
                         mountedTemplate.$.appContext.app.unmount.bind(mountedTemplate));

diff --git a/packages/vue2-strategy/src/core/component.ts b/packages/vue2-strategy/src/core/component.ts
@@ -1,7 +1,7 @@
 import * as VueType from "vue";
 import IVue, { VNode, VueConstructor } from "vue";
 
-import * as events from "devextreme/events";
+import { triggerHandler } from "devextreme/events";
 
 import { pullAllChildren } from "./children-processing";
 import Configuration, { bindOptionWatchers, setEmitOptionChangedFunc } from "./configuration";
@@ -105,7 +105,7 @@ const BaseComponent = (): VueConstructor<IBaseComponent> => Vue.extend({
     beforeDestroy(): void {
         const instance = this.$_instance;
         if (instance) {
-            events.triggerHandler(this.$el, DX_REMOVE_EVENT);
+            triggerHandler(this.$el, DX_REMOVE_EVENT);
             instance.dispose();
         }
     },

diff --git a/packages/vue2-strategy/src/core/templates-manager.ts b/packages/vue2-strategy/src/core/templates-manager.ts
@@ -6,8 +6,8 @@ import {
     mountTemplate
 } from "./templates-discovering";
 
-import * as domAdapter from "devextreme/core/dom_adapter";
-import * as events from "devextreme/events";
+import domAdapter from "devextreme/core/dom_adapter";
+import { one } from "devextreme/events";
 import { DX_REMOVE_EVENT, DX_TEMPLATE_WRAPPER_CLASS } from "./constants";
 import { allKeysAreEqual } from "./helpers";
 
@@ -82,9 +82,9 @@ class TemplatesManager {
                     const removalListener = document.createElement(container.nodeName === "TABLE" ? "tbody" : "span");
                     removalListener.style.display = "none";
                     container.appendChild(removalListener);
-                    events.one(removalListener, DX_REMOVE_EVENT, mountedTemplate.$destroy.bind(mountedTemplate));
+                    one(removalListener, DX_REMOVE_EVENT, mountedTemplate.$destroy.bind(mountedTemplate));
                 } else {
-                    events.one(element, DX_REMOVE_EVENT, mountedTemplate.$destroy.bind(mountedTemplate));
+                    one(element, DX_REMOVE_EVENT, mountedTemplate.$destroy.bind(mountedTemplate));
                 }
 
                 return element;

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,6 +15,7 @@
                 "vue2-strategy/src/core"
             ]
         },
+        "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
         "target": "es5",
         "module": "commonjs",