@jsenv/core 24.5.1 → 24.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "24.5.1",
+  "version": "24.5.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {

package/src/internal/building/asset_url_versioning.js

@@ -20,14 +20,31 @@ const fileNamePatternFromRessource = (ressource) => {
   }
 
   if (ressource.urlVersioningDisabled) {
-    if (ressource.isEntryPoint || ressource.isJsModule) {
-      return `[name][extname]`
+    if (canMoveToAssetsDirectory(ressource)) {
+      return assetFileNamePatternWithoutHash
     }
-    return assetFileNamePatternWithoutHash
+    return `[name][extname]`
   }
 
-  if (ressource.isEntryPoint || ressource.isJsModule) {
-    return `[name]-[hash][extname]`
+  if (canMoveToAssetsDirectory(ressource)) {
+    return assetFileNamePattern
   }
-  return assetFileNamePattern
+  return `[name]-[hash][extname]`
+}
+
+const canMoveToAssetsDirectory = (ressource) => {
+  if (ressource.isEntryPoint) {
+    return false
+  }
+  // in theory js module can be moved to assets directory
+  // but that needs to be tested
+  if (ressource.isJsModule) {
+    return false
+  }
+  // service worker MUST be at the root (same level than the HTML file)
+  // otherwise it might be registered for the scope "/assets/" instead of "/"
+  if (ressource.isServiceWorker) {
+    return false
+  }
+  return true
 }

package/src/internal/building/js/parseJsRessource.js

@@ -69,7 +69,7 @@ export const parseJsRessource = async (
     if (minify) {
       const result = await minifyJs({
         url: map ? asProjectUrl(jsCompiledUrl) : jsOriginalUrl,
-        code: jsString,
+        code,
         map,
         toplevel: false,
       })

package/src/internal/building/rollup_plugin_jsenv.js

@@ -1560,21 +1560,20 @@ const finalizeServiceWorkers = async ({
     Object.keys(serviceWorkers).map(async (projectRelativeUrl) => {
       const projectUrl = resolveUrl(projectRelativeUrl, "file://")
       projectRelativeUrl = urlToRelativeUrl(projectUrl, "file://")
-      const buildRelativeUrl = buildMappings[projectRelativeUrl]
-      if (!buildRelativeUrl) {
+      const serviceWorkerBuildRelativeUrl = buildMappings[projectRelativeUrl]
+      if (!serviceWorkerBuildRelativeUrl) {
         throw new Error(
           `"${projectRelativeUrl}" service worker file missing in the build`,
         )
       }
-      const buildFileContent = rollupBuild[buildRelativeUrl].source
-      rollupBuild[buildRelativeUrl].source = serviceWorkerFinalizer(
-        buildFileContent,
-        {
+      const buildFileContent = rollupBuild[serviceWorkerBuildRelativeUrl].source
+      rollupBuild[serviceWorkerBuildRelativeUrl].source =
+        serviceWorkerFinalizer(buildFileContent, {
+          serviceWorkerBuildRelativeUrl,
           buildManifest,
           rollupBuild,
           lineBreakNormalization,
-        },
-      )
+        })
     }),
   )
 }

package/src/jsenvServiceWorkerFinalizer.js

@@ -1,19 +1,40 @@
+import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
+
 import { generateContentHash } from "./internal/building/url-versioning.js"
 
 export const jsenvServiceWorkerFinalizer = (
   code,
-  { buildManifest, rollupBuild, lineBreakNormalization },
+  {
+    serviceWorkerBuildRelativeUrl,
+    buildManifest,
+    rollupBuild,
+    lineBreakNormalization,
+  },
 ) => {
   const generatedUrlsConfig = {}
   Object.keys(buildManifest).forEach((projectRelativeUrl) => {
     if (projectRelativeUrl.endsWith(".map")) {
       return
     }
+
     const buildRelativeUrl = buildManifest[projectRelativeUrl]
+    const buildUrl = resolveUrl(buildRelativeUrl, "file://")
+    const serviceWorkerBuildUrl = resolveUrl(
+      serviceWorkerBuildRelativeUrl,
+      "file://",
+    )
+    const urlRelativeToServiceWorker = urlToRelativeUrl(
+      buildUrl,
+      serviceWorkerBuildUrl,
+    )
+    if (urlRelativeToServiceWorker === "") {
+      // don't put the service worker itself
+      return
+    }
     const versioned = fileNameContainsHash(buildRelativeUrl)
     const rollupFile = rollupBuild[buildRelativeUrl]
 
-    generatedUrlsConfig[buildRelativeUrl] = {
+    generatedUrlsConfig[urlRelativeToServiceWorker] = {
       versioned,
       ...(versioned
         ? {}