requirejs-esm 1.0.2 → 2.0.1

package/dist/plugin.js

@@ -129,21 +129,24 @@
 
   // Ensures that every JavaScript dependency will be prefixed by `esm!`.
   // Relative paths will be converted to be relative to the parent module.
-  function resolvePath$1 (sourcePath, currentFile, { pluginName }) {
+  function resolvePath$1 (sourcePath, currentFile, { pluginName, needsResolve } = {}) {
     // Ignore paths with other plugins applied and the three built-in
     // pseudo-modules of RequireJS.
-    if (!pluginName || sourcePath.includes('!') || sourcePath === 'require' ||
+    if (sourcePath.includes('!') || sourcePath === 'require' ||
         sourcePath === 'module' || sourcePath === 'exports') return
 
     // If `sourcePath` is relative to `currentFile` - starts with ./ or ../ -
     // prepend the parent directory of `currentFile` to it. This was needed
     // for modules located outside the source root (`baseUrl`), which were
     // mapped there using the `paths` of `map` configuration properties.
-    if (sourcePath.charAt(0) === '.' && (sourcePath.charAt(1) === '/' ||
-        sourcePath.charAt(1) === '.' && sourcePath.charAt(2) === '/')) {
+    if ((sourcePath.charAt(0) === '.' && (sourcePath.charAt(1) === '/' ||
+         sourcePath.charAt(1) === '.' && sourcePath.charAt(2) === '/')) &&
+        !(needsResolve && needsResolve(sourcePath, currentFile))) {
       sourcePath = joinPath(parentDir(currentFile), sourcePath);
+      if (sourcePath.endsWith('.js')) sourcePath = sourcePath.substring(0, sourcePath.length - 3);
     }
-    return `${pluginName}!${sourcePath}`
+
+    return pluginName ? `${pluginName}!${sourcePath}` : sourcePath
   }
 
   let skipModules$1 = [];
@@ -85281,9 +85284,6 @@
 
   // Updates dependency paths to be prefixed by `esm!` or otherwise updated.
   function updateAmdDeps(amd, options) {
-    const { resolvePath } = options;
-    if (!resolvePath) return
-
     const { deps } = amd;
     if (!deps) return
 
@@ -85291,6 +85291,7 @@
     const { elements } = deps;
     if (!elements.length) return
 
+    const { resolvePath } = options;
     let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
@@ -85669,11 +85670,8 @@
   // Update dependency paths to be prefixed by `esm!` or otherwise updated.
   function prepareImportPaths(importPaths, options ) {
     const { resolvePath } = options;
-    if (!resolvePath) return
-
     if (resolvePath) {
       const { sourceFileName: parentName } = options;
-
       for (const importPath of importPaths) {
         if (importPath.type === 'Literal') {
           const moduleName = importPath.value;
@@ -85684,7 +85682,6 @@
         }
       }
     }
-
     return arrayExpression(importPaths)
   }
 
@@ -85693,7 +85690,7 @@
     const { length } = amds;
     if (length) {
       options.amd = true;
-      if (options.pluginName) {
+      if (options.resolvePath) {
         for (const amd of amds) {
           options.updated |= updateAmdDeps(amd, options);
         }
@@ -85714,7 +85711,7 @@
     sourceMap
   } = {}) {
     // const ast = parse(text, { ecmaVersion, sourceType: 'module', locations: true })
-    let ast = parseModule(text, { loc: true });
+    let ast = parseModule(text, { next: true, loc: true });
 
     const options = { sourceFileName: file, pluginName, resolvePath, originalResolvePath: resolvePath$1 };
     transformModules(ast, options);