@jsenv/core 39.5.21 → 39.5.23

package/dist/jsenv_core.js

@@ -4851,7 +4851,7 @@ const writeHead = (
   if (statusText === undefined) {
     statusText = statusTextFromStatus(status);
   } else {
-    statusText = statusText.replace(/\\n/g, "\n");
+    statusText = statusText.replace(/\n/g, "");
   }
   if (responseIsServerHttp2Stream) {
     nodeHeaders = {
@@ -11530,7 +11530,9 @@ const assertAndNormalizeReturnValue = (hook, returnValue, info) => {
     if (!returnValueAssertion.appliesTo.includes(hook.name)) {
       continue;
     }
-    const assertionResult = returnValueAssertion.assertion(returnValue, info);
+    const assertionResult = returnValueAssertion.assertion(returnValue, info, {
+      hook,
+    });
     if (assertionResult !== undefined) {
       // normalization
       returnValue = assertionResult;
@@ -11544,7 +11546,7 @@ const returnValueAssertions = [
   {
     name: "url_assertion",
     appliesTo: ["resolveReference", "redirectReference"],
-    assertion: (valueReturned) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href;
       }
@@ -11552,7 +11554,7 @@ const returnValueAssertions = [
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" plugin: it must be a string; got ${valueReturned}`,
       );
     },
   },
@@ -11564,7 +11566,7 @@ const returnValueAssertions = [
       "finalizeUrlContent",
       "optimizeUrlContent",
     ],
-    assertion: (valueReturned, urlInfo) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (typeof valueReturned === "string" || Buffer.isBuffer(valueReturned)) {
         return { content: valueReturned };
       }
@@ -11575,13 +11577,13 @@ const returnValueAssertions = [
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {
           throw new Error(
-            `Unexpected "content" returned by plugin: it must be a string or a buffer; got ${content}`,
+            `Unexpected "content" returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string or a buffer; got ${content}`,
           );
         }
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string, a buffer or an object; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string, a buffer or an object; got ${valueReturned}`,
       );
     },
   },
@@ -19908,13 +19910,13 @@ const injectImportMetaHot = (urlInfo, importMetaHotClientFileUrl) => {
     expectedType: "js_module",
     specifier: importMetaHotClientFileUrl,
   });
-  const magicSource = createMagicSource(urlInfo.content);
-  magicSource.prepend(
-    `import { createImportMetaHot } from ${importMetaHotClientFileReference.generatedSpecifier};
+  let content = urlInfo.content;
+  let prelude = `import { createImportMetaHot } from ${importMetaHotClientFileReference.generatedSpecifier};
 import.meta.hot = createImportMetaHot(import.meta.url);
-`,
-  );
-  return magicSource.toContentAndSourcemap();
+`;
+  return {
+    content: `${prelude.replace(/\n/g, "")}${content}`,
+  };
 };
 
 const jsenvPluginAutoreloadClient = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.5.21",
+  "version": "39.5.23",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -78,10 +78,10 @@
     "@jsenv/node-esm-resolution": "1.0.6",
     "@jsenv/plugin-bundling": "2.7.16",
     "@jsenv/plugin-minification": "1.5.10",
-    "@jsenv/plugin-supervisor": "1.5.26",
+    "@jsenv/plugin-supervisor": "1.5.27",
     "@jsenv/plugin-transpilation": "1.4.84",
     "@jsenv/runtime-compat": "1.3.1",
-    "@jsenv/server": "15.3.2",
+    "@jsenv/server": "15.3.3",
     "@jsenv/sourcemap": "1.2.25",
     "@jsenv/url-meta": "8.5.2",
     "@jsenv/urls": "2.5.2",

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -109,11 +109,11 @@ const injectImportMetaHot = (urlInfo, importMetaHotClientFileUrl) => {
     expectedType: "js_module",
     specifier: importMetaHotClientFileUrl,
   });
-  const magicSource = createMagicSource(urlInfo.content);
-  magicSource.prepend(
-    `import { createImportMetaHot } from ${importMetaHotClientFileReference.generatedSpecifier};
+  let content = urlInfo.content;
+  let prelude = `import { createImportMetaHot } from ${importMetaHotClientFileReference.generatedSpecifier};
 import.meta.hot = createImportMetaHot(import.meta.url);
-`,
-  );
-  return magicSource.toContentAndSourcemap();
+`;
+  return {
+    content: `${prelude.replace(/\n/g, "")}${content}`,
+  };
 };

package/src/plugins/plugin_controller.js

@@ -324,7 +324,9 @@ const assertAndNormalizeReturnValue = (hook, returnValue, info) => {
     if (!returnValueAssertion.appliesTo.includes(hook.name)) {
       continue;
     }
-    const assertionResult = returnValueAssertion.assertion(returnValue, info);
+    const assertionResult = returnValueAssertion.assertion(returnValue, info, {
+      hook,
+    });
     if (assertionResult !== undefined) {
       // normalization
       returnValue = assertionResult;
@@ -338,7 +340,7 @@ const returnValueAssertions = [
   {
     name: "url_assertion",
     appliesTo: ["resolveReference", "redirectReference"],
-    assertion: (valueReturned) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (valueReturned instanceof URL) {
         return valueReturned.href;
       }
@@ -346,7 +348,7 @@ const returnValueAssertions = [
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" plugin: it must be a string; got ${valueReturned}`,
       );
     },
   },
@@ -358,7 +360,7 @@ const returnValueAssertions = [
       "finalizeUrlContent",
       "optimizeUrlContent",
     ],
-    assertion: (valueReturned, urlInfo) => {
+    assertion: (valueReturned, urlInfo, { hook }) => {
       if (typeof valueReturned === "string" || Buffer.isBuffer(valueReturned)) {
         return { content: valueReturned };
       }
@@ -369,13 +371,13 @@ const returnValueAssertions = [
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {
           throw new Error(
-            `Unexpected "content" returned by plugin: it must be a string or a buffer; got ${content}`,
+            `Unexpected "content" returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string or a buffer; got ${content}`,
           );
         }
         return undefined;
       }
       throw new Error(
-        `Unexpected value returned by plugin: it must be a string, a buffer or an object; got ${valueReturned}`,
+        `Unexpected value returned by "${hook.plugin.name}" ${hook.name} hook: it must be a string, a buffer or an object; got ${valueReturned}`,
       );
     },
   },