add missing import meta (#2435)

systemjs · Oct 6, 2022 · 41c6c92 · 41c6c92
1 parent 16818a2
commit 41c6c92
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/extras/global.js b/src/extras/global.js
@@ -47,9 +47,9 @@
   }
 
   var impt = systemJSPrototype.import;
-  systemJSPrototype.import = function (id, parentUrl) {
+  systemJSPrototype.import = function (id, parentUrl, meta) {
     noteGlobalProps();
-    return impt.call(this, id, parentUrl);
+    return impt.call(this, id, parentUrl, meta);
   };
 
   var emptyInstantiation = [[], function () { return {} }];

diff --git a/src/extras/named-register.js b/src/extras/named-register.js
@@ -38,7 +38,7 @@
       firstNamedDefine = null;
       firstName = null;
     });
-    return register.apply(this, [deps, declare]);
+    return register.apply(this, [deps, declare, metas]);
   };
 
   var resolve = systemJSPrototype.resolve;
@@ -55,13 +55,13 @@
   };
 
   var instantiate = systemJSPrototype.instantiate;
-  systemJSPrototype.instantiate = function (url, firstParentUrl) {
+  systemJSPrototype.instantiate = function (url, firstParentUrl, meta) {
     var result = this.registerRegistry[url];
     if (result) {
       this.registerRegistry[url] = null;
       return result;
     } else {
-      return instantiate.call(this, url, firstParentUrl);
+      return instantiate.call(this, url, firstParentUrl, meta);
     }
   };
 

diff --git a/src/extras/transform.js b/src/extras/transform.js
@@ -9,9 +9,9 @@ import { errMsg } from '../err-msg.js';
   var systemJSPrototype = global.System.constructor.prototype;
 
   var instantiate = systemJSPrototype.instantiate;
-  systemJSPrototype.instantiate = function (url, parent) {
+  systemJSPrototype.instantiate = function (url, parent, meta) {
     if (url.slice(-5) === '.wasm')
-      return instantiate.call(this, url, parent);
+      return instantiate.call(this, url, parent, meta);
 
     var loader = this;
     return fetch(url, { credentials: 'same-origin' })

diff --git a/src/features/depcache.js b/src/features/depcache.js
@@ -3,11 +3,11 @@ import { systemJSPrototype, getOrCreateLoad } from '../system-core.js';
 import { importMap } from './import-maps.js';
 
 var systemInstantiate = systemJSPrototype.instantiate;
-systemJSPrototype.instantiate = function (url, firstParentUrl) {
+systemJSPrototype.instantiate = function (url, firstParentUrl, meta) {
   var preloads = (!process.env.SYSTEM_BROWSER && this[IMPORT_MAP] || importMap).depcache[url];
   if (preloads) {
     for (var i = 0; i < preloads.length; i++)
       getOrCreateLoad(this, this.resolve(preloads[i], url), url);
   }
-  return systemInstantiate.call(this, url, firstParentUrl);
-};
+  return systemInstantiate.call(this, url, firstParentUrl, meta);
+};
diff --git a/src/features/fetch-load.js b/src/features/fetch-load.js
@@ -13,13 +13,14 @@ if (typeof fetch !== 'undefined')
 
 var instantiate = systemJSPrototype.instantiate;
 var jsContentTypeRegEx = /^(text|application)\/(x-)?javascript(;|$)/;
-systemJSPrototype.instantiate = function (url, parent) {
+systemJSPrototype.instantiate = function (url, parent, meta) {
   var loader = this;
-  if (!this.shouldFetch(url))
+  if (!this.shouldFetch(url, parent, meta))
     return instantiate.apply(this, arguments);
   return this.fetch(url, {
     credentials: 'same-origin',
-    integrity: importMap.integrity[url]
+    integrity: importMap.integrity[url],
+    meta
   })
   .then(function (res) {
     if (!res.ok)