Prevent minification of nextDefineUri

GoogleChromeLabs · May 7, 2021 · 63b992c · 63b992c
1 parent f40810a
commit 63b992c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/client-bundle-plugin.js b/lib/client-bundle-plugin.js
@@ -147,11 +147,11 @@ export default function (inputOptions, outputOptions, resolveFileUrl) {
         const inlineDefines = [
           ...allModules.map(
             (item) =>
-              `nextDefineUri=location.origin+${resolveFileUrl(item)};${
+              `self.nextDefineUri=location.origin+${resolveFileUrl(item)};${
                 item.code
               }`,
           ),
-          'nextDefineUri=""',
+          'self.nextDefineUri=""',
         ];
 
         return JSON.stringify(inlineDefines.join(''));

diff --git a/lib/omt.ejs b/lib/omt.ejs
@@ -11,8 +11,6 @@
  * limitations under the License.
  */
 
-var nextDefineUri;
-
 // If the loader is already loaded, just stop.
 if (!self.<%- amdFunctionName %>) {
   let registry = {};
@@ -25,7 +23,7 @@ if (!self.<%- amdFunctionName %>) {
         fetch(uri)
           .then(resp => resp.text())
           .then(code => {
-            nextDefineUri = uri;
+            self.nextDefineUri = uri;
             eval(code);
           })
       <% } else { %>
@@ -36,7 +34,7 @@ if (!self.<%- amdFunctionName %>) {
             script.onload = resolve;
             document.head.appendChild(script);
           } else {
-            nextDefineUri = uri;
+            self.nextDefineUri = uri;
             importScripts(uri);
             resolve();
           }
@@ -53,7 +51,7 @@ if (!self.<%- amdFunctionName %>) {
   };
 
   self.<%- amdFunctionName %> = (depsNames, factory) => {
-    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
+    const uri = self.nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
     if (registry[uri]) {
       // Module is already loading or loaded.
       return;
@@ -65,9 +63,9 @@ if (!self.<%- amdFunctionName %>) {
       exports,
       require
     };
-    registry[uri] = Promise.all(depsNames.map(
+    registry[uri] = Promise.resolve().then(() => Promise.all(depsNames.map(
       depName => specialDeps[depName] || require(depName)
-    )).then(deps => {
+    ))).then(deps => {
       factory(...deps);
       return exports;
     });