@jsenv/core 28.6.0 → 29.0.0

package/package.json

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

package/src/build/build.js

@@ -123,8 +123,8 @@ export const build = async ({
   sourcemaps = false,
   sourcemapsSourcesContent,
   urlAnalysis = {},
-  nodeEsmResolution = true,
-  fileSystemMagicResolution,
+  urlResolution,
+  fileSystemMagicRedirection,
   directoryReferenceAllowed,
   transpilation = {},
   bundling = true,
@@ -221,8 +221,8 @@ build ${entryPointKeys.length} entry points`)
           runtimeCompat,
 
           urlAnalysis,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
+          urlResolution,
+          fileSystemMagicRedirection,
           directoryReferenceAllowed,
           transpilation: {
             ...transpilation,
@@ -326,10 +326,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 if (rawUrlInfo.content === reference.content) {
                   return true
                 }
-                if (rawUrlInfo.originalContent === reference.content) {
-                  return true
-                }
-                return false
+                return rawUrlInfo.originalContent === reference.content
               })
               const parentUrlInfo = finalGraph.getUrlInfo(reference.parentUrl)
               if (!rawUrlInfo) {
@@ -635,7 +632,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           const bundler = bundlers[rawUrlInfo.type]
           if (bundler) {
             bundler.urlInfos.push(rawUrlInfo)
-            return
           }
         }
         GRAPH.forEach(rawGraph, (rawUrlInfo) => {
@@ -1510,18 +1506,12 @@ const isUsed = (urlInfo) => {
   if (urlInfo.injected) {
     return true
   }
-  if (urlInfo.dependents.size > 0) {
-    return true
-  }
-  return false
+  return urlInfo.dependents.size > 0
 }
 
 const canUseVersionedUrl = (urlInfo) => {
   if (urlInfo.isEntryPoint) {
     return false
   }
-  if (urlInfo.type === "webmanifest") {
-    return false
-  }
-  return true
+  return urlInfo.type !== "webmanifest"
 }

package/src/dev/start_dev_server.js

@@ -50,9 +50,9 @@ export const startDevServer = async ({
   runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   urlAnalysis = {},
+  urlResolution,
   supervisor = true,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
+  fileSystemMagicRedirection,
   transpilation,
   explorer = true, // see jsenv_plugin_explorer.js
   // toolbar = false,
@@ -152,9 +152,9 @@ export const startDevServer = async ({
 
     plugins,
     urlAnalysis,
+    urlResolution,
+    fileSystemMagicRedirection,
     supervisor,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
     transpilation,
     clientFiles,
     clientMainFileUrl,

package/src/omega/kitchen.js

@@ -134,6 +134,7 @@ export const createKitchen = ({
       isResourceHint,
       isImplicit,
       hasVersioningEffect,
+      version: null,
       injected,
       timing: {},
       // for inline resources the reference contains the content
@@ -936,53 +937,3 @@ const determineFileUrlForOutDirectory = ({ urlInfo, context }) => {
     preferAbsolute: true,
   })
 }
-
-// import { getOriginalPosition } from "@jsenv/core/src/utils/sourcemap/original_position.js"
-// const getUrlSite = async (
-//   urlInfo,
-//   { line, column, originalLine, originalColumn },
-// ) => {
-//   if (typeof originalLine === "number") {
-//     return {
-//       url: urlInfo.url,
-//       line: originalLine,
-//       column: originalColumn,
-//     }
-//   }
-//   if (urlInfo.content === urlInfo.originalContent) {
-//     return {
-//       url: urlInfo.url,
-//       line,
-//       column,
-//     }
-//   }
-//   // at this point things were transformed: line and column are generated
-//   // no sourcemap -> cannot map back to original file
-//   const { sourcemap } = urlInfo
-//   if (!sourcemap) {
-//     return {
-//       url: urlInfo.generatedUrl,
-//       content: urlInfo.content,
-//       line,
-//       column,
-//     }
-//   }
-//   const originalPosition = await getOriginalPosition({
-//     sourcemap,
-//     line,
-//     column,
-//   })
-//   // cannot map back to original file
-//   if (!originalPosition || originalPosition.line === null) {
-//     return {
-//       url: urlInfo.generatedUrl,
-//       line,
-//       column,
-//     }
-//   }
-//   return {
-//     url: urlInfo.url,
-//     line: originalPosition.line,
-//     column: originalPosition.column,
-//   }
-// }

package/src/omega/omega_server.js

@@ -30,9 +30,9 @@ export const startOmegaServer = async ({
 
   plugins,
   urlAnalysis,
+  urlResolution,
+  fileSystemMagicRedirection,
   supervisor,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
   transpilation,
   clientAutoreload,
   clientFiles,
@@ -93,9 +93,9 @@ export const startOmegaServer = async ({
 
           plugins,
           urlAnalysis,
+          urlResolution,
+          fileSystemMagicRedirection,
           supervisor,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
           transpilation,
           clientAutoreload,
           clientFiles,

package/src/omega/server/file_service.js

@@ -26,9 +26,9 @@ export const createFileService = ({
 
   plugins,
   urlAnalysis,
+  urlResolution,
+  fileSystemMagicRedirection,
   supervisor,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
   transpilation,
   clientAutoreload,
   clientFiles,
@@ -128,9 +128,9 @@ export const createFileService = ({
           runtimeCompat,
 
           urlAnalysis,
+          urlResolution,
+          fileSystemMagicRedirection,
           supervisor,
-          nodeEsmResolution,
-          fileSystemMagicResolution,
           transpilation,
 
           clientMainFileUrl,

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -2,17 +2,7 @@ export const jsenvPluginCacheControl = () => {
   return {
     name: "jsenv:cache_control",
     appliesDuring: "dev",
-    augmentResponse: ({ reference }, context) => {
-      if (context.scenarios.test) {
-        // During dev, all files are put into browser cache for 1 hour because:
-        // 1: Browser cache is a temporary directory created by playwright
-        // 2: We assume source files won't be modified while tests are running
-        return {
-          headers: {
-            "cache-control": `private,max-age=3600,immutable`,
-          },
-        }
-      }
+    augmentResponse: ({ reference }) => {
       if (
         reference.searchParams.has("v") &&
         !reference.searchParams.has("hmr")

package/src/plugins/explorer/client/explorer.html

@@ -365,7 +365,7 @@
         </section>
       </article>
     </div>
-    <script>
+    <script no-supervisor>
       // eslint-disable-next-line no-undef
       const { rootDirectoryUrl, groups, files } = SERVER_PARAMS
 
@@ -479,7 +479,7 @@
 
       document.querySelector("main").appendChild(fileListElement)
     </script>
-    <script>
+    <script no-supervisor>
       // make menu scrollable
       const getMenuWrapperSize = () => {
         return document.querySelector(".menu-wrapper").getBoundingClientRect()

package/src/plugins/explorer/jsenv_plugin_explorer.js

@@ -17,6 +17,7 @@ export const jsenvPluginExplorer = ({
       "./tests/**/*.test.html": true,
     },
   },
+  clientMainFileUrl,
 }) => {
   const faviconClientFileUrl = new URL("./client/jsenv.png", import.meta.url)
 
@@ -25,53 +26,60 @@ export const jsenvPluginExplorer = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: async (urlInfo, context) => {
-        if (urlInfo.url !== explorerHtmlFileUrl) {
+        if (urlInfo.url !== clientMainFileUrl) {
           return null
         }
-        const associationsForExplorable = {}
-        Object.keys(groups).forEach((groupName) => {
-          const groupConfig = groups[groupName]
-          associationsForExplorable[groupName] = {
-            "**/.jsenv/": false, // avoid visting .jsenv directory in jsenv itself
-            ...groupConfig,
-          }
-        })
-        const matchingFileResultArray = await collectFiles({
-          directoryUrl: context.rootDirectoryUrl,
-          associations: associationsForExplorable,
-          predicate: (meta) =>
-            Object.keys(meta).some((group) => Boolean(meta[group])),
-        })
-        const files = matchingFileResultArray.map(({ relativeUrl, meta }) => ({
-          relativeUrl,
-          meta,
-        }))
         let html = urlInfo.content
-        html = html.replace(
-          "ignore:FAVICON_HREF",
-          DATA_URL.stringify({
-            contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
-            base64Flag: true,
-            data: readFileSync(new URL(faviconClientFileUrl)).toString(
-              "base64",
+        if (html.includes("ignore:FAVICON_HREF")) {
+          html = html.replace(
+            "ignore:FAVICON_HREF",
+            DATA_URL.stringify({
+              contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
+              base64Flag: true,
+              data: readFileSync(new URL(faviconClientFileUrl)).toString(
+                "base64",
+              ),
+            }),
+          )
+        }
+        if (html.includes("SERVER_PARAMS")) {
+          const associationsForExplorable = {}
+          Object.keys(groups).forEach((groupName) => {
+            const groupConfig = groups[groupName]
+            associationsForExplorable[groupName] = {
+              "**/.jsenv/": false, // avoid visting .jsenv directory in jsenv itself
+              ...groupConfig,
+            }
+          })
+          const matchingFileResultArray = await collectFiles({
+            directoryUrl: context.rootDirectoryUrl,
+            associations: associationsForExplorable,
+            predicate: (meta) =>
+              Object.keys(meta).some((group) => Boolean(meta[group])),
+          })
+          const files = matchingFileResultArray.map(
+            ({ relativeUrl, meta }) => ({
+              relativeUrl,
+              meta,
+            }),
+          )
+
+          html = html.replace(
+            "SERVER_PARAMS",
+            JSON.stringify(
+              {
+                rootDirectoryUrl: context.rootDirectoryUrl,
+                groups,
+                files,
+              },
+              null,
+              "  ",
             ),
-          }),
-        )
-        html = html.replace(
-          "SERVER_PARAMS",
-          JSON.stringify(
-            {
-              rootDirectoryUrl: context.rootDirectoryUrl,
-              groups,
-              files,
-            },
-            null,
-            "  ",
-          ),
-        )
-        Object.assign(urlInfo.headers, {
-          "cache-control": "no-store",
-        })
+          )
+          Object.assign(urlInfo.headers, {
+            "cache-control": "no-store",
+          })
+        }
         return html
       },
     },

package/src/plugins/plugins.js

@@ -1,8 +1,6 @@
 import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url_analysis.js"
-import { jsenvPluginLeadingSlash } from "./leading_slash/jsenv_plugin_leading_slash.js"
 import { jsenvPluginImportmap } from "./importmap/jsenv_plugin_importmap.js"
 import { jsenvPluginUrlResolution } from "./url_resolution/jsenv_plugin_url_resolution.js"
-import { jsenvPluginNodeEsmResolution } from "./node_esm_resolution/jsenv_plugin_node_esm_resolution.js"
 import { jsenvPluginUrlVersion } from "./url_version/jsenv_plugin_url_version.js"
 import { jsenvPluginFileUrls } from "./file_urls/jsenv_plugin_file_urls.js"
 import { jsenvPluginHttpUrls } from "./http_urls/jsenv_plugin_http_urls.js"
@@ -30,10 +28,10 @@ export const getCorePlugins = ({
   runtimeCompat,
 
   urlAnalysis = {},
-  supervisor,
-  nodeEsmResolution = true,
-  fileSystemMagicResolution,
+  urlResolution = {},
+  fileSystemMagicRedirection,
   directoryReferenceAllowed,
+  supervisor,
   transpilation = true,
   minification = false,
   bundling = false,
@@ -50,19 +48,19 @@ export const getCorePlugins = ({
   if (supervisor === true) {
     supervisor = {}
   }
-  if (nodeEsmResolution === true) {
-    nodeEsmResolution = {}
-  }
-  if (fileSystemMagicResolution === true) {
-    fileSystemMagicResolution = {}
+  if (fileSystemMagicRedirection === true) {
+    fileSystemMagicRedirection = {}
   }
   if (clientAutoreload === true) {
     clientAutoreload = {}
   }
-  clientMainFileUrl =
-    clientMainFileUrl || explorer
-      ? explorerHtmlFileUrl
-      : new URL("./index.html", rootDirectoryUrl)
+  if (clientMainFileUrl === undefined) {
+    clientMainFileUrl = explorer
+      ? String(explorerHtmlFileUrl)
+      : String(new URL("./index.html", rootDirectoryUrl))
+  } else {
+    clientMainFileUrl = String(clientMainFileUrl)
+  }
 
   return [
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
@@ -74,13 +72,14 @@ export const getCorePlugins = ({
     jsenvPluginInline(), // before "file urls" to resolve and load inline urls
     jsenvPluginFileUrls({
       directoryReferenceAllowed,
-      ...fileSystemMagicResolution,
+      ...fileSystemMagicRedirection,
     }),
     jsenvPluginHttpUrls(),
-    jsenvPluginLeadingSlash(),
-    // before url resolution to handle "js_import_export" resolution
-    jsenvPluginNodeEsmResolution(nodeEsmResolution),
-    jsenvPluginUrlResolution({ clientMainFileUrl }),
+    jsenvPluginUrlResolution({
+      runtimeCompat,
+      urlResolution,
+      clientMainFileUrl,
+    }),
     jsenvPluginUrlVersion(),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
@@ -100,6 +99,13 @@ export const getCorePlugins = ({
         ]
       : []),
     jsenvPluginCacheControl(),
-    ...(explorer ? [jsenvPluginExplorer(explorer)] : []),
+    ...(explorer
+      ? [
+          jsenvPluginExplorer({
+            ...explorer,
+            clientMainFileUrl,
+          }),
+        ]
+      : []),
   ]
 }

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -1,39 +1,115 @@
-export const jsenvPluginUrlResolution = ({ clientMainFileUrl }) => {
-  const urlResolver = (reference) => {
+/*
+ * This plugin is responsible to resolve urls except for a few cases:
+ * - A custom plugin implements a resolveUrl hook returning something
+ * - The reference.type is "filesystem" -> it is handled by jsenv_plugin_file_urls.js
+ *
+ * By default node esm resolution applies inside js modules
+ * and the rest uses the web standard url resolution (new URL):
+ * - "http_request"
+ * - "entry_point"
+ * - "js_import_export"
+ * - "link_href"
+ * - "script_src"
+ * - "a_href"
+ * - "iframe_src
+ * - "img_src"
+ * - "img_srcset"
+ * - "source_src"
+ * - "source_srcset"
+ * - "image_href"
+ * - "use_href"
+ * - "css_@import"
+ * - "css_url"
+ * - "sourcemap_comment"
+ * - "js_url_specifier"
+ * - "js_inline_content"
+ * - "webmanifest_icon_src"
+ * - "package_json"
+ */
+
+import { createNodeEsmResolver } from "./node_esm_resolver.js"
+
+export const jsenvPluginUrlResolution = ({
+  runtimeCompat,
+  clientMainFileUrl,
+  urlResolution,
+}) => {
+  const resolveUrlUsingWebResolution = (reference) => {
     return new URL(
       reference.specifier,
       reference.baseUrl || reference.parentUrl,
     ).href
   }
+
+  const resolvers = {}
+  Object.keys(urlResolution).forEach((referenceType) => {
+    const resolver = urlResolution[referenceType]
+    if (typeof resolver !== "object") {
+      throw new Error(
+        `Unexpected urlResolution configuration:
+"${referenceType}" resolution value must be an object, got ${resolver}`,
+      )
+    }
+    let { web, node_esm, ...rest } = resolver
+    const unexpectedKey = Object.keys(rest)[0]
+    if (unexpectedKey) {
+      throw new Error(
+        `Unexpected urlResolution configuration:
+"${referenceType}" resolution key must be "web" or "node_esm", found "${
+          Object.keys(rest)[0]
+        }"`,
+      )
+    }
+    if (node_esm === undefined) {
+      node_esm = referenceType === "js_import_export"
+    }
+    if (web === undefined) {
+      web = true
+    }
+    if (node_esm) {
+      if (node_esm === true) node_esm = {}
+      const { packageConditions } = node_esm
+      resolvers[referenceType] = createNodeEsmResolver({
+        runtimeCompat,
+        packageConditions,
+      })
+    } else if (web) {
+      resolvers[referenceType] = resolveUrlUsingWebResolution
+    }
+  })
+
+  if (!resolvers["js_import_export"]) {
+    resolvers.js_import_export = createNodeEsmResolver({ runtimeCompat })
+  }
+  if (!resolvers["*"]) {
+    resolvers["*"] = resolveUrlUsingWebResolution
+  }
+
   return {
     name: "jsenv:url_resolution",
     appliesDuring: "*",
-    resolveUrl: {
-      "http_request": (reference) => {
-        if (reference.specifier === "/") {
-          return String(clientMainFileUrl)
+    resolveUrl: (reference, context) => {
+      if (reference.specifier === "/") {
+        return String(clientMainFileUrl)
+      }
+      if (reference.specifier[0] === "/") {
+        return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
+          .href
+      }
+      const resolver = resolvers[reference.type] || resolvers["*"]
+      return resolver(reference, context)
+    },
+    // when specifier is prefixed by "file:///@ignore/"
+    // we return an empty js module (used by node esm)
+    fetchUrlContent: (urlInfo) => {
+      if (urlInfo.url.startsWith("file:///@ignore/")) {
+        return {
+          content: "export default {}",
+          contentType: "text/javascript",
+          type: "js_module",
         }
-        return urlResolver(reference)
-      },
-      "entry_point": urlResolver, // during build
-      "link_href": urlResolver,
-      "script_src": urlResolver,
-      "a_href": urlResolver,
-      "iframe_src": urlResolver,
-      "img_src": urlResolver,
-      "img_srcset": urlResolver,
-      "source_src": urlResolver,
-      "source_srcset": urlResolver,
-      "image_href": urlResolver,
-      "use_href": urlResolver,
-      "css_@import": urlResolver,
-      "css_url": urlResolver,
-      "sourcemap_comment": urlResolver,
-      "js_import_export": urlResolver,
-      "js_url_specifier": urlResolver,
-      "js_inline_content": urlResolver,
-      "webmanifest_icon_src": urlResolver,
-      "package_json": urlResolver,
+      }
+      return null
     },
   }
 }