@jsenv/core 27.0.0-alpha.52 → 27.0.0-alpha.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.52",
+  "version": "27.0.0-alpha.55",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -68,7 +68,7 @@
     "@jsenv/node-esm-resolution": "0.0.6",
     "@jsenv/server": "12.6.2",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.7.2",
+    "@jsenv/utils": "1.7.3",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

package/src/build/build.js

@@ -22,6 +22,7 @@ import {
   injectQueryParams,
   setUrlFilename,
   asUrlUntilPathname,
+  normalizeUrl,
 } from "@jsenv/utils/urls/url_utils.js"
 import { createVersionGenerator } from "@jsenv/utils/versioning/version_generator.js"
 import { generateSourcemapUrl } from "@jsenv/utils/sourcemap/sourcemap_utils.js"
@@ -223,9 +224,6 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
     })
   })
   const addToBundlerIfAny = (rawUrlInfo) => {
-    // if (rawUrlInfo.dependencies.size === 0) {
-    //   return
-    // }
     const bundler = bundlers[rawUrlInfo.type]
     if (bundler) {
       bundler.urlInfos.push(rawUrlInfo)
@@ -253,6 +251,21 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
           }
           addToBundlerIfAny(dependencyUrlInfo)
         })
+        rawUrlInfo.references.forEach((reference) => {
+          if (
+            reference.isRessourceHint &&
+            reference.expectedType === "js_module"
+          ) {
+            const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
+            if (
+              referencedUrlInfo &&
+              // something else than the ressource hint is using this url
+              referencedUrlInfo.dependents.size > 0
+            ) {
+              addToBundlerIfAny(referencedUrlInfo)
+            }
+          }
+        })
         return
       }
     }
@@ -361,25 +374,10 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
           if (urlRedirectedByBundle) {
             return urlRedirectedByBundle
           }
-          const parentIsFromBundle = Boolean(
-            bundleUrlInfos[reference.parentUrl],
-          )
-          // urls inside css bundled by parcel
-          // contains url relative to the bundle file (which is considered inside build directory)
-          // if the file is not itself a bundle file it must be resolved against
-          // the original css url
-          if (
-            parentIsFromBundle &&
-            !bundleUrlInfos[url] &&
-            urlIsInsideOf(url, buildDirectoryUrl)
-          ) {
-            const parentRawUrl = rawUrls[reference.parentUrl]
-            url = new URL(reference.specifier, parentRawUrl).href
-          }
           const urlRedirected = rawUrlRedirections[url]
           return urlRedirected || url
         },
