Compatibility with DevExtreme 21.1 (#484)

Author: AlekseyMartynov

js-test/check-ts-compilation.ts

@@ -13,7 +13,7 @@ let store = AspNetData.createStore({
     }
 })
 
-store.load({ sort: "name" }).done(r => {
+store.load({ sort: "name" }).then(r => {
 
 })
 

js-test/test.js

@@ -4,22 +4,26 @@
 (function(factory) {
     "use strict";
 
+    function unwrapESModule(module) {
+        return module && module.__esModule && module.default ? module.default : module;
+    }
+
     if(typeof define === "function" && define.amd) {
         define(function(require) {
             factory(
-                require("xhr-mock").default,
-                require("devextreme/core/version"),
-                require("devextreme/data/data_source"),
-                require("devextreme/core/utils/ajax"),
+                unwrapESModule(require("xhr-mock")),
+                unwrapESModule(require("devextreme/core/version")),
+                unwrapESModule(require("devextreme/data/data_source")),
+                unwrapESModule(require("devextreme/core/utils/ajax")),
                 require(ASPNET_DATA_SCRIPT)
             );
         });
     } else if (typeof module === "object" && module.exports) {
         module.exports = factory(
-            require("xhr-mock").default,
-            require("devextreme/core/version"),
-            require("devextreme/data/data_source"),
-            require("devextreme/core/utils/ajax"),
+            unwrapESModule(require("xhr-mock")),
+            unwrapESModule(require("devextreme/core/version")),
+            unwrapESModule(require("devextreme/data/data_source")),
+            unwrapESModule(require("devextreme/core/utils/ajax")),
             require(ASPNET_DATA_SCRIPT)
         );
     } else {
@@ -38,6 +42,9 @@
     // https://github.com/karma-runner/karma-qunit/issues/57
     var QUnit = window.QUnit;
 
+    if(typeof devextremeVersion === "object")
+        devextremeVersion = devextremeVersion.version;
+
     devextremeVersion = devextremeVersion.split(".").map(Number);
 
     var createStore = AspNet.createStore,

js/dx.aspnet.data.js

@@ -6,23 +6,27 @@
 (function(factory) {
     "use strict";
 
+    function unwrapESModule(module) {
+        return module && module.__esModule && module.default ? module.default : module;
+    }
+
     if(typeof define === "function" && define.amd) {
         define(function(require, exports, module) {
             module.exports = factory(
-                require("devextreme/core/utils/ajax"),
+                unwrapESModule(require("devextreme/core/utils/ajax")),
                 require("jquery").Deferred,
                 require("jquery").extend,
-                require("devextreme/data/custom_store"),
-                require("devextreme/data/utils")
+                unwrapESModule(require("devextreme/data/custom_store")),
+                unwrapESModule(require("devextreme/data/utils"))
             );
         });
     } else if (typeof module === "object" && module.exports) {
         module.exports = factory(
-            require("devextreme/core/utils/ajax"),
+            unwrapESModule(require("devextreme/core/utils/ajax")),
             require("jquery").Deferred,
             require("jquery").extend,
-            require("devextreme/data/custom_store"),
-            require("devextreme/data/utils")
+            unwrapESModule(require("devextreme/data/custom_store")),
+            unwrapESModule(require("devextreme/data/utils"))
         );
     } else {
         DevExpress.data.AspNet = factory(