@jsenv/core 38.0.4 → 38.0.5

package/dist/jsenv_core.js

@@ -400,13 +400,28 @@ const injectQueryParams = (url, params) => {
   const urlWithParams = urlObject.href;
   return normalizeUrl(urlWithParams);
 };
+
+const injectQueryParamWithoutEncoding = (url, key, value) => {
+  const urlObject = new URL(url);
+  let { origin, pathname, search, hash } = urlObject;
+  // origin is "null" for "file://" urls with Node.js
+  if (origin === "null" && urlObject.href.startsWith("file:")) {
+    origin = "file://";
+  }
+  if (search === "") {
+    search = `?${key}=${value}`;
+  } else {
+    search += `${key}=${value}`;
+  }
+  return `${origin}${pathname}${search}${hash}`;
+};
 const injectQueryParamIntoSpecifierWithoutEncoding = (
   specifier,
   key,
   value,
 ) => {
   if (isValidUrl$1(specifier)) {
-    return injectQueryParams(specifier, key);
+    return injectQueryParamWithoutEncoding(specifier, key, value);
   }
   const [beforeQuestion, afterQuestion = ""] = specifier.split("?");
   const searchParams = new URLSearchParams(afterQuestion);
@@ -21343,9 +21358,17 @@ build "${entryPointKeys[0]}"`);
       logger.info(`
 build ${entryPointKeys.length} entry points`);
     }
-    const explicitJsModuleFallback = entryPointKeys.some((key) =>
-      key.includes("?js_module_fallback"),
-    );
+    let explicitJsModuleConversion = false;
+    for (const entryPointKey of entryPointKeys) {
+      if (entryPointKey.includes("?js_module_fallback")) {
+        explicitJsModuleConversion = true;
+        break;
+      }
+      if (entryPointKey.includes("?as_js_classic")) {
+        explicitJsModuleConversion = true;
+        break;
+      }
+    }
     const rawRedirections = new Map();
     const entryUrls = [];
     const contextSharedDuringBuild = {
@@ -21390,7 +21413,7 @@ build ${entryPointKeys.length} entry points`);
           magicDirectoryIndex,
           directoryReferenceAllowed,
           transpilation: {
-            babelHelpersAsImport: !explicitJsModuleFallback,
+            babelHelpersAsImport: !explicitJsModuleConversion,
             ...transpilation,
             jsModuleFallback: false,
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.0.4",
+  "version": "38.0.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -61,22 +61,22 @@
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "5.1.0",
-    "@jsenv/filesystem": "4.2.5",
+    "@jsenv/ast": "5.1.1",
+    "@jsenv/filesystem": "4.2.6",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.4.0",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/js-module-fallback": "1.3.1",
+    "@jsenv/js-module-fallback": "1.3.2",
     "@jsenv/runtime-compat": "1.2.0",
     "@jsenv/server": "15.1.0",
-    "@jsenv/sourcemap": "1.2.0",
-    "@jsenv/plugin-bundling": "2.5.0",
+    "@jsenv/sourcemap": "1.2.1",
+    "@jsenv/plugin-bundling": "2.5.1",
     "@jsenv/plugin-minification": "1.5.0",
-    "@jsenv/plugin-transpilation": "1.3.0",
-    "@jsenv/plugin-supervisor": "1.3.0",
+    "@jsenv/plugin-transpilation": "1.3.1",
+    "@jsenv/plugin-supervisor": "1.3.1",
     "@jsenv/url-meta": "8.1.0",
-    "@jsenv/urls": "2.2.0",
+    "@jsenv/urls": "2.2.1",
     "@jsenv/utils": "2.0.1"
   },
   "devDependencies": {

package/src/build/build.js

@@ -237,9 +237,17 @@ build "${entryPointKeys[0]}"`);
       logger.info(`
 build ${entryPointKeys.length} entry points`);
     }
-    const explicitJsModuleFallback = entryPointKeys.some((key) =>
-      key.includes("?js_module_fallback"),
-    );
+    let explicitJsModuleConversion = false;
+    for (const entryPointKey of entryPointKeys) {
+      if (entryPointKey.includes("?js_module_fallback")) {
+        explicitJsModuleConversion = true;
+        break;
+      }
+      if (entryPointKey.includes("?as_js_classic")) {
+        explicitJsModuleConversion = true;
+        break;
+      }
+    }
     const rawRedirections = new Map();
     const entryUrls = [];
     const contextSharedDuringBuild = {
@@ -284,7 +292,7 @@ build ${entryPointKeys.length} entry points`);
           magicDirectoryIndex,
           directoryReferenceAllowed,
           transpilation: {
-            babelHelpersAsImport: !explicitJsModuleFallback,
+            babelHelpersAsImport: !explicitJsModuleConversion,
             ...transpilation,
             jsModuleFallback: false,
           },