@jsenv/core 27.0.0-alpha.63 → 27.0.0-alpha.64

package/src/plugins/inject_globals/jsenv_plugin_inject_globals.js

@@ -11,56 +11,65 @@ export const jsenvPluginInjectGlobals = (globals = {}) => {
   if (Object.keys(globals).length === 0) {
     return []
   }
-
-  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)
-    magicSource.append(
-      generateClientCodeForGlobals({
-        globals,
-        isWebWorker: isWebWorkerUrlInfo(urlInfo),
-      }),
-    )
-    return magicSource.toContentAndSourcemap()
-  }
-
   return {
     name: "jsenv:inject_globals",
     appliesDuring: "*",
     transformUrlContent: {
-      html: globalInjectorOnHtmlEntryPoint,
-      js_classic: globalsInjectorOnJsEntryPoints,
-      js_module: globalsInjectorOnJsEntryPoints,
+      html: injectGlobals,
+      js_classic: injectGlobals,
+      js_module: injectGlobals,
     },
   }
 }
 
+export const injectGlobals = (urlInfo, globals) => {
+  if (urlInfo.type === "html") {
+    return globalInjectorOnHtmlEntryPoint(urlInfo, globals)
+  }
+  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
+    return globalsInjectorOnJsEntryPoints(urlInfo, globals)
+  }
+  throw new Error(`cannot inject globals into "${urlInfo.type}"`)
+}
+
+const globalInjectorOnHtmlEntryPoint = async (urlInfo, globals) => {
+  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,
+  })
+  const clientCode = generateClientCodeForGlobals({
+    globals,
+    isWebWorker: false,
+  })
+  injectScriptAsEarlyAsPossible(
+    htmlAst,
+    createHtmlNode({
+      "tagName": "script",
+      "textContent": clientCode,
+      "injected-by": "jsenv:inject_globals",
+    }),
+  )
+  return stringifyHtmlAst(htmlAst)
+}
+
+const globalsInjectorOnJsEntryPoints = async (urlInfo, globals) => {
+  if (!urlInfo.data.isEntryPoint && !urlInfo.data.isWebWorkerEntryPoint) {
+    return null
+  }
+  const clientCode = generateClientCodeForGlobals({
+    globals,
+    isWebWorker: isWebWorkerUrlInfo(urlInfo),
+  })
+  const magicSource = createMagicSource(urlInfo.content)
+  magicSource.prepend(clientCode)
+  return magicSource.toContentAndSourcemap()
+}
+
 const generateClientCodeForGlobals = ({ isWebWorker = false, globals }) => {
   const globalName = isWebWorker ? "self" : "window"
   return `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -35,10 +35,7 @@ export const jsenvPluginDataUrls = () => {
       }
       return (async () => {
         const urlInfo = context.urlGraph.getUrlInfo(reference.url)
-        await context.cook({
-          reference,
-          urlInfo,
-        })
+        await context.cook(urlInfo, { reference })
         if (urlInfo.originalContent === urlInfo.content) {
           return reference.generatedUrl
         }

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -54,9 +54,8 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
                 contentType: "text/css",
                 content: textNode.value,
               })
-            await context.cook({
+            await context.cook(inlineStyleUrlInfo, {
               reference: inlineStyleReference,
-              urlInfo: inlineStyleUrlInfo,
             })
             setHtmlNodeGeneratedText(node, {
               generatedText: inlineStyleUrlInfo.content,
@@ -77,7 +76,7 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
           // - we want to avoid cooking twice a script during build
           const generatedBy = getHtmlNodeAttributeByName(node, "generated-by")
           if (generatedBy) {
-            if (generatedBy.value === "jsenv:script_type_module_as_classic") {
+            if (generatedBy.value === "jsenv:as_js_classic_html") {
               if (!analyzeConvertedScripts) {
                 return
               }
@@ -135,9 +134,8 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
                 content: textNode.value,
               })
 
-            await context.cook({
+            await context.cook(inlineScriptUrlInfo, {
               reference: inlineScriptReference,
-              urlInfo: inlineScriptUrlInfo,
             })
             setHtmlNodeGeneratedText(node, {
               generatedText: inlineScriptUrlInfo.content,

package/src/plugins/inline/jsenv_plugin_inline_query_param.js

@@ -25,10 +25,7 @@ export const jsenvPluginInlineQueryParam = () => {
         }
         return (async () => {
           const urlInfo = context.urlGraph.getUrlInfo(reference.url)
-          await context.cook({
-            reference,
-            urlInfo,
-          })
+          await context.cook(urlInfo, { reference })
           const specifier = DataUrl.stringify({
             mediaType: urlInfo.contentType,
             base64Flag: true,

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -49,10 +49,7 @@ export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
       inlineUrlInfo.jsQuote = quote
       inlineReference.escape = (value) =>
         JS_QUOTES.escapeSpecialChars(value.slice(1, -1), { quote })
-      await context.cook({
-        reference: inlineReference,
-        urlInfo: inlineUrlInfo,
-      })
+      await context.cook(inlineUrlInfo, { reference: inlineReference })
       magicSource.replace({
         start: inlineContentInfo.start,
         end: inlineContentInfo.end,

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -138,6 +138,10 @@ const jsenvPluginNodeModulesVersionInUrls = ({
         return null
       }
       const packageVersion = readPackageJson(packageUrl).version
+      if (!packageVersion) {
+        // example where it happens: https://github.com/babel/babel/blob/2ce56e832c2dd7a7ed92c89028ba929f874c2f5c/packages/babel-runtime/helpers/esm/package.json#L2
+        return null
+      }
       return {
         v: packageVersion,
       }

package/src/plugins/plugins.js

@@ -44,7 +44,10 @@ export const getCorePlugins = ({
   }
   return [
     jsenvPluginUrlAnalysis(),
-    jsenvPluginTranspilation(transpilation),
+    jsenvPluginTranspilation({
+      rootDirectoryUrl,
+      ...transpilation,
+    }),
     ...(htmlSupervisor
       ? [
           jsenvPluginHtmlSupervisor({