requirejs-esm 1.0.0 → 1.0.1

package/dist/plugin.js

@@ -1,10 +1,12 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define([
 //>>excludeStart('excludeEsm', pragmas.excludeEsm)
       'module'
 //>>excludeEnd('excludeEsm')
     ], factory) :
+//>>excludeStart('excludeEsm', pragmas.excludeEsm)
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+//>>excludeEnd('excludeEsm')
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.requirejsEsmPlugin = factory());
 })(this, (function (
 //>>excludeStart('excludeEsm', pragmas.excludeEsm)
@@ -66,23 +68,18 @@
 
   var writeText$1 = writeText;
 
-  let skipModules$1 = [];
-
-  function setSkipModules(names) {
-    skipModules$1 = names;
-  }
-
-  // Checks if a module name is included in the list of modules to skip
-  // the transformation.
-  function skipModule(name) {
-    for (const skipModule of skipModules$1) {
-      // Recognise an asterisk at the beginning
-      if (skipModule.startsWith('*')) {
-        if (name.indexOf(skipModule.substring(1)) >= 0) return true
-      }
-      // Accept a path prefix as well.
-      else if (name.startsWith(skipModule)) return true
+  // Returns the child file name by cutting the directoris before the last slash,
+  // including the slash. If there is no slash in the path - the path is just
+  // a file name, it will return the file name. If the path includes a URL
+  // query starting with the question mark, it will cut it away including the
+  // question mark.
+  function childFile (path) {
+    const lastSlash = path.lastIndexOf('/');
+    if (lastSlash > 0) {
+      path = path.substring(lastSlash + 1);
     }
+    const questionMark = path.lastIndexOf('?');
+    return questionMark > 0 ? path.substring(0, questionMark) : path
   }
 
   // Returns the parent directory by cutting the file name after the last slash,
@@ -149,6 +146,25 @@
     return `${pluginName}!${sourcePath}`
   }
 
+  let skipModules$1 = [];
+
+  function setSkipModules(names) {
+    skipModules$1 = names;
+  }
+
+  // Checks if a module name is included in the list of modules to skip
+  // the transformation.
+  function skipModule(name) {
+    for (const skipModule of skipModules$1) {
+      // Recognise an asterisk at the beginning
+      if (skipModule.startsWith('*')) {
+        if (name.indexOf(skipModule.substring(1)) >= 0) return true
+      }
+      // Accept a path prefix as well.
+      else if (name.startsWith(skipModule)) return true
+    }
+  }
+
   const errorMessages = {
       [0]: 'Unexpected token',
       [28]: "Unexpected token: '%0'",
@@ -85755,6 +85771,34 @@
   //>>excludeEnd('excludeEsm')
   var plugin = {
     load(name, req, onload, reqConfig) {
+  //>>excludeStart('excludeEsm', pragmas.excludeEsm)
+      const { isBuild } = reqConfig;
+      // if (!bundledModules) {
+      //   bundledModules = new Set()
+      //   const { bundles } = reqConfig
+      //   if (bundles) {
+      //     verbose && console.log('esm: initialising bundles', name)
+      //     for (const bundle in bundles) {
+      //       for (const module of bundles[bundle]) {
+      //         bundledModules.add(module)
+      //       }
+      //     }
+      //   }
+      // }
+
+      // Paths relative to the current directory include the file extension.
+      // Otherwise the file extension must not be used for JavaScript modules.
+      // The file name should include the orioginal extension in the source maps.
+      const file = name.endsWith(fileExtension) ? name : name + fileExtension;
+      // Compilation and bundling of module sub-trees can be skipped, if those
+      // are mapped to the pseudo-path `empty:`, meaning that those modules
+      // are external and will be loaded during the runtime.
+      const url = req.toUrl(file);
+      if (url.startsWith('empty:')) {
+        verbose && console.log('esm: skipping', name, 'mapped to', url);
+        return onload()
+      }
+
       verbose && console.log('esm: loading', name);
       // If the module has been already defined from a module bundle, it was
       // already transpiled, when the output bundle was written. No need to
@@ -85769,24 +85813,14 @@
       // If the whole application is transpiled, there is no need to transpile
       // ESM modules or prefix dependencies of AMD modules. Even not yet defined
       // modules can be loaded just by `require` to get better performance.
-      if (!mixedAmdAndEsm && !reqConfig.isBuild && req.specified(name) ||
-          onlyAmd || skipModule(name)) {
+      if (!mixedAmdAndEsm && !isBuild && req.specified(name) ||
+          /*bundledModules.has(name) ||*/ onlyAmd || skipModule(name) ||
+          // If the module was bundled, it had to be already transpiled.
+          !isBuild && childFile(url) !== childFile(file)) {
         verbose && console.log('esm: delegating', name);
+  //>>excludeEnd('excludeEsm')
         return req([name], onload, onload.error)
-      }
   //>>excludeStart('excludeEsm', pragmas.excludeEsm)
-
-      // Paths relative to the current directory include the file extension.
-      // Otherwise the file extension must not be used for JavaScript modules.
-      // The file name should include the orioginal extension in the source maps.
-      const file = name.endsWith(fileExtension) ? name : name + fileExtension;
-      // Compilation and bundling of module sub-trees can be skipped, if those
-      // are mapped to the pseudo-path `empty:`, meaning that those modules
-      // are external and will be loaded during the runtime.
-      const url = req.toUrl(file);
-      if (url.startsWith('empty:')) {
-        verbose && console.log('esm: skipping', name, 'mapped to', url);
-        return onload()
       }
 
       // Fetch the text of the source module by AJAX and transpile it.
@@ -85807,12 +85841,12 @@
             // Always produce the source maps when transpiling in the browser, otherwise
             // the debugging would me impossible. When building and bundling, check if
             // the source maps were enabled for the output.
-            sourceMap: sourceMap || !reqConfig.isBuild
+            sourceMap: sourceMap || !isBuild
           }));
           if (!updated) {
             verbose && console.log('esm: retaining', name);
             // return req([name], onload, onload.error)
-          } else if (reqConfig.isBuild && debugDir) {
+          } else if (isBuild && debugDir) {
             writeText$1(`${debugDir}/${file}`, code);
           }
         } catch (error) {
@@ -85823,7 +85857,7 @@
         }
 
         // Remember the transpiled content for the writing phase during the build.
-        if (reqConfig.isBuild) {
+        if (isBuild) {
           buildMap[name] = code;
         }