@jsenv/core 28.0.0 → 28.1.0

package/src/plugins/inject_globals/inject_globals.js

@@ -30,10 +30,10 @@ const globalInjectorOnHtml = async (urlInfo, globals) => {
   injectScriptNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({
-      "tagName": "script",
-      "textContent": clientCode,
-      "injected-by": "jsenv:inject_globals",
+      tagName: "script",
+      textContent: clientCode,
     }),
+    "jsenv:inject_globals",
   )
   return stringifyHtmlAst(htmlAst)
 }

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -40,7 +40,7 @@ export const jsenvPluginDataUrls = () => {
           return reference.generatedUrl
         }
         const specifier = DATA_URL.stringify({
-          contentType: urlInfo.headers["content-type"],
+          contentType: urlInfo.contentType,
           base64Flag: urlInfo.data.base64Flag,
           data: urlInfo.data.base64Flag
             ? dataToBase64(urlInfo.content)

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -59,7 +59,8 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
               })
               setHtmlNodeText(styleNode, inlineStyleUrlInfo.content)
               setHtmlNodeAttributes(styleNode, {
-                "generated-by": "jsenv:html_inline_content",
+                "jsenv-plugin-owner": "jsenv:html_inline_content",
+                "jsenv-plugin-action": "content_cooked",
               })
             })
           },
@@ -71,14 +72,17 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
             // If the inline script was already handled by an other plugin, ignore it
             // - we want to preserve inline scripts generated by html supervisor during dev
             // - we want to avoid cooking twice a script during build
-            const generatedBy = getHtmlNodeAttribute(scriptNode, "generated-by")
+            const jsenvPluginOwner = getHtmlNodeAttribute(
+              scriptNode,
+              "jsenv-plugin-owner",
+            )
             if (
-              generatedBy === "jsenv:as_js_classic_html" &&
+              jsenvPluginOwner === "jsenv:as_js_classic_html" &&
               !analyzeConvertedScripts
             ) {
               return
             }
