@jsenv/core 38.0.3 → 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);
@@ -8258,19 +8273,6 @@ const versionToBits$2 = (version) => {
   return (major << 16) | (minor << 8) | patch;
 };
 
-/*
- * TODO:
- * js classic might contain importScripts or self.importScripts calls
- * (when it's inside worker, service worker, etc...)
- * ideally we should bundle it when urlInfo.subtype === "worker"
- */
-
-// import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-
-const bundleJsClassic = () => {
-  return {};
-};
-
 const bundleJsModules = async (
   jsModuleUrlInfos,
   {
@@ -8707,11 +8709,6 @@ const jsenvPluginBundling = ({
       return bundleCss(cssUrlInfos);
     };
   }
-  if (js_classic) {
-    bundle.js_classic = (jsClassicUrlInfos) => {
-      return bundleJsClassic();
-    };
-  }
   if (js_module) {
     if (js_module === true) {
       js_module = {};
@@ -9231,7 +9228,7 @@ export default inlineContent.text;`,
  *
  */
 const babelHelperClientDirectoryUrl = new URL(
-  "../packages/internal/plugin-transpilation/src/babel/babel_helper_directory/babel_helpers/",
+  "./babel_helpers/",
   import.meta.url,
 ).href;
 
@@ -19780,7 +19777,12 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       return buildUrlFromCache;
     }
     if (urlInfo.type === "directory") {
-      const directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
+      let directoryPath;
+      if (urlInfo.filenameHint) {
+        directoryPath = urlInfo.filenameHint;
+      } else {
+        directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
+      }
       const { search } = new URL(url);
       const buildUrl = `${buildDirectoryUrl}${directoryPath}${search}`;
       associateBuildUrl(url, buildUrl);
@@ -21356,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 = {
@@ -21403,7 +21413,7 @@ build ${entryPointKeys.length} entry points`);
           magicDirectoryIndex,
           directoryReferenceAllowed,
           transpilation: {
-            babelHelpersAsImport: !explicitJsModuleFallback,
+            babelHelpersAsImport: !explicitJsModuleConversion,
             ...transpilation,
             jsModuleFallback: false,
           },
@@ -21472,8 +21482,8 @@ build ${entryPointKeys.length} entry points`);
           ? [jsenvPluginLineBreakNormalization()]
           : []),
         jsenvPluginJsModuleFallback({
-          remapImportSpecifier: (specifier) => {
-            return buildSpecifierManager.remapPlaceholder(specifier);
+          remapImportSpecifier: (specifier, parentUrl) => {
+            return buildSpecifierManager.remapPlaceholder(specifier, parentUrl);
           },
         }),
         jsenvPluginInlining(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.0.3",
+  "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.0",
+    "@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,
           },
@@ -353,8 +361,8 @@ build ${entryPointKeys.length} entry points`);
           ? [jsenvPluginLineBreakNormalization()]
           : []),
         jsenvPluginJsModuleFallback({
-          remapImportSpecifier: (specifier) => {
-            return buildSpecifierManager.remapPlaceholder(specifier);
+          remapImportSpecifier: (specifier, parentUrl) => {
+            return buildSpecifierManager.remapPlaceholder(specifier, parentUrl);
           },
         }),
         jsenvPluginInlining(),

package/src/build/build_urls_generator.js

@@ -34,7 +34,12 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       return buildUrlFromCache;
     }
     if (urlInfo.type === "directory") {
-      const directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
+      let directoryPath;
+      if (urlInfo.filenameHint) {
+        directoryPath = urlInfo.filenameHint;
+      } else {
+        directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
+      }
       const { search } = new URL(url);
       const buildUrl = `${buildDirectoryUrl}${directoryPath}${search}`;
       associateBuildUrl(url, buildUrl);