es-module-shims 1.3.2 → 1.3.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+ES Module Shims 1.3.6 (2021/12/07)
+* Fix resolve hook via esms options (#233, @ffortier)
+
+ES Module Shims 1.3.5 (2021/12/02)
+* Fix trailing comment regex for source mapping normalization with trailling comments (https://github.com/guybedford/es-module-shims/pull/231)
+
+ES Module Shims 1.3.4 (2021/12/02)
+* Support source mapping normalization with trailing comments (https://github.com/guybedford/es-module-shims/pull/229)
+
+ES Module Shims 1.3.3 (2021/11/30))
+* Remove use of document.write (https://github.com/guybedford/es-module-shims/pull/227, @lewisl9029)
+
 ES Module Shims 1.3.2 (2021/11/16)
 * Fix CSP nonce detection (https://github.com/guybedford/es-module-shims/pull/223, @MathiasWP)
 

package/README.md

@@ -85,7 +85,7 @@ If using CSS modules or JSON modules, since these features are relatively new, t
 
 ```html
 <script>
-window.esmsInitOptions = { enable: ['css-modules', 'json-modules'] }
+window.esmsInitOptions = { polyfillEnable: ['css-modules', 'json-modules'] }
 </script>
 ```
 

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/* ES Module Shims 1.3.2 */
+/* ES Module Shims 1.3.6 */
 (function () {
 
   const edge = navigator.userAgent.match(/Edge\/\d\d\.\d+$/);
@@ -199,14 +199,14 @@
 
   const optionsScript = document.querySelector('script[type=esms-options]');
 
-  const esmsInitOptions$1 = optionsScript ? JSON.parse(optionsScript.innerHTML) : self.esmsInitOptions ? self.esmsInitOptions : {};
+  const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : self.esmsInitOptions ? self.esmsInitOptions : {};
 
-  let shimMode = !!esmsInitOptions$1.shimMode;
-  const resolveHook = globalHook(shimMode && esmsInitOptions$1.resolve);
+  let shimMode = !!esmsInitOptions.shimMode;
+  const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
 
-  const skip = esmsInitOptions$1.skip ? new RegExp(esmsInitOptions$1.skip) : null;
+  const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
 
-  let nonce = esmsInitOptions$1.nonce;
+  let nonce = esmsInitOptions.nonce;
 
   if (!nonce) {
     const nonceElement = document.querySelector('script[nonce]');
@@ -214,18 +214,18 @@
       nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
   }
 
-  const onerror = globalHook(esmsInitOptions$1.onerror || noop);
-  const onpolyfill = globalHook(esmsInitOptions$1.onpolyfill || noop);
+  const onerror = globalHook(esmsInitOptions.onerror || noop);
+  const onpolyfill = globalHook(esmsInitOptions.onpolyfill || noop);
 
-  const { revokeBlobURLs, noLoadEventRetriggers } = esmsInitOptions$1;
+  const { revokeBlobURLs, noLoadEventRetriggers } = esmsInitOptions;
 
-  const fetchHook = esmsInitOptions$1.fetch ? globalHook(esmsInitOptions$1.fetch) : fetch;
+  const fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
 
   function globalHook (name) {
     return typeof name === 'string' ? self[name] : name;
   }
 
-  const enable = Array.isArray(esmsInitOptions$1.polyfillEnable) ? esmsInitOptions$1.polyfillEnable : [];
+  const enable = Array.isArray(esmsInitOptions.polyfillEnable) ? esmsInitOptions.polyfillEnable : [];
   const cssModulesEnabled = enable.includes('css-modules');
   const jsonModulesEnabled = enable.includes('json-modules');
 
@@ -298,8 +298,7 @@
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
         document.head.appendChild(iframe);
-        // we use document.write here because eg Weixin built-in browser doesn't support setting srcdoc
-        iframe.contentWindow.document.write(`<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`);
+        iframe.src = createBlob(`<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`, 'text/html');
       })
     ]);
   });
@@ -319,7 +318,7 @@
     };
   }
 