-        normalizeUrl: (reference) => {
+        redirectUrl: (reference) => {
           if (!reference.url.startsWith("file:")) {
             return null
           }
@@ -618,6 +616,7 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
       urlGraph: finalGraph,
       kitchen: finalGraphKitchen,
       outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
+      skipRessourceHint: true,
       startLoading: (cookEntryFile) => {
         entryUrls.forEach((entryUrl) => {
           const [, postBuildEntryUrlInfo] = cookEntryFile({
@@ -698,7 +697,7 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
       urlInfo.dependents.size === 0
     ) {
       cleanupActions.push(() => {
-        delete finalGraph.urlInfos[urlInfo.url]
+        finalGraph.deleteUrlInfo(urlInfo.url)
       })
     }
   })
@@ -731,12 +730,12 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
       buildInlineContents[buildRelativeUrl] = urlInfo.content
     } else {
       buildFileContents[buildRelativeUrl] = urlInfo.content
+      const buildRelativeUrlWithoutVersioning = urlToRelativeUrl(
+        urlInfo.url,
+        buildDirectoryUrl,
+      )
+      buildManifest[buildRelativeUrlWithoutVersioning] = buildRelativeUrl
     }
-    const buildRelativeUrlWithoutVersioning = urlToRelativeUrl(
-      urlInfo.url,
-      buildDirectoryUrl,
-    )
-    buildManifest[buildRelativeUrlWithoutVersioning] = buildRelativeUrl
   })
   if (writeOnFileSystem) {
     if (buildDirectoryClean) {
@@ -859,11 +858,13 @@ const applyUrlVersioning = async ({
       })
       urlInfo.data.version = versionGenerator.generate()
 
-      urlInfo.data.versionedUrl = injectVersionIntoBuildUrl({
-        buildUrl: urlInfo.url,
-        version: urlInfo.data.version,
-        versioningMethod,
-      })
+      urlInfo.data.versionedUrl = normalizeUrl(
+        injectVersionIntoBuildUrl({
+          buildUrl: urlInfo.url,
+          version: urlInfo.data.version,
+          versioningMethod,
+        }),
+      )
     })
     const versionMappings = {}
     const usedVersionMappings = []
@@ -969,6 +970,7 @@ const applyUrlVersioning = async ({
     await loadUrlGraph({
       urlGraph: finalGraph,
       kitchen: versioningKitchen,
+      skipRessourceHint: true,
       startLoading: (cookEntryFile) => {
         postBuildEntryUrls.forEach((postBuildEntryUrl) => {
           cookEntryFile({

package/src/build/build_urls_generator.js

@@ -56,8 +56,8 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
 // 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",
+  ".ts": ".js",
   ".tsx": ".js",
 }
 

package/src/build/start_build_server.js

@@ -68,6 +68,7 @@ export const startBuildServer = async ({
   buildDirectoryUrl = assertAndNormalizeDirectoryUrl(buildDirectoryUrl)
 
   const reloadableProcess = await initReloadableProcess({
+    signal,
     handleSIGINT,
     ...(buildServerAutoreload
       ? {

package/src/execute/runtimes/browsers/from_playwright.js

@@ -280,6 +280,9 @@ export const createRuntimeFromPlaywright = ({
                 /* eslint-disable no-undef */
                 /* istanbul ignore next */
                 () => {
+                  if (!window.__html_supervisor__) {
+                    throw new Error(`window.__html_supervisor__ not found`)
+                  }
                   return window.__html_supervisor__.getScriptExecutionResults()
                 },
                 /* eslint-enable no-undef */

package/src/omega/kitchen.js

@@ -10,7 +10,7 @@ import { createDetailedMessage } from "@jsenv/logger"
 
 import { stringifyUrlSite } from "@jsenv/utils/urls/url_trace.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
-import { setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
+import { normalizeUrl, setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
 
 import { createPluginController } from "../plugins/plugin_controller.js"
 import { createUrlInfoTransformer } from "./url_graph/url_info_transformations.js"
@@ -142,7 +142,7 @@ export const createKitchen = ({
   }
   const resolveReference = (reference) => {
     try {
-      const resolvedUrl = pluginController.callHooksUntil(
+      let resolvedUrl = pluginController.callHooksUntil(
         "resolveUrl",
         reference,
         baseContext,
@@ -150,6 +150,7 @@ export const createKitchen = ({
       if (!resolvedUrl) {
         throw new Error(`NO_RESOLVE`)
       }
+      resolvedUrl = normalizeUrl(resolvedUrl)
       reference.url = resolvedUrl
       if (reference.external) {
         reference.generatedUrl = resolvedUrl
@@ -157,29 +158,20 @@ export const createKitchen = ({
         return urlGraph.reuseOrCreateUrlInfo(reference.url)
       }
       pluginController.callHooks(
-        "normalizeUrl",
+        "redirectUrl",
         reference,
         baseContext,
         (returnValue) => {
-          if (returnValue === reference.url) {
+          const normalizedReturnValue = normalizeUrl(returnValue)
+          if (normalizedReturnValue === reference.url) {
             return
           }
           const previousReference = { ...reference }
-          reference.url = returnValue
+          reference.url = normalizedReturnValue
           mutateReference(previousReference, reference)
         },
       )
-      // force a last normalization on url search params
-      // some plugin use URLSearchParams to alter the url search params
-      // which can result into "file:///file.css?css_module"
-      // becoming "file:///file.css?css_module="
-      // we want to get rid of the "=" and consider it's the same url
-      if (
-        // disable on data urls (would mess up base64 encoding)
-        !reference.url.startsWith("data:")
-      ) {
-        reference.url = reference.url.replace(/[=](?=&|$)/g, "")
-      }
+
       const urlInfo = urlGraph.reuseOrCreateUrlInfo(reference.url)
       applyReferenceEffectsOnUrlInfo(reference, urlInfo, baseContext)
 
@@ -200,10 +192,7 @@ export const createKitchen = ({
           Object.keys(returnValue).forEach((key) => {
             referenceUrlObject.searchParams.set(key, returnValue[key])
           })
-          reference.generatedUrl = referenceUrlObject.href.replace(
-            /[=](?=&|$)/g,
-            "",
-          )
+          reference.generatedUrl = normalizeUrl(referenceUrlObject.href)
         },
       )
       const returnValue = pluginController.callHooksUntil(
@@ -275,12 +264,13 @@ export const createKitchen = ({
       return
     }
     try {
-      const returnValue = await pluginController.callAsyncHooksUntil(
-        "fetchUrlContent",
-        urlInfo,
-        context,
-      )
-      if (!returnValue) {
+      const fetchUrlContentReturnValue =
+        await pluginController.callAsyncHooksUntil(
+          "fetchUrlContent",
+          urlInfo,
+          context,
+        )
+      if (!fetchUrlContentReturnValue) {
         logger.warn(
           createDetailedMessage(
             `no plugin has handled the url during "fetchUrlContent" hook -> consider url as external (ignore it)`,
@@ -293,7 +283,7 @@ export const createKitchen = ({
         urlInfo.external = true
         return
       }
-      if (returnValue.external) {
+      if (fetchUrlContentReturnValue.external) {
         urlInfo.external = true
         return
       }
@@ -306,7 +296,7 @@ export const createKitchen = ({
         content,
         sourcemap,
         filename,
-      } = returnValue
+      } = fetchUrlContentReturnValue
       urlInfo.type =
         type ||
         reference.expectedType ||
@@ -661,8 +651,6 @@ export const createKitchen = ({
   const prepareEntryPoint = (params) => {
     const entryReference = createReference(params)
     const entryUrlInfo = resolveReference(entryReference)
-    // I should likely delete urlInfo.sourcemap
-    // otherwise it is reused when page is reloaded
     return [entryReference, entryUrlInfo]
   }
 

package/src/omega/server/file_service.js

@@ -20,6 +20,11 @@ export const createFileService = ({
     urlGraph,
     scenario,
   }
+  const augmentResponseContext = {
+    rootDirectoryUrl,
+    urlGraph,
+    scenario,
+  }
 
   const getResponse = async (request) => {
     // serve file inside ".jsenv" directory
@@ -58,9 +63,19 @@ export const createFileService = ({
       reference.parentUrl,
     )
     try {
-      // urlInfo objects are reused, they must be "reset" before cooking then again
-      if (!urlInfo.isInline && !urlInfo.type === "sourcemap") {
-        urlGraph.resetUrlInfo(urlInfo)
+      // urlInfo objects are reused, they must be "reset" before cooking them again
+      if (
+        urlInfo.contentEtag &&
+        !urlInfo.isInline &&
+        urlInfo.type !== "sourcemap"
+      ) {
+        urlInfo.sourcemap = null
+        urlInfo.sourcemapReference = null
+        urlInfo.content = null
+        urlInfo.originalContent = null
+        urlInfo.type = null
+        urlInfo.subtype = null
+        urlInfo.timing = {}
       }
       const { runtimeName, runtimeVersion } = parseUserAgentHeader(
         request.headers["user-agent"],
@@ -92,7 +107,7 @@ export const createFileService = ({
       kitchen.pluginController.callHooks(
         "augmentResponse",
         { reference, urlInfo },
-        {},
+        augmentResponseContext,
         (returnValue) => {
           response = composeTwoResponses(response, returnValue)
         },

package/src/omega/url_graph/url_graph_load.js

@@ -33,6 +33,13 @@ export const loadUrlGraph = async ({
     })
     const { references } = urlInfo
     references.forEach((reference) => {
+      // we don't cook ressource hints
+      // because they might refer to ressource that will be modified during build
+      // It also means something else have to reference that url in order to cook it
+      // so that the preload is deleted by "resync_ressource_hints.js" otherwise
+      if (reference.isRessourceHint) {
+        return
+      }
       // we use reference.generatedUrl to mimic what a browser would do:
       // do a fetch to the specifier as found in the file
       const referencedUrlInfo = urlGraph.reuseOrCreateUrlInfo(

package/src/omega/url_graph.js

@@ -15,16 +15,6 @@ export const createUrlGraph = ({
       }
     }
   }
-  const resetUrlInfo = (urlInfo) => {
-    urlInfo.sourcemap = null
-    urlInfo.sourcemapReference = null
-    urlInfo.content = null
-    urlInfo.originalContent = null
-    urlInfo.type = null
-    urlInfo.subtype = null
-    urlInfo.data = {}
-    urlInfo.timing = {}
-  }
 
   const reuseOrCreateUrlInfo = (url) => {
     const existingUrlInfo = urlInfos[url]
@@ -160,7 +150,6 @@ export const createUrlGraph = ({
     reuseOrCreateUrlInfo,
     getUrlInfo,
     deleteUrlInfo,
-    resetUrlInfo,
     inferReference,
     findDependent,
     updateReferences,

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -2,7 +2,7 @@ export const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
     appliesDuring: { dev: true },
-    normalizeUrl: (reference) => {
+    redirectUrl: (reference) => {
       const urlObject = new URL(reference.url)
       if (!urlObject.searchParams.has("hmr")) {
         reference.data.hmr = false

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -247,20 +247,9 @@ const rollupPluginJsenv = ({
         code: urlInfo.content,
         map: urlInfo.sourcemap
           ? sourcemapConverter.toFilePaths(urlInfo.sourcemap)
-          : urlInfo.sourcemap,
+          : null,
       }
     },
-    // resolveFileUrl: ({ moduleId }) => {
-    //   return `${fileUrlConverter.asFileUrl(moduleId)}`
-    // },
-    renderChunk: (code, chunkInfo) => {
-      const { facadeModuleId } = chunkInfo
-      if (!facadeModuleId) {
-        // happens for inline module scripts for instance
-        return null
-      }
-      return null
-    },
   }
 }
 

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -0,0 +1,34 @@
+export const jsenvPluginCacheControl = () => {
+  return {
+    name: "jsenv:cache_control",
+    appliesDuring: {
+      dev: true,
+      test: true,
+    },
+    augmentResponse: ({ reference }, context) => {
+      if (context.scenario === "dev") {
+        // 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`,
+          },
+        }
+      }
+      if (
+        reference.searchParams.has("v") &&
+        !reference.searchParams.has("hmr")
+      ) {
+        return {
+          headers: {
+            "cache-control": `private,max-age=${SECONDS_IN_30_DAYS},immutable`,
+          },
+        }
+      }
+      return null
+    },
+  }
+}
+
+const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30

package/src/plugins/filesystem_magic/jsenv_plugin_filesystem_magic.js

@@ -13,7 +13,7 @@ export const jsenvPluginFileSystemMagic = ({
   return {
     name: "jsenv:filesystem_magic",
     appliesDuring: "*",
-    normalizeUrl: (reference) => {
+    redirectUrl: (reference) => {
       // http, https, data, about, etc
       if (!reference.url.startsWith("file:")) {
         return null

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -274,8 +274,9 @@ const getOriginalName = (path, name) => {
     return getOriginalName(path, importedName)
   }
   if (binding.path.type === "VariableDeclarator") {
-    if (binding.path.node.init.type === "Identifier") {
-      const previousName = binding.path.node.init.name
+    const { init } = binding.path.node
+    if (init && init.type === "Identifier") {
+      const previousName = init.name
       return getOriginalName(path, previousName)
     }
   }

package/src/plugins/plugin_controller.js

@@ -5,7 +5,7 @@ export const createPluginController = ({
   scenario,
   hooks = [
     "resolveUrl",
-    "normalizeUrl",
+    "redirectUrl",
     "fetchUrlContent",
     "transformUrlContent",
     "transformUrlSearchParams",
@@ -226,7 +226,7 @@ const assertAndNormalizeReturnValue = (hookName, returnValue) => {
 const returnValueAssertions = [
   {
     name: "url_assertion",
-    appliesTo: ["resolveUrl", "normalizeUrl"],
+    appliesTo: ["resolveUrl", "redirectUrl"],
     assertion: (valueReturned) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href

package/src/plugins/plugins.js

@@ -17,6 +17,7 @@ import { jsenvPluginBundling } from "./bundling/jsenv_plugin_bundling.js"
 import { jsenvPluginMinification } from "./minification/jsenv_plugin_minification.js"
 import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js"
 import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js"
+import { jsenvPluginCacheControl } from "./cache_control/jsenv_plugin_cache_control.js"
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
@@ -68,7 +69,6 @@ export const getCorePlugins = ({
     jsenvPluginInjectGlobals(injectedGlobals),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
-    // jsenvPluginWorkers(),
 
     jsenvPluginBundling(bundling),
     jsenvPluginMinification(minification),
@@ -87,5 +87,6 @@ export const getCorePlugins = ({
           }),
         ]
       : []),
+    jsenvPluginCacheControl(),
   ]
 }

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -44,34 +44,42 @@ export const jsenvPluginAsJsClassic = ({ systemJsInjection }) => {
 }
 
 const asJsClassic = ({ systemJsInjection, systemJsClientFileUrl }) => {
+  const propagateJsClassicSearchParam = (reference, context) => {
+    const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+    if (
+      !parentUrlInfo ||
+      !new URL(parentUrlInfo.url).searchParams.has("as_js_classic")
+    ) {
+      return null
+    }
+    const urlTransformed = injectQueryParams(reference.url, {
+      as_js_classic: "",
+    })
+    reference.filename = generateJsClassicFilename(reference.url)
+    return urlTransformed
+  }
+
   return {
     name: "jsenv:as_js_classic",
     appliesDuring: "*",
     // forward ?as_js_classic to referenced urls
-    normalizeUrl: (reference, context) => {
-      // We want to propagate transformation of js module to js classic
-      // but only for import specifier (static/dynamic import + re-export)
-      // All other references won't get the ?as_js_classic
-      // otherwise we could try to transform inline ressources, specifiers inside new URL(). ...
-      if (
-        reference.type !== "js_import_export" &&
-        reference.subtype !== "system_register_arg" &&
-        reference.subtype !== "system_import_arg"
-      ) {
-        return null
-      }
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
-      if (
-        !parentUrlInfo ||
-        !new URL(parentUrlInfo.url).searchParams.has("as_js_classic")
-      ) {
+    redirectUrl: {
+      // We want to propagate transformation of js module to js classic to:
+      // - import specifier (static/dynamic import + re-export)
+      // - url specifier when inside System.register/_context.import()
+      //   (because it's the transpiled equivalent of static and dynamic imports)
+      // And not other references otherwise we could try to transform inline ressources
+      // or specifiers inside new URL()...
+      js_import_export: propagateJsClassicSearchParam,
+      js_url_specifier: (reference, context) => {
+        if (
+          reference.subtype === "system_register_arg" ||
+          reference.subtype === "system_import_arg"
+        ) {
+          return propagateJsClassicSearchParam(reference, context)
+        }
         return null
-      }
-      const urlTransformed = injectQueryParams(reference.url, {
-        as_js_classic: "",
-      })
-      reference.filename = generateJsClassicFilename(reference.url)
-      return urlTransformed
+      },
     },
     fetchUrlContent: async (urlInfo, context) => {
       const originalUrlInfo = await fetchOriginalUrlInfo({
@@ -119,7 +127,15 @@ const asJsClassic = ({ systemJsInjection, systemJsClientFileUrl }) => {
 
 const generateJsClassicFilename = (url) => {
   const filename = urlToFilename(url)
-  const [basename, extension] = splitFileExtension(filename)
+  let [basename, extension] = splitFileExtension(filename)
+  const { searchParams } = new URL(url)
+  if (
+    searchParams.has("as_json_module") ||
+    searchParams.has("as_css_module") ||
+    searchParams.has("as_text_module")
+  ) {
+    extension = ".js"
+  }
   return `${basename}.es5${extension}`
 }
 

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_script_type_module_as_classic.js

@@ -98,7 +98,16 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
         })
 
         const jsModuleUrls = []
-        const getReferenceAsJsClassic = async (reference) => {
+        const getReferenceAsJsClassic = async (
+          reference,
+          {
+            // we don't cook ressource hints
+            // because they might refer to ressource that will be modified during build
+            // It also means something else HAVE to reference that url in order to cook it
+            // so that the preload is deleted by "resync_ressource_hints.js" otherwise
+            cookIt = false,
+          } = {},
+        ) => {
           const [newReference, newUrlInfo] = context.referenceUtils.update(
             reference,
             {
@@ -112,6 +121,8 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
           const jsModuleUrl = newUrlInfo.url
           if (!jsModuleUrls.includes(jsModuleUrl)) {
             jsModuleUrls.push(newUrlInfo.url)
+          }
+          if (cookIt) {
             // during dev it means js modules will be cooked before server sends the HTML
             // it's ok because:
             // - during dev script_type_module are supported (dev use a recent browser)
@@ -141,9 +152,9 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
           // but it's unlikely to happen and people should use "modulepreload" in that case anyway
           if (expectedScriptType === "module") {
             actions.push(async () => {
-              const [newReference] = await getReferenceAsJsClassic(
-                context.referenceUtils.findByGeneratedSpecifier(href),
-              )
+              const reference =
+                context.referenceUtils.findByGeneratedSpecifier(href)
+              const [newReference] = await getReferenceAsJsClassic(reference)
               assignHtmlNodeAttributes(preloadAsScriptNode, {
                 href: newReference.generatedSpecifier,
               })
@@ -158,9 +169,9 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
           )
           const href = hrefAttribute.value
           actions.push(async () => {
-            const [newReference] = await getReferenceAsJsClassic(
-              context.referenceUtils.findByGeneratedSpecifier(href),
-            )
+            const reference =
+              context.referenceUtils.findByGeneratedSpecifier(href)
+            const [newReference] = await getReferenceAsJsClassic(reference)
             assignHtmlNodeAttributes(modulePreloadNode, {
               rel: "preload",
               as: "script",
@@ -176,9 +187,11 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
           if (srcAttribute) {
             actions.push(async () => {
               const specifier = srcAttribute.value
-              const [newReference] = await getReferenceAsJsClassic(
-                context.referenceUtils.findByGeneratedSpecifier(specifier),
-              )
+              const reference =
+                context.referenceUtils.findByGeneratedSpecifier(specifier)
+              const [newReference] = await getReferenceAsJsClassic(reference, {
+                cookIt: true,
+              })
               removeHtmlNodeAttributeByName(moduleScriptNode, "type")
               srcAttribute.value = newReference.generatedSpecifier
             })
@@ -214,6 +227,7 @@ export const jsenvPluginScriptTypeModuleAsClassic = ({
             })
             const [, newUrlInfo] = await getReferenceAsJsClassic(
               inlineReference,
+              { cookIt: true },
             )
             removeHtmlNodeAttributeByName(moduleScriptNode, "type")
             setHtmlNodeGeneratedText(moduleScriptNode, {

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_workers_type_module_as_classic.js

@@ -21,7 +21,7 @@ export const jsenvPluginWorkersTypeModuleAsClassic = ({
   return {
     name: "jsenv:workers_type_module_as_classic",
     appliesDuring: "*",
-    normalizeUrl: {
+    redirectUrl: {
       js_url_specifier: (reference, context) => {
         if (reference.expectedType !== "js_module") {
           return null

package/src/plugins/transpilation/babel/helpers/babel_plugin_structure.js

@@ -1,7 +1,12 @@
 import { getBabelHelperFileUrl, requireBabelPlugin } from "@jsenv/babel-plugins"
 import { babelPluginCompatMap } from "./babel_plugins_compatibility.js"
 
-export const getBaseBabelPluginStructure = ({ url, isSupported }) => {
+export const getBaseBabelPluginStructure = ({
+  url,
+  isSupported,
+  // isJsModule,
+  // getImportSpecifier,
+}) => {
   const isBabelPluginNeeded = (babelPluginName) => {
     return !isSupported(babelPluginCompatMap[babelPluginName])
   }
@@ -35,6 +40,12 @@ export const getBaseBabelPluginStructure = ({ url, isSupported }) => {
       requireBabelPlugin("babel-plugin-transform-async-to-promises"),
       {
         topLevelAwait: "ignore", // will be handled by "jsenv:top_level_await" plugin
+        externalHelpers: false,
+        // enable once https://github.com/rpetrich/babel-plugin-transform-async-to-promises/pull/83
+        // externalHelpers: isJsModule,
+        // externalHelpersPath: isJsModule ? getImportSpecifier(
+        //     "babel-plugin-transform-async-to-promises/helpers.mjs",
+        //   ) : null
       },
     ]
   }

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -33,27 +33,29 @@ export const jsenvPluginBabel = ({ getCustomBabelPlugins } = {}) => {
       )
     }
 
-    const { referenceUtils } = context
     const isSupported = (feature) =>
       RUNTIME_COMPAT.isSupported(clientRuntimeCompat, feature)
+    const getImportSpecifier = (clientFileUrl) => {
+      const [reference] = context.referenceUtils.inject({
+        type: "js_import_export",
+        expectedType: "js_module",
+        specifier: clientFileUrl,
+      })
+      return JSON.parse(reference.generatedSpecifier)
+    }
+
     const babelPluginStructure = getBaseBabelPluginStructure({
       url: urlInfo.url,
       isSupported,
       isWorkerContext,
+      isJsModule,
+      getImportSpecifier,
     })
     if (getCustomBabelPlugins) {
       Object.assign(babelPluginStructure, getCustomBabelPlugins(context))
     }
 
     if (isJsModule) {
-      const getImportSpecifier = (clientFileUrl) => {
-        const [reference] = referenceUtils.inject({
-          type: "js_import_export",
-          expectedType: "js_module",
-          specifier: clientFileUrl,
-        })
-        return JSON.parse(reference.generatedSpecifier)
-      }
       if (!isSupported("global_this")) {
         babelPluginStructure["global-this-as-jsenv-import"] = [
           babelPluginGlobalThisAsJsenvImport,

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

@@ -27,16 +27,16 @@ export const jsenvPluginImportAssertions = () => {
         end: reference.assertNode.end,
       })
     }
-
-    return injectQueryParams(reference.url, {
+    const newUrl = injectQueryParams(reference.url, {
       [searchParam]: "",
     })
+    return newUrl
   }
 
   const importAssertions = {
     name: "jsenv:import_assertions",
     appliesDuring: "*",
-    normalizeUrl: {
+    redirectUrl: {
       js_import_export: (reference, context) => {
         if (!reference.assert) {
           return null

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -24,6 +24,16 @@ export const jsenvPluginTopLevelAwait = () => {
                 // Maybe we could pass target: "es6" when we support arrow function
                 // https://github.com/rpetrich/babel-plugin-transform-async-to-promises/blob/92755ff8c943c97596523e586b5fa515c2e99326/async-to-promises.ts#L55
                 topLevelAwait: "simple",
+                // enable once https://github.com/rpetrich/babel-plugin-transform-async-to-promises/pull/83
+                // externalHelpers: true,
+                // externalHelpersPath: JSON.parse(
+                //   context.referenceUtils.inject({
+                //     type: "js_import_export",
+                //     expectedType: "js_module",
+                //     specifier:
+                //       "babel-plugin-transform-async-to-promises/helpers.mjs",
+                //   })[0],
+                // ),
               },
             ],
           ],

package/src/plugins/url_analysis/html/html_urls.js

@@ -96,8 +96,8 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
       ...readFetchMetas(node),
     })
   }
-  const onNode = (node) => {
-    if (node.nodeName === "link") {
+  const visitors = {
+    link: (node) => {
       const relAttribute = getHtmlNodeAttributeByName(node, "rel")
       const rel = relAttribute ? relAttribute.value : undefined
       const typeAttribute = getHtmlNodeAttributeByName(node, "type")
@@ -114,13 +114,9 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
           stylesheet: "css",
         }[rel],
       })
-      return
-    }
-    // if (node.nodeName === "style") {
-    //   // styles.push(node)
-    //   return
-    // }
-    if (node.nodeName === "script") {
+    },
+    // style: () => {},
+    script: (node) => {
       const typeAttributeNode = getHtmlNodeAttributeByName(node, "type")
       visitAttributeAsUrlSpecifier({
         type: "script_src",
@@ -133,23 +129,22 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
         node,
         attributeName: "src",
       })
-      return
-    }
-    if (node.nodeName === "a") {
+    },
+    a: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "a_href",
         node,
         attributeName: "href",
       })
-    }
-    if (node.nodeName === "iframe") {
+    },
+    iframe: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "iframe_src",
         node,
         attributeName: "src",
       })
-    }
-    if (node.nodeName === "img") {
+    },
+    img: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "img_src",
         node,
@@ -159,9 +154,8 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
         type: "img_srcset",
         node,
       })
-      return
-    }
-    if (node.nodeName === "source") {
+    },
+    souce: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "source_src",
         node,
@@ -171,25 +165,22 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
         type: "source_srcset",
         node,
       })
-      return
-    }
+    },
     // svg <image> tag
-    if (node.nodeName === "image") {
+    image: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "image_href",
         node,
         attributeName: "href",
       })
-      return
-    }
-    if (node.nodeName === "use") {
+    },
+    use: (node) => {
       visitAttributeAsUrlSpecifier({
         type: "use_href",
         node,
         attributeName: "href",
       })
-      return
-    }
+    },
   }
   const visitAttributeAsUrlSpecifier = ({
     type,
@@ -252,7 +243,12 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
       })
     }
   }
-  visitHtmlAst(htmlAst, onNode)
+  visitHtmlAst(htmlAst, (node) => {
+    const visitor = visitors[node.nodeName]
+    if (visitor) {
+      visitor(node)
+    }
+  })
 }
 
 const crossOriginCompatibleTagNames = ["script", "link", "img", "source"]

package/src/plugins/url_version/jsenv_plugin_url_version.js

@@ -1,8 +1,8 @@
-export const jsenvPluginUrlVersion = ({ longTermCache = true } = {}) => {
+export const jsenvPluginUrlVersion = () => {
   return {
     name: "jsenv:url_version",
-    appliesDuring: "*", // maybe only during dev?
-    normalizeUrl: (reference) => {
+    appliesDuring: "*",
+    redirectUrl: (reference) => {
       // "v" search param goal is to enable long-term cache
       // for server response headers
       // it is also used by hmr to bypass browser cache
@@ -24,24 +24,5 @@ export const jsenvPluginUrlVersion = ({ longTermCache = true } = {}) => {
         v: reference.data.version,
       }
     },
-    augmentResponse: ({ reference }) => {
-      if (!longTermCache) {
-        return null
-      }
-      if (!reference.searchParams.has("v")) {
-        return null
-      }
-      if (reference.searchParams.has("hmr")) {
-        return null
-      }
-      // When url is versioned put it in browser cache for 30 days
-      return {
-        headers: {
-          "cache-control": `private,max-age=${SECONDS_IN_30_DAYS},immutable`,
-        },
-      }
-    },
   }
 }
-
-const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30