avoid module-types override shouldFetch

systemjs · Sep 23, 2022 · 2107260 · 2107260
1 parent d44d41f
commit 2107260
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/extras/module-types.js b/src/extras/module-types.js
@@ -8,8 +8,9 @@ import { resolveUrl } from '../common.js';
   var systemJSPrototype = global.System.constructor.prototype;
 
   var moduleTypesRegEx = /^[^#?]+\.(css|html|json|wasm)([?#].*)?$/;
+  var _shouldFetch = systemJSPrototype.shouldFetch.bind(systemJSPrototype)
   systemJSPrototype.shouldFetch = function (url) {
-    return moduleTypesRegEx.test(url);
+    return _shouldFetch(url) || moduleTypesRegEx.test(url);
   };
 
   var jsonContentType = /^application\/json(;|$)/;

diff --git a/test/system-node.mjs b/test/system-node.mjs
@@ -37,7 +37,7 @@ describe('NodeJS version of SystemJS', () => {
 
   describe('import maps', () => {
     it('can load a module from the network', async () => {
-      applyImportMap(System, {imports: {"rxjs": "https://unpkg.com/@esm-bundle/rxjs@6.5.4-fix.0/system/rxjs.min.js"}});
+      applyImportMap(System, {imports: {"rxjs": "https://cdn.jsdelivr.net/npm/@esm-bundle/rxjs@6.5.4-fix.0/system/rxjs.min.js"}});
       const rxjs = await System.import("rxjs");
       assert.ok(rxjs.Observable);
     });
@@ -48,4 +48,4 @@ describe('NodeJS version of SystemJS', () => {
       assert.equal(foo.p, 5);
     });
   });
-});
+});