@jsenv/core 27.0.0-alpha.68 → 27.0.0-alpha.70

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

@@ -8403,7 +8403,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 +13143,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.68",
+  "version": "27.0.0-alpha.70",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -69,7 +69,7 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.2",
-    "@jsenv/filesystem": "4.0.1",
+    "@jsenv/filesystem": "4.0.2",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.6.3",
@@ -77,8 +77,8 @@
     "@jsenv/node-esm-resolution": "0.0.10",
     "@jsenv/server": "12.6.3",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.8.4",
-    "@jsenv/urls": "1.1.1",
+    "@jsenv/utils": "1.8.5",
+    "@jsenv/urls": "1.1.2",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

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,
+  }
+}