@jsenv/core 27.0.0-alpha.36 → 27.0.0-alpha.39

package/main.js

@@ -1,7 +1,10 @@
 // dev
 export { startDevServer } from "./src/dev/start_dev_server.js"
 // test
-export { executeTestPlan } from "./src/test/execute_test_plan.js"
+export {
+  executeTestPlan,
+  defaultCoverageConfig,
+} from "./src/test/execute_test_plan.js"
 export {
   chromium,
   chromiumIsolatedTab,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.36",
+  "version": "27.0.0-alpha.39",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -31,19 +31,20 @@
     "./packages/*"
   ],
   "scripts": {
-    "eslint": "npx eslint ./test/dev_server/manual/main/importmap_inline/ --ext=.js,.mjs,.cjs,.html",
+    "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
+    "dev": "node ./script/dev/dev.mjs",
     "build": "node ./script/build/build.mjs",
     "test": "node ./script/test/test.mjs",
-    "test-with-coverage": "npm run test -- --coverage",
-    "dev": "node ./script/dev/dev.mjs",
+    "test-packages": "npm run test --workspaces --if-present",
     "start_file_server": "node ./script/dev/start_file_server.mjs",
+    "workspace-versions": "node ./script/publish/workspace_versions.mjs",
+    "workspace-publish": "node ./script/publish/workspace_publish.mjs",
     "performances": "node --expose-gc ./script/performance/generate_performance_report.mjs --log --once",
     "file-size": "node ./script/file_size/file_size.mjs --log",
     "prettier": "prettier --write .",
     "playwright-install": "npx playwright install-deps && npx playwright install",
     "certificate-install": "node ./script/dev/install_certificate_authority.mjs",
-    "workspace-versions": "node ./script/publish/workspace_versions.mjs",
-    "workspace-publish": "node ./script/publish/workspace_publish.mjs",
+    "test-with-coverage": "npm run test -- --coverage",
     "prepublishOnly": "npm run build"
   },
   "optionalDependencies": {
@@ -63,10 +64,10 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.5.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/node-esm-resolution": "0.0.4",
+    "@jsenv/node-esm-resolution": "0.0.6",
     "@jsenv/server": "12.6.1",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.4.4",
+    "@jsenv/utils": "1.5.0",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",
@@ -93,7 +94,7 @@
     "@jsenv/file-size-impact": "12.1.11",
     "@jsenv/https-local": "1.0.8",
     "@jsenv/importmap-node-module": "5.1.3",
-    "@jsenv/package-workspace": "0.0.5",
+    "@jsenv/package-workspace": "0.1.1",
     "@jsenv/performance-impact": "2.2.10",
     "@jsenv/pwa": "5.0.0",
     "eslint": "8.13.0",
@@ -102,10 +103,7 @@
     "eslint-plugin-react": "7.29.4",
     "playwright": "1.20.2",
     "postcss-import": "14.1.0",
-    "preact": "10.7.1",
     "prettier": "2.6.2",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }

package/src/build/build.js

@@ -30,6 +30,7 @@ import {
   stringifyHtmlAst,
 } from "@jsenv/utils/html_ast/html_ast.js"
 
+import { jsenvPluginUrlReferences } from "../plugins/url_references/jsenv_plugin_url_references.js"
 import { jsenvPluginInline } from "../plugins/inline/jsenv_plugin_inline.js"
 import { jsenvPluginAsJsClassic } from "../plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js"
 import { createUrlGraph } from "../omega/url_graph.js"
