@jsenv/core 27.0.0-alpha.73 → 27.0.0-alpha.76

package/dist/babel_helpers/objectWithoutProperties/objectWithoutProperties.js

@@ -1,4 +1,4 @@
-import objectWithoutPropertiesLoose from "./oose/objectWithoutPropertiesLoose.js";
+import objectWithoutPropertiesLoose from "../objectWithoutPropertiesLoose/objectWithoutPropertiesLoose.js";
 export default ((source, excluded) => {
   if (source === null) return {};
   var target = objectWithoutPropertiesLoose(source, excluded);

package/dist/js/html_supervisor_setup.js

@@ -32,7 +32,10 @@ window.__html_supervisor__ = {
             lastWindowError = e.error
           }
           const cleanup = () => {
-            document.body.removeChild(script)
+            // the execution of the script itself can remove script from the page
+            if (script.parentNode) {
+              script.parentNode.removeChild(script)
+            }
             window.removeEventListener("error", windowErrorCallback)
           }
           window.addEventListener("error", windowErrorCallback)

package/dist/main.js

@@ -969,7 +969,9 @@ const jsenvPluginNodeEsmResolver = ({
     fetchUrlContent: urlInfo => {
       if (urlInfo.url.startsWith("file:///@ignore/")) {
         return {
-          content: "export default {}"
+          content: "export default {}",
+          contentType: "text/javascript",
+          type: "js_module"
         };
       }
 
@@ -1232,17 +1234,9 @@ const jsenvPluginFileUrls = ({
 
       const fileBuffer = readFileSync(urlObject);
       const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
-
-      if (CONTENT_TYPE.isTextual(contentType)) {
-        return {
-          contentType,
-          content: String(fileBuffer)
-        };
-      }
-
       return {
-        contentType,
-        content: fileBuffer
+        content: CONTENT_TYPE.isTextual(contentType) ? String(fileBuffer) : fileBuffer,
+        contentType
       };
     }
   }];
@@ -1791,12 +1785,12 @@ const jsenvPluginDataUrls = () => {
       } = DATA_URL.parse(urlInfo.url);
       urlInfo.data.base64Flag = base64Flag;
       return {
-        contentType,
         content: contentFromUrlData({
           contentType,
           base64Flag,
           urlData
-        })
+        }),
+        contentType
       };
     },
     formatUrl: (reference, context) => {
@@ -1819,7 +1813,7 @@ const jsenvPluginDataUrls = () => {
         }
 
         const specifier = DATA_URL.stringify({
-          contentType: urlInfo.contentType,
+          contentType: urlInfo.headers["content-type"],
           base64Flag: urlInfo.data.base64Flag,
           data: urlInfo.data.base64Flag ? dataToBase64(urlInfo.content) : String(urlInfo.content)
         });
@@ -1918,10 +1912,10 @@ const jsenvPluginInlineUrls = () => {
       }
 
       return {
-        contentType: urlInfo.contentType,
         // we want to fetch the original content otherwise we might re-cook
         // content already cooked
-        content: urlInfo.originalContent
+        content: urlInfo.originalContent,
+        contentType: urlInfo.contentType
       };
     }
   };
@@ -2459,78 +2453,6 @@ const babelPluginMetadataImportMetaScenarios = () => {
   };
 };
 
