@jsenv/core 25.0.0-alpha.2 → 25.0.0-alpha.3

package/dist/compile_proxy/asset-manifest.json

@@ -1,4 +1,4 @@
 {
-  "compile_proxy_e3b0c442.js.map": "compile_proxy_e3b0c442_809f35f7.js.map",
-  "compile_proxy.html": "compile_proxy_7ad5faa6.html"
+  "compile_proxy.html": "compile_proxy_7ad5faa6.html",
+  "compile_proxy_e3b0c442.js.map": "compile_proxy_e3b0c442_809f35f7.js.map"
 }

package/dist/toolbar/asset-manifest.json

@@ -1,13 +1,13 @@
 {
-  ".jsenv/build/best/src/internal/dev_server/toolbar/compilation/compilation.css.map": "assets/compilation.css_e37c747b.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/eventsource/eventsource.css.map": "assets/eventsource.css_c0c71e7b.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/execution/execution.css.map": "assets/execution.css_f3377c10.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/focus/focus.css.map": "assets/focus.css_896f3e45.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/responsive/overflow-menu.css.map": "assets/overflow-menu.css_2859d519.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/settings/settings.css.map": "assets/settings.css_61548139.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/theme/light-theme.css.map": "assets/light-theme.css_72a60fa3.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/tooltip/tooltip.css.map": "assets/tooltip.css_a94a8bdd.map",
-  ".jsenv/build/best/src/internal/dev_server/toolbar/toolbar.main.css.map": "assets/toolbar.main.css_269d7ce2.map",
+  "assets/compilation.css.map": "assets/compilation.css_e37c747b.map",
+  "assets/eventsource.css.map": "assets/eventsource.css_c0c71e7b.map",
+  "assets/execution.css.map": "assets/execution.css_f3377c10.map",
+  "assets/focus.css.map": "assets/focus.css_896f3e45.map",
+  "assets/light-theme.css.map": "assets/light-theme.css_72a60fa3.map",
+  "assets/overflow-menu.css.map": "assets/overflow-menu.css_2859d519.map",
+  "assets/settings.css.map": "assets/settings.css_61548139.map",
+  "assets/toolbar.main.css.map": "assets/toolbar.main.css_269d7ce2.map",
+  "assets/tooltip.css.map": "assets/tooltip.css_a94a8bdd.map",
   "toolbar.html": "toolbar_04ba410c.html",
   "toolbar.main2.js.map": "toolbar.main2_6c1b3d82.js.map"
 }

package/dist/toolbar_injector/asset-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".jsenv/build/best/src/internal/dev_server/toolbar/jsenv-logo.svg": "assets/jsenv-logo_188b9ca6.svg",
+  "assets/jsenv-logo.svg": "assets/jsenv-logo_188b9ca6.svg",
   "toolbar_injector.js": "toolbar_injector_4a48bc53.js",
   "toolbar_injector.js.map": "toolbar_injector_4a48bc53.js.map"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "25.0.0-alpha.2",