@@ -141,6 +142,10 @@ build ${entryPointKeys.length} entry points`)
         },
       },
       ...getCorePlugins({
+        rootDirectoryUrl,
+        urlGraph: rawGraph,
+        scenario: "build",
+
         nodeEsmResolution,
         fileSystemMagicResolution,
         injectedGlobals,
@@ -330,6 +335,7 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
     sourcemaps,
     runtimeCompat,
     plugins: [
+      jsenvPluginUrlReferences(),
       jsenvPluginAsJsClassic({
         systemJsInjection: true,
       }),
@@ -852,6 +858,7 @@ const applyUrlVersioning = async ({
       sourcemaps,
       runtimeCompat,
       plugins: [
+        jsenvPluginUrlReferences(),
         jsenvPluginInline({
           fetchInlineUrls: false,
           analyzeConvertedScripts: true, // to be able to version their urls

package/src/build/build_urls_generator.js

@@ -28,8 +28,9 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
     const urlObject = new URL(url)
     let { search, hash } = urlObject
     let name = getUrlName(url, urlInfo)
-    const [basename, extension] = splitFileExtension(name)
-    let nameCandidate = name
+    let [basename, extension] = splitFileExtension(name)
+    extension = extensionMappings[extension] || extension
+    let nameCandidate = `${basename}${extension}` // reconstruct name in case extension was normalized
     let integer = 1
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -48,6 +49,18 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
   }
 }
 
+// It's best to generate files with an extension representing what is inside the file
+// and after build js files contains solely js (js or typescript is gone).
+// This way a static file server is already configured to server the correct content-type
+// (otherwise one would have to configure that ".jsx" is "text/javascript")
+// To keep in mind: if you have "user.jsx" and "user.js" AND both file are not bundled
+// you end up with "dist/js/user.js" and "dist/js/user2.js"
+const extensionMappings = {
+  ".ts": ".js",
+  ".jsx": ".js",
+  ".tsx": ".js",
+}
+
 const splitFileExtension = (filename) => {
   const dotLastIndex = filename.lastIndexOf(".")
   if (dotLastIndex === -1) {

package/src/build/start_build_server.js

@@ -21,6 +21,7 @@ import {
   pluginCORS,
   fetchFileSystem,
 } from "@jsenv/server"
+import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/logger"
 import { Abort } from "@jsenv/abort"
 
@@ -50,6 +51,9 @@ export const startBuildServer = async ({
   cooldownBetweenFileEvents,
   autorestart,
 }) => {
+  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
+  buildDirectoryUrl = assertAndNormalizeDirectoryUrl(buildDirectoryUrl)
+
   const autorestartProcess = await initProcessAutorestart({
     signal,
     handleSIGINT,

package/src/omega/kitchen.js

@@ -13,7 +13,6 @@ import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 import { setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
 
 import { createPluginController } from "../plugins/plugin_controller.js"
-import { jsenvPluginUrlReferences } from "../plugins/url_references/jsenv_plugin_url_references.js"
 import { createUrlInfoTransformer } from "./url_graph/url_info_transformations.js"
 import { RUNTIME_COMPAT } from "./compat/runtime_compat.js"
 import { defaultRuntimeCompat } from "./compat/default_runtime_compat.js"
@@ -50,7 +49,7 @@ export const createKitchen = ({
   writeOnFileSystem = true,
 }) => {
   const pluginController = createPluginController({
-    plugins: [jsenvPluginUrlReferences(), ...plugins],
+    plugins,
     scenario,
   })
   const jsenvDirectoryUrl = new URL(".jsenv/", rootDirectoryUrl).href
@@ -119,6 +118,7 @@ export const createKitchen = ({
       // for inline ressources the reference contains the content
       content,
       contentType,
+      timing: {},
     }
   }
   const mutateReference = (reference, newReference) => {
@@ -208,6 +208,7 @@ export const createKitchen = ({
       })
     }
   }
+  baseContext.resolveReference = resolveReference
   const urlInfoTransformer = createUrlInfoTransformer({
     logger,
     urlGraph,
@@ -651,6 +652,7 @@ export const createKitchen = ({
 
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   Object.assign(urlInfo.data, reference.data)
+  Object.assign(urlInfo.timing, reference.timing)
   if (reference.injected) {
     urlInfo.data.injected = true
   }

package/src/omega/server/file_service.js

@@ -60,11 +60,11 @@ export const createFileService = ({
           [runtimeName]: runtimeVersion,
         },
       })
-      const { response, contentType, content } = urlInfo
+      let { response, contentType, content } = urlInfo
       if (response) {
         return response
       }
-      return {
+      response = {
         url: reference.url,
         status: 200,
         headers: {
@@ -73,7 +73,17 @@ export const createFileService = ({
           "cache-control": `private,max-age=0,must-revalidate`,
         },
         body: content,
+        timing: urlInfo.timing,
       }
+      kitchen.pluginController.callHooks(
+        "augmentResponse",
+        { reference, urlInfo },
+        {},
+        (returnValue) => {
+          response = composeTwoResponses(response, returnValue)
+        },
+      )
+      return response
     } catch (e) {
       const code = e.code
       if (code === "PARSE_ERROR") {
@@ -125,16 +135,7 @@ export const createFileService = ({
   }
   return async (request) => {
     let response = await getResponse(request)
-    if (response.url) {
-      kitchen.pluginController.callHooks(
-        "augmentResponse",
-        response,
-        {},
-        (returnValue) => {
-          response = composeTwoResponses(response, returnValue)
-        },
-      )
-    }
+
     return response
   }
 }

package/src/omega/url_graph/url_info_transformations.js

@@ -23,7 +23,12 @@ export const createUrlInfoTransformer = ({
       // for inline content (<script> insdide html)
       // chrome won't be able to fetch the file as it does not exists
       // so sourcemap must contain sources
-      urlInfo.isInline || sourcemapsSources
+      sourcemapsSources ||
+      urlInfo.isInline ||
+      (sourcemap.sources &&
+        sourcemap.sources.some(
+          (source) => !source || !source.startsWith("file:"),
+        ))
     if (sourcemap.sources && sourcemap.sources.length > 1) {
       sourcemap.sources = sourcemap.sources.map(
         (source) => new URL(source, urlInfo.data.rawUrl || urlInfo.url).href,

package/src/omega/url_graph.js

@@ -150,5 +150,6 @@ const createUrlInfo = (url) => {
     content: undefined,
     sourcemap: null,
     sourcemapReference: null,
+    timing: {},
   }
 }

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_server.js

@@ -43,9 +43,8 @@ export const jsenvPluginDevSSEServer = ({
       urlInfo.data.hmrTimestamp = hmrTimestamp
       urlInfo.dependents.forEach((dependentUrl) => {
         const dependentUrlInfo = urlInfos[dependentUrl]
-        if (
-          !dependentUrlInfo.data.hotAcceptDependencies.includes(urlInfo.url)
-        ) {
+        const { hotAcceptDependencies = [] } = dependentUrlInfo.data
+        if (!hotAcceptDependencies.includes(urlInfo.url)) {
           iterate(dependentUrlInfo, hmrTimestamp)
         }
       })

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -12,8 +12,14 @@ import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 
 export const jsenvPluginCommonJsGlobals = () => {
   const transformCommonJsGlobals = async (urlInfo, { scenario }) => {
+    if (
+      !urlInfo.content.includes("process.env.NODE_ENV") &&
+      !urlInfo.content.includes("__filename") &&
+      !urlInfo.content.includes("__dirname")
+    ) {
+      return null
+    }
     const isJsModule = urlInfo.type === "js_module"
-
     const replaceMap = {
       "process.env.NODE_ENV": `("${
         scenario === "dev" || scenario === "test" ? "dev" : "prod"

package/src/plugins/filesystem_magic/jsenv_plugin_filesystem_magic.js

@@ -6,7 +6,7 @@ import { urlToExtension } from "@jsenv/filesystem"
 import { applyFileSystemMagicResolution } from "@jsenv/node-esm-resolution"
 
 export const jsenvPluginFileSystemMagic = ({
-  magicExtensions = ["inherit"],
+  magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preservesSymlink = true,
 } = {}) => {

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -40,6 +40,9 @@ export const jsenvPluginImportMetaHot = () => {
         cssUrlInfo.data.hotAcceptDependencies = []
       },
       js_module: async (urlInfo, context) => {
+        if (!urlInfo.content.includes("import.meta.hot")) {
+          return null
+        }
         const { metadata } = await applyBabelPlugins({
           babelPlugins: [babelPluginMetadataImportMetaHot],
           urlInfo,

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -18,6 +18,13 @@ export const jsenvPluginImportMetaScenarios = () => {
     appliesDuring: "*",
     transformUrlContent: {
       js_module: async (urlInfo, { scenario }) => {
+        if (
+          !urlInfo.content.includes("import.meta.dev") &&
+          !urlInfo.content.includes("import.meta.test") &&
+          !urlInfo.content.includes("import.meta.build")
+        ) {
+          return null
+        }
         const { metadata } = await applyBabelPlugins({
           babelPlugins: [babelPluginMetadataImportMetaScenarios],
           urlInfo,

package/src/plugins/inject_globals/jsenv_plugin_inject_globals.js

@@ -1,3 +1,9 @@
+import {
+  parseHtmlString,
+  injectScriptAsEarlyAsPossible,
+  createHtmlNode,
+  stringifyHtmlAst,
+} from "@jsenv/utils/html_ast/html_ast.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 
@@ -5,11 +11,41 @@ export const jsenvPluginInjectGlobals = (globals = {}) => {
   if (Object.keys(globals).length === 0) {
     return []
   }
-  const injectGlobals = (urlInfo) => {
+
+  const globalInjectorOnHtmlEntryPoint = (urlInfo) => {
+    if (!urlInfo.data.isEntryPoint) {
+      return null
+    }
+    // ideally we would inject an importmap but browser support is too low
+    // (even worse for worker/service worker)
+    // so for now we inject code into entry points
+    const htmlAst = parseHtmlString(urlInfo.content, {
+      storeOriginalPositions: false,
+    })
+    injectScriptAsEarlyAsPossible(
+      htmlAst,
+      createHtmlNode({
+        "tagName": "script",
+        "textContent": generateClientCodeForGlobals({
+          globals,
+          isWebWorker: false,
+        }),
+        "injected-by": "jsenv:inject_globals",
+      }),
+    )
+    return stringifyHtmlAst(htmlAst)
+  }
+
+  const globalsInjectorOnJsEntryPoints = (urlInfo) => {
+    if (!urlInfo.data.isEntryPoint && !urlInfo.data.isWebWorkerEntryPoint) {
+      return null
+    }
     const magicSource = createMagicSource(urlInfo.content)
-    const globalName = isWebWorkerUrlInfo(urlInfo) ? "self" : "window"
-    magicSource.prepend(
-      `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`,
+    magicSource.append(
+      generateClientCodeForGlobals({
+        globals,
+        isWebWorker: isWebWorkerUrlInfo(urlInfo),
+      }),
     )
     return magicSource.toContentAndSourcemap()
   }
@@ -18,8 +54,14 @@ export const jsenvPluginInjectGlobals = (globals = {}) => {
     name: "jsenv:inject_globals",
     appliesDuring: "*",
     transformUrlContent: {
-      js_classic: injectGlobals,
-      js_module: injectGlobals,
+      html: globalInjectorOnHtmlEntryPoint,
+      js_classic: globalsInjectorOnJsEntryPoints,
+      js_module: globalsInjectorOnJsEntryPoints,
     },
   }
 }
+
+const generateClientCodeForGlobals = ({ isWebWorker = false, globals }) => {
+  const globalName = isWebWorker ? "self" : "window"
+  return `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`
+}

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -7,6 +7,13 @@ import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_g
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {
+    if (
+      !urlInfo.content.includes("InlineContent(") &&
+      !urlInfo.content.includes("new Blob(") &&
+      !urlInfo.content.includes("JSON.parse(")
+    ) {
+      return null
+    }
     const { metadata } = await applyBabelPlugins({
       babelPlugins: [babelPluginMetadataInlineContentCalls],
       urlInfo,

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -7,25 +7,91 @@
  *   it should likely be an other plugin happening after the others
  */
 
+import { registerFileLifecycle } from "@jsenv/filesystem"
+
 import {
   applyNodeEsmResolution,
-  lookupPackageScope,
-  readPackageJson,
+  defaultLookupPackageScope,
+  defaultReadPackageJson,
 } from "@jsenv/node-esm-resolution"
 
 export const jsenvPluginNodeEsmResolution = ({
+  rootDirectoryUrl,
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   packageConditions = ["browser", "import"],
-} = {}) => {
-  const nodeEsmResolution = {
+  filesInvalidatingCache = ["package.json", "package-lock.json"],
+}) => {
+  const packageScopesCache = new Map()
+  const lookupPackageScope = (url) => {
+    const fromCache = packageScopesCache.get(url)
+    if (fromCache) {
+      return fromCache
+    }
+    const packageScope = defaultLookupPackageScope(url)
+    packageScopesCache.set(url, packageScope)
+    return packageScope
+  }
+  const packageJsonsCache = new Map()
+  const readPackageJson = (url) => {
+    const fromCache = packageJsonsCache.get(url)
+    if (fromCache) {
+      return fromCache
+    }
+    const packageJson = defaultReadPackageJson(url)
+    packageJsonsCache.set(url, packageJson)
+    return packageJson
+  }
+
+  const unregisters = []
+  filesInvalidatingCache.forEach((file) => {
+    const unregister = registerFileLifecycle(new URL(file, rootDirectoryUrl), {
+      added: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      updated: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      removed: () => {
+        packageScopesCache.clear()
+        packageJsonsCache.clear()
+      },
+      keepProcessAlive: false,
+    })
+    unregisters.push(unregister)
+  })
+
+  return [
+    jsenvPluginNodeEsmResolver({
+      packageConditions,
+      lookupPackageScope,
+      readPackageJson,
+    }),
+    jsenvPluginNodeModulesVersionInUrls({
+      lookupPackageScope,
+      readPackageJson,
+    }),
+  ]
+}
+
+const jsenvPluginNodeEsmResolver = ({
+  packageConditions,
+  lookupPackageScope,
+  readPackageJson,
+}) => {
+  return {
     name: "jsenv:node_esm_resolve",
     appliesDuring: "*",
     resolveUrl: {
       js_import_export: (reference) => {
+        const { parentUrl, specifier } = reference
         const { url } = applyNodeEsmResolution({
           conditions: packageConditions,
-          parentUrl: reference.parentUrl,
-          specifier: reference.specifier,
+          parentUrl,
+          specifier,
+          lookupPackageScope,
+          readPackageJson,
         })
         return url
       },
@@ -39,9 +105,14 @@ export const jsenvPluginNodeEsmResolution = ({
       return null
     },
   }
+}
 
-  const packageVersionInUrl = {
-    name: "jsenv:package_url_version",
+const jsenvPluginNodeModulesVersionInUrls = ({
+  lookupPackageScope,
+  readPackageJson,
+}) => {
+  return {
+    name: "jsenv:node_modules_version_in_urls",
     appliesDuring: {
       dev: true,
       test: true,
@@ -72,6 +143,4 @@ export const jsenvPluginNodeEsmResolution = ({
       }
     },
   }
-
-  return [nodeEsmResolution, packageVersionInUrl]
 }

package/src/plugins/plugin_controller.js

@@ -1,3 +1,5 @@
+import { timeStart } from "@jsenv/server"
+
 export const createPluginController = ({
   plugins,
   scenario,
@@ -47,7 +49,13 @@ export const createPluginController = ({
     }
     currentPlugin = hook.plugin
     currentHookName = hook.hookName
+    const timeEnd = timeStart(
+      `${currentHookName}-${currentPlugin.name.replace("jsenv:", "")}`,
+    )
     let valueReturned = hookFn(info, context)
+    if (info.timing) {
+      Object.assign(info.timing, timeEnd())
+    }
     valueReturned = assertAndNormalizeReturnValue(hook.hookName, valueReturned)
     currentPlugin = null
     currentHookName = null
@@ -60,7 +68,13 @@ export const createPluginController = ({
     }
     currentPlugin = hook.plugin
     currentHookName = hook.hookName
+    const timeEnd = timeStart(
+      `${currentHookName}-${currentPlugin.name.replace("jsenv:", "")}`,
+    )
     let valueReturned = await hookFn(info, context)
+    if (info.timing) {
+      Object.assign(info.timing, timeEnd())
+    }
     valueReturned = assertAndNormalizeReturnValue(hook.hookName, valueReturned)
     currentPlugin = null
     currentHookName = null
@@ -145,12 +159,18 @@ const flattenAndFilterPlugins = (pluginsRaw, { scenario }) => {
       const { appliesDuring } = pluginEntry
       if (appliesDuring === undefined) {
         console.warn(`"appliesDuring" is undefined on ${pluginEntry.name}`)
+        return
       }
       if (appliesDuring === "*") {
         plugins.push(pluginEntry)
         return
       }
-      if (appliesDuring && appliesDuring[scenario]) {
+      if (typeof appliesDuring !== "object") {
+        throw new Error(
+          `"appliesDuring" must be an object or "*", got ${appliesDuring}`,
+        )
+      }
+      if (appliesDuring[scenario]) {
         plugins.push(pluginEntry)
         return
       }

package/src/plugins/plugins.js

@@ -1,3 +1,4 @@
+import { jsenvPluginUrlReferences } from "../plugins/url_references/jsenv_plugin_url_references.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"
@@ -38,7 +39,11 @@ export const getCorePlugins = ({
   if (autoreload === true) {
     autoreload = {}
   }
+  if (nodeEsmResolution === true) {
+    nodeEsmResolution = {}
+  }
   return [
+    jsenvPluginUrlReferences(),
     jsenvPluginTranspilation(transpilation),
     ...(htmlSupervisor ? [jsenvPluginHtmlSupervisor(htmlSupervisor)] : []), // before inline as it turns inline <script> into <script src>
     jsenvPluginInline(), // before "file urls" to resolve and load inline urls
@@ -46,7 +51,11 @@ export const getCorePlugins = ({
     jsenvPluginFileUrls(),
     jsenvPluginHttpUrls(),
     jsenvPluginLeadingSlash(),
-    jsenvPluginNodeEsmResolution(nodeEsmResolution), // before url resolution to handle "js_import_export" resolution
+    // before url resolution to handle "js_import_export" resolution
+    jsenvPluginNodeEsmResolution({
+      rootDirectoryUrl,
+      ...nodeEsmResolution,
+    }),
     jsenvPluginUrlResolution(),
     jsenvPluginFileSystemMagic(fileSystemMagicResolution),
     jsenvPluginUrlVersion(),

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -14,6 +14,10 @@ export const jsenvPluginImportAssertions = () => {
     appliesDuring: "*",
     transformUrlContent: {
       js_module: async (urlInfo, context) => {
+        // "usesImportAssertion" is set by "jsenv:imports_analysis"
+        if (!urlInfo.data.usesImportAssertion) {
+          return null
+        }
         const importTypesToTranspile = getImportTypesToTranspile(context)
         if (importTypesToTranspile.length === 0) {
           return null

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -8,10 +8,11 @@ export const jsenvPluginTopLevelAwait = () => {
     appliesDuring: "*",
     transformUrlContent: {
       js_module: async (urlInfo, context) => {
-        if (!urlInfo.data.usesTopLevelAwait) {
+        if (context.isSupportedOnCurrentClients("top_level_await")) {
           return null
         }
-        if (context.isSupportedOnCurrentClients("top_level_await")) {
+        const usesTLA = await usesTopLevelAwait(urlInfo)
+        if (!usesTLA) {
           return null
         }
         const { code, map } = await applyBabelPlugins({
@@ -35,3 +36,35 @@ export const jsenvPluginTopLevelAwait = () => {
     },
   }
 }
+
+const usesTopLevelAwait = async (urlInfo) => {
+  if (!urlInfo.content.includes("await ")) {
+    return false
+  }
+  const { metadata } = await applyBabelPlugins({
+    urlInfo,
+    babelPlugins: [babelPluginMetadataUsesTopLevelAwait],
+  })
+  return metadata.usesTopLevelAwait
+}
+
+const babelPluginMetadataUsesTopLevelAwait = () => {
+  return {
+    name: "metadata-uses-top-level-await",
+    visitor: {
+      Program: (programPath, state) => {
+        let usesTopLevelAwait = false
+        programPath.traverse({
+          AwaitExpression: (path) => {
+            const closestFunction = path.getFunctionParent()
+            if (!closestFunction) {
+              usesTopLevelAwait = true
+              path.stop()
+            }
+          },
+        })
+        state.file.metadata.usesTopLevelAwait = usesTopLevelAwait
+      },
+    },
+  }
+}

package/src/plugins/url_references/js/js_urls.js

@@ -1,8 +1,5 @@
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import {
-  analyzeImportCall,
-  isImportCall,
-  analyzeImportExportDeclaration,
   analyzeNewUrlCall,
   analyzeNewWorkerOrNewSharedWorker,
   analyzeImportScriptCalls,
@@ -14,19 +11,7 @@ import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 
 export const parseAndTransformJsUrls = async (urlInfo, context) => {
-  const isJsModule = urlInfo.type === "js_module"
-  const isWebWorker = isWebWorkerUrlInfo(urlInfo)
-  const { metadata } = await applyBabelPlugins({
-    babelPlugins: [
-      [babelPluginMetadataJsUrlMentions, { isJsModule, isWebWorker }],
-    ],
-    urlInfo,
-  })
-  const { jsMentions, usesTopLevelAwait, usesImport, usesExport } = metadata
-  urlInfo.data.usesImport = usesImport
-  urlInfo.data.usesExport = usesExport
-  urlInfo.data.usesTopLevelAwait = usesTopLevelAwait
-
+  const jsMentions = await performJsUrlsStaticAnalysis(urlInfo)
   const { rootDirectoryUrl, referenceUtils } = context
   const actions = []
   const magicSource = createMagicSource(urlInfo.content)
@@ -58,6 +43,51 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
   return magicSource.toContentAndSourcemap()
 }
 
+const performJsUrlsStaticAnalysis = async (urlInfo) => {
+  const isJsModule = urlInfo.type === "js_module"
+  const isWebWorker = isWebWorkerUrlInfo(urlInfo)
+  if (canSkipStaticAnalysis(urlInfo, { isJsModule, isWebWorker })) {
+    return []
+  }
+  const { metadata } = await applyBabelPlugins({
+    babelPlugins: [
+      [babelPluginMetadataJsUrlMentions, { isJsModule, isWebWorker }],
+    ],
+    urlInfo,
+  })
+  const { jsMentions } = metadata
+  return jsMentions
+}
+
+const canSkipStaticAnalysis = (urlInfo, { isJsModule, isWebWorker }) => {
+  const js = urlInfo.content
+  if (isJsModule) {
+    if (
+      js.includes("new URL(") ||
+      js.includes("new Worker(") ||
+      js.includes("new SharedWorker(") ||
+      js.includes("serviceWorker.register(")
+    ) {
+      return false
+    }
+  }
+  if (!isJsModule) {
+    if (
+      js.includes("System.") ||
+      js.includes("new URL(") ||
+      js.includes("new Worker(") ||
+      js.includes("new SharedWorker(") ||
+      js.includes("serviceWorker.register(")
+    ) {
+      return false
+    }
+  }
+  if (isWebWorker && js.includes("importScripts(")) {
+    return false
+  }
+  return true
+}
+
 /*
  * see also
  * https://github.com/jamiebuilds/babel-handbook/blob/master/translations/en/plugin-handbook.md
@@ -70,10 +100,6 @@ const babelPluginMetadataJsUrlMentions = (_, { isJsModule, isWebWorker }) => {
     visitor: {
       Program(programPath, state) {
         const jsMentions = []
-        let usesImport = false
-        let usesExport = false
-        let usesTopLevelAwait = false
-
         const callOneStaticAnalyzer = (path, analyzer) => {
           const returnValue = analyzer(path)
           if (returnValue === null) {
@@ -96,14 +122,7 @@ const babelPluginMetadataJsUrlMentions = (_, { isJsModule, isWebWorker }) => {
             }
           }
         }
-
         const visitors = {
-          AwaitExpression: (path) => {
-            const closestFunction = path.getFunctionParent()
-            if (!closestFunction) {
-              usesTopLevelAwait = true
-            }
-          },
           NewExpression: (path) => {
             callStaticAnalyzers(path, [
               (path) => analyzeNewWorkerOrNewSharedWorker(path, { isJsModule }),
@@ -113,50 +132,16 @@ const babelPluginMetadataJsUrlMentions = (_, { isJsModule, isWebWorker }) => {
         }
         const callExpressionStaticAnalysers = [
           ...(isJsModule
-            ? [analyzeImportCall]
+            ? []
             : [analyzeSystemRegisterCall, analyzeSystemImportCall]),
           ...(isWebWorker ? [analyzeImportScriptCalls] : []),
           analyzeServiceWorkerRegisterCall,
         ]
         visitors.CallExpression = (path) => {
-          if (isJsModule && !usesImport && isImportCall(path.node)) {
-            usesImport = true
-          }
           callStaticAnalyzers(path, callExpressionStaticAnalysers)
         }
-
-        if (isJsModule) {
-          Object.assign(visitors, {
-            ExportNamedDeclaration: (path) => {
-              if (!usesImport && path.node.source) {
-                usesImport = true
-              }
-              usesExport = true
-              callStaticAnalyzers(path, [analyzeImportExportDeclaration])
-            },
-            ExportAllDeclaration: (path) => {
-              usesImport = true
-              usesExport = true
-              callStaticAnalyzers(path, [analyzeImportExportDeclaration])
-            },
-            ExportDefaultDeclaration: (path) => {
-              if (!usesImport && path.node.source) {
-                usesImport = true
-              }
-              usesExport = true
-              callStaticAnalyzers(path, [analyzeImportExportDeclaration])
-            },
-            ImportDeclaration: (path) => {
-              usesImport = true
-              callStaticAnalyzers(path, [analyzeImportExportDeclaration])
-            },
-          })
-        }
         programPath.traverse(visitors)
         state.file.metadata.jsMentions = jsMentions
-        state.file.metadata.usesImport = usesImport
-        state.file.metadata.usesExport = usesExport
-        state.file.metadata.usesTopLevelAwait = usesTopLevelAwait
       },
     },
   }

package/src/plugins/url_references/jsenv_plugin_imports_analysis.js

@@ -0,0 +1,46 @@
+import { parseJsModuleImports } from "@jsenv/utils/js_ast/parse_js_module_imports.js"
+import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+
+export const jsenvPluginImportsAnalysis = () => {
+  return {
+    name: "jsenv:imports_analysis",
+    appliesDuring: "*",
+    transformUrlContent: {
+      js_module: async (urlInfo, context) => {
+        const [imports, exports] = await parseJsModuleImports(
+          urlInfo.content,
+          (urlInfo.data && urlInfo.data.rawUrl) || urlInfo.url,
+        )
+        const actions = []
+        const magicSource = createMagicSource(urlInfo.content)
+        urlInfo.data.usesImport = imports.length > 0
+        urlInfo.data.usesExport = exports.length > 0
+        urlInfo.data.usesImportAssertion = imports.some(
+          (importInfo) => importInfo.usesAssert,
+        )
+        imports.forEach((importInfo) => {
+          const [reference] = context.referenceUtils.found({
+            type: "js_import_export",
+            subtype: importInfo.subtype,
+            expectedType: "js_module",
+            expectedSubtype: urlInfo.subtype,
+            line: importInfo.line,
+            column: importInfo.column,
+            specifier: importInfo.specifier,
+          })
+          actions.push(async () => {
+            magicSource.replace({
+              start: importInfo.start,
+              end: importInfo.end,
+              replacement: await context.referenceUtils.readGeneratedSpecifier(
+                reference,
+              ),
+            })
+          })
+        })
+        await Promise.all(actions.map((action) => action()))
+        return magicSource.toContentAndSourcemap()
+      },
+    },
+  }
+}

package/src/plugins/url_references/jsenv_plugin_url_analysis.js

@@ -0,0 +1,18 @@
+import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
+import { parseAndTransformCssUrls } from "./css/css_urls.js"
+import { parseAndTransformJsUrls } from "./js/js_urls.js"
+import { parseAndTransformWebmanifestUrls } from "./webmanifest/webmanifest_urls.js"
+
+export const jsenvPluginUrlAnalysis = () => {
+  return {
+    name: "jsenv:url_analysis",
+    appliesDuring: "*",
+    transformUrlContent: {
+      html: parseAndTransformHtmlUrls,
+      css: parseAndTransformCssUrls,
+      js_classic: parseAndTransformJsUrls,
+      js_module: parseAndTransformJsUrls,
+      webmanifest: parseAndTransformWebmanifestUrls,
+    },
+  }
+}

package/src/plugins/url_references/jsenv_plugin_url_references.js

@@ -1,18 +1,6 @@
-import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
-import { parseAndTransformCssUrls } from "./css/css_urls.js"
-import { parseAndTransformJsUrls } from "./js/js_urls.js"
-import { parseAndTransformWebmanifestUrls } from "./webmanifest/webmanifest_urls.js"
+import { jsenvPluginImportsAnalysis } from "./jsenv_plugin_imports_analysis.js"
+import { jsenvPluginUrlAnalysis } from "./jsenv_plugin_url_analysis.js"
 
 export const jsenvPluginUrlReferences = () => {
-  return {
-    name: "jsenv:url_references",
-    appliesDuring: "*",
-    transformUrlContent: {
-      html: parseAndTransformHtmlUrls,
-      css: parseAndTransformCssUrls,
-      js_classic: parseAndTransformJsUrls,
-      js_module: parseAndTransformJsUrls,
-      webmanifest: parseAndTransformWebmanifestUrls,
-    },
-  }
+  return [jsenvPluginImportsAnalysis(), jsenvPluginUrlAnalysis()]
 }

package/src/plugins/url_version/jsenv_plugin_url_version.js

@@ -1,6 +1,4 @@
-export const jsenvPluginUrlVersion = ({
-  longTermCache = false, // will become true once things get more stable
-} = {}) => {
+export const jsenvPluginUrlVersion = ({ longTermCache = true } = {}) => {
   return {
     name: "jsenv:url_version",
     appliesDuring: "*", // maybe only during dev?
@@ -15,7 +13,7 @@ export const jsenvPluginUrlVersion = ({
       urlObject.searchParams.delete("v")
       return urlObject.href
     },
-    transformUrl: (reference) => {
+    transformUrlSearchParams: (reference) => {
       if (!reference.data.version) {
         return null
       }
@@ -26,15 +24,14 @@ export const jsenvPluginUrlVersion = ({
         v: reference.data.version,
       }
     },
-    augmentResponse: ({ url }) => {
+    augmentResponse: ({ reference }) => {
       if (!longTermCache) {
         return null
       }
-      const urlObject = new URL(url)
-      if (!urlObject.searchParams.has("v")) {
+      if (!reference.searchParams.has("v")) {
         return null
       }
-      if (urlObject.searchParams.has("hmr")) {
+      if (reference.searchParams.has("hmr")) {
         return null
       }
       // When url is versioned put it in browser cache for 30 days

package/src/test/execute_plan.js

@@ -142,7 +142,10 @@ export const executePlan = async (
         plugins: [
           ...plugins,
           ...getCorePlugins({
+            rootDirectoryUrl,
+            urlGraph,
             scenario,
+
             htmlSupervisor: true,
             nodeEsmResolution,
             fileSystemMagicResolution,

package/src/test/execute_test_plan.js

@@ -13,6 +13,14 @@ import { generateCoverageHtmlDirectory } from "@jsenv/utils/coverage/coverage_re
 import { generateCoverageTextLog } from "@jsenv/utils/coverage/coverage_reporter_text_log.js"
 import { executePlan } from "./execute_plan.js"
 
+export const defaultCoverageConfig = {
+  "./index.js": true,
+  "./main.js": true,
+  "./src/**/*.js": true,
+  "./**/*.test.*": false, // contains .test. -> nope
+  "./**/test/": false, // inside a test folder -> nope,
+}
+
 /**
  * Execute a list of files and log how it goes
  * @param {Object} testPlanParameters
@@ -57,13 +65,7 @@ export const executeTestPlan = async ({
   coverage = process.argv.includes("--cover") ||
     process.argv.includes("--coverage"),
   coverageTempDirectoryRelativeUrl = "./.coverage/tmp/",
-  coverageConfig = {
-    "./index.js": true,
-    "./main.js": true,
-    "./src/**/*.js": true,
-    "./**/*.test.*": false, // contains .test. -> nope
-    "./**/test/": false, // inside a test folder -> nope,
-  },
+  coverageConfig = defaultCoverageConfig,
   coverageIncludeMissing = true,
   coverageAndExecutionAllowed = false,
   coverageForceIstanbul = false,