Partial fix for gfranko#104, part 1 only

6si · Apr 12, 2022 · 6633296 · 6633296
1 parent 1b02c05
commit 6633296
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/build/amdclean.js b/build/amdclean.js
@@ -1,4 +1,4 @@
-/*! amdclean - v2.7.0 - 2015-04-10
+/*! amdclean - v2.7.0 - 2015-12-05
 * http://gregfranko.com/amdclean
 * Copyright (c) 2015 Greg Franko */
 
@@ -464,7 +464,7 @@ convertToIIFEDeclaration = function convertToIIFEDeclaration(obj) {
           'computed': true,
           'object': {
             'type': 'Identifier',
-            'name': 'module'
+            'name': 'modules'
           },
           'property': {
             'type': 'Literal',
@@ -1451,7 +1451,7 @@ clean = function clean() {
       });
     }
   });
-  // Adds a local module variable if a user wants local module information available to them
+  // Adds a local modules variable if a user wants local module information available to them
   if (_.isObject(options.config) && !_.isEmpty(options.config)) {
     configAst = function () {
       var props = [];
@@ -1493,7 +1493,7 @@ clean = function clean() {
         'type': 'VariableDeclarator',
         'id': {
           'type': 'Identifier',
-          'name': 'module'
+          'name': 'modules'
         },
         'init': {
           'type': 'ObjectExpression',
@@ -1528,7 +1528,7 @@ clean = function clean() {
 };
 (function () {
   (function (root, factory, undefined) {
-
+    'use strict';
     // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, and plain browser loading
     if (typeof define === 'function' && define.amd) {
       factory.amd = true;
@@ -1554,7 +1554,7 @@ clean = function clean() {
       root.amdclean = factory(null, root);
     }
   }(this, function cleanamd(amdDependencies, context) {
-
+    'use strict';
     // Third-Party Dependencies
     // Note: These dependencies are hoisted to the top (as local variables) at build time (Look in the gulpfile.js file and the AMDclean wrap option for more details)
     sourcemapToAst = function () {

diff --git a/build/amdclean.min.js b/build/amdclean.min.js
diff --git a/src/amdclean.js b/src/amdclean.js
@@ -1,4 +1,4 @@
-/*! amdclean - v2.7.0 - 2015-04-10
+/*! amdclean - v2.7.0 - 2015-12-05
 * http://gregfranko.com/amdclean
 * Copyright (c) 2015 Greg Franko */
 
@@ -464,7 +464,7 @@ convertToIIFEDeclaration = function convertToIIFEDeclaration(obj) {
           'computed': true,
           'object': {
             'type': 'Identifier',
-            'name': 'module'
+            'name': 'modules'
           },
           'property': {
             'type': 'Literal',
@@ -1451,7 +1451,7 @@ clean = function clean() {
       });
     }
   });
-  // Adds a local module variable if a user wants local module information available to them
+  // Adds a local modules variable if a user wants local module information available to them
   if (_.isObject(options.config) && !_.isEmpty(options.config)) {
     configAst = function () {
       var props = [];
@@ -1493,7 +1493,7 @@ clean = function clean() {
         'type': 'VariableDeclarator',
         'id': {
           'type': 'Identifier',
-          'name': 'module'
+          'name': 'modules'
         },
         'init': {
           'type': 'ObjectExpression',
@@ -1528,7 +1528,7 @@ clean = function clean() {
 };
 (function () {
   (function (root, factory, undefined) {
-
+    'use strict';
     // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, and plain browser loading
     if (typeof define === 'function' && define.amd) {
       factory.amd = true;
@@ -1554,7 +1554,7 @@ clean = function clean() {
       root.amdclean = factory(null, root);
     }
   }(this, function cleanamd(amdDependencies, context) {
-
+    'use strict';
     // Third-Party Dependencies
     // Note: These dependencies are hoisted to the top (as local variables) at build time (Look in the gulpfile.js file and the AMDclean wrap option for more details)
     sourcemapToAst = function () {

diff --git a/src/modules/clean.js b/src/modules/clean.js
@@ -261,7 +261,7 @@ define([
       }
     });
 
-    // Adds a local module variable if a user wants local module information available to them
+    // Adds a local modules variable if a user wants local module information available to them
     if (_.isObject(options.config) && !_.isEmpty(options.config)) {
       configAst = (function() {
         var props = [];
@@ -306,7 +306,7 @@ define([
           'type': 'VariableDeclarator',
           'id': {
             'type': 'Identifier',
-            'name': 'module'
+            'name': 'modules'
           },
           'init': {
             'type': 'ObjectExpression',

diff --git a/src/modules/convertToIIFEDeclaration.js b/src/modules/convertToIIFEDeclaration.js
@@ -115,7 +115,7 @@ define([
             'computed': true,
             'object': {
               'type': 'Identifier',
-              'name': 'module'
+              'name': 'modules'
             },
             'property': {
               'type': 'Literal',

diff --git a/test/specs/convert.js b/test/specs/convert.js
@@ -901,7 +901,7 @@ describe('amdclean specs', function() {
           }
         }),
         cleanedCode = amdclean.clean(AMDcode, options),
-        standardJavaScript = "var moment,module={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (require,exports,module){return moment;}({},{},module['moment']);}";
+        standardJavaScript = "var moment,modules={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (require,exports,module){return moment;}({},{},modules['moment']);}";
 
       expect(cleanedCode).toBe(standardJavaScript);
     });
@@ -920,7 +920,7 @@ describe('amdclean specs', function() {
           }
         }),
         cleanedCode = amdclean.clean(AMDcode, options),
-        standardJavaScript = "var moment,module={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (module){return moment;}(module['moment']);}";
+        standardJavaScript = "var moment,modules={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (module){return moment;}(modules['moment']);}";
 
       expect(cleanedCode).toBe(standardJavaScript);
     });
@@ -939,7 +939,7 @@ describe('amdclean specs', function() {
           }
         }),
         cleanedCode = amdclean.clean(AMDcode, options),
-        standardJavaScript = "var moment,module={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (test,module){return moment;}(test,module['moment']);}";
+        standardJavaScript = "var moment,modules={'moment':{'config':function(){return{'noGlobal':true};}}};if(true){moment=function (test,module){return moment;}(test,modules['moment']);}";
 
       expect(cleanedCode).toBe(standardJavaScript);
     });