@jsenv/core 25.0.0 → 25.2.0

package/src/executeTestPlan.js

@@ -49,6 +49,7 @@ export const executeTestPlan = async ({
   completedExecutionLogMerging = false,
   logSummary = true,
   updateProcessExitCode = true,
+  windowsProcessExitFix = true,
 
   maxExecutionsInParallel = 1,
   defaultMsAllocatedPerExecution = 30000,
@@ -90,6 +91,7 @@ export const executeTestPlan = async ({
   compileServerCanWriteOnFilesystem,
   babelPluginMap,
   babelConfigFileUrl,
+  preservedUrls,
   workers,
   serviceWorkers,
   importMapInWebWorkers,
@@ -193,6 +195,7 @@ export const executeTestPlan = async ({
     compileServerCanWriteOnFilesystem,
     babelPluginMap,
     babelConfigFileUrl,
+    preservedUrls,
     workers,
     serviceWorkers,
     importMapInWebWorkers,
@@ -254,6 +257,17 @@ export const executeTestPlan = async ({
     await Promise.all(promises)
   }
 
+  // Sometimes on windows test plan scripts never ends
+  // I suspect it's some node process keeping the process alive
+  // because not properly killed for some reason.
+  // (It can be reproduced on @jsenv/importmap-node-module where playwright is not involved)
+  // The hotfix for now is to manually call process.exit() in on windows
+  if (process.platform === "win32" && windowsProcessExitFix) {
+    setTimeout(() => {
+      process.exit()
+    }, 2000).unref()
+  }
+
   return {
     testPlanAborted: result.aborted,
     testPlanSummary: result.planSummary,

package/src/internal/building/buildUsingRollup.js

@@ -24,6 +24,7 @@ export const buildUsingRollup = async ({
   entryPoints,
   compileServerOrigin,
   compileDirectoryRelativeUrl,
+  jsenvDirectoryRelativeUrl,
   buildDirectoryUrl,
   buildDirectoryClean,
   assetManifestFile = false,
@@ -43,8 +44,8 @@ export const buildUsingRollup = async ({
   importMapFileRelativeUrl,
   importDefaultExtension,
   externalImportSpecifiers,
-  externalImportUrlPatterns,
   importPaths,
+  preservedUrls,
   workers,
   serviceWorkers,
   serviceWorkerFinalizer,
@@ -98,6 +99,7 @@ export const buildUsingRollup = async ({
     entryPoints,
     compileServerOrigin,
     compileDirectoryRelativeUrl,
+    jsenvDirectoryRelativeUrl,
     buildDirectoryUrl,
 
     format,
@@ -112,8 +114,8 @@ export const buildUsingRollup = async ({
     importMapFileRelativeUrl,
     importDefaultExtension,
     externalImportSpecifiers,
-    externalImportUrlPatterns,
     importPaths,
+    preservedUrls,
     workers,
     serviceWorkers,
     serviceWorkerFinalizer,

package/src/internal/building/build_stats.js

@@ -90,6 +90,9 @@ const getProjectFileContents = (ressourceBuilder) => {
       // sourcemap generated by rollup do not have bufferBeforeBuild
       return
     }
+    if (!bufferBeforeBuild) {
+      throw new Error(`bufferBeforeBuild missing for ${url}`)
+    }
     projectFileContents[url] = bufferBeforeBuild
   })
   return projectFileContents

package/src/internal/building/build_url_generator.js

@@ -0,0 +1,153 @@
+import { urlToBasename, urlToExtension } from "@jsenv/filesystem"
+
+import { generateContentHash } from "./url_versioning.js"
+
+export const createBuildUrlGenerator = ({
+  entryPointUrls,
+  asOriginalUrl,
+  lineBreakNormalization,
+}) => {
+  const availableNameGenerator = createAvailableNameGenerator()
+
+  const prepareBuildUrlForRessource = (ressource) => {
+    const buildRelativeUrlPattern = getBuildRelativeUrlPattern({
+      entryPointUrls,
+      asOriginalUrl,
+      availableNameGenerator,
+      ressource,
+    })
+    const buildRelativeUrlWithoutHash = buildRelativeUrlPattern.replace(
+      "_[hash]",
+      "",
+    )
+    return {
+      buildRelativeUrlPattern,
+      buildRelativeUrlWithoutHash,
+    }
+  }
+
+  const computeBuildRelativeUrl = (ressource) => {
+    const buildRelativeUrl = renderFileNamePattern(
+      ressource.buildRelativeUrlPattern,
+      {
+        hash: () =>
+          generateContentHash(ressource.bufferAfterBuild, {
+            contentType: ressource.contentType,
+            lineBreakNormalization,
+          }),
+      },
+    )
+    return buildRelativeUrl
+  }
+
+  return { prepareBuildUrlForRessource, computeBuildRelativeUrl }
+}
+
+const getBuildRelativeUrlPattern = ({
+  entryPointUrls,
+  asOriginalUrl,
+  availableNameGenerator,
+  ressource,
+}) => {
+  if (ressource.isEntryPoint) {
+    const originalUrl = asOriginalUrl(ressource.url)
+    const entryPointBuildRelativeUrlPattern = entryPointUrls[originalUrl]
+    return entryPointBuildRelativeUrlPattern
+  }
+
+  // inline ressource
+  // TODO: should inherit importer directory location because inline
+  if (ressource.isInline) {
+    // const importerBuildRelativeUrlWithoutHash =
+    //   ressource.importer.buildRelativeUrlWithoutHash
+    const name = urlToBasename(ressource.url)
+    const extension = urlToExtension(ressource.url)
+    // no need to ensure name is unique because it's already done
+    return `${name}_[hash]${extension}`
+  }
+
+  // importmap.
+  // the goal is to put the importmap at the same relative path
+  // than in the project to avoid having to re-resolve mappings
+  if (ressource.contentType === "application/importmap+json") {
+    const name = availableNameGenerator.getAvailableNameInDirectory(
+      urlToBasename(ressource.url),
+      "/",
+    )
+    const extension = urlToExtension(ressource.url)
+    return `${name}_[hash]${extension}`
+  }
+
+  // service worker:
+  // - MUST be at the root (same level than the HTML file)
+  //   otherwise it might be registered for the scope "/assets/" instead of "/"
+  // - MUST not be versioned
+  if (ressource.isServiceWorker) {
+    const name = availableNameGenerator.getAvailableNameInDirectory(
+      urlToBasename(ressource.url),
+      "/",
+    )
+    const extension = urlToExtension(ressource.url)
+    return `${name}${extension}`
+  }
+
+  if (ressource.isWorker) {
+    const name = availableNameGenerator.getAvailableNameInDirectory(
+      urlToBasename(ressource.url),
+      "/",
+    )
+    const extension = urlToExtension(ressource.url)
+    return `${name}_[hash]${extension}`
+  }
+
+  if (ressource.isJsModule) {
+    const name = availableNameGenerator.getAvailableNameInDirectory(
+      urlToBasename(ressource.url),
+      "/",
+    )
+    return `${name}_[hash].js`
+  }
+
+  const name = availableNameGenerator.getAvailableNameInDirectory(
+    urlToBasename(ressource.url),
+    "assets/",
+  )
+  const extension = urlToExtension(ressource.url)
+  return ressource.urlVersioningDisabled
+    ? `assets/${name}${extension}`
+    : `assets/${name}_[hash]${extension}`
+}
+
+const createAvailableNameGenerator = () => {
+  const cache = {}
+  const getAvailableNameInDirectory = (name, directory) => {
+    let names = cache[directory]
+    if (!names) {
+      names = []
+      cache[directory] = names
+    }
+
+    let nameCandidate = name
+    let integer = 1
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      if (!names.includes(nameCandidate)) {
+        names.push(nameCandidate)
+        return nameCandidate
+      }
+      integer++
+      nameCandidate = `${name}${integer}`
+    }
+  }
+
+  return {
+    getAvailableNameInDirectory,
+  }
+}
+
+const renderFileNamePattern = (pattern, replacements) => {
+  return pattern.replace(/\[(\w+)\]/g, (_match, type) => {
+    const replacement = replacements[type](_match)
+    return replacement
+  })
+}

package/src/internal/building/css/parseCssRessource.js

@@ -6,6 +6,7 @@ import {
 } from "@jsenv/filesystem"
 
 import {
+  generateSourcemapUrl,
   getCssSourceMappingUrl,
   setCssSourceMappingUrl,
 } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
@@ -17,11 +18,18 @@ import { moveCssUrls } from "./moveCssUrls.js"
 export const parseCssRessource = async (
   cssRessource,
   { notifyReferenceFound },
-  { asProjectUrl, asOriginalUrl, minify, minifyCssOptions, cssConcatenation },
+  {
+    jsenvRemoteDirectory,
+    asProjectUrl,
+    asOriginalUrl,
+    minify,
+    minifyCssOptions,
+    cssConcatenation,
+  },
 ) => {
   const cssString = String(cssRessource.bufferBeforeBuild)
   const cssSourcemapUrl = getCssSourceMappingUrl(cssString)
-  const url = cssRessource.url
+  const cssUrl = cssRessource.url
   let code = cssString
   let map
   let sourcemapReference
@@ -42,7 +50,10 @@ export const parseCssRessource = async (
     sourcemapReference = notifyReferenceFound({
       referenceLabel: "css sourcemaping comment",
       contentType: "application/octet-stream",
-      ressourceSpecifier: `${urlToFilename(cssRessource.url)}.map`,
+      ressourceSpecifier: urlToRelativeUrl(
+        generateSourcemapUrl(cssUrl),
+        cssUrl,
+      ),
       isPlaceholder: true,
       isSourcemap: true,
     })
@@ -50,7 +61,7 @@ export const parseCssRessource = async (
 
   const { atImports, urlDeclarations } = await parseCssUrls({
     code,
-    url,
+    url: cssUrl,
   })
   const urlNodeReferenceMapping = new Map()
   const atImportReferences = []
@@ -75,11 +86,7 @@ export const parseCssRessource = async (
     urlNodeReferenceMapping.set(urlDeclaration.urlNode, urlReference)
   })
 
-  return async ({
-    getUrlRelativeToImporter,
-    precomputeBuildRelativeUrl,
-    buildDirectoryUrl,
-  }) => {
+  return async ({ getUrlRelativeToImporter, buildDirectoryUrl }) => {
     const sourcemapRessource = sourcemapReference.ressource
     const cssCompiledUrl = cssRessource.url
     const cssOriginalUrl = asOriginalUrl(cssCompiledUrl)
@@ -96,16 +103,13 @@ export const parseCssRessource = async (
         if (!urlNodeFound) {
           return urlNode.value
         }
-
         // url node nous dit quel référence y correspond
         const urlNodeReference = urlNodeReferenceMapping.get(urlNodeFound)
         const cssUrlRessource = urlNodeReference.ressource
-
         const { isExternal } = cssUrlRessource
         if (isExternal) {
           return urlNode.value
         }
-
         const { isInline } = cssUrlRessource
         if (isInline) {
           return getRessourceAsBase64Url(cssUrlRessource)
@@ -126,16 +130,18 @@ export const parseCssRessource = async (
         )
         atImportReference.inlinedCallback()
         let code = String(atImportReference.ressource.bufferAfterBuild)
+        const from = resolveUrl(
+          atImportReference.ressource.buildRelativeUrl,
+          buildDirectoryUrl,
+        )
+        const to = resolveUrl(
+          cssRessource.buildRelativeUrlWithoutHash,
+          buildDirectoryUrl,
+        )
         const moveResult = await moveCssUrls({
           code,
-          from: resolveUrl(
-            atImportReference.ressource.buildRelativeUrl,
-            buildDirectoryUrl,
-          ),
-          to: resolveUrl(
-            precomputeBuildRelativeUrl(cssRessource),
-            buildDirectoryUrl,
-          ),
+          from,
+          to,
           // moveCssUrls will change the css source code
           // Ideally we should update the sourcemap referenced by css
           // to target the one after css urls are moved.
@@ -153,7 +159,6 @@ export const parseCssRessource = async (
     })
     code = replaceCssResult.code
     map = replaceCssResult.map
-
     cssRessource.buildEnd(code)
 
     // In theory code should never be modified once buildEnd() is called
@@ -168,15 +173,16 @@ export const parseCssRessource = async (
       cssRessource.buildRelativeUrl,
       buildDirectoryUrl,
     )
-    const sourcemapPrecomputedBuildUrl = resolveUrl(
-      `${urlToFilename(cssBuildUrl)}.map`,
-      cssBuildUrl,
-    )
-
+    const sourcemapPrecomputedBuildUrl = generateSourcemapUrl(cssBuildUrl)
     map.file = urlToFilename(cssBuildUrl)
     if (map.sources) {
       map.sources = map.sources.map((source) => {
         const sourceUrl = resolveUrl(source, cssOriginalUrl)
+        if (jsenvRemoteDirectory.isFileUrlForRemoteUrl(sourceUrl)) {
+          const sourceRemoteUrl =
+            jsenvRemoteDirectory.remoteUrlFromFileUrl(sourceUrl)
+          return sourceRemoteUrl
+        }
         const sourceUrlRelativeToSourceMap = urlToRelativeUrl(
           sourceUrl,
           sourcemapPrecomputedBuildUrl,