-  const resolve = resolveHook ? async (id, parentUrl) => ({ r: await esmsInitOptions.resolve(id, parentUrl, defaultResolve), b: false }) : _resolve;
+  const resolve = resolveHook ? async (id, parentUrl) => ({ r: await resolveHook(id, parentUrl, defaultResolve), b: false }) : _resolve;
 
   let id = 0;
   const registry = {};
@@ -530,9 +529,9 @@
       resolvedSource += source.slice(lastIndex);
     }
 
-    resolvedSource = resolvedSource.replace(/\n\/\/# sourceMappingURL=([^\n]+)\s*$/, (match, url) => match.replace(url, () => new URL(url, load.r)));
+    // ; and // trailer support added for Ruby 7 source maps compatibility
     let hasSourceURL = false;
-    resolvedSource = resolvedSource.replace(/\n\/\/# sourceURL=([^\n]+)\s*$/, (match, url) => (hasSourceURL = true, match.replace(url, () => new URL(url, load.r))));
+    resolvedSource = resolvedSource.replace(sourceMapURLRegEx, (match, isMapping, url) => (hasSourceURL = !isMapping, match.replace(url, () => new URL(url, load.r))));
     if (!hasSourceURL)
       resolvedSource += '\n//# sourceURL=' + load.r;
 
@@ -540,6 +539,8 @@
     load.S = undefined;
   }
 
+  const sourceMapURLRegEx = /\n\/\/# source(Mapping)?URL=([^\n]+)\s*((;|\/\/[^#][^\n]*)\s*)*$/;
+
   const jsContentType = /^(text|application)\/(x-)?javascript(;|$)/;
   const jsonContentType = /^(text|application)\/json(;|$)/;
   const cssContentType = /^(text|application)\/css(;|$)/;

package/dist/es-module-shims.wasm.js

@@ -1,4 +1,4 @@
-/* ES Module Shims Wasm 1.3.2 */
+/* ES Module Shims Wasm 1.3.6 */
 (function () {
 
   const edge = navigator.userAgent.match(/Edge\/\d\d\.\d+$/);
@@ -199,14 +199,14 @@
 
   const optionsScript = document.querySelector('script[type=esms-options]');
 
-  const esmsInitOptions$1 = optionsScript ? JSON.parse(optionsScript.innerHTML) : self.esmsInitOptions ? self.esmsInitOptions : {};
+  const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : self.esmsInitOptions ? self.esmsInitOptions : {};
 
-  let shimMode = !!esmsInitOptions$1.shimMode;
-  const resolveHook = globalHook(shimMode && esmsInitOptions$1.resolve);
+  let shimMode = !!esmsInitOptions.shimMode;
+  const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
 
-  const skip = esmsInitOptions$1.skip ? new RegExp(esmsInitOptions$1.skip) : null;
+  const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
 
-  let nonce = esmsInitOptions$1.nonce;
+  let nonce = esmsInitOptions.nonce;
 
   if (!nonce) {
     const nonceElement = document.querySelector('script[nonce]');
@@ -214,18 +214,18 @@
       nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
   }
 
-  const onerror = globalHook(esmsInitOptions$1.onerror || noop);
-  const onpolyfill = globalHook(esmsInitOptions$1.onpolyfill || noop);
+  const onerror = globalHook(esmsInitOptions.onerror || noop);
+  const onpolyfill = globalHook(esmsInitOptions.onpolyfill || noop);
 
-  const { revokeBlobURLs, noLoadEventRetriggers } = esmsInitOptions$1;
+  const { revokeBlobURLs, noLoadEventRetriggers } = esmsInitOptions;
 
-  const fetchHook = esmsInitOptions$1.fetch ? globalHook(esmsInitOptions$1.fetch) : fetch;
+  const fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
 
   function globalHook (name) {
     return typeof name === 'string' ? self[name] : name;
   }
 
-  const enable = Array.isArray(esmsInitOptions$1.polyfillEnable) ? esmsInitOptions$1.polyfillEnable : [];
+  const enable = Array.isArray(esmsInitOptions.polyfillEnable) ? esmsInitOptions.polyfillEnable : [];
   const cssModulesEnabled = enable.includes('css-modules');
   const jsonModulesEnabled = enable.includes('json-modules');
 
@@ -295,8 +295,7 @@
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
         document.head.appendChild(iframe);
-        // we use document.write here because eg Weixin built-in browser doesn't support setting srcdoc
-        iframe.contentWindow.document.write(`<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`);
+        iframe.src = createBlob(`<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`, 'text/html');
       })
     ]);
   });
