@jsenv/core 34.0.0 → 34.0.2

package/dist/js/ws.js

@@ -9,6 +9,9 @@ import require$$0$1 from "zlib";
 import require$$0$2 from "buffer";
 import require$$7 from "url";
 
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
 const {
   Duplex
 } = require$$0;
@@ -149,14 +152,9 @@ function createWebSocketStream(ws, options) {
   return duplex;
 }
 var stream = createWebSocketStream;
-var bufferUtilExports = {};
+var stream$1 = /*@__PURE__*/getDefaultExportFromCjs(stream);
 var bufferUtil$1 = {
-  get exports() {
-    return bufferUtilExports;
-  },
-  set exports(v) {
-    bufferUtilExports = v;
-  }
+  exports: {}
 };
 var constants = {
   BINARY_TYPES: ['nodebuffer', 'arraybuffer', 'fragments'],
@@ -276,16 +274,17 @@ bufferUtil$1.exports = {
 if (!process.env.WS_NO_BUFFER_UTIL) {
   try {
     const bufferUtil = require('bufferutil');
-    mask = bufferUtilExports.mask = function (source, mask, output, offset, length) {
+    mask = bufferUtil$1.exports.mask = function (source, mask, output, offset, length) {
       if (length < 48) _mask(source, mask, output, offset, length);else bufferUtil.mask(source, mask, output, offset, length);
     };
-    unmask$1 = bufferUtilExports.unmask = function (buffer, mask) {
+    unmask$1 = bufferUtil$1.exports.unmask = function (buffer, mask) {
       if (buffer.length < 32) _unmask(buffer, mask);else bufferUtil.unmask(buffer, mask);
     };
   } catch (e) {
     // Continue regardless of the error.
   }
 }
+var bufferUtilExports = bufferUtil$1.exports;
 const kDone = Symbol('kDone');
 const kRun = Symbol('kRun');
 
@@ -746,14 +745,8 @@ function inflateOnError(err) {
   err[kStatusCode$2] = 1007;
   this[kCallback](err);
 }
-var validationExports = {};
 var validation = {
-  get exports() {
-    return validationExports;
-  },
-  set exports(v) {
-    validationExports = v;
-  }
+  exports: {}
 };
 var isValidUTF8_1;
 const {
@@ -853,19 +846,20 @@ validation.exports = {
   tokenChars: tokenChars$2
 };
 if (isUtf8) {
-  isValidUTF8_1 = validationExports.isValidUTF8 = function (buf) {
+  isValidUTF8_1 = validation.exports.isValidUTF8 = function (buf) {
     return buf.length < 24 ? _isValidUTF8(buf) : isUtf8(buf);
   };
 } /* istanbul ignore else  */else if (!process.env.WS_NO_UTF_8_VALIDATE) {
   try {
     const isValidUTF8 = require('utf-8-validate');
-    isValidUTF8_1 = validationExports.isValidUTF8 = function (buf) {
+    isValidUTF8_1 = validation.exports.isValidUTF8 = function (buf) {
       return buf.length < 32 ? _isValidUTF8(buf) : isValidUTF8(buf);
     };
   } catch (e) {
     // Continue regardless of the error.
   }
 }
+var validationExports = validation.exports;
 const {
   Writable
 } = require$$0;
@@ -1309,6 +1303,7 @@ function error(ErrorCtor, message, prefix, statusCode, errorCode) {
   err[kStatusCode$1] = statusCode;
   return err;
 }
+var receiver$1 = /*@__PURE__*/getDefaultExportFromCjs(receiver);
 
 /* eslint no-unused-vars: ["error", { "varsIgnorePattern": "^net|tls$" }] */
 const {
@@ -1725,6 +1720,7 @@ let Sender$1 = class Sender {
   }
 };
 var sender = Sender$1;
+var sender$1 = /*@__PURE__*/getDefaultExportFromCjs(sender);
 const {
   kForOnEventAttribute: kForOnEventAttribute$1,
   kListener: kListener$1
@@ -3316,6 +3312,7 @@ function socketOnError$1() {
     this.destroy();
   }
 }
+var WebSocket$2 = /*@__PURE__*/getDefaultExportFromCjs(websocket);
 const {
   tokenChars
 } = validationExports;
@@ -3801,5 +3798,6 @@ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
     abortHandshake(socket, code, message);
   }
 }
+var websocketServer$1 = /*@__PURE__*/getDefaultExportFromCjs(websocketServer);
 
-export { receiver as Receiver, sender as Sender, websocket as WebSocket, websocketServer as WebSocketServer, stream as createWebSocketStream, websocket as default };
+export { receiver$1 as Receiver, sender$1 as Sender, WebSocket$2 as WebSocket, websocketServer$1 as WebSocketServer, stream$1 as createWebSocketStream, WebSocket$2 as default };

package/dist/jsenv.js

@@ -14753,21 +14753,7 @@ function default_1({
   };
 }
 
-/*
- * When systemjs format is used by babel, it will generated UID based on
- * the import specifier:
- * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
- * But at this stage import specifier are absolute file urls
- * So without minification these specifier are long and dependent
- * on where the files are on the filesystem.
- * This can be mitigated by minification that will rename them.
- * But to fix this issue once and for all I have copy-pasted
- * "@babel/plugin-transform-modules-systemjs" to introduce
- * "generateIdentifierHint" options and prevent that from hapenning
- */
-const TRANSFORM_MODULES_SYSTEMJS_PATH = fileURLToPath(new URL("./js/babel_plugin_transform_modules_systemjs.cjs", import.meta.url));
 const convertJsModuleToJsClassic = async ({
-  rootDirectoryUrl,
   systemJsInjection,
   systemJsClientFileUrl,
   urlInfo,
@@ -14792,15 +14778,8 @@ const convertJsModuleToJsClassic = async ({
     babelPlugins: [...(jsClassicFormat === "system" ? [
     // proposal-dynamic-import required with systemjs for babel8:
     // https://github.com/babel/babel/issues/10746
-    requireFromJsenv("@babel/plugin-proposal-dynamic-import"), [
-    // eslint-disable-next-line import/no-dynamic-require
-    requireFromJsenv(TRANSFORM_MODULES_SYSTEMJS_PATH), {
-      generateIdentifierHint: key => {
-        if (key.startsWith("file://")) {
-          return urlToRelativeUrl(key, rootDirectoryUrl);
-        }
-        return key;
-      }
+    requireFromJsenv("@babel/plugin-proposal-dynamic-import"), requireFromJsenv("@babel/plugin-transform-modules-systemjs"), [babelPluginRelativeImports, {
+      rootUrl: jsModuleUrlInfo.url
     }], [default_1, {
       asyncAwait: false,
       // already handled + we might not needs it at all
@@ -14809,7 +14788,9 @@ const convertJsModuleToJsClassic = async ({
       asyncAwait: false,
       // already handled + we might not needs it at all
       topLevelAwait: "simple"
-    }], babelPluginTransformImportMetaUrl, babelPluginTransformImportMetaResolve, requireFromJsenv("@babel/plugin-transform-modules-umd")])],
+    }], babelPluginTransformImportMetaUrl, babelPluginTransformImportMetaResolve, requireFromJsenv("@babel/plugin-transform-modules-umd"), [babelPluginRelativeImports, {
+      rootUrl: jsModuleUrlInfo.url
+    }]])],
     urlInfo: jsModuleUrlInfo
   });
   let sourcemap = jsModuleUrlInfo.sourcemap;
@@ -14846,6 +14827,68 @@ const convertJsModuleToJsClassic = async ({
   };
 };
 
+/*
+ * When systemjs or umd format is used by babel, it will generated UID based on
+ * the import specifier:
+ * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
+ * But at this stage import specifier are absolute file urls
+ * This can be mitigated by minification that will rename them.
+ * But to fix this issue once and for all there is babelPluginRelativeImports below
+ */
+const babelPluginRelativeImports = babel => {
+  const t = babel.types;
+  const replaceSpecifierAtPath = (path, state) => {
+    const specifier = path.node.value;
+    if (specifier.startsWith("file://")) {
+      const specifierRelative = urlToRelativeUrl(specifier, state.opts.rootUrl);
+      path.replaceWith(t.stringLiteral(specifierRelative));
+    }
+  };
+  return {
+    name: "relative-imports",
+    visitor: {
+      CallExpression: (path, state) => {
+        if (path.node.callee.type !== "Import") {
+          // Some other function call, not import();
+          return;
+        }
+        if (path.node.arguments[0].type !== "StringLiteral") {
+          // Non-string argument, probably a variable or expression, e.g.
+          // import(moduleId)
+          // import('./' + moduleName)
+          return;
+        }
+        const sourcePath = path.get("arguments")[0];
+        if (sourcePath.node.type === "StringLiteral") {
+          replaceSpecifierAtPath(sourcePath, state);
+        }
+      },
+      ImportDeclaration: (path, state) => {
+        const sourcePath = path.get("source");
+        replaceSpecifierAtPath(sourcePath, state);
+      },
+      ExportAllDeclaration: (path, state) => {
+        const sourcePath = path.get("source");
+        replaceSpecifierAtPath(sourcePath, state);
+      },
+      ExportNamedDeclaration: (path, state) => {
+        if (!path.node.source) {
+          // This export has no "source", so it's probably
+          // a local variable or function, e.g.
+          // export { varName }
+          // export const constName = ...
+          // export function funcName() {}
+          return;
+        }
+        const sourcePath = path.get("source");
+        if (sourcePath.node.type === "StringLiteral") {
+          replaceSpecifierAtPath(sourcePath, state);
+        }
+      }
+    }
+  };
+};
+
 /*
  * - propagate ?as_js_classic to urls
  * - perform conversion from js module to js classic when url uses ?as_js_classic
@@ -17539,6 +17582,7 @@ const jsenvPluginHttpUrls = () => {
  * and create a variable named "undefined"
  */
 const injectSupervisorIntoJs = async ({
+  webServer,
   content,
   url,
   type,
@@ -17564,7 +17608,7 @@ const injectSupervisorIntoJs = async ({
     specifier: sourcemapDataUrl
   });
   code = `${code}
-//# sourceURL=${url}`;
+//# sourceURL=${urlToRelativeUrl(url, webServer.rootDirectoryUrl)}`;
   return code;
 };
 const babelPluginJsModuleSupervisor = babel => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "34.0.0",
+  "version": "34.0.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -66,14 +66,14 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "3.0.4",
+    "@jsenv/ast": "3.0.5",
     "@jsenv/babel-plugins": "1.1.5",
     "@jsenv/filesystem": "4.2.3",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.4",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/plugin-bundling": "2.1.3",
+    "@jsenv/plugin-bundling": "2.1.4",
     "@jsenv/server": "15.0.2",
     "@jsenv/sourcemap": "1.0.10",
     "@jsenv/uneval": "1.6.0",
@@ -100,18 +100,18 @@
     "@babel/plugin-syntax-import-assertions": "7.20.0",
     "@jsenv/assert": "./packages/assert/",
     "@jsenv/eslint-config": "./packages/eslint-config/",
-    "@jsenv/file-size-impact": "14.0.0",
+    "@jsenv/file-size-impact": "14.1.0",
     "@jsenv/https-local": "3.0.6",
     "@jsenv/package-workspace": "0.5.1",
     "@jsenv/performance-impact": "4.1.0",
     "@jsenv/plugin-globals": "./packages/jsenv-plugin-globals/",
     "@jsenv/plugin-minification": "./packages/jsenv-plugin-minification/",
     "@jsenv/plugin-placeholders": "./packages/jsenv-plugin-placeholders/",
-    "eslint": "8.36.0",
+    "eslint": "8.38.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-react": "7.32.2",
-    "playwright": "1.32.1",
+    "playwright": "1.32.3",
     "prettier": "2.8.7"
   }
 }

package/src/plugins/supervisor/js_supervisor_injection.js

@@ -36,10 +36,12 @@
  * and create a variable named "undefined"
  */
 
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { applyBabelPlugins } from "@jsenv/ast"
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap"
 
 export const injectSupervisorIntoJs = async ({
+  webServer,
   content,
   url,
   type,
@@ -66,7 +68,7 @@ export const injectSupervisorIntoJs = async ({
     specifier: sourcemapDataUrl,
   })
   code = `${code}
-//# sourceURL=${url}`
+//# sourceURL=${urlToRelativeUrl(url, webServer.rootDirectoryUrl)}`
   return code
 }
 

package/src/plugins/transpilation/as_js_classic/convert_js_module_to_js_classic.js

@@ -1,4 +1,3 @@
-import { fileURLToPath } from "node:url"
 import { urlToRelativeUrl } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
 import {
@@ -17,24 +16,7 @@ import { babelPluginTransformImportMetaResolve } from "./helpers/babel_plugin_tr
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
 import customAsyncToPromises from "./async-to-promises.js"
 
-/*
- * When systemjs format is used by babel, it will generated UID based on
- * the import specifier:
- * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
- * But at this stage import specifier are absolute file urls
- * So without minification these specifier are long and dependent
- * on where the files are on the filesystem.
- * This can be mitigated by minification that will rename them.
- * But to fix this issue once and for all I have copy-pasted
- * "@babel/plugin-transform-modules-systemjs" to introduce
- * "generateIdentifierHint" options and prevent that from hapenning
- */
-const TRANSFORM_MODULES_SYSTEMJS_PATH = fileURLToPath(
-  new URL("./babel_plugin_transform_modules_systemjs.cjs", import.meta.url),
-)
-
 export const convertJsModuleToJsClassic = async ({
-  rootDirectoryUrl,
   systemJsInjection,
   systemJsClientFileUrl,
   urlInfo,
@@ -60,18 +42,8 @@ export const convertJsModuleToJsClassic = async ({
             // proposal-dynamic-import required with systemjs for babel8:
             // https://github.com/babel/babel/issues/10746
             requireFromJsenv("@babel/plugin-proposal-dynamic-import"),
-            [
-              // eslint-disable-next-line import/no-dynamic-require
-              requireFromJsenv(TRANSFORM_MODULES_SYSTEMJS_PATH),
-              {
-                generateIdentifierHint: (key) => {
-                  if (key.startsWith("file://")) {
-                    return urlToRelativeUrl(key, rootDirectoryUrl)
-                  }
-                  return key
-                },
-              },
-            ],
+            requireFromJsenv("@babel/plugin-transform-modules-systemjs"),
+            [babelPluginRelativeImports, { rootUrl: jsModuleUrlInfo.url }],
             [
               customAsyncToPromises,
               {
@@ -91,6 +63,7 @@ export const convertJsModuleToJsClassic = async ({
             babelPluginTransformImportMetaUrl,
             babelPluginTransformImportMetaResolve,
             requireFromJsenv("@babel/plugin-transform-modules-umd"),
+            [babelPluginRelativeImports, { rootUrl: jsModuleUrlInfo.url }],
           ]),
     ],
     urlInfo: jsModuleUrlInfo,
@@ -132,3 +105,67 @@ export const convertJsModuleToJsClassic = async ({
     sourcemap,
   }
 }
+
+/*
+ * When systemjs or umd format is used by babel, it will generated UID based on
+ * the import specifier:
+ * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
+ * But at this stage import specifier are absolute file urls
+ * This can be mitigated by minification that will rename them.
+ * But to fix this issue once and for all there is babelPluginRelativeImports below
+ */
+const babelPluginRelativeImports = (babel) => {
+  const t = babel.types
+
+  const replaceSpecifierAtPath = (path, state) => {
+    const specifier = path.node.value
+    if (specifier.startsWith("file://")) {
+      const specifierRelative = urlToRelativeUrl(specifier, state.opts.rootUrl)
+      path.replaceWith(t.stringLiteral(specifierRelative))
+    }
+  }
+
+  return {
+    name: "relative-imports",
+    visitor: {
+      CallExpression: (path, state) => {
+        if (path.node.callee.type !== "Import") {
+          // Some other function call, not import();
+          return
+        }
+        if (path.node.arguments[0].type !== "StringLiteral") {
+          // Non-string argument, probably a variable or expression, e.g.
+          // import(moduleId)
+          // import('./' + moduleName)
+          return
+        }
+        const sourcePath = path.get("arguments")[0]
+        if (sourcePath.node.type === "StringLiteral") {
+          replaceSpecifierAtPath(sourcePath, state)
+        }
+      },
+      ImportDeclaration: (path, state) => {
+        const sourcePath = path.get("source")
+        replaceSpecifierAtPath(sourcePath, state)
+      },
+      ExportAllDeclaration: (path, state) => {
+        const sourcePath = path.get("source")
+        replaceSpecifierAtPath(sourcePath, state)
+      },
+      ExportNamedDeclaration: (path, state) => {
+        if (!path.node.source) {
+          // This export has no "source", so it's probably
+          // a local variable or function, e.g.
+          // export { varName }
+          // export const constName = ...
+          // export function funcName() {}
+          return
+        }
+        const sourcePath = path.get("source")
+        if (sourcePath.node.type === "StringLiteral") {
+          replaceSpecifierAtPath(sourcePath, state)
+        }
+      },
+    },
+  }
+}