@jsenv/core 28.2.0 → 28.2.1

package/dist/main.js

@@ -3741,6 +3741,9 @@ const createUrlGraph = () => {
 
     if (urlInfo) {
       urlInfoMap.delete(url);
+      urlInfo.dependencies.forEach(dependencyUrl => {
+        getUrlInfo(dependencyUrl).dependents.delete(url);
+      });
 
       if (urlInfo.sourcemapReference) {
         deleteUrlInfo(urlInfo.sourcemapReference.url);
@@ -10034,7 +10037,10 @@ const convertJsModuleToJsClassic = async ({
   };
 };
 
-// propagate ?as_js_classic to referenced urls
+/*
+ * - propagate ?as_js_classic to urls
+ * - perform conversion from js module to js classic when url uses ?as_js_classic
+ */
 const jsenvPluginAsJsClassicConversion = ({
   systemJsInjection,
   systemJsClientFileUrl,
@@ -11008,6 +11014,14 @@ const jsenvPluginAsJsClassicLibrary = ({
             isImplicit: true
           });
         });
+      } else if (context.scenarios.build) {
+        jsModuleBundledUrlInfo.sourceUrls.forEach(sourceUrl => {
+          const sourceUrlInfo = context.urlGraph.getUrlInfo(sourceUrl);
+
+          if (sourceUrlInfo.dependents.size === 0) {
+            context.urlGraph.deleteUrlInfo(sourceUrl);
+          }
+        });
       }
 
       const {
@@ -11023,7 +11037,7 @@ const jsenvPluginAsJsClassicLibrary = ({
         content,
         contentType: "text/javascript",
         type: "js_classic",
-        originalUrl: jsModuleUrlInfo.originalUrl,
+        originalUrl: urlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
         sourcemap
       };
@@ -18865,7 +18879,8 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       specifier: context.reference.specifier.replace(`?${searchParam}`, "").replace(`&${searchParam}`, ""),
       url: urlObject.href,
       generatedSpecifier: null,
-      generatedUrl: null
+      generatedUrl: null,
+      filename: null
     };
     const urlInfoWithoutSearchParam = context.urlGraph.reuseOrCreateUrlInfo(referenceWithoutSearchParam.url);
 
@@ -18971,7 +18986,7 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
     urlInfo.injected = true;
   }
 
-  if (reference.filename) {
+  if (reference.filename && !urlInfo.filename) {
     urlInfo.filename = reference.filename;
   }
 
@@ -19916,7 +19931,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     });
     const finalGraphKitchen = createKitchen({
       logLevel,
-      rootDirectoryUrl,
+      rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
       scenarios: {
         build: true
@@ -20297,6 +20312,15 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         };
 
         GRAPH.forEach(rawGraph, rawUrlInfo => {
+          // cleanup unused urls (avoid bundling things that are not actually used)
+          // happens for:
+          // - js import assertions
+          // - as_js_classic_library
+          if (!isUsed(rawUrlInfo)) {
+            rawGraph.deleteUrlInfo(rawUrlInfo.url);
+            return;
+          }
+
           if (rawUrlInfo.isEntryPoint) {
             addToBundlerIfAny(rawUrlInfo);
 
@@ -20845,11 +20869,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       {
         const actions = [];
         GRAPH.forEach(finalGraph, urlInfo => {
-          // nothing uses this url anymore
-          // - versioning update inline content
-          // - file converted for import assertion or js_classic conversion
-          if (!urlInfo.isEntryPoint && urlInfo.type !== "sourcemap" && urlInfo.dependents.size === 0 && !urlInfo.injected // injected during postbuild
-          ) {
+          if (!isUsed(urlInfo)) {
             actions.push(() => {
               finalGraph.deleteUrlInfo(urlInfo.url);
             });
@@ -21146,6 +21166,29 @@ const assertEntryPoints = ({
   });
 };
 
+const isUsed = urlInfo => {
+  // nothing uses this url anymore
+  // - versioning update inline content
+  // - file converted for import assertion or js_classic conversion
+  if (urlInfo.isEntryPoint) {
+    return true;
+  }
+
+  if (urlInfo.type === "sourcemap") {
+    return true;
+  }
+
+  if (urlInfo.injected) {
+    return true;
+  }
+
+  if (urlInfo.dependents.size > 0) {
+    return true;
+  }
+
+  return false;
+};
+
 const canUseVersionedUrl = urlInfo => {
   if (urlInfo.isEntryPoint) {
     return false;
@@ -25778,7 +25821,9 @@ const startDevServer = async ({
   sourcemaps = "inline",
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  writeGeneratedFiles = true
+  // no real need to write files during github workflow
+  // and mitigates https://github.com/actions/runner-images/issues/3885
+  writeGeneratedFiles = !process.env.CI
 }) => {
   const logger = createLogger({
     logLevel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "28.2.0",
+  "version": "28.2.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -103,7 +103,7 @@
     "@jsenv/eslint-config": "16.2.1",
     "@jsenv/file-size-impact": "13.0.1",
     "@jsenv/https-local": "3.0.1",
-    "@jsenv/package-workspace": "0.4.1",
+    "@jsenv/package-workspace": "0.5.0",
     "@jsenv/performance-impact": "3.0.1",
     "eslint": "8.21.0",
     "eslint-plugin-html": "7.1.0",

package/src/build/build.js

@@ -264,7 +264,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     })
     const finalGraphKitchen = createKitchen({
       logLevel,
-      rootDirectoryUrl,
+      rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
       scenarios: { build: true },
       runtimeCompat,
@@ -643,6 +643,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           }
         }
         GRAPH.forEach(rawGraph, (rawUrlInfo) => {
+          // cleanup unused urls (avoid bundling things that are not actually used)
+          // happens for:
+          // - js import assertions
+          // - as_js_classic_library
+          if (!isUsed(rawUrlInfo)) {
+            rawGraph.deleteUrlInfo(rawUrlInfo.url)
+            return
+          }
           if (rawUrlInfo.isEntryPoint) {
             addToBundlerIfAny(rawUrlInfo)
             if (rawUrlInfo.type === "html") {
@@ -1216,15 +1224,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       delete_unused_urls: {
         const actions = []
         GRAPH.forEach(finalGraph, (urlInfo) => {
-          // nothing uses this url anymore
-          // - versioning update inline content
-          // - file converted for import assertion or js_classic conversion
-          if (
-            !urlInfo.isEntryPoint &&
-            urlInfo.type !== "sourcemap" &&
-            urlInfo.dependents.size === 0 &&
-            !urlInfo.injected // injected during postbuild
-          ) {
+          if (!isUsed(urlInfo)) {
             actions.push(() => {
               finalGraph.deleteUrlInfo(urlInfo.url)
             })
@@ -1501,6 +1501,25 @@ const assertEntryPoints = ({ entryPoints }) => {
   })
 }
 
+const isUsed = (urlInfo) => {
+  // nothing uses this url anymore
+  // - versioning update inline content
+  // - file converted for import assertion or js_classic conversion
+  if (urlInfo.isEntryPoint) {
+    return true
+  }
+  if (urlInfo.type === "sourcemap") {
+    return true
+  }
+  if (urlInfo.injected) {
+    return true
+  }
+  if (urlInfo.dependents.size > 0) {
+    return true
+  }
+  return false
+}
+
 const canUseVersionedUrl = (urlInfo) => {
   if (urlInfo.isEntryPoint) {
     return false

package/src/dev/start_dev_server.js

@@ -68,7 +68,9 @@ export const startDevServer = async ({
   sourcemaps = "inline",
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  writeGeneratedFiles = true,
+  // no real need to write files during github workflow
+  // and mitigates https://github.com/actions/runner-images/issues/3885
+  writeGeneratedFiles = !process.env.CI,
 }) => {
   const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)

package/src/omega/kitchen.js

@@ -714,6 +714,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       url: urlObject.href,
       generatedSpecifier: null,
       generatedUrl: null,
+      filename: null,
     }
     const urlInfoWithoutSearchParam = context.urlGraph.reuseOrCreateUrlInfo(
       referenceWithoutSearchParam.url,
@@ -813,7 +814,7 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   if (reference.injected) {
     urlInfo.injected = true
   }
-  if (reference.filename) {
+  if (reference.filename && !urlInfo.filename) {
     urlInfo.filename = reference.filename
   }
   if (reference.isInline) {

package/src/omega/url_graph.js

@@ -12,6 +12,9 @@ export const createUrlGraph = () => {
     const urlInfo = urlInfoMap.get(url)
     if (urlInfo) {
       urlInfoMap.delete(url)
+      urlInfo.dependencies.forEach((dependencyUrl) => {
+        getUrlInfo(dependencyUrl).dependents.delete(url)
+      })
       if (urlInfo.sourcemapReference) {
         deleteUrlInfo(urlInfo.sourcemapReference.url)
       }

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

@@ -1,5 +1,7 @@
-// propagate ?as_js_classic to referenced urls
-// and perform the conversion during fetchUrlContent
+/*
+ * - propagate ?as_js_classic to urls
+ * - perform conversion from js module to js classic when url uses ?as_js_classic
+ */
 
 import { injectQueryParams } from "@jsenv/urls"
 import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"

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

@@ -64,6 +64,13 @@ export const jsenvPluginAsJsClassicLibrary = ({
             isImplicit: true,
           })
         })
+      } else if (context.scenarios.build) {
+        jsModuleBundledUrlInfo.sourceUrls.forEach((sourceUrl) => {
+          const sourceUrlInfo = context.urlGraph.getUrlInfo(sourceUrl)
+          if (sourceUrlInfo.dependents.size === 0) {
+            context.urlGraph.deleteUrlInfo(sourceUrl)
+          }
+        })
       }
       const { content, sourcemap } = await convertJsModuleToJsClassic({
         systemJsInjection,
@@ -75,7 +82,7 @@ export const jsenvPluginAsJsClassicLibrary = ({
         content,
         contentType: "text/javascript",
         type: "js_classic",
-        originalUrl: jsModuleUrlInfo.originalUrl,
+        originalUrl: urlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
         sourcemap,
       }