6.1.9

systemjs · Jan 11, 2020 · bfce71e · bfce71e
1 parent a13f88f
commit bfce71e
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+SystemJS 6.1.9
+* Fix bug where url query params and hash broke module type file extension check (https://github.com/systemjs/systemjs/pull/2096 @LarsDenBakker)
+
 SystemJS 6.1.8
 * Ensure that __esModule is copied to ns even if it isn't enumerable. Improves webpack interop when using libraryTarget system.
 

diff --git a/dist/extras/module-types.js b/dist/extras/module-types.js
@@ -8,7 +8,9 @@
 
   systemJSPrototype.instantiate = function (url, parent) {
     const loader = this;
-    const ext = url.slice(url.lastIndexOf('.'));
+    const path = url.split('?')[0].split('#')[0];
+    const ext = path.slice(path.lastIndexOf('.'));
+
     switch (ext) {
       case '.css':
         return loadDynamicModule(function (_export, source) {
@@ -34,7 +36,7 @@
           const deps = [];
           const setters = [];
           const importObj = {};
-      
+
           // we can only set imports if supported (eg early Safari doesnt support)
           if (WebAssembly.Module.imports)
             WebAssembly.Module.imports(module).forEach(function (impt) {
@@ -46,7 +48,7 @@
                 });
               }
             });
-      
+
           return [deps, function (_export) {
             return {
               setters: setters,

diff --git a/dist/extras/module-types.min.js b/dist/extras/module-types.min.js
diff --git a/dist/extras/module-types.min.js.map b/dist/extras/module-types.min.js.map
diff --git a/dist/s.js b/dist/s.js
@@ -1,5 +1,5 @@
 /*
-* SJS 6.1.8
+* SJS 6.1.9
 * Minimal SystemJS Build
 */
 (function () {

diff --git a/dist/system.js b/dist/system.js
@@ -1,5 +1,5 @@
 /*
-* SystemJS 6.1.8
+* SystemJS 6.1.9
 */
 (function () {
   const hasSelf = typeof self !== 'undefined';
@@ -713,7 +713,9 @@
 
     systemJSPrototype.instantiate = function (url, parent) {
       const loader = this;
-      const ext = url.slice(url.lastIndexOf('.'));
+      const path = url.split('?')[0].split('#')[0];
+      const ext = path.slice(path.lastIndexOf('.'));
+
       switch (ext) {
         case '.css':
           return loadDynamicModule(function (_export, source) {
@@ -739,7 +741,7 @@
             const deps = [];
             const setters = [];
             const importObj = {};
-        
+
             // we can only set imports if supported (eg early Safari doesnt support)
             if (WebAssembly.Module.imports)
               WebAssembly.Module.imports(module).forEach(function (impt) {
@@ -751,7 +753,7 @@
                   });
                 }
               });
-        
+
             return [deps, function (_export) {
               return {
                 setters: setters,

diff --git a/dist/system.min.js b/dist/system.min.js