@jsenv/plugin-supervisor 1.3.8 → 1.4.0

package/dist/jsenv_plugin_supervisor.js

@@ -465,11 +465,11 @@ const replaceSourceMappingUrl = (source, regexp, callback) => {
  */
 
 const injectSupervisorIntoJs = async ({
-  webServer,
   content,
   url,
   type,
-  inlineSrc
+  inlineSrc,
+  sourcemaps
 }) => {
   const babelPluginJsSupervisor = type === "js_module" ? babelPluginJsModuleSupervisor : babelPluginJsClassicSupervisor;
   const result = await applyBabelPlugins({
@@ -481,14 +481,16 @@ const injectSupervisorIntoJs = async ({
     inputUrl: url
   });
   let code = result.code;
-  let map = result.map;
-  const sourcemapDataUrl = generateSourcemapDataUrl(map);
-  code = SOURCEMAP.writeComment({
-    contentType: "text/javascript",
-    content: code,
-    specifier: sourcemapDataUrl
-  });
-  code = "".concat(code, "\n//# sourceURL=").concat(urlToRelativeUrl(url, webServer.rootDirectoryUrl));
+  if (sourcemaps === "inline") {
+    const map = result.map;
+    const sourcemapDataUrl = generateSourcemapDataUrl(map);
+    code = SOURCEMAP.writeComment({
+      contentType: "text/javascript",
+      content: code,
+      specifier: sourcemapDataUrl
+    });
+  }
+  code = "".concat(code, "\n//# sourceURL=").concat(inlineSrc);
   return code;
 };
 const babelPluginJsModuleSupervisor = babel => {
@@ -702,7 +704,8 @@ const injectSupervisorIntoHTML = async ({
   generateInlineScriptSrc = ({
     inlineScriptUrl
   }) => urlToRelativeUrl(inlineScriptUrl, webServer.rootDirectoryUrl),
-  inlineAsRemote
+  inlineAsRemote,
+  sourcemaps = "inline"
 }) => {
   const htmlAst = parseHtml({
     html: content,
@@ -777,7 +780,8 @@ const injectSupervisorIntoHTML = async ({
               content: textContent,
               url: inlineScriptUrl,
               type,
-              inlineSrc: inlineScriptSrc
+              inlineSrc: inlineScriptSrc,
+              sourcemaps
             });
             mutations.push(() => {
               setHtmlNodeText(scriptNode, inlineJsSupervised, {
@@ -873,7 +877,7 @@ const injectSupervisorIntoHTML = async ({
     }, "  ");
     injectHtmlNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
       tagName: "script",
-      textContent: "window.__supervisor__.setup({".concat(setupParamsSource, "})")
+      textContent: "window.__supervisor__.setup({\n  ".concat(setupParamsSource, "\n});")
     }), "jsenv:supervisor");
     injectHtmlNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
       tagName: "script",
@@ -1106,7 +1110,8 @@ const jsenvPluginSupervisor = ({
               content: textContent
             });
             return inlineScriptReference.generatedSpecifier;
-          }
+          },
+          sourcemaps: htmlUrlInfo.kitchen.context.sourcemaps
         });
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "/dist/"
   ],
   "dependencies": {
-    "@jsenv/ast": "6.0.0",
+    "@jsenv/ast": "6.0.1",
     "@jsenv/urls": "2.2.1",
     "@jsenv/sourcemap": "1.2.4",
     "launch-editor": "2.6.1"

package/src/client/supervisor.js

@@ -960,15 +960,13 @@ window.__supervisor__ = (() => {
               }
               const { codeFrame, cause } = errorDetails;
               if (codeFrame) {
-                this.root.querySelector(
-                  ".text",
-                ).innerHTML += `\n\n${codeFrame}`;
+                this.root.querySelector(".text").innerHTML +=
+                  `\n\n${codeFrame}`;
               }
               if (cause) {
                 const causeIndented = prefixRemainingLines(cause, "  ");
-                this.root.querySelector(
-                  ".text",
-                ).innerHTML += `\n  [cause]: ${causeIndented}`;
+                this.root.querySelector(".text").innerHTML +=
+                  `\n  [cause]: ${causeIndented}`;
               }
             });
           }

package/src/html_supervisor.js

@@ -78,6 +78,7 @@ export const injectSupervisorIntoHTML = async (
     generateInlineScriptSrc = ({ inlineScriptUrl }) =>
       urlToRelativeUrl(inlineScriptUrl, webServer.rootDirectoryUrl),
     inlineAsRemote,
+    sourcemaps = "inline",
   },
 ) => {
   const htmlAst = parseHtml({ html: content, url });
@@ -113,7 +114,10 @@ export const injectSupervisorIntoHTML = async (
       });
       if (inlineAsRemote) {
         // prefere la version src
-        scriptInfos.push({ type, src: inlineScriptSrc });
+        scriptInfos.push({
+          type,
+          src: inlineScriptSrc,
+        });
         const remoteJsSupervised = generateCodeToSuperviseScriptWithSrc({
           type,
           src: inlineScriptSrc,
@@ -129,7 +133,11 @@ export const injectSupervisorIntoHTML = async (
           });
         });
       } else {
-        scriptInfos.push({ type, src: inlineScriptSrc, isInline: true });
+        scriptInfos.push({
+          type,
+          src: inlineScriptSrc,
+          isInline: true,
+        });
         actions.push(async () => {
           try {
             const inlineJsSupervised = await injectSupervisorIntoJs({
@@ -138,6 +146,7 @@ export const injectSupervisorIntoHTML = async (
               url: inlineScriptUrl,
               type,
               inlineSrc: inlineScriptSrc,
+              sourcemaps,
             });
             mutations.push(() => {
               setHtmlNodeText(scriptNode, inlineJsSupervised, {
@@ -228,7 +237,9 @@ export const injectSupervisorIntoHTML = async (
       htmlAst,
       createHtmlNode({
         tagName: "script",
-        textContent: `window.__supervisor__.setup({${setupParamsSource}})`,
+        textContent: `window.__supervisor__.setup({
+  ${setupParamsSource}
+});`,
       }),
       "jsenv:supervisor",
     );

package/src/js_supervisor.js

@@ -36,16 +36,15 @@
  * and create a variable named "undefined"
  */
 
-import { urlToRelativeUrl } from "@jsenv/urls";
 import { applyBabelPlugins } from "@jsenv/ast";
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 
 export const injectSupervisorIntoJs = async ({
-  webServer,
   content,
   url,
   type,
   inlineSrc,
+  sourcemaps,
 }) => {
   const babelPluginJsSupervisor =
     type === "js_module"
@@ -58,15 +57,17 @@ export const injectSupervisorIntoJs = async ({
     inputUrl: url,
   });
   let code = result.code;
-  let map = result.map;
-  const sourcemapDataUrl = generateSourcemapDataUrl(map);
-  code = SOURCEMAP.writeComment({
-    contentType: "text/javascript",
-    content: code,
-    specifier: sourcemapDataUrl,
-  });
+  if (sourcemaps === "inline") {
+    const map = result.map;
+    const sourcemapDataUrl = generateSourcemapDataUrl(map);
+    code = SOURCEMAP.writeComment({
+      contentType: "text/javascript",
+      content: code,
+      specifier: sourcemapDataUrl,
+    });
+  }
   code = `${code}
-//# sourceURL=${urlToRelativeUrl(url, webServer.rootDirectoryUrl)}`;
+//# sourceURL=${inlineSrc}`;
   return code;
 };
 

package/src/jsenv_plugin_supervisor.js

@@ -216,6 +216,7 @@ export const jsenvPluginSupervisor = ({
                 });
               return inlineScriptReference.generatedSpecifier;
             },
+            sourcemaps: htmlUrlInfo.kitchen.context.sourcemaps,
           },
         );
       },