Add support for CommonJS loaders (#243)

Author: AlekseyMartynov

appveyor.yml

@@ -29,6 +29,7 @@ test_script:
   - npm run karma
   - npm run karma-bundled
   - npm run karma-bundled-nojquery
+  - npm run karma-bundled-nojquery-cjs
 
   - >-
     OpenCover\tools\OpenCover.Console -returntargetcode -register:user -oldstyle

build/make-nojquery.js

@@ -8,13 +8,13 @@ const README = `# DevExtreme ASP.NET Data
 jQuery-free version of [devextreme-aspnet-data](https://www.npmjs.com/package/devextreme-aspnet-data).
 `;
 
-const JQ_SURROGATE_AMD = `{
-                    ajax: require("devextreme/core/utils/ajax").sendRequest,
-                    Deferred: require("devextreme/core/utils/deferred").Deferred,
-                    extend: require("devextreme/core/utils/extend").extend
-                }`;
+const JQ_SURROGATE_MODULAR = `$1{
+$1    ajax: require("devextreme/core/utils/ajax").sendRequest,
+$1    Deferred: require("devextreme/core/utils/deferred").Deferred,
+$1    extend: require("devextreme/core/utils/extend").extend
+$1}`;
 
-const JQ_SURROGATE_GLOBAL = `throw "This script should be used with an AMD loader"`;
+const JQ_SURROGATE_GLOBAL = `throw "This script should be used with an AMD or CommonJS loader"`;
 
 const AJAX_SETTINGS_SURROGATE = `{
         cache?: boolean;
@@ -45,9 +45,9 @@ fs.writeFileSync(path.join(outputPath, "package.json"), JSON.stringify(nojqueryP
 fs.writeFileSync(
     path.join(outputPath, "index.js"),
     fs.readFileSync(path.join(__dirname, "../js/dx.aspnet.data.js"), "utf-8")
-        .replace("require(\"jquery\")", JQ_SURROGATE_AMD)
+        .replace(/( +)require\("jquery"\)/g, JQ_SURROGATE_MODULAR)
         .replace(/DevExpress\.data\.AspNet = [^]+?\)/, JQ_SURROGATE_GLOBAL)
-        .replace(/\/\* global .+?\*\//, "/* global define */")
+        .replace(/\/\* global .+?\*\//, "/* global define, module, require */")
 );
 
 fs.writeFileSync(

js-test/test.js

@@ -1,36 +1,37 @@
 // jshint strict: true, browser: true, undef: true, unused: true, eqeqeq: true
-/* global ASPNET_DATA_SCRIPT, DevExpress, define, Promise */
+/* global ASPNET_DATA_SCRIPT, DevExpress, define, module, Promise, require */
 
 (function(factory) {
     "use strict";
 
-    var QUnit = window.QUnit;
-
     if(typeof define === "function" && define.amd) {
-        define("qunit-amd", function() {
-            return QUnit; // https://github.com/karma-runner/karma-qunit/issues/57
-        });
-
         define(function(require) {
             factory(
-                require("qunit-amd"),
                 require("xhr-mock").default,
                 require("devextreme/data/data_source"),
                 require(ASPNET_DATA_SCRIPT)
             );
         });
+    } else if (typeof module === "object" && module.exports) {
+        module.exports = factory(
+            require("xhr-mock").default,
+            require("devextreme/data/data_source"),
+            require(ASPNET_DATA_SCRIPT)
+        );
     } else {
         factory(
-            QUnit,
             window.XHRMock,
             DevExpress.data.DataSource,
             DevExpress.data.AspNet
         );
     }
 
-})(function(QUnit, XHRMock, DataSource, AspNet) {
+})(function(XHRMock, DataSource, AspNet) {
     "use strict";
 
+    // https://github.com/karma-runner/karma-qunit/issues/57
+    var QUnit = window.QUnit;
+
     var createStore = AspNet.createStore,
         NEVER_RESOLVE = new Promise(function() { });
 

js/dx.aspnet.data.js

@@ -2,7 +2,7 @@
 // Copyright (c) Developer Express Inc.
 
 // jshint strict: true, undef: true, unused: true, eqeqeq: true
-/* global DevExpress, jQuery, define */
+/* global DevExpress, jQuery, define, module, require */
 
 (function(factory) {
     "use strict";
@@ -15,6 +15,12 @@
                 require("devextreme/data/utils")
             );
         });
+    } else if (typeof module === "object" && module.exports) {
+        module.exports = factory(
+            require("jquery"),
+            require("devextreme/data/custom_store"),
+            require("devextreme/data/utils")
+        );
     } else {
         DevExpress.data.AspNet = factory(
             jQuery,

package.json

@@ -37,6 +37,7 @@
     "karma": "cd js-test && karma start",
     "karma-bundled": "cd js-test && webpack --define ASPNET_DATA_SCRIPT='../js/dx.aspnet.data.js' test.js test-bundle.js && karma start --bundled",
     "karma-bundled-nojquery": "cd js-test && webpack --define ASPNET_DATA_SCRIPT='../js-nojquery/index.js' test.js test-bundle.js && karma start --bundled",
+    "karma-bundled-nojquery-cjs": "cd js-test && webpack --define ASPNET_DATA_SCRIPT='../js-nojquery/index.js' --define define=false test.js test-bundle.js && karma start --bundled",
     "dts": "cd js-test && tsc check-ts-compilation.ts && tsc check-ts-compilation.nojquery.ts",
     "jshint": "jshint --verbose js js-nojquery",
     "eclint": "eclint check *.{yml,json} {net,js,js-test}/**/*.{cs,js,ts,html,json,cshtml,tt} !net/**/{bin,obj}/** !net/docfx/build/** !js-test/test-bundle.js !net/Sample/{node_modules,wwwroot/lib}/**"