-            if (generatedBy === "jsenv:html_supervisor") {
+            if (jsenvPluginOwner === "jsenv:supervisor") {
               return
             }
             actions.push(async () => {
@@ -117,7 +121,8 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
               })
               setHtmlNodeText(scriptNode, inlineScriptUrlInfo.content)
               setHtmlNodeAttributes(scriptNode, {
-                "generated-by": "jsenv:html_inline_content",
+                "jsenv-plugin-owner": "jsenv:html_inline_content",
+                "jsenv-plugin-action": "content_cooked",
                 ...(extension
                   ? { type: type === "js_module" ? "module" : undefined }
                   : {}),

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -90,7 +90,7 @@ export const jsenvPluginNodeEsmResolution = ({
       }
     },
     resolveUrl: {
-      js_import_export: (reference, context) => {
+      js_import_export: (reference) => {
         const { parentUrl, specifier } = reference
         const { type, url } = applyNodeEsmResolution({
           conditions: packageConditions,
@@ -99,7 +99,6 @@ export const jsenvPluginNodeEsmResolution = ({
           lookupPackageScope,
           readPackageJson,
         })
-
         // this reference depend on package.json and node_modules
         // to be resolved. Each file using this specifier
         // must be invalidated when package.json or package_lock.json
@@ -108,17 +107,7 @@ export const jsenvPluginNodeEsmResolution = ({
           type !== "relative_specifier" &&
           type !== "absolute_specifier" &&
           type !== "node_builtin_specifier"
-        const relatedUrlInfos = context.urlGraph.getRelatedUrlInfos(
-          reference.parentUrl,
-        )
-        relatedUrlInfos.forEach((relatedUrlInfo) => {
-          if (relatedUrlInfo.dependsOnPackageJson) {
-            // the url may depend due to an other reference
-            // in that case keep dependsOnPackageJson to true
-            return
-          }
-          relatedUrlInfo.dependsOnPackageJson = dependsOnPackageJson
-        })
+        reference.dependsOnPackageJson = dependsOnPackageJson
         return url
       },
     },

package/src/plugins/plugin_controller.js

@@ -208,9 +208,9 @@ const flattenAndFilterPlugins = (plugins, { scenarios }) => {
         return
       }
       if (typeof appliesDuring === "string") {
-        if (!["dev", "test", "build"].includes(appliesDuring)) {
+        if (!["dev", "build"].includes(appliesDuring)) {
           throw new Error(
-            `"appliesDuring" must be "dev", "test" or "build", got ${appliesDuring}`,
+            `"appliesDuring" must be "dev" or "build", got ${appliesDuring}`,
           )
         }
         if (scenarios[appliesDuring]) {

package/src/plugins/plugins.js

@@ -7,7 +7,7 @@ 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"
 import { jsenvPluginInline } from "./inline/jsenv_plugin_inline.js"
-import { jsenvPluginHtmlSupervisor } from "./html_supervisor/jsenv_plugin_html_supervisor.js"
+import { jsenvPluginSupervisor } from "./supervisor/jsenv_plugin_supervisor.js"
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js"
 import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js"
 import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js"
@@ -27,7 +27,7 @@ export const getCorePlugins = ({
   runtimeCompat,
 
   urlAnalysis = {},
-  htmlSupervisor,
+  supervisor,
   nodeEsmResolution = true,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
@@ -40,8 +40,8 @@ export const getCorePlugins = ({
   clientFilesPruneCallbackList,
   explorer,
 } = {}) => {
-  if (htmlSupervisor === true) {
-    htmlSupervisor = {}
+  if (supervisor === true) {
+    supervisor = {}
   }
   if (nodeEsmResolution === true) {
     nodeEsmResolution = {}
@@ -56,7 +56,7 @@ export const getCorePlugins = ({
   return [
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
     jsenvPluginTranspilation(transpilation),
-    ...(htmlSupervisor ? [jsenvPluginHtmlSupervisor(htmlSupervisor)] : []), // before inline as it turns inline <script> into <script src>
+    ...(supervisor ? [jsenvPluginSupervisor(supervisor)] : []), // before inline as it turns inline <script> into <script src>
     jsenvPluginImportmap(),
     // before node esm to handle bare specifiers
     // + before node esm to handle importmap before inline content

package/src/plugins/server_events/jsenv_plugin_server_events_client_injection.js

@@ -32,11 +32,11 @@ export const jsenvPluginServerEventsClientInjection = () => {
         injectScriptNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
-            "tagName": "script",
-            "type": "module",
-            "src": serverEventsClientFileReference.generatedSpecifier,
-            "injected-by": "jsenv:server_events",
+            tagName: "script",
+            type: "module",
+            src: serverEventsClientFileReference.generatedSpecifier,
           }),
+          "jsenv:server_events",
         )
         const htmlModified = stringifyHtmlAst(htmlAst)
         return {

package/src/plugins/supervisor/client/script_type_module_supervisor.js

@@ -0,0 +1,108 @@
+let previousExecutionPromise
+
+// https://twitter.com/damienmaillard/status/1554752482273787906
+const isWebkitOrSafari =
+  typeof window.webkitConvertPointFromNodeToPage === "function"
+
+export const superviseScriptTypeModule = async ({ src, async }) => {
+  const execute = isWebkitOrSafari
+    ? createExecuteWithDynamicImport({ src })
+    : createExecuteWithScript({ src })
+  const startExecution = () => {
+    const execution = window.__supervisor__.createExecution({
+      src,
+      type: "js_module",
+      execute,
+    })
+    return execution.start()
+  }
+  if (async) {
+    startExecution()
+    return
+  }
+  // there is guaranteed execution order for non async script type="module"
+  // see https://gist.github.com/jakub-g/385ee6b41085303a53ad92c7c8afd7a6#typemodule-vs-non-module-typetextjavascript-vs-script-nomodule
+  if (previousExecutionPromise) {
+    await previousExecutionPromise
+    previousExecutionPromise = null
+  }
+  previousExecutionPromise = startExecution()
+}
+
+const createExecuteWithScript = ({ src }) => {
+  const currentScript = document.querySelector(
+    `script[type="module"][inlined-from-src="${src}"]`,
+  )
+  const parentNode = currentScript.parentNode
+  let nodeToReplace
+  let currentScriptClone
+
+  return async ({ isReload }) => {
+    const urlObject = new URL(src, window.location)
+    const loadPromise = new Promise((resolve, reject) => {
+      currentScriptClone = document.createElement("script")
+      Array.from(currentScript.attributes).forEach((attribute) => {
+        currentScriptClone.setAttribute(attribute.nodeName, attribute.nodeValue)
+      })
+      if (isReload) {
+        urlObject.searchParams.set("hmr", Date.now())
+        nodeToReplace = currentScriptClone
+        currentScriptClone.src = urlObject.href
+      } else {
+        currentScriptClone.removeAttribute("jsenv-plugin-owner")
+        currentScriptClone.removeAttribute("jsenv-plugin-action")
+        currentScriptClone.removeAttribute("inlined-from-src")
+        currentScriptClone.removeAttribute("original-position")
+        currentScriptClone.removeAttribute("original-src-position")
+        nodeToReplace = currentScript
+        currentScriptClone.src = src
+      }
+      currentScriptClone.addEventListener("error", reject)
+      currentScriptClone.addEventListener("load", resolve)
+      parentNode.replaceChild(currentScriptClone, nodeToReplace)
+    })
+    try {
+      await loadPromise
+    } catch (e) {
+      // eslint-disable-next-line no-throw-literal
+      throw {
+        message: `Failed to fetch module: ${urlObject.href}`,
+        reportedBy: "script_error_event",
+        url: urlObject.href,
+        // window.error won't be dispatched for this error
+        needsReport: true,
+      }
+    }
+    // do not resolve right away, wait for top level execution
+    try {
+      const namespace = await import(urlObject.href)
+      return namespace
+    } catch (e) {
+      e.reportedBy = "dynamic_import"
+      throw e
+    }
+  }
+}
+
+const createExecuteWithDynamicImport = ({ src }) => {
+  return async ({ isReload }) => {
+    const urlObject = new URL(src, window.location)
+    if (isReload) {
+      urlObject.searchParams.set("hmr", Date.now())
+    }
+    try {
+      const namespace = await import(urlObject.href)
+      return namespace
+    } catch (e) {
+      e.reportedBy = "dynamic_import"
+      // dynamic import would hide the error to the browser
+      // so it must be re-reported using window.reportError
+      if (typeof window.reportError === "function") {
+        window.reportError(e)
+      } else {
+        console.error(e)
+      }
+      throw e
+    }
+  }
+}