@jsenv/core 38.0.2 → 38.0.4

package/dist/jsenv_core.js

@@ -8258,19 +8258,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 +8694,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 +9213,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;
 
@@ -12327,6 +12309,7 @@ const createUrlInfo = (url, context) => {
 
     sourcemap: null,
     sourcemapIsWrong: false,
+    sourcemapReference: null,
 
     generatedUrl: null,
     sourcemapGeneratedUrl: null,
@@ -13101,14 +13084,10 @@ const createUrlInfoTransformer = ({
   sourcemapsComment,
   sourcemapsSources,
   sourcemapsSourcesProtocol,
-  sourcemapsSourcesContent,
+  sourcemapsSourcesContent = true,
   outDirectoryUrl,
   supervisor,
 }) => {
-  if (sourcemapsSourcesContent === undefined) {
-    sourcemapsSourcesContent = true;
-  }
-
   const formatSourcemapSource =
     typeof sourcemapsSources === "function"
       ? (source, urlInfo) => {
@@ -13167,6 +13146,7 @@ const createUrlInfoTransformer = ({
     urlInfo.content = undefined;
     urlInfo.sourcemap = null;
     urlInfo.sourcemapIsWrong = null;
+    urlInfo.sourcemapReference = null;
   };
 
   const setContentProperties = (
@@ -13231,6 +13211,10 @@ const createUrlInfoTransformer = ({
     generatedUrlObject.searchParams.delete("js_module_fallback");
     generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
+    generatedUrlObject.searchParams.delete("as_css_module");
+    generatedUrlObject.searchParams.delete("as_json_module");
+    generatedUrlObject.searchParams.delete("as_text_module");
+    generatedUrlObject.searchParams.delete("dynamic_import");
     const urlForSourcemap = generatedUrlObject.href;
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap);
 
@@ -13257,6 +13241,7 @@ const createUrlInfoTransformer = ({
         specifierLine: line,
         specifierColumn: column,
       });
+      urlInfo.sourcemapReference = sourcemapReference;
       try {
         await sourcemapReference.urlInfo.cook();
         const sourcemapRaw = JSON.parse(sourcemapReference.urlInfo.content);
@@ -13370,11 +13355,11 @@ const createUrlInfoTransformer = ({
     if (!contentIsInlined) {
       writeFileSync(new URL(generatedUrl), urlInfo.content);
     }
-    const { sourcemapGeneratedUrl, sourcemap } = urlInfo;
-    if (sourcemapGeneratedUrl && sourcemap) {
+    const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
+    if (sourcemapGeneratedUrl && sourcemapReference) {
       writeFileSync(
         new URL(sourcemapGeneratedUrl),
-        JSON.stringify(sourcemap, null, "  "),
+        sourcemapReference.urlInfo.content,
       );
     }
   };
@@ -13393,25 +13378,28 @@ const createUrlInfoTransformer = ({
     // in this scenarion we don't want to inject sourcemap reference
     // just update the content
 
-    let sourcemapReference = null;
-    for (const referenceToOther of urlInfo.referenceToOthersSet) {
-      if (referenceToOther.type === "sourcemap_comment") {
-        sourcemapReference = referenceToOther;
-        break;
-      }
-    }
+    let sourcemapReference = urlInfo.sourcemapReference;
     if (!sourcemapReference) {
-      sourcemapReference = urlInfo.dependencies.inject({
-        trace: {
-          message: `sourcemap comment placeholder`,
-          url: urlInfo.url,
-        },
-        type: "sourcemap_comment",
-        subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
-        expectedType: "sourcemap",
-        specifier: urlInfo.sourcemapGeneratedUrl,
-        isInline: sourcemaps === "inline",
-      });
+      for (const referenceToOther of urlInfo.referenceToOthersSet) {
+        if (referenceToOther.type === "sourcemap_comment") {
+          sourcemapReference = referenceToOther;
+          break;
+        }
+      }
+      if (!sourcemapReference) {
+        sourcemapReference = urlInfo.dependencies.inject({
+          trace: {
+            message: `sourcemap comment placeholder`,
+            url: urlInfo.url,
+          },
+          type: "sourcemap_comment",
+          subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
+          expectedType: "sourcemap",
+          specifier: urlInfo.sourcemapGeneratedUrl,
+          isInline: sourcemaps === "inline",
+        });
+      }
+      urlInfo.sourcemapReference = sourcemapReference;
     }
     const sourcemapUrlInfo = sourcemapReference.urlInfo;
     // It's possible urlInfo content to be modified after being finalized
@@ -14324,6 +14312,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
 
     // urlInfo objects are reused, they must be "reset" before cooking them again
     if (urlInfo.error || urlInfo.content !== undefined) {
+      if (urlInfo.isInline) {
+        return;
+      }
       urlInfo.error = null;
       urlInfo.type = null;
       urlInfo.subtype = null;
@@ -19771,7 +19762,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);
@@ -21463,8 +21459,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.2",
+  "version": "38.0.4",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -67,7 +67,7 @@
     "@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.1",
     "@jsenv/runtime-compat": "1.2.0",
     "@jsenv/server": "15.1.0",
     "@jsenv/sourcemap": "1.2.0",

package/src/build/build.js

@@ -353,8 +353,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);

package/src/kitchen/kitchen.js

@@ -456,6 +456,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
 
     // urlInfo objects are reused, they must be "reset" before cooking them again
     if (urlInfo.error || urlInfo.content !== undefined) {
+      if (urlInfo.isInline) {
+        return;
+      }
       urlInfo.error = null;
       urlInfo.type = null;
       urlInfo.subtype = null;

package/src/kitchen/url_graph/url_graph.js

@@ -212,6 +212,7 @@ const createUrlInfo = (url, context) => {
 
     sourcemap: null,
     sourcemapIsWrong: false,
+    sourcemapReference: null,
 
     generatedUrl: null,
     sourcemapGeneratedUrl: null,

package/src/kitchen/url_graph/url_info_transformations.js

@@ -18,14 +18,10 @@ export const createUrlInfoTransformer = ({
   sourcemapsComment,
   sourcemapsSources,
   sourcemapsSourcesProtocol,
-  sourcemapsSourcesContent,
+  sourcemapsSourcesContent = true,
   outDirectoryUrl,
   supervisor,
 }) => {
-  if (sourcemapsSourcesContent === undefined) {
-    sourcemapsSourcesContent = true;
-  }
-
   const formatSourcemapSource =
     typeof sourcemapsSources === "function"
       ? (source, urlInfo) => {
@@ -84,6 +80,7 @@ export const createUrlInfoTransformer = ({
     urlInfo.content = undefined;
     urlInfo.sourcemap = null;
     urlInfo.sourcemapIsWrong = null;
+    urlInfo.sourcemapReference = null;
   };
 
   const setContentProperties = (
@@ -148,6 +145,10 @@ export const createUrlInfoTransformer = ({
     generatedUrlObject.searchParams.delete("js_module_fallback");
     generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
+    generatedUrlObject.searchParams.delete("as_css_module");
+    generatedUrlObject.searchParams.delete("as_json_module");
+    generatedUrlObject.searchParams.delete("as_text_module");
+    generatedUrlObject.searchParams.delete("dynamic_import");
     const urlForSourcemap = generatedUrlObject.href;
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap);
 
@@ -174,6 +175,7 @@ export const createUrlInfoTransformer = ({
         specifierLine: line,
         specifierColumn: column,
       });
+      urlInfo.sourcemapReference = sourcemapReference;
       try {
         await sourcemapReference.urlInfo.cook();
         const sourcemapRaw = JSON.parse(sourcemapReference.urlInfo.content);
@@ -287,11 +289,11 @@ export const createUrlInfoTransformer = ({
     if (!contentIsInlined) {
       writeFileSync(new URL(generatedUrl), urlInfo.content);
     }
-    const { sourcemapGeneratedUrl, sourcemap } = urlInfo;
-    if (sourcemapGeneratedUrl && sourcemap) {
+    const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
+    if (sourcemapGeneratedUrl && sourcemapReference) {
       writeFileSync(
         new URL(sourcemapGeneratedUrl),
-        JSON.stringify(sourcemap, null, "  "),
+        sourcemapReference.urlInfo.content,
       );
     }
   };
@@ -310,25 +312,28 @@ export const createUrlInfoTransformer = ({
     // in this scenarion we don't want to inject sourcemap reference
     // just update the content
 
-    let sourcemapReference = null;
-    for (const referenceToOther of urlInfo.referenceToOthersSet) {
-      if (referenceToOther.type === "sourcemap_comment") {
-        sourcemapReference = referenceToOther;
-        break;
-      }
-    }
+    let sourcemapReference = urlInfo.sourcemapReference;
     if (!sourcemapReference) {
-      sourcemapReference = urlInfo.dependencies.inject({
-        trace: {
-          message: `sourcemap comment placeholder`,
-          url: urlInfo.url,
-        },
-        type: "sourcemap_comment",
-        subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
-        expectedType: "sourcemap",
-        specifier: urlInfo.sourcemapGeneratedUrl,
-        isInline: sourcemaps === "inline",
-      });
+      for (const referenceToOther of urlInfo.referenceToOthersSet) {
+        if (referenceToOther.type === "sourcemap_comment") {
+          sourcemapReference = referenceToOther;
+          break;
+        }
+      }
+      if (!sourcemapReference) {
+        sourcemapReference = urlInfo.dependencies.inject({
+          trace: {
+            message: `sourcemap comment placeholder`,
+            url: urlInfo.url,
+          },
+          type: "sourcemap_comment",
+          subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
+          expectedType: "sourcemap",
+          specifier: urlInfo.sourcemapGeneratedUrl,
+          isInline: sourcemaps === "inline",
+        });
+      }
+      urlInfo.sourcemapReference = sourcemapReference;
     }
     const sourcemapUrlInfo = sourcemapReference.urlInfo;
     // It's possible urlInfo content to be modified after being finalized