@jsenv/core 27.0.0-alpha.69 → 27.0.0-alpha.71

package/dist/js/html_supervisor_installer.js

@@ -393,25 +393,19 @@ const installHtmlSupervisor = ({
     }
   };
 
-  const queue = [];
-  let previousDonePromise = null;
-
-  const dequeue = () => {
-    const next = queue.shift();
-
-    if (next) {
-      __html_supervisor__.addScriptToExecute(next);
+  const classicExecutionQueue = createExecutionQueue(performExecution);
+  const deferedExecutionQueue = createExecutionQueue(performExecution);
+  deferedExecutionQueue.waitFor(new Promise(resolve => {
+    if (document.readyState === "interactive" || document.readyState === "complete") {
+      resolve();
     } else {
-      const nextDefered = deferQueue.shift();
-
-      if (nextDefered) {
-        __html_supervisor__.addScriptToExecute(nextDefered);
-      }
+      document.addEventListener("readystatechange", () => {
+        if (document.readyState === "interactive") {
+          resolve();
+        }
+      });
     }
-  };
-
-  const deferQueue = [];
-  let previousDeferDonePromise = null;
+  }));
 
   __html_supervisor__.addScriptToExecute = async scriptToExecute => {
     if (scriptToExecute.async) {
@@ -422,52 +416,19 @@ const installHtmlSupervisor = ({
     const useDeferQueue = scriptToExecute.defer || scriptToExecute.type === "js_module";
 
     if (useDeferQueue) {
-      if (document.readyState !== "interactive") {
-        deferQueue.push(scriptToExecute);
-        return;
-      }
-
-      if (previousDonePromise) {
-        // defer must wait for the regular script to be done
-        deferQueue.push(scriptToExecute);
-        return;
-      }
+      // defer must wait for classic script to be done
+      const classicExecutionPromise = classicExecutionQueue.getPromise();
 
-      if (previousDeferDonePromise) {
-        deferQueue.push(scriptToExecute);
-        return;
+      if (classicExecutionPromise) {
+        deferedExecutionQueue.waitFor(classicExecutionPromise);
       }
 
-      previousDeferDonePromise = performExecution(scriptToExecute);
-      await previousDeferDonePromise;
-      previousDeferDonePromise = null;
-      dequeue();
-      return;
-    }
-
-    if (previousDonePromise) {
-      queue.push(scriptToExecute);
-      return;
+      deferedExecutionQueue.executeAsap(scriptToExecute);
+    } else {
+      classicExecutionQueue.executeAsap(scriptToExecute);
     }
-
-    previousDonePromise = performExecution(scriptToExecute);
-    await previousDonePromise;
-    previousDonePromise = null;
-    dequeue();
   };
 
-  if (document.readyState !== "interactive" && document.readyState !== "complete") {
-    document.addEventListener("readystatechange", () => {
-      if (document.readyState === "interactive") {
-        const nextDefered = deferQueue.shift();
-
-        if (nextDefered) {
-          __html_supervisor__.addScriptToExecute(nextDefered);
-        }
-      }
-    });
-  }
-
   __html_supervisor__.collectScriptResults = async () => {
     collectCalled = true;
 
@@ -519,4 +480,43 @@ const superviseScriptTypeModule = ({
   });
 };
 
+const createExecutionQueue = execute => {
+  const scripts = [];
+  let promiseToWait = null;
+
+  const waitFor = async promise => {
+    promiseToWait = promise;
+    promiseToWait.then(() => {
+      promiseToWait = null;
+      dequeue();
+    }, () => {
+      promiseToWait = null;
+      dequeue();
+    });
+  };
+
+  const executeAsap = async script => {
+    if (promiseToWait) {
+      scripts.push(script);
+      return;
+    }
+
+    waitFor(execute(script));
+  };
+
+  const dequeue = () => {
+    const scriptWaiting = scripts.shift();
+
+    if (scriptWaiting) {
+      __html_supervisor__.addScriptToExecute(scriptWaiting);
+    }
+  };
+
+  return {
+    waitFor,
+    executeAsap,
+    getPromise: () => promiseToWait
+  };
+};
+
 export { installHtmlSupervisor, superviseScriptTypeModule };

package/dist/main.js

@@ -2724,30 +2724,12 @@ export default inlineContent.text`
   return [asJsonModule, asCssModule, asTextModule];
 };
 
-// https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-core/src/tools/build-external-helpers.js
-// the list of possible helpers:
-// https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-helpers/src/helpers.js#L13
-const babelHelperClientDirectoryUrl = new URL("./babel_helpers/", import.meta.url).href; // we cannot use "@jsenv/core/src/*" because babel helper might be injected
-// into node_modules not depending on "@jsenv/core"
-
-const getBabelHelperFileUrl = babelHelperName => {
-  const babelHelperFileUrl = new URL(`./${babelHelperName}/${babelHelperName}.js`, babelHelperClientDirectoryUrl).href;
-  return babelHelperFileUrl;
-};
-const babelHelperNameFromUrl = url => {
-  if (!url.startsWith(babelHelperClientDirectoryUrl)) {
-    return null;
-  }
-
-  const afterBabelHelperDirectory = url.slice(babelHelperClientDirectoryUrl.length);
-  const babelHelperName = afterBabelHelperDirectory.slice(0, afterBabelHelperDirectory.indexOf("/"));
-  return babelHelperName;
-};
-
-const require$4 = createRequire(import.meta.url); // eslint-disable-next-line import/no-dynamic-require
+const require$4 = createRequire(import.meta.url);
 
+const babelPluginPackagePath = require$4.resolve("@jsenv/babel-plugins");
 
-const requireBabelPlugin = name => require$4(name);
+const babelPluginPackageUrl = pathToFileURL(babelPluginPackagePath);
+const requireBabelPlugin = createRequire(babelPluginPackageUrl);
 
 const babelPluginTransformImportMetaUrl = babel => {
   return {
@@ -3499,6 +3481,26 @@ const getFeatureCompat = feature => {
   return feature;
 };
 
+// https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-core/src/tools/build-external-helpers.js
+// the list of possible helpers:
+// https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-helpers/src/helpers.js#L13
+const babelHelperClientDirectoryUrl = new URL("./babel_helpers/", import.meta.url).href; // we cannot use "@jsenv/core/src/*" because babel helper might be injected
+// into node_modules not depending on "@jsenv/core"
+
+const getBabelHelperFileUrl = babelHelperName => {
+  const babelHelperFileUrl = new URL(`./${babelHelperName}/${babelHelperName}.js`, babelHelperClientDirectoryUrl).href;
+  return babelHelperFileUrl;
+};
+const babelHelperNameFromUrl = url => {
+  if (!url.startsWith(babelHelperClientDirectoryUrl)) {
+    return null;
+  }
+
+  const afterBabelHelperDirectory = url.slice(babelHelperClientDirectoryUrl.length);
+  const babelHelperName = afterBabelHelperDirectory.slice(0, afterBabelHelperDirectory.indexOf("/"));
+  return babelHelperName;
+};
+
 /* eslint-disable camelcase */
 // copied from
 // https://github.com/babel/babel/blob/e498bee10f0123bb208baa228ce6417542a2c3c4/packages/babel-compat-data/data/plugins.json#L1
@@ -8403,7 +8405,7 @@ const startDevServer = async ({
   // - inside a forked child process
   // - inside a worker thread
   // (because node cluster won't work)
-  devServerAutoreload = typeof process.send !== "function" && !parentPort && !process.debugPort,
+  devServerAutoreload = typeof process.send !== "function" && !parentPort && !process.env.VSCODE_INSPECTOR_OPTIONS,
   clientFiles = {
     "./**": true,
     "./**/.*/": false,
@@ -13143,7 +13145,7 @@ const startBuildServer = async ({
   // - inside a forked child process
   // - inside a worker thread
   // (because node cluster won't work)
-  buildServerAutoreload = typeof process.send !== "function" && !parentPort && !process.debugPort,
+  buildServerAutoreload = typeof process.send !== "function" && !parentPort && !process.env.VSCODE_INSPECTOR_OPTIONS,
   cooldownBetweenFileEvents
 }) => {
   const logger = createLogger({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.69",
+  "version": "27.0.0-alpha.71",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -68,7 +68,7 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
-    "@jsenv/babel-plugins": "1.0.2",
+    "@jsenv/babel-plugins": "1.0.3",
     "@jsenv/filesystem": "4.0.2",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",

package/src/build/start_build_server.js

@@ -61,7 +61,7 @@ export const startBuildServer = async ({
   // (because node cluster won't work)
   buildServerAutoreload = typeof process.send !== "function" &&
     !parentPort &&
-    !process.debugPort,
+    !process.env.VSCODE_INSPECTOR_OPTIONS,
   cooldownBetweenFileEvents,
 }) => {
   const logger = createLogger({ logLevel })

package/src/dev/start_dev_server.js

@@ -42,7 +42,7 @@ export const startDevServer = async ({
   // (because node cluster won't work)
   devServerAutoreload = typeof process.send !== "function" &&
     !parentPort &&
-    !process.debugPort,
+    !process.env.VSCODE_INSPECTOR_OPTIONS,
   clientFiles = {
     "./**": true,
     "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)

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

@@ -133,21 +133,24 @@ export const installHtmlSupervisor = ({ logs, measurePerf }) => {
     }
   }
 
-  const queue = []
-  let previousDonePromise = null
-  const dequeue = () => {
-    const next = queue.shift()
-    if (next) {
-      __html_supervisor__.addScriptToExecute(next)
-    } else {
-      const nextDefered = deferQueue.shift()
-      if (nextDefered) {
-        __html_supervisor__.addScriptToExecute(nextDefered)
+  const classicExecutionQueue = createExecutionQueue(performExecution)
+  const deferedExecutionQueue = createExecutionQueue(performExecution)
+  deferedExecutionQueue.waitFor(
+    new Promise((resolve) => {
+      if (
+        document.readyState === "interactive" ||
+        document.readyState === "complete"
+      ) {
+        resolve()
+      } else {
+        document.addEventListener("readystatechange", () => {
+          if (document.readyState === "interactive") {
+            resolve()
+          }
+        })
       }
-    }
-  }
-  const deferQueue = []
-  let previousDeferDonePromise = null
+    }),
+  )
   __html_supervisor__.addScriptToExecute = async (scriptToExecute) => {
     if (scriptToExecute.async) {
       performExecution(scriptToExecute)
@@ -156,46 +159,15 @@ export const installHtmlSupervisor = ({ logs, measurePerf }) => {
     const useDeferQueue =
       scriptToExecute.defer || scriptToExecute.type === "js_module"
     if (useDeferQueue) {
-      if (document.readyState !== "interactive") {
-        deferQueue.push(scriptToExecute)
-        return
-      }
-      if (previousDonePromise) {
-        // defer must wait for the regular script to be done
-        deferQueue.push(scriptToExecute)
-        return
-      }
-      if (previousDeferDonePromise) {
-        deferQueue.push(scriptToExecute)
-        return
+      // defer must wait for classic script to be done
+      const classicExecutionPromise = classicExecutionQueue.getPromise()
+      if (classicExecutionPromise) {
+        deferedExecutionQueue.waitFor(classicExecutionPromise)
       }
-      previousDeferDonePromise = performExecution(scriptToExecute)
-      await previousDeferDonePromise
-      previousDeferDonePromise = null
-      dequeue()
-      return
-    }
-    if (previousDonePromise) {
-      queue.push(scriptToExecute)
-      return
+      deferedExecutionQueue.executeAsap(scriptToExecute)
+    } else {
+      classicExecutionQueue.executeAsap(scriptToExecute)
     }
-    previousDonePromise = performExecution(scriptToExecute)
-    await previousDonePromise
-    previousDonePromise = null
-    dequeue()
-  }
-  if (
-    document.readyState !== "interactive" &&
-    document.readyState !== "complete"
-  ) {
-    document.addEventListener("readystatechange", () => {
-      if (document.readyState === "interactive") {
-        const nextDefered = deferQueue.shift()
-        if (nextDefered) {
-          __html_supervisor__.addScriptToExecute(nextDefered)
-        }
-      }
-    })
   }
 
   __html_supervisor__.collectScriptResults = async () => {
@@ -240,3 +212,43 @@ export const superviseScriptTypeModule = ({ src, isInline }) => {
     execute: () => import(new URL(src, document.location.href).href),
   })
 }
+
+const createExecutionQueue = (execute) => {
+  const scripts = []
+
+  let promiseToWait = null
+  const waitFor = async (promise) => {
+    promiseToWait = promise
+    promiseToWait.then(
+      () => {
+        promiseToWait = null
+        dequeue()
+      },
+      () => {
+        promiseToWait = null
+        dequeue()
+      },
+    )
+  }
+
+  const executeAsap = async (script) => {
+    if (promiseToWait) {
+      scripts.push(script)
+      return
+    }
+    waitFor(execute(script))
+  }
+
+  const dequeue = () => {
+    const scriptWaiting = scripts.shift()
+    if (scriptWaiting) {
+      __html_supervisor__.addScriptToExecute(scriptWaiting)
+    }
+  }
+
+  return {
+    waitFor,
+    executeAsap,
+    getPromise: () => promiseToWait,
+  }
+}

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

@@ -15,11 +15,11 @@ import { createRequire } from "node:module"
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
 
-import { requireBabelPlugin } from "@jsenv/babel-plugins"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
 
+import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
 import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"
 import { jsenvPluginAsJsClassicWorkers } from "./jsenv_plugin_as_js_classic_workers.js"

package/src/plugins/transpilation/babel/helpers/babel_plugin_structure.js

@@ -1,4 +1,5 @@
-import { getBabelHelperFileUrl, requireBabelPlugin } from "@jsenv/babel-plugins"
+import { getBabelHelperFileUrl } from "@jsenv/babel-plugins"
+import { requireBabelPlugin } from "../require_babel_plugin.js"
 import { babelPluginCompatMap } from "./babel_plugins_compatibility.js"
 
 export const getBaseBabelPluginStructure = ({

package/src/plugins/transpilation/babel/require_babel_plugin.js

@@ -0,0 +1,8 @@
+import { createRequire } from "node:module"
+import { pathToFileURL } from "node:url"
+
+const require = createRequire(import.meta.url)
+const babelPluginPackagePath = require.resolve("@jsenv/babel-plugins")
+const babelPluginPackageUrl = pathToFileURL(babelPluginPackagePath)
+
+export const requireBabelPlugin = createRequire(babelPluginPackageUrl)

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -1,6 +1,5 @@
-import { requireBabelPlugin } from "@jsenv/babel-plugins"
-
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { requireBabelPlugin } from "./babel/require_babel_plugin.js"
 
 export const jsenvPluginTopLevelAwait = () => {
   return {