+  "version": "25.0.0-alpha.3",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {

package/src/buildProject.js

@@ -15,6 +15,15 @@ import {
   jsenvNodeRuntimeSupport,
 } from "./internal/generateGroupMap/jsenvRuntimeSupport.js"
 
+/**
+ * Generate optimized version of source files into a directory
+ * @param {string|url} projectDirectoryUrl Root directory of the project
+ * @param {string|url} buildDirectoryRelativeUrl Directory where optimized files are written
+ * @param {object} entryPoints Describe entry point paths and control their names in the build directory
+ * @param {"esmodule" | "systemjs" | "commonjs" | "global"} format Code generated will use this module format
+ * @param {object} runtimeSupport Code generated will be compatible with these runtimes
+ * @param {boolean} [minify=false] Minify file content in the build directory (HTML, CSS, JS, JSON, SVG)
+ */
 export const buildProject = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,

package/src/executeTestPlan.js

@@ -22,7 +22,7 @@ import { jsenvCoverageConfig } from "./jsenvCoverageConfig.js"
 /**
  * Execute a list of files and log how it goes
  * @param {object} testPlan Configure files to execute and their runtimes (browsers/node)
- * @param {string|url} projectDirectoryUrl Root directory of your files
+ * @param {string|url} projectDirectoryUrl Root directory of the project
  * @param {number} [maxExecutionsInParallel=1] Maximum amount of execution in parallel
  * @param {number} [defaultMsAllocatedPerExecution=30000] Milliseconds after which execution is aborted and considered as failed by timeout
  * @param {number} [cooldownBetweenExecutions=0] Millisecond to wait between each execution

package/src/internal/building/rollup_plugin_jsenv.js

@@ -182,14 +182,16 @@ export const createRollupPlugins = async ({
     projectDirectoryUrl,
   )
 
-  // map build relative urls without hash (called "ressourceName") to real build relative urls
-  let buildManifest = {}
+  // Object mapping project relative urls to build relative urls
+  let buildMappings = {}
+  // Object mapping ressource names to build relative urls
+  let ressourceMappings = {}
 
   const ressourcesReferencedByJs = []
   const createImportMapForFilesUsedInJs = () => {
     const topLevelMappings = {}
     ressourcesReferencedByJs.sort(comparePathnames).forEach((ressourceName) => {
-      const buildRelativeUrl = buildManifest[ressourceName]
+      const buildRelativeUrl = ressourceMappings[ressourceName]
       if (
         ressourceName &&
         buildRelativeUrl &&
@@ -203,12 +205,6 @@ export const createRollupPlugins = async ({
     }
   }
 
-  // an object where keys are build relative urls
-  // and values rollup chunk or asset
-  // we need this because we sometimes tell rollup
-  // that a file.fileName is something while it's not really this
-  // because of remapping
-  let buildMappings = {}
   let rollupBuild
 
   const EMPTY_CHUNK_URL = resolveUrl("__empty__", projectDirectoryUrl)
@@ -1390,7 +1386,7 @@ export const createRollupPlugins = async ({
           buildMappings[originalProjectRelativeUrl] =
             jsRessource.buildRelativeUrl
         }
-        buildManifest[jsRessource.fileName] = jsRessource.buildRelativeUrl
+        ressourceMappings[jsRessource.fileName] = jsRessource.buildRelativeUrl
       })
       // wait for asset build relative urls
       // to ensure the importmap will contain remappings for them
@@ -1402,7 +1398,7 @@ export const createRollupPlugins = async ({
           })
           if (ressource && !ressource.isJsModule) {
             await ressource.getReadyPromise()
-            buildManifest[ressourceName] = ressource.buildRelativeUrl
+            ressourceMappings[ressourceName] = ressource.buildRelativeUrl
           }
         }),
       )
@@ -1456,7 +1452,7 @@ export const createRollupPlugins = async ({
           // in case sourcemap is mutated, we must not trust rollup but the asset builder source instead
           rollupFileInfo.source = assetRessource.bufferAfterBuild
           assetBuild[buildRelativeUrl] = rollupFileInfo
-          buildManifest[assetRessource.fileName] = buildRelativeUrl
+          ressourceMappings[assetRessource.fileName] = buildRelativeUrl
           if (assetRessource.bufferBeforeBuild) {
             const originalProjectUrl = asOriginalUrl(assetRessource.url)
             const originalProjectRelativeUrl = urlToRelativeUrl(
@@ -1474,8 +1470,8 @@ export const createRollupPlugins = async ({
       }
       rollupBuild = sortObjectByPathnames(rollupBuild)
       // fill "buildFileContents", "buildInlineFilesContents"
-      // and update "buildManifest" and "buildMappings" in case some ressource where inlined
-      // by ressourceBuilder.rollupBuildEnd
+      // and update "buildMappings"
+      // in case some ressource where inlined by ressourceBuilder.rollupBuildEnd
       Object.keys(rollupBuild).forEach((buildRelativeUrl) => {
         const rollupFileInfo = rollupBuild[buildRelativeUrl]
         const ressource = ressourceBuilder.findRessource((ressource) => {
@@ -1488,7 +1484,6 @@ export const createRollupPlugins = async ({
           return false
         })
         if (ressource.isInline) {
-          delete buildManifest[ressource.fileName]
           if (ressource.isJsModule) {
             delete jsModuleBuild[buildRelativeUrl]
           } else {
@@ -1508,19 +1503,18 @@ export const createRollupPlugins = async ({
         }
       })
 
+      ressourceMappings = sortObjectByPathnames(ressourceMappings)
+      buildMappings = sortObjectByPathnames(buildMappings)
       await visitServiceWorkers({
         projectDirectoryUrl,
         serviceWorkerUrls,
         classicServiceWorkerUrls,
         serviceWorkerFinalizer,
         buildMappings,
-        buildManifest,
+        ressourceMappings,
         buildFileContents,
         lineBreakNormalization,
       })
-
-      buildManifest = sortObjectByPathnames(buildManifest)
-      buildMappings = sortObjectByPathnames(buildMappings)
       const buildDuration = Date.now() - buildStartMs
       buildStats = createBuildStats({
         buildFileContents,
@@ -1560,7 +1554,11 @@ export const createRollupPlugins = async ({
         rollupBuild,
         urlResponseBodyMap: urlLoader.getUrlResponseBodyMap(),
         buildMappings,
-        buildManifest,
+        ressourceMappings,
+        // Object mapping build relative urls without hash to build relative urls
+        buildManifest: createBuildManifest({
+          buildFileContents,
+        }),
         buildImportMap: createImportMapForFilesUsedInJs(),
         buildFileContents,
         buildInlineFileContents,
@@ -1573,6 +1571,21 @@ export const createRollupPlugins = async ({
   }
 }
 
+const createBuildManifest = ({ buildFileContents }) => {
+  const buildManifest = {}
+  Object.keys(buildFileContents).forEach((buildRelativeUrl) => {
+    const relativeUrlWithoutHash = asFileNameWithoutHash(buildRelativeUrl)
+    buildManifest[relativeUrlWithoutHash] = buildRelativeUrl
+  })
+  return buildManifest
+}
+
+const asFileNameWithoutHash = (fileName) => {
+  return fileName.replace(/_[a-z0-9]{8,}(\..*?)?$/, (_, afterHash = "") => {
+    return afterHash
+  })
+}
+
 const prepareEntryPoints = async (
   entryPoints,
   {
@@ -1718,7 +1731,6 @@ const visitServiceWorkers = async ({
   classicServiceWorkerUrls,
   serviceWorkerFinalizer,
   buildMappings,
-  buildManifest,
   buildFileContents,
   lineBreakNormalization,
 }) => {
@@ -1745,7 +1757,6 @@ const visitServiceWorkers = async ({
         let code = buildFileContents[serviceWorkerBuildRelativeUrl]
         code = await serviceWorkerFinalizer(code, {
           serviceWorkerBuildRelativeUrl,
-          buildManifest,
           buildFileContents,
           lineBreakNormalization,
         })

package/src/jsenvServiceWorkerFinalizer.js

@@ -4,20 +4,14 @@ import { generateContentHash } from "./internal/building/url_versioning.js"
 
 export const jsenvServiceWorkerFinalizer = (
   code,
-  {
-    serviceWorkerBuildRelativeUrl,
-    buildManifest,
-    buildFileContents,
-    lineBreakNormalization,
-  },
+  { serviceWorkerBuildRelativeUrl, buildFileContents, lineBreakNormalization },
 ) => {
   const generatedUrlsConfig = {}
-  Object.keys(buildManifest).forEach((projectRelativeUrl) => {
-    if (projectRelativeUrl.endsWith(".map")) {
+  Object.keys(buildFileContents).forEach((buildRelativeUrl) => {
+    if (buildRelativeUrl.endsWith(".map")) {
       return
     }
 
-    const buildRelativeUrl = buildManifest[projectRelativeUrl]
     const buildUrl = resolveUrl(buildRelativeUrl, "file://")
     const serviceWorkerBuildUrl = resolveUrl(
       serviceWorkerBuildRelativeUrl,