@jsenv/core 27.0.0-alpha.74 → 27.0.0-alpha.75

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

@@ -2459,78 +2459,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",
@@ -6027,7 +5955,6 @@ const getCorePlugins = ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = true,
   minification = false,
   bundling = false,
@@ -6057,7 +5984,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,
@@ -8396,11 +8323,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 +8343,7 @@ const startDevServer = async ({
   },
   plugins = [],
   urlAnalysis = {},
-  htmlSupervisor = true,
-  injectedGlobals,
+  htmlSupervisor = false,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -8577,7 +8502,6 @@ const startDevServer = async ({
       runtimeCompat,
       urlAnalysis,
       htmlSupervisor,
-      injectedGlobals,
       nodeEsmResolution,
       fileSystemMagicResolution,
       transpilation,
@@ -9135,7 +9059,6 @@ const executePlan = async (plan, {
   scenario,
   sourcemaps,
   plugins,
-  injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -9220,7 +9143,6 @@ const executePlan = async (plan, {
           htmlSupervisor: true,
           nodeEsmResolution,
           fileSystemMagicResolution,
-          injectedGlobals,
           transpilation: { ...transpilation,
             getCustomBabelPlugins: ({
               clientRuntimeCompat
@@ -9738,7 +9660,6 @@ const executeTestPlan = async ({
   coverageSkipFull = false,
   sourcemaps = "inline",
   plugins = [],
-  injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
   writeGeneratedFiles = false,
@@ -9819,7 +9740,6 @@ const executeTestPlan = async ({
     scenario: "test",
     sourcemaps,
     plugins,
-    injectedGlobals,
     nodeEsmResolution,
     fileSystemMagicResolution,
     writeGeneratedFiles,
@@ -11899,7 +11819,6 @@ const build = async ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   directoryReferenceAllowed,
-  injectedGlobals,
   transpilation = {},
   bundling = true,
   minification = true,
@@ -11908,11 +11827,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 +11930,6 @@ build ${entryPointKeys.length} entry points`);
         nodeEsmResolution,
         fileSystemMagicResolution,
         directoryReferenceAllowed,
-        injectedGlobals,
         transpilation: { ...transpilation,
           babelHelpersAsImport: !useExplicitJsClassicConversion,
           jsModuleAsJsClassic: false
@@ -13307,7 +13224,6 @@ const execute = async ({
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
-  injectedGlobals,
   transpilation,
   htmlSupervisor = true,
   writeGeneratedFiles = false,
@@ -13361,7 +13277,6 @@ const execute = async ({
         scenario,
         runtimeCompat,
         htmlSupervisor,
-        injectedGlobals,
         nodeEsmResolution,
         fileSystemMagicResolution,
         transpilation
@@ -13436,4 +13351,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.74",
+  "version": "27.0.0-alpha.75",
   "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.4",
+    "@jsenv/filesystem": "4.0.5",
     "@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.7",
+    "@jsenv/utils": "1.8.8",
     "@jsenv/url-meta": "7.0.0",
-    "@jsenv/urls": "1.2.1",
+    "@jsenv/urls": "1.2.2",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

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,

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/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/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/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,