@jsenv/core 24.5.3 → 24.5.7

package/src/internal/browser_detection/detectChrome.js

@@ -1,6 +1,8 @@
 import { userAgentToVersion, firstMatch } from "./util.js"
 
-export const detectChrome = () => userAgentToBrowser(window.navigator.userAgent)
+export const detectChrome = () => {
+  return userAgentToBrowser(window.navigator.userAgent)
+}
 
 const userAgentToBrowser = (userAgent) => {
   if (/chromium/i.test(userAgent)) {

package/src/internal/browser_detection/user_agent_data.js

@@ -0,0 +1,26 @@
+/*
+ * Prefer window.navigator.userAgentData before resorting to
+ * window.navigator.userAgent because of
+ * https://blog.chromium.org/2021/09/user-agent-reduction-origin-trial-and-dates.html
+ */
+
+export const detectFromUserAgentData = () => {
+  const { userAgentData } = window.navigator
+  if (!userAgentData) {
+    return null
+  }
+
+  const { brands } = userAgentData
+  let i = 0
+  while (i < brands.legth) {
+    const { brand, version } = brands[i]
+    i++
+    if (brand === "chromium" || brand === "Google Chrome") {
+      return {
+        name: "chrome",
+        version,
+      }
+    }
+  }
+  return null
+}

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/jsenvServiceWorkerFinalizer.js

@@ -27,6 +27,10 @@ export const jsenvServiceWorkerFinalizer = (
       buildUrl,
       serviceWorkerBuildUrl,
     )
+    if (urlRelativeToServiceWorker === "") {
+      // don't put the service worker itself
+      return
+    }
     const versioned = fileNameContainsHash(buildRelativeUrl)
     const rollupFile = rollupBuild[buildRelativeUrl]