-const jsenvPluginInjectGlobals = (globals = {}) => {
-  if (Object.keys(globals).length === 0) {
-    return [];
-  }
-
-  return {
-    name: "jsenv:inject_globals",
-    appliesDuring: "*",
-    transformUrlContent: {
-      html: injectGlobals,
-      js_classic: injectGlobals,
-      js_module: injectGlobals
-    }
-  };
-};
-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, "  ")});`;
-};
-
 const jsenvPluginCssParcel = () => {
   return {
     name: "jsenv:css_parcel",
@@ -2643,14 +2565,14 @@ const jsenvPluginAsModules = () => {
 
       const jsonText = JSON.stringify(originalUrlInfo.content.trim());
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         // here we could `export default ${jsonText}`:
         // but js engine are optimized to recognize JSON.parse
         // and use a faster parsing strategy
-        content: `export default JSON.parse(${jsonText})`
+        content: `export default JSON.parse(${jsonText})`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent
       };
     }
   };
@@ -2676,16 +2598,16 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true
       });
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(inlineContentClientFileUrl)}
   
   const inlineContent = new InlineContent(${cssText}, { type: "text/css" })
   const stylesheet = new CSSStyleSheet()
   stylesheet.replaceSync(inlineContent.text)
-  export default stylesheet`
+  export default stylesheet`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent
       };
     }
   };
@@ -2711,14 +2633,14 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true
       });
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(inlineContentClientFileUrl)}
   
 const inlineContent = new InlineContent(${textPlain}, { type: "text/plain" })
-export default inlineContent.text`
+export default inlineContent.text`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent
       };
     }
   };
@@ -3202,11 +3124,11 @@ const jsenvPluginAsJsClassicConversion = ({
       });
       urlInfo.data.jsClassicFormat = jsClassicFormat;
       return {
+        content,
+        contentType: "text/javascript",
+        type: "js_classic",
         originalUrl: originalUrlInfo.originalUrl,
         originalContent: originalUrlInfo.originalContent,
-        type: "js_classic",
-        contentType: "text/javascript",
-        content,
         sourcemap
       };
     }
@@ -6027,7 +5949,6 @@ const getCorePlugins = ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = true,
   minification = false,
   bundling = false,
@@ -6057,7 +5978,7 @@ const getCorePlugins = ({
     rootDirectoryUrl,
     runtimeCompat,
     ...nodeEsmResolution
-  }), jsenvPluginUrlResolution(), jsenvPluginUrlVersion(), jsenvPluginInjectGlobals(injectedGlobals), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), jsenvPluginNodeRuntime({
+  }), jsenvPluginUrlResolution(), jsenvPluginUrlVersion(), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), jsenvPluginNodeRuntime({
     runtimeCompat
   }), jsenvPluginBundling(bundling), jsenvPluginMinification(minification), jsenvPluginImportMetaHot(), ...(clientAutoreload ? [jsenvPluginAutoreload({
     rootDirectoryUrl,
@@ -6368,7 +6289,7 @@ const createUrlInfo = url => {
     sourcemap: null,
     sourcemapReference: null,
     timing: {},
-    responseHeaders: {}
+    headers: {}
   };
 };
 
@@ -6666,14 +6587,15 @@ const returnValueAssertions = [{
     if (typeof valueReturned === "object") {
       const {
         shouldHandle,
-        content
+        content,
+        body
       } = valueReturned;
 
       if (shouldHandle === false) {
         return undefined;
       }
 
-      if (typeof content !== "string" && !Buffer.isBuffer(content)) {
+      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}`);
       }
 
