@jsenv/core 28.4.2 → 28.5.1

package/dist/js/supervisor.js

@@ -277,6 +277,7 @@ window.__supervisor__ = (() => {
 
     const getErrorStackWithoutErrorMessage = error => {
       let stack = error.stack;
+      if (!stack) return "";
       const messageInStack = `${error.name}: ${error.message}`;
 
       if (stack.startsWith(messageInStack)) {

package/dist/main.js

@@ -3693,7 +3693,7 @@ const formatters = {
   },
   "css_@import": {
     encode: JSON.stringify,
-    code: JSON.stringify
+    decode: JSON.stringify
   },
   // https://github.com/webpack-contrib/css-loader/pull/627/files
   "css_url": {
@@ -10301,15 +10301,24 @@ const jsenvPluginAsJsClassicHtml = ({
           }
 
           if (needsSystemJs) {
-            mutations.push(() => {
-              const [systemJsReference] = context.referenceUtils.inject({
+            mutations.push(async () => {
+              const systemJsFileContent = readFileSync$1(new URL(systemJsClientFileUrl), {
+                encoding: "utf8"
+              });
+              const [systemJsReference, systemJsUrlInfo] = context.referenceUtils.inject({
                 type: "script_src",
                 expectedType: "js_classic",
-                specifier: systemJsClientFileUrl
+                isInline: true,
+                contentType: "text/javascript",
+                content: systemJsFileContent,
+                specifier: "s.js"
+              });
+              await context.cook(systemJsUrlInfo, {
+                reference: systemJsReference
               });
               injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
                 tagName: "script",
-                src: systemJsReference.generatedSpecifier
+                textContent: systemJsUrlInfo.content
               }), "jsenv:as_js_classic_html");
             });
           }
@@ -10319,7 +10328,7 @@ const jsenvPluginAsJsClassicHtml = ({
           return null;
         }
 
-        mutations.forEach(mutation => mutation());
+        await Promise.all(mutations.map(mutation => mutation()));
         return stringifyHtmlAst(htmlAst);
       }
     }
@@ -20216,13 +20225,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // - happens for "as_js_classic" injecting "s.js"
 
           if (reference.injected) {
-            const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({
-              type: reference.type,
-              expectedType: reference.expectedType,
-              expectedSubtype: reference.expectedSubtype,
-              parentUrl: buildToRawUrls[reference.parentUrl],
-              specifier: reference.specifier,
-              injected: true
+            const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({ ...reference,
+              parentUrl: buildToRawUrls[reference.parentUrl]
             });
             await rawGraphKitchen.cook(rawUrlInfo, {
               reference: ref

package/package.json

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

package/src/build/build.js

@@ -528,12 +528,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             // - happens for "as_js_classic" injecting "s.js"
             if (reference.injected) {
               const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({
-                type: reference.type,
-                expectedType: reference.expectedType,
-                expectedSubtype: reference.expectedSubtype,
+                ...reference,
                 parentUrl: buildToRawUrls[reference.parentUrl],
-                specifier: reference.specifier,
-                injected: true,
               })
               await rawGraphKitchen.cook(rawUrlInfo, { reference: ref })
               return rawUrlInfo

package/src/omega/url_specifier_encoding.js

@@ -31,7 +31,7 @@ export const urlSpecifierEncoding = {
 const formatters = {
   "js_import_export": { encode: JSON.stringify, decode: JSON.parse },
   "js_url_specifier": { encode: JSON.stringify, decode: JSON.parse },
-  "css_@import": { encode: JSON.stringify, code: JSON.stringify },
+  "css_@import": { encode: JSON.stringify, decode: JSON.stringify },
   // https://github.com/webpack-contrib/css-loader/pull/627/files
   "css_url": {
     encode: (url) => {

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

@@ -237,6 +237,7 @@ window.__supervisor__ = (() => {
 
     const getErrorStackWithoutErrorMessage = (error) => {
       let stack = error.stack
+      if (!stack) return ""
       const messageInStack = `${error.name}: ${error.message}`
       if (stack.startsWith(messageInStack)) {
         stack = stack.slice(messageInStack.length)

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

@@ -5,6 +5,7 @@
  * - <link rel="modulepreload"> are converted to <link rel="preload">
  */
 
+import { readFileSync } from "node:fs"
 import {
   parseHtmlString,
   visitHtmlNodes,
@@ -160,17 +161,28 @@ export const jsenvPluginAsJsClassicHtml = ({
             }
           }
           if (needsSystemJs) {
-            mutations.push(() => {
-              const [systemJsReference] = context.referenceUtils.inject({
-                type: "script_src",
-                expectedType: "js_classic",
-                specifier: systemJsClientFileUrl,
+            mutations.push(async () => {
+              const systemJsFileContent = readFileSync(
+                new URL(systemJsClientFileUrl),
+                { encoding: "utf8" },
+              )
+              const [systemJsReference, systemJsUrlInfo] =
+                context.referenceUtils.inject({
+                  type: "script_src",
+                  expectedType: "js_classic",
+                  isInline: true,
+                  contentType: "text/javascript",
+                  content: systemJsFileContent,
+                  specifier: "s.js",
+                })
+              await context.cook(systemJsUrlInfo, {
+                reference: systemJsReference,
               })
               injectScriptNodeAsEarlyAsPossible(
                 htmlAst,
                 createHtmlNode({
                   tagName: "script",
-                  src: systemJsReference.generatedSpecifier,
+                  textContent: systemJsUrlInfo.content,
                 }),
                 "jsenv:as_js_classic_html",
               )
@@ -180,7 +192,7 @@ export const jsenvPluginAsJsClassicHtml = ({
         if (mutations.length === 0) {
           return null
         }
-        mutations.forEach((mutation) => mutation())
+        await Promise.all(mutations.map((mutation) => mutation()))
         return stringifyHtmlAst(htmlAst)
       },
     },