@@ -317,7 +316,7 @@
     };
   }
 
-  const resolve = resolveHook ? async (id, parentUrl) => ({ r: await esmsInitOptions.resolve(id, parentUrl, defaultResolve), b: false }) : _resolve;
+  const resolve = resolveHook ? async (id, parentUrl) => ({ r: await resolveHook(id, parentUrl, defaultResolve), b: false }) : _resolve;
 
   let id = 0;
   const registry = {};
@@ -528,9 +527,9 @@
       resolvedSource += source.slice(lastIndex);
     }
 
-    resolvedSource = resolvedSource.replace(/\n\/\/# sourceMappingURL=([^\n]+)\s*$/, (match, url) => match.replace(url, () => new URL(url, load.r)));
+    // ; and // trailer support added for Ruby 7 source maps compatibility
     let hasSourceURL = false;
-    resolvedSource = resolvedSource.replace(/\n\/\/# sourceURL=([^\n]+)\s*$/, (match, url) => (hasSourceURL = true, match.replace(url, () => new URL(url, load.r))));
+    resolvedSource = resolvedSource.replace(sourceMapURLRegEx, (match, isMapping, url) => (hasSourceURL = !isMapping, match.replace(url, () => new URL(url, load.r))));
     if (!hasSourceURL)
       resolvedSource += '\n//# sourceURL=' + load.r;
 
@@ -538,6 +537,8 @@
     load.S = undefined;
   }
 
+  const sourceMapURLRegEx = /\n\/\/# source(Mapping)?URL=([^\n]+)\s*((;|\/\/[^#][^\n]*)\s*)*$/;
+
   const jsContentType = /^(text|application)\/(x-)?javascript(;|$)/;
   const jsonContentType = /^(text|application)\/json(;|$)/;
   const cssContentType = /^(text|application)\/css(;|$)/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "1.3.2",
+  "version": "1.3.6",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {
@@ -11,10 +11,10 @@
     "build": "rollup -c",
     "bench": "bash bench/bench.sh",
     "bench:clear": "rm -rf bench/results",
-    "footprint": "npm run build && cat dist/es-module-shims.js | brotli | wc -c",
-    "footprint:csp": "npm run build && cat dist/es-module-shims.csp.js | brotli | wc -c",
+    "footprint": "npm run build ; cat dist/es-module-shims.js | brotli | wc -c",
+    "footprint:csp": "npm run build ; cat dist/es-module-shims.csp.js | brotli | wc -c",
     "prepublishOnly": "npm run build",
-    "test": "npm run test:test-base-href && npm run test:test-csp && npm run test:test-dom-order && npm run test:test-early-module-load && npm run test:test-polyfill && npm run test:test-polyfill-wasm && npm run test:test-preload-case && npm run test:test-revoke-blob-urls && npm run test:test-shim",
+    "test": "npm run test:test-base-href ; npm run test:test-csp ; npm run test:test-dom-order ; npm run test:test-early-module-load ; npm run test:test-polyfill ; npm run test:test-polyfill-wasm ; npm run test:test-preload-case ; npm run test:test-revoke-blob-urls ; npm run test:test-shim",
     "test:test-base-href": "cross-env TEST_NAME=test-base-href node test/server.mjs",
     "test:test-csp": "cross-env TEST_NAME=test-csp node test/server.mjs",
     "test:test-dom-order": "cross-env TEST_NAME=test-dom-order node test/server.mjs",