@@ -7297,17 +7219,35 @@ const createKitchen = ({
         return;
       }
 
-      const {
+      let {
+        content,
+        contentType,
         data,
         type,
         subtype,
-        contentType = "application/octet-stream",
         originalUrl,
         originalContent,
-        content,
         sourcemap,
-        filename
+        filename,
+        status = 200,
+        headers = {},
+        body
       } = fetchUrlContentReturnValue;
+
+      if (status !== 200) {
+        throw new Error(`unexpected status, ${status}`);
+      }
+
+      if (content === undefined) {
+        content = body;
+      }
+
+      if (contentType === undefined) {
+        contentType = headers["content-type"] || "application/octet-stream";
+      }
+
+      urlInfo.contentType = contentType;
+      urlInfo.headers = headers;
       urlInfo.type = type || reference.expectedType || inferUrlInfoType({
         url: urlInfo.url,
         contentType
@@ -7316,8 +7256,7 @@ const createKitchen = ({
         url: urlInfo.url,
         type: urlInfo.type,
         subtype: urlInfo.subtype
-      });
-      urlInfo.contentType = contentType; // during build urls info are reused and load returns originalUrl/originalContent
+      }); // during build urls info are reused and load returns originalUrl/originalContent
 
       urlInfo.originalUrl = originalUrl || urlInfo.originalUrl;
       urlInfo.originalContent = originalContent === undefined ? content : originalContent;
@@ -8042,7 +7981,7 @@ const createFileService = ({
         status: 304,
         headers: {
           "cache-control": `private,max-age=0,must-revalidate`,
-          ...urlInfo.responseHeaders
+          ...urlInfo.headers
         }
       };
     }
@@ -8057,7 +7996,6 @@ const createFileService = ({
         urlInfo.type = null;
         urlInfo.subtype = null;
         urlInfo.timing = {};
-        urlInfo.responseHeaders = {};
       }
 
       const {
@@ -8073,10 +8011,7 @@ const createFileService = ({
         outDirectoryUrl: scenario === "dev" ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/` : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`
       });
       let {
-        response,
-        contentType,
-        content,
-        contentEtag
+        response
       } = urlInfo;
 
       if (response) {
@@ -8087,13 +8022,13 @@ const createFileService = ({
         url: reference.url,
         status: 200,
         headers: {
-          "content-type": contentType,
-          "content-length": Buffer.byteLength(content),
+          "content-length": Buffer.byteLength(urlInfo.content),
           "cache-control": `private,max-age=0,must-revalidate`,
-          "eTag": contentEtag,
-          ...urlInfo.responseHeaders
+          "eTag": urlInfo.contentEtag,
+          ...urlInfo.headers,
+          "content-type": urlInfo.contentType
         },
-        body: content,
+        body: urlInfo.content,
         timing: urlInfo.timing
       };
       kitchen.pluginController.callHooks("augmentResponse", {
@@ -8396,11 +8331,10 @@ const startDevServer = async ({
   // (because node cluster won't work)
   devServerAutoreload = typeof process.send !== "function" && !parentPort && !process.env.VSCODE_INSPECTOR_OPTIONS,
   clientFiles = {
-    "./**": true,
-    "./**/.*/": false,
+    "./src/": true,
+    "./src/**/.*/": false,
     // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
-    "./**/dist/": false,
-    "./**/node_modules/": false
+    "./src/**/node_modules/": false
   },
   cooldownBetweenFileEvents,
   clientAutoreload = true,
@@ -8417,8 +8351,7 @@ const startDevServer = async ({
   },
   plugins = [],
   urlAnalysis = {},
-  htmlSupervisor = true,
-  injectedGlobals,
+  htmlSupervisor = false,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -8577,7 +8510,6 @@ const startDevServer = async ({
       runtimeCompat,
       urlAnalysis,
       htmlSupervisor,
-      injectedGlobals,
       nodeEsmResolution,
       fileSystemMagicResolution,
       transpilation,
@@ -9135,7 +9067,6 @@ const executePlan = async (plan, {
   scenario,
   sourcemaps,
   plugins,
-  injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -9220,7 +9151,6 @@ const executePlan = async (plan, {
           htmlSupervisor: true,
           nodeEsmResolution,
           fileSystemMagicResolution,
-          injectedGlobals,
           transpilation: { ...transpilation,
             getCustomBabelPlugins: ({
               clientRuntimeCompat
@@ -9738,7 +9668,6 @@ const executeTestPlan = async ({
   coverageSkipFull = false,
   sourcemaps = "inline",
   plugins = [],
-  injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
   writeGeneratedFiles = false,
@@ -9819,7 +9748,6 @@ const executeTestPlan = async ({
     scenario: "test",
     sourcemaps,
     plugins,
-    injectedGlobals,
     nodeEsmResolution,
     fileSystemMagicResolution,
     writeGeneratedFiles,
@@ -11899,7 +11827,6 @@ const build = async ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = {},
   bundling = true,
   minification = true,
@@ -11908,11 +11835,10 @@ const build = async ({
   // "filename", "search_param"
   lineBreakNormalization = process.platform === "win32",
   clientFiles = {
-    "./**": true,
-    "./**/.*/": false,
+    "./src/": true,
+    "./src/**/.*/": false,
     // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
-    "./dist/": false,
-    "./**/node_modules/": false
+    "./src/**/node_modules/": false
   },
   cooldownBetweenFileEvents,
   watch = false,
@@ -12012,7 +11938,6 @@ build ${entryPointKeys.length} entry points`);
         nodeEsmResolution,
         fileSystemMagicResolution,
         directoryReferenceAllowed,
-        injectedGlobals,
         transpilation: { ...transpilation,
           babelHelpersAsImport: !useExplicitJsClassicConversion,
           jsModuleAsJsClassic: false
@@ -12985,10 +12910,10 @@ const applyUrlVersioning = async ({
             const rawUrlInfo = rawGraph.getUrlInfo(rawUrls[versionedUrlInfo.url]);
             const finalUrlInfo = finalGraph.getUrlInfo(versionedUrlInfo.url);
             return {
-              originalContent: rawUrlInfo ? rawUrlInfo.originalContent : undefined,
-              sourcemap: finalUrlInfo ? finalUrlInfo.sourcemap : undefined,
+              content: versionedUrlInfo.content,
               contentType: versionedUrlInfo.contentType,
-              content: versionedUrlInfo.content
+              originalContent: rawUrlInfo ? rawUrlInfo.originalContent : undefined,
+              sourcemap: finalUrlInfo ? finalUrlInfo.sourcemap : undefined
             };
           }
 
@@ -13307,7 +13232,6 @@ const execute = async ({
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
-  injectedGlobals,
   transpilation,
   htmlSupervisor = true,
   writeGeneratedFiles = false,
@@ -13361,7 +13285,6 @@ const execute = async ({
         scenario,
         runtimeCompat,
         htmlSupervisor,
-        injectedGlobals,
         nodeEsmResolution,
         fileSystemMagicResolution,
         transpilation
@@ -13436,4 +13359,81 @@ const execute = async ({
   }
 };
 
-export { build, chromium, chromiumIsolatedTab, defaultCoverageConfig, execute, executeTestPlan, firefox, firefoxIsolatedTab, injectGlobals, nodeProcess, startBuildServer, startDevServer, webkit, webkitIsolatedTab };
+const injectGlobals = (urlInfo, globals) => {
+  if (urlInfo.type === "html") {
+    return globalInjectorOnHtml(urlInfo, globals);
+  }
+
+  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
+    return globalsInjectorOnJs(urlInfo, globals);
+  }
+
+  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
+};
+
+const globalInjectorOnHtml = async (urlInfo, globals) => {
+  // 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 globalsInjectorOnJs = async (urlInfo, globals) => {
+  const clientCode = generateClientCodeForGlobals({
+    globals,
+    isWebWorker: urlInfo.subtype === "worker" || urlInfo.subtype === "service_worker" || urlInfo.subtype === "shared_worker"
+  });
+  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, "  ")});`;
+};
+
+const jsenvPluginInjectGlobals = urlAssociations => {
+  return {
+    name: "jsenv:inject_globals",
+    appliesDuring: "*",
+    transformUrlContent: async urlInfo => {
+      const url = Object.keys(urlAssociations).find(url => {
+        return url === urlInfo.url;
+      });
+
+      if (!url) {
+        return null;
+      }
+
+      let globals = urlAssociations[url];
+
+      if (typeof globals === "function") {
+        globals = await globals();
+      }
+
+      if (Object.keys(globals).length === 0) {
+        return null;
+      }
+
+      return injectGlobals(urlInfo, globals);
+    }
+  };
+};
+
+export { build, chromium, chromiumIsolatedTab, defaultCoverageConfig, execute, executeTestPlan, firefox, firefoxIsolatedTab, jsenvPluginInjectGlobals, nodeProcess, startBuildServer, startDevServer, webkit, webkitIsolatedTab };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.73",
+  "version": "27.0.0-alpha.76",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -68,7 +68,7 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.3",
-    "@jsenv/filesystem": "4.0.3",
+    "@jsenv/filesystem": "4.0.6",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.6.3",
@@ -76,9 +76,9 @@
     "@jsenv/node-esm-resolution": "0.0.10",
     "@jsenv/server": "12.6.3",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.8.6",
+    "@jsenv/utils": "1.8.9",
     "@jsenv/url-meta": "7.0.0",
-    "@jsenv/urls": "1.2.0",
+    "@jsenv/urls": "1.2.3",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",
@@ -118,4 +118,4 @@
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }
-}
+}

package/src/build/build.js

@@ -109,7 +109,6 @@ export const build = async ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = {},
   bundling = true,
   minification = true,
@@ -118,10 +117,9 @@ export const build = async ({
   lineBreakNormalization = process.platform === "win32",
 
   clientFiles = {
-    "./**": true,
-    "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
-    "./dist/": false,
-    "./**/node_modules/": false,
+    "./src/": true,
+    "./src/**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
+    "./src/**/node_modules/": false,
   },
   cooldownBetweenFileEvents,
   watch = false,
@@ -224,7 +222,6 @@ build ${entryPointKeys.length} entry points`)
           nodeEsmResolution,
           fileSystemMagicResolution,
           directoryReferenceAllowed,
-          injectedGlobals,
           transpilation: {
             ...transpilation,
             babelHelpersAsImport: !useExplicitJsClassicConversion,
@@ -1187,12 +1184,12 @@ const applyUrlVersioning = async ({
               )
               const finalUrlInfo = finalGraph.getUrlInfo(versionedUrlInfo.url)
               return {
+                content: versionedUrlInfo.content,
+                contentType: versionedUrlInfo.contentType,
                 originalContent: rawUrlInfo
                   ? rawUrlInfo.originalContent
                   : undefined,
                 sourcemap: finalUrlInfo ? finalUrlInfo.sourcemap : undefined,
-                contentType: versionedUrlInfo.contentType,
-                content: versionedUrlInfo.content,
               }
             }
             return versionedUrlInfo

package/src/dev/start_dev_server.js

@@ -44,10 +44,9 @@ export const startDevServer = async ({
     !parentPort &&
     !process.env.VSCODE_INSPECTOR_OPTIONS,
   clientFiles = {
-    "./**": true,
-    "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
-    "./**/dist/": false,
-    "./**/node_modules/": false,
+    "./src/": true,
+    "./src/**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
+    "./src/**/node_modules/": false,
   },
   cooldownBetweenFileEvents,
   clientAutoreload = true,
@@ -65,8 +64,7 @@ export const startDevServer = async ({
   },
   plugins = [],
   urlAnalysis = {},
-  htmlSupervisor = true,
-  injectedGlobals,
+  htmlSupervisor = false,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -188,7 +186,6 @@ export const startDevServer = async ({
 
         urlAnalysis,
         htmlSupervisor,
-        injectedGlobals,
         nodeEsmResolution,
         fileSystemMagicResolution,
         transpilation,

package/src/execute/execute.js

@@ -32,7 +32,6 @@ export const execute = async ({
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
-  injectedGlobals,
   transpilation,
   htmlSupervisor = true,
   writeGeneratedFiles = false,
@@ -87,7 +86,6 @@ export const execute = async ({
           runtimeCompat,
 
           htmlSupervisor,
-          injectedGlobals,
           nodeEsmResolution,
           fileSystemMagicResolution,
           transpilation,

package/src/main.js

@@ -24,4 +24,4 @@ export { startBuildServer } from "./build/start_build_server.js"
 
 // advanced
 export { execute } from "./execute/execute.js"
-export { injectGlobals } from "./plugins/inject_globals/jsenv_plugin_inject_globals.js"
+export { jsenvPluginInjectGlobals } from "./plugins/inject_globals/jsenv_plugin_inject_globals.js"

package/src/omega/kitchen.js

@@ -272,24 +272,36 @@ export const createKitchen = ({
         )
         return
       }
-      const {
+      let {
+        content,
+        contentType,
         data,
         type,
         subtype,
-        contentType = "application/octet-stream",
         originalUrl,
         originalContent,
-        content,
         sourcemap,
         filename,
+
+        status = 200,
+        headers = {},
+        body,
       } = fetchUrlContentReturnValue
+      if (status !== 200) {
+        throw new Error(`unexpected status, ${status}`)
+      }
+      if (content === undefined) {
+        content = body
+      }
+      if (contentType === undefined) {
+        contentType = headers["content-type"] || "application/octet-stream"
+      }
+      urlInfo.contentType = contentType
+      urlInfo.headers = headers
       urlInfo.type =
         type ||
         reference.expectedType ||
-        inferUrlInfoType({
-          url: urlInfo.url,
-          contentType,
-        })
+        inferUrlInfoType({ url: urlInfo.url, contentType })
       urlInfo.subtype =
         subtype ||
         reference.expectedSubtype ||
@@ -298,7 +310,6 @@ export const createKitchen = ({
           type: urlInfo.type,
           subtype: urlInfo.subtype,
         })
-      urlInfo.contentType = contentType
       // during build urls info are reused and load returns originalUrl/originalContent
       urlInfo.originalUrl = originalUrl || urlInfo.originalUrl
       urlInfo.originalContent =

package/src/omega/server/file_service.js

@@ -66,7 +66,7 @@ export const createFileService = ({
         status: 304,
         headers: {
           "cache-control": `private,max-age=0,must-revalidate`,
-          ...urlInfo.responseHeaders,
+          ...urlInfo.headers,
         },
       }
     }
@@ -84,7 +84,6 @@ export const createFileService = ({
         urlInfo.type = null
         urlInfo.subtype = null
         urlInfo.timing = {}
-        urlInfo.responseHeaders = {}
       }
       const { runtimeName, runtimeVersion } = parseUserAgentHeader(
         request.headers["user-agent"],
@@ -100,7 +99,7 @@ export const createFileService = ({
             ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
             : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`,
       })
-      let { response, contentType, content, contentEtag } = urlInfo
+      let { response } = urlInfo
       if (response) {
         return response
       }
@@ -108,13 +107,13 @@ export const createFileService = ({
         url: reference.url,
         status: 200,
         headers: {
-          "content-type": contentType,
-          "content-length": Buffer.byteLength(content),
+          "content-length": Buffer.byteLength(urlInfo.content),
           "cache-control": `private,max-age=0,must-revalidate`,
-          "eTag": contentEtag,
-          ...urlInfo.responseHeaders,
+          "eTag": urlInfo.contentEtag,
+          ...urlInfo.headers,
+          "content-type": urlInfo.contentType,
         },
-        body: content,
+        body: urlInfo.content,
         timing: urlInfo.timing,
       }
       kitchen.pluginController.callHooks(

package/src/omega/url_graph.js

@@ -196,6 +196,6 @@ const createUrlInfo = (url) => {
     sourcemap: null,
     sourcemapReference: null,
     timing: {},
-    responseHeaders: {},
+    headers: {},
   }
 }

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -178,15 +178,11 @@ export const jsenvPluginFileUrls = ({
         }
         const fileBuffer = readFileSync(urlObject)
         const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url)
-        if (CONTENT_TYPE.isTextual(contentType)) {
-          return {
-            contentType,
-            content: String(fileBuffer),
-          }
-        }
         return {
+          content: CONTENT_TYPE.isTextual(contentType)
+            ? String(fileBuffer)
+            : fileBuffer,
           contentType,
-          content: fileBuffer,
         }
       },
     },

package/src/plugins/html_supervisor/client/html_supervisor_setup.js

@@ -32,7 +32,10 @@ window.__html_supervisor__ = {
             lastWindowError = e.error
           }
           const cleanup = () => {
-            document.body.removeChild(script)
+            // the execution of the script itself can remove script from the page
+            if (script.parentNode) {
+              script.parentNode.removeChild(script)
+            }
             window.removeEventListener("error", windowErrorCallback)
           }
           window.addEventListener("error", windowErrorCallback)

package/src/plugins/inject_globals/inject_globals.js

@@ -0,0 +1,57 @@
+import {
+  parseHtmlString,
+  injectScriptAsEarlyAsPossible,
+  createHtmlNode,
+  stringifyHtmlAst,
+} from "@jsenv/utils/html_ast/html_ast.js"
+import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+
+export const injectGlobals = (urlInfo, globals) => {
+  if (urlInfo.type === "html") {
+    return globalInjectorOnHtml(urlInfo, globals)
+  }
+  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
+    return globalsInjectorOnJs(urlInfo, globals)
+  }
+  throw new Error(`cannot inject globals into "${urlInfo.type}"`)
+}
+
+const globalInjectorOnHtml = async (urlInfo, globals) => {
+  // 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 globalsInjectorOnJs = async (urlInfo, globals) => {
+  const clientCode = generateClientCodeForGlobals({
+    globals,
+    isWebWorker:
+      urlInfo.subtype === "worker" ||
+      urlInfo.subtype === "service_worker" ||
+      urlInfo.subtype === "shared_worker",
+  })
+  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/inject_globals/jsenv_plugin_inject_globals.js

@@ -1,76 +1,24 @@
-import {
-  parseHtmlString,
-  injectScriptAsEarlyAsPossible,
-  createHtmlNode,
-  stringifyHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
+import { injectGlobals } from "./inject_globals.js"
 
-export const jsenvPluginInjectGlobals = (globals = {}) => {
-  if (Object.keys(globals).length === 0) {
-    return []
-  }
+export const jsenvPluginInjectGlobals = (urlAssociations) => {
   return {
     name: "jsenv:inject_globals",
     appliesDuring: "*",
-    transformUrlContent: {
-      html: injectGlobals,
-      js_classic: injectGlobals,
-      js_module: injectGlobals,
+    transformUrlContent: async (urlInfo) => {
+      const url = Object.keys(urlAssociations).find((url) => {
+        return url === urlInfo.url
+      })
+      if (!url) {
+        return null
+      }
+      let globals = urlAssociations[url]
+      if (typeof globals === "function") {
+        globals = await globals()
+      }
+      if (Object.keys(globals).length === 0) {
+        return null
+      }
+      return injectGlobals(urlInfo, globals)
     },
   }
 }
-
-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

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

package/src/plugins/inline/jsenv_plugin_inline.js

@@ -26,10 +26,10 @@ const jsenvPluginInlineUrls = () => {
         return null
       }
       return {
-        contentType: urlInfo.contentType,
         // we want to fetch the original content otherwise we might re-cook
         // content already cooked
         content: urlInfo.originalContent,
+        contentType: urlInfo.contentType,
       }
     },
   }

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -110,6 +110,8 @@ const jsenvPluginNodeEsmResolver = ({
       if (urlInfo.url.startsWith("file:///@ignore/")) {
         return {
           content: "export default {}",
+          contentType: "text/javascript",
+          type: "js_module",
         }
       }
       return null

package/src/plugins/plugin_controller.js

@@ -266,11 +266,11 @@ const returnValueAssertions = [
         return { content: valueReturned }
       }
       if (typeof valueReturned === "object") {
-        const { shouldHandle, content } = valueReturned
+        const { shouldHandle, content, body } = valueReturned
         if (shouldHandle === false) {
           return undefined
         }
-        if (typeof content !== "string" && !Buffer.isBuffer(content)) {
+        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}`,
           )

package/src/plugins/plugins.js

@@ -10,7 +10,6 @@ import { jsenvPluginInline } from "./inline/jsenv_plugin_inline.js"
 import { jsenvPluginHtmlSupervisor } from "./html_supervisor/jsenv_plugin_html_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 { jsenvPluginInjectGlobals } from "./inject_globals/jsenv_plugin_inject_globals.js"
 import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js"
 import { jsenvPluginNodeRuntime } from "./node_runtime/jsenv_plugin_node_runtime.js"
 // build only
@@ -32,7 +31,6 @@ export const getCorePlugins = ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = true,
   minification = false,
   bundling = false,
@@ -67,7 +65,6 @@ export const getCorePlugins = ({
     }),
     jsenvPluginUrlResolution(),
     jsenvPluginUrlVersion(),
-    jsenvPluginInjectGlobals(injectedGlobals),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
 

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

@@ -123,11 +123,11 @@ const jsenvPluginAsJsClassicConversion = ({
       })
       urlInfo.data.jsClassicFormat = jsClassicFormat
       return {
+        content,
+        contentType: "text/javascript",
+        type: "js_classic",
         originalUrl: originalUrlInfo.originalUrl,
         originalContent: originalUrlInfo.originalContent,
-        type: "js_classic",
-        contentType: "text/javascript",
-        content,
         sourcemap,
       }
     },

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -98,14 +98,14 @@ const jsenvPluginAsModules = () => {
       }
       const jsonText = JSON.stringify(originalUrlInfo.content.trim())
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         // here we could `export default ${jsonText}`:
         // but js engine are optimized to recognize JSON.parse
         // and use a faster parsing strategy
         content: `export default JSON.parse(${jsonText})`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
       }
     },
   }
@@ -130,10 +130,6 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true,
       })
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(
           inlineContentClientFileUrl,
         )}
@@ -142,6 +138,10 @@ const jsenvPluginAsModules = () => {
   const stylesheet = new CSSStyleSheet()
   stylesheet.replaceSync(inlineContent.text)
   export default stylesheet`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
       }
     },
   }
@@ -166,16 +166,16 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true,
       })
       return {
-        originalUrl: originalUrlInfo.originalUrl,
-        originalContent: originalUrlInfo.originalContent,
-        type: "js_module",
-        contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(
           inlineContentClientFileUrl,
         )}
   
 const inlineContent = new InlineContent(${textPlain}, { type: "text/plain" })
 export default inlineContent.text`,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
       }
     },
   }

package/src/test/execute_plan.js

@@ -57,7 +57,6 @@ export const executePlan = async (
     scenario,
     sourcemaps,
     plugins,
-    injectedGlobals,
     nodeEsmResolution,
     fileSystemMagicResolution,
     transpilation,
@@ -144,7 +143,6 @@ export const executePlan = async (
             htmlSupervisor: true,
             nodeEsmResolution,
             fileSystemMagicResolution,
-            injectedGlobals,
             transpilation: {
               ...transpilation,
               getCustomBabelPlugins: ({ clientRuntimeCompat }) => {

package/src/test/execute_test_plan.js

@@ -83,7 +83,6 @@ export const executeTestPlan = async ({
 
   sourcemaps = "inline",
   plugins = [],
-  injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
   writeGeneratedFiles = false,
@@ -168,7 +167,6 @@ export const executeTestPlan = async ({
     scenario: "test",
     sourcemaps,
     plugins,
-    injectedGlobals,
     nodeEsmResolution,
     fileSystemMagicResolution,
     writeGeneratedFiles,