requirejs-esm 1.0.1 → 2.0.0

package/README.md

@@ -8,9 +8,11 @@ A [RequireJS] plugin converting JavaScript modules from ESM to AMD. It takes car
 
 The official [RequireJS optimizer] (`r.js`) does not wire up source maps from the original (not transpiled) sources to the source map of the output bundle. It makes this or similar plugins unfeasible for serious work. If you want the proper support for source maps, replace the official optimizer package ([`requirejs`]) with the forked [`@prantlf/requirejs`], which is fixed.
 
+An alternative to this plugin is a preprocessor, which converts the module format before RequireJS consumes it. It is a lot less intrusive solution, but it requires a pluggable development web server, so that a plugin (compatible with [connect middleware]) can be registered in it. See [requirejs-esm-preprocessor] for more information.
+
 ## Installation
 
-This module can be installed in your project using [NPM], [PNPM] or [Yarn]. Make sure, that you use [Node.js] version 6 or newer.
+This module can be installed in your project using [NPM], [PNPM] or [Yarn]. Make sure, that you use [Node.js] version 14 or newer.
 
 ```sh
 npm i -D requirejs-esm
@@ -48,11 +50,20 @@ pragmasOnSave: {
 }
 ```
 
-See also a [demo] project:
+See also a [demo-local] project, which includes sources only from the local `src` directory:
 
 ```sh
 npm start
-open http://localhost:8967/demo/normal.html
+open http://localhost:8967/demo-local/normal.html
+open http://localhost:8967/demo-local/optimized.html
+```
+
+See also a [demo-extern] project, which includes sources from the local `src` directory and from `node_modules` outside of it:
+
+```sh
+npm run start
+open http://localhost:8967/demo-extern/normal.html
+open http://localhost:8967/demo-extern/optimized.html
 ```
 
 ## Advanced
@@ -173,13 +184,16 @@ Licensed under the MIT license.
 [RequireJS]: http://requirejs.org
 [RequireJS optimizer]: https://requirejs.org/docs/optimization.html
 [requirejs-babel7]: https://www.npmjs.com/package/requirejs-babel7
+[requirejs-esm-preprocessor]: https://www.npmjs.com/package/requirejs-esm-preprocessor
+[connect middleware]: https://github.com/senchalabs/connect/wiki
 [`requirejs`]: https://www.npmjs.com/package/requirejs
 [`@prantlf/requirejs`]: https://www.npmjs.com/package/@prantlf/requirejs
 [Node.js]: http://nodejs.org/
 [NPM]: https://www.npmjs.com/
 [PNPM]: https://pnpm.io/
 [Yarn]: https://yarnpkg.com/
-[demo]: https://github.com/prantlf/requirejs-esm/tree/master/demo
+[demo-local]: https://github.com/prantlf/requirejs-esm/tree/master/demo-local
+[demo-extern]: https://github.com/prantlf/requirejs-esm/tree/master/demo-extern
 [default module name resolution]: https://github.com/prantlf/requirejs-esm/blob/master/src/resolve-path.js#L48
 [resolvePath]: https://github.com/tleunen/babel-plugin-module-resolver/blob/master/DOCS.md#resolvepath
 [a lot faster]: ./perf/README.md#readme

package/dist/api.js

@@ -53,21 +53,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 (sourcePath, currentFile, { pluginName }) {
+  function resolvePath (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
   }
 
   const errorMessages = {
@@ -944,9 +947,9 @@
                   mask |= 8;
                   break;
               case 115:
-                  if (mask & 12)
+                  if (mask & 32)
                       report(parser, 34, 's');
-                  mask |= 12;
+                  mask |= 32;
                   break;
               default:
                   report(parser, 33);
@@ -1859,7 +1862,7 @@
                           }
                           else if (ch === 61) {
                               advanceChar(parser);
-                              return 8456000;
+                              return 8456256;
                           }
                           if (ch === 33) {
                               const index = parser.index + 1;
@@ -2042,7 +2045,7 @@
                       const ch = parser.currentChar;
                       if (ch === 61) {
                           advanceChar(parser);
-                          return 8456001;
+                          return 8456257;
                       }
                       if (ch !== 62)
                           return 8456259;
@@ -5034,7 +5037,7 @@
       nextToken(parser, context | 32768);
       const argument = parser.flags & 1 || parser.token & 1048576
           ? null
-          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.line, parser.column);
+          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.linePos, parser.colPos);
       matchOrInsertSemicolon(parser, context | 32768);
       return finishNode(parser, context, start, line, column, {
           type: 'ReturnStatement',
@@ -6150,7 +6153,7 @@
               if ((context & 524288) < 1)
                   report(parser, 26);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 2;
               break;
           }
@@ -6159,7 +6162,7 @@
               if ((context & 262144) < 1)
                   report(parser, 27);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 1;
               break;
           }
@@ -6190,10 +6193,10 @@
           expr = parseUpdateExpression(parser, context, expr, start, line, column);
       }
       else if ((parser.token & 67108864) === 67108864) {
-          context = (context | 134217728 | 8192) ^ (134217728 | 8192);
+          context = (context | 134217728) ^ 134217728;
           switch (parser.token) {
               case 67108877: {
-                  nextToken(parser, context | 1073741824);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.assignable = 1;
                   const property = parsePropertyOrPrivatePropertyName(parser, context);
                   expr = finishNode(parser, context, start, line, column, {
@@ -6249,7 +6252,7 @@
                   break;
               }
               case 67108991: {
-                  nextToken(parser, context);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.flags |= 2048;
                   parser.assignable = 2;
                   expr = parseOptionalChain(parser, context, expr, start, line, column);
@@ -8413,12 +8416,10 @@
       }
       else if (context & 1 && parser.token === 131) {
           kind |= 4096;
-          key = parsePrivateIdentifier(parser, context, tokenPos, linePos, colPos);
-          context = context | 16384;
+          key = parsePrivateIdentifier(parser, context | 16384, tokenPos, linePos, colPos);
       }
       else if (context & 1 && (parser.token & 1073741824) === 1073741824) {
           kind |= 128;
-          context = context | 16384;
       }
       else if (token === 122) {
           key = parseIdentifier(parser, context, 0);
@@ -8784,7 +8785,7 @@
       });
   }
   function parseJSXExpressionContainer(parser, context, inJSXChild, isAttr, start, line, column) {
-      nextToken(parser, context);
+      nextToken(parser, context | 32768);
       const { tokenPos, linePos, colPos } = parser;
       if (parser.token === 14)
           return parseJSXSpreadChild(parser, context, tokenPos, linePos, colPos);
@@ -81686,6 +81687,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URLSearchParams,
@@ -82237,6 +82241,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URL,
@@ -85182,9 +85189,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
 
@@ -85192,6 +85196,7 @@
     const { elements } = deps;
     if (!elements.length) return
 
+    const { resolvePath } = options;
     let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
@@ -85570,11 +85575,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;
@@ -85585,7 +85587,6 @@
         }
       }
     }
-
     return arrayExpression(importPaths)
   }
 
@@ -85594,7 +85595,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);
         }