6.2.2

CHANGELOG.md

@@ -1,3 +1,6 @@
+SystemJS 6.2.2
+* Supporting multiple define variations for named modules. Resolves #2118. (https://github.com/systemjs/systemjs/pull/2119)
+
 SystemJS 6.2.1
 * Fix problem with named register modules (resolves #2115) (https://github.com/systemjs/systemjs/pull/2116)
 

dist/extras/amd.js

@@ -115,38 +115,42 @@
   global.define = function (name, deps, execute) {
     // define('', [], function () {})
     if (typeof name === 'string') {
+      const depsAndExec = getDepsAndExec(deps, execute);
       if (amdDefineDeps) {
         if (!System.registerRegistry)
           throw Error('Include the named register extension for SystemJS named AMD support.');
-        addToRegisterRegistry(name, createAMDRegister(deps, execute));
+        addToRegisterRegistry(name, createAMDRegister(depsAndExec[0], depsAndExec[1]));
         amdDefineDeps = [];
         amdDefineExec = emptyFn;
         return;
       }
       else {
         if (System.registerRegistry)
-          addToRegisterRegistry(name, createAMDRegister([].concat(deps), execute));
+          addToRegisterRegistry(name, createAMDRegister([].concat(depsAndExec[0]), depsAndExec[1]));
         name = deps;
         deps = execute;
       }
     }
+    const depsAndExec = getDepsAndExec(name, deps);
+    amdDefineDeps = depsAndExec[0];
+    amdDefineExec = depsAndExec[1];
+  };
+  global.define.amd = {};
+
+  function getDepsAndExec(arg1, arg2) {
     // define([], function () {})
-    if (name instanceof Array) {
-      amdDefineDeps = name;
-      amdDefineExec = deps;
+    if (arg1 instanceof Array) {
+      return [arg1, arg2];
     }
     // define({})
-    else if (typeof name === 'object') {
-      amdDefineDeps = [];
-      amdDefineExec = function () { return name };
+    else if (typeof arg1 === 'object') {
+      return [[], function () { return arg1 }];
     }
     // define(function () {})
-    else if (typeof name === 'function') {
-      amdDefineDeps = requireExportsModule;
-      amdDefineExec = name;
+    else if (typeof arg1 === 'function') {
+      return [requireExportsModule, arg1];
     }
-  };
-  global.define.amd = {};
+  }
 
   function addToRegisterRegistry(name, define) {
     if (!firstNamedDefine) {

dist/s.js

@@ -1,5 +1,5 @@
 /*
-* SJS 6.2.1
+* SJS 6.2.2
 * Minimal SystemJS Build
 */
 (function () {

dist/system.js

@@ -1,5 +1,5 @@
 /*
-* SystemJS 6.2.1
+* SystemJS 6.2.2
 */
 (function () {
   const hasSelf = typeof self !== 'undefined';