@jsenv/core 24.5.6 → 24.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "24.5.6",
+  "version": "24.6.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -45,55 +45,55 @@
     "playwright": "1.x"
   },
   "dependencies": {
-    "@babel/core": "7.16.0",
+    "@babel/core": "7.16.5",
     "@babel/helper-module-imports": "7.16.0",
-    "@babel/helpers": "7.16.3",
-    "@babel/parser": "7.16.4",
-    "@babel/plugin-proposal-dynamic-import": "7.16.0",
+    "@babel/helpers": "7.16.5",
+    "@babel/parser": "7.16.6",
+    "@babel/plugin-proposal-dynamic-import": "7.16.5",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-syntax-import-assertions": "7.16.0",
+    "@babel/plugin-syntax-import-assertions": "7.16.5",
     "@babel/plugin-syntax-import-meta": "7.10.4",
     "@babel/plugin-syntax-numeric-separator": "7.10.4",
-    "@babel/plugin-transform-modules-systemjs": "7.16.0",
+    "@babel/plugin-transform-modules-systemjs": "7.16.5",
     "@c88/v8-coverage": "0.1.1",
     "@jsenv/abort": "4.1.2",
-    "@jsenv/filesystem": "2.5.1",
+    "@jsenv/filesystem": "2.6.0",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/log": "1.5.0",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/server": "12.2.0",
+    "@jsenv/server": "12.2.1",
     "@jsenv/uneval": "1.6.0",
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "13.0.6",
+    "@rollup/plugin-node-resolve": "13.1.1",
     "@rollup/plugin-replace": "3.0.0",
     "acorn-import-assertions": "1.8.0",
     "ansi-to-html": "0.7.2",
     "bytes": "3.1.1",
     "cjs-module-lexer": "1.2.2",
-    "construct-style-sheets-polyfill": "3.0.4",
-    "cssnano": "5.0.11",
-    "cssnano-preset-default": "5.1.7",
+    "construct-style-sheets-polyfill": "3.0.5",
+    "cssnano": "5.0.14",
+    "cssnano-preset-default": "5.1.9",
     "cuid": "2.1.8",
-    "estree-walker": "3.0.0",
+    "estree-walker": "3.0.1",
     "html-minifier": "4.0.0",
-    "humanize-duration": "3.27.0",
+    "humanize-duration": "3.27.1",
     "is-valid-identifier": "2.0.2",
     "istanbul-lib-coverage": "3.2.0",
     "istanbul-lib-instrument": "5.1.0",
     "istanbul-lib-report": "3.0.0",
-    "istanbul-reports": "3.0.5",
+    "istanbul-reports": "3.1.1",
     "magic-string": "0.25.7",
     "parse5": "6.0.1",
     "pidtree": "0.5.0",
-    "postcss": "8.3.11",
-    "postcss-value-parser": "4.1.0",
+    "postcss": "8.4.5",
+    "postcss-value-parser": "4.2.0",
     "regenerator-runtime": "0.13.9",
     "resolve": "1.20.0",
-    "rollup": "2.60.1",
+    "rollup": "2.61.1",
     "rollup-plugin-node-builtins-brofs": "2.1.3",
     "rollup-plugin-node-globals": "1.4.0",
-    "rollup-plugin-polyfill-node": "0.7.0",
+    "rollup-plugin-polyfill-node": "0.8.0",
     "source-map": "0.7.3",
     "systemjs": "6.11.0",
     "terser": "5.10.0",
@@ -103,20 +103,20 @@
     "wrap-ansi": "8.0.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.16.3",
-    "@babel/plugin-syntax-jsx": "7.16.0",
-    "@babel/plugin-transform-block-scoping": "7.16.0",
-    "@babel/plugin-transform-react-jsx": "7.16.0",
+    "@babel/eslint-parser": "7.16.5",
+    "@babel/plugin-syntax-jsx": "7.16.5",
+    "@babel/plugin-transform-block-scoping": "7.16.5",
+    "@babel/plugin-transform-react-jsx": "7.16.5",
     "@babel/plugin-transform-typescript": "7.16.1",
-    "@babel/preset-env": "7.16.4",
-    "@jsenv/assert": "2.3.2",
+    "@babel/preset-env": "7.16.5",
+    "@jsenv/assert": "2.4.0",
     "@jsenv/babel-preset": "./packages/jsenv-babel-preset",
     "@jsenv/eslint-config": "16.0.9",
     "@jsenv/file-size-impact": "12.1.1",
     "@jsenv/github-release-package": "1.2.3",
     "@jsenv/https-local": "1.0.3",
     "@jsenv/importmap-eslint-resolver": "5.2.1",
-    "@jsenv/importmap-node-module": "2.8.0",
+    "@jsenv/importmap-node-module": "5.0.0",
     "@jsenv/package-publish": "1.6.2",
     "@jsenv/performance-impact": "2.2.1",
     "@jsenv/pwa": "4.0.0",
@@ -126,10 +126,10 @@
     "eslint-plugin-import": "2.25.3",
     "eslint-plugin-react": "7.27.1",
     "node-notifier": "10.0.0",
-    "playwright": "1.16.3",
+    "playwright": "1.17.1",
     "postcss-import": "14.0.2",
-    "preact": "10.5.15",
-    "prettier": "2.4.1",
+    "preact": "10.6.4",
+    "prettier": "2.5.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "redux": "4.1.2",

package/readme.md

@@ -61,7 +61,7 @@ export const countDogs = (animals) => {
 </html>
 ```
 
-2 - Create _execute_test_plan.mjs_
+2 - Create _test.mjs_
 
 ```js
 import {
@@ -70,7 +70,7 @@ import {
   firefoxTabRuntime,
 } from "@jsenv/core"
 
-executeTestPlan({
+await executeTestPlan({
   projectDirectoryUrl: new URL("./", import.meta.url),
   testPlan: {
     "./animals.test.html": {
@@ -94,24 +94,24 @@ npx playwright install-deps
 npx playwright install
 ```
 
-4 - Run _execute_test_plan.mjs_ with Node.js
+4 - Run _test.mjs_ with Node.js
 
 ```console
-> node ./execute_test_plan.mjs
+> node ./test.mjs
 
 ✔ execution 1 of 2 completed (all completed)
 file: animals.test.html
-runtime: chromium/82.0.4057.0
-duration: 1.2 seconds
+runtime: chromium/97.0.4666.0
+duration: 0.45 seconds
 
 ✔ execution 2 of 2 completed (all completed)
 file: animals.test.html
-runtime: firefox/73.0b13
-duration: 2.4 seconds
+runtime: firefox/93.0
+duration: 0.81 seconds
 
 -------------- summary -----------------
 2 executions: all completed
-total duration: 3.6 seconds
+total duration: 1.2 seconds
 ----------------------------------------
 ```
 
@@ -119,7 +119,7 @@ To read more about testing in jsenv, check [jsenv test runner documentation](./d
 
 # Dev server overview
 
-You have an html file that you want to open in a browser on your machine.
+You want to execute the following _main.html_ file in a browser.
 
 ```html
 <!DOCTYPE html>
@@ -145,11 +145,11 @@ npm install --save-dev @jsenv/core
 ```js
 import { startDevServer } from "@jsenv/core"
 
-startDevServer({
+await startDevServer({
   projectDirectoryUrl: new URL("./", import.meta.url),
   explorableConfig: {
     source: {
-      "**/*.html": true,
+      "./*.html": true,
     },
   },
   port: 3456,
@@ -336,9 +336,7 @@ Jsenv configuration is done in [jsenv.config.mjs](#jsenvconfigmjs) and [babel.co
 
 ## jsenv.config.mjs
 
-Jsenv codebase usually puts configuration in a top level file named _jsenv.config.mjs_.
-
-It's recommended to use the following _jsenv.config.mjs_
+We recommend to put configuration in a top level file named _jsenv.config.mjs_ like the one below:
 
 ```js
 /*

package/src/buildProject.js

@@ -159,9 +159,8 @@ export const buildProject = async ({
     jsenvDirectoryRelativeUrl,
     jsenvDirectoryClean,
     // build compiled files are written into a different directory
-    // than exploring-server. This is because here we compile for rollup
+    // than dev-server. This is because here we compile for rollup
     // that is expecting esmodule format, not systemjs
-    // + some more differences like import.meta.dev
     outDirectoryName: "build",
     importDefaultExtension,
     moduleOutFormat: "esmodule", // rollup or jsenv rollup plugin will transform into the right format

package/src/executeTestPlan.js

@@ -32,20 +32,23 @@ export const executeTestPlan = async ({
   importDefaultExtension,
 
   testPlan,
-  defaultMsAllocatedPerExecution,
-  cooldownBetweenExecutions,
 
-  maxExecutionsInParallel,
+  logMemoryHeapUsage = false,
   completedExecutionLogAbbreviation = false,
   completedExecutionLogMerging = false,
   logSummary = true,
   updateProcessExitCode = true,
+
+  maxExecutionsInParallel = 1,
+  defaultMsAllocatedPerExecution = 30000,
   // stopAfterExecute: true to ensure runtime is stopped once executed
   // because we have what we wants: execution is completed and
   // we have associated coverage and capturedConsole
   // passsing false means all node process and browsers launched stays opened
   // (can eventually be used for debug)
   stopAfterExecute = true,
+  cooldownBetweenExecutions = 0,
+  gcBetweenExecutions = logMemoryHeapUsage,
 
   coverage = process.argv.includes("--cover") ||
     process.argv.includes("--coverage"),
@@ -148,13 +151,16 @@ export const executeTestPlan = async ({
     importResolutionMethod,
     importDefaultExtension,
 
+    logMemoryHeapUsage,
+    completedExecutionLogMerging,
+    completedExecutionLogAbbreviation,
+    logSummary,
+
     defaultMsAllocatedPerExecution,
     maxExecutionsInParallel,
     stopAfterExecute,
     cooldownBetweenExecutions,
-    completedExecutionLogMerging,
-    completedExecutionLogAbbreviation,
-    logSummary,
+    gcBetweenExecutions,
 
     coverage,
     coverageConfig,

package/src/internal/browser_detection/browser_detection.js

@@ -1,6 +1,7 @@
 // https://github.com/Ahmdrza/detect-browser/blob/26254f85cf92795655a983bfd759d85f3de850c6/detect-browser.js#L1
 // https://github.com/lancedikson/bowser/blob/master/src/parser-browsers.js#L1
 
+import { detectFromUserAgentData } from "./user_agent_data.js"
 import { detectAndroid } from "./detectAndroid.js"
 import { detectInternetExplorer } from "./detectInternetExplorer.js"
 import { detectOpera } from "./detectOpera.js"
@@ -25,6 +26,7 @@ const detectorCompose = (detectors) => () => {
 }
 
 const detector = detectorCompose([
+  detectFromUserAgentData, // keep this first
   detectOpera,
   detectInternetExplorer,
   detectEdge,

package/src/internal/browser_detection/detectChrome.js

@@ -1,18 +1,6 @@
 import { userAgentToVersion, firstMatch } from "./util.js"
 
 export const detectChrome = () => {
-  const { userAgentData } = window.navigator
-  if (userAgentData) {
-    const brand = userAgentData.brands.some((brand) => {
-      return brand.brand === "chromium" || brand.brand === "Google Chrome"
-    })
-    if (brand) {
-      return {
-        name: "chrome",
-        version: brand.version,
-      }
-    }
-  }
   return userAgentToBrowser(window.navigator.userAgent)
 }
 

package/src/internal/browser_detection/user_agent_data.js

@@ -0,0 +1,26 @@
+/*
+ * Prefer window.navigator.userAgentData before resorting to
+ * window.navigator.userAgent because of
+ * https://blog.chromium.org/2021/09/user-agent-reduction-origin-trial-and-dates.html
+ */
+
+export const detectFromUserAgentData = () => {
+  const { userAgentData } = window.navigator
+  if (!userAgentData) {
+    return null
+  }
+
+  const { brands } = userAgentData
+  let i = 0
+  while (i < brands.length) {
+    const { brand, version } = brands[i]
+    i++
+    if (brand === "chromium" || brand === "Google Chrome") {
+      return {
+        name: "chrome",
+        version,
+      }
+    }
+  }
+  return null
+}

package/src/internal/browser_launcher/executeHtmlFile.js

@@ -30,6 +30,7 @@ export const executeHtmlFile = async (
     coverageForceIstanbul,
     coveragePlaywrightAPIAvailable,
     transformErrorHook,
+    forceCompilation,
   },
 ) => {
   const fileUrl = resolveUrl(fileRelativeUrl, projectDirectoryUrl)
@@ -66,7 +67,7 @@ export const executeHtmlFile = async (
     let executionResult
     const { canAvoidCompilation, compileId } = browserRuntimeFeaturesReport
     executeOperation.throwIfAborted()
-    if (canAvoidCompilation) {
+    if (canAvoidCompilation && !forceCompilation) {
       executionResult = await executeSource({
         projectDirectoryUrl,
         compileServerOrigin,

package/src/internal/browser_launcher/from_playwright.js

@@ -45,6 +45,7 @@ export const createRuntimeFromPlaywright = ({
     stopOnExit = true,
     ignoreHTTPSErrors = true,
     stopAfterAllExecutionCallbackList,
+    forceCompilation,
   }) => {
     const stopCallbackList = createCallbackListNotifiedOnce()
     const stoppedCallbackList = createCallbackListNotifiedOnce()
@@ -139,6 +140,7 @@ export const createRuntimeFromPlaywright = ({
 
       coveragePlaywrightAPIAvailable,
       transformErrorHook,
+      forceCompilation,
     })
 
     return {
@@ -272,6 +274,7 @@ const createExecuteHook = ({
 
   coveragePlaywrightAPIAvailable,
   transformErrorHook,
+  forceCompilation,
 }) => {
   const execute = async ({ signal, fileRelativeUrl }) => {
     const executeOperation = Abort.startOperation()
@@ -294,6 +297,7 @@ const createExecuteHook = ({
       coveragePlaywrightAPIAvailable,
       coverageIgnorePredicate,
       transformErrorHook,
+      forceCompilation,
     })
     return result
   }

package/src/internal/compiling/js-compilation-service/jsenvTransform.js

@@ -52,6 +52,9 @@ export const jsenvTransform = async ({
     parserOpts: {
       allowAwaitOutsideFunction: allowTopLevelAwait,
     },
+    generatorOpts: {
+      compact: false,
+    },
   }
 
   const babelHelperName = filePathToBabelHelperName(inputPath)

package/src/internal/executing/createSummaryLog.js

@@ -1,16 +1,17 @@
 import { ANSI } from "@jsenv/log"
 
 import { msAsDuration } from "../logs/msAsDuration.js"
+import { formatByte } from "../logs/byte.js"
 import { EXECUTION_COLORS } from "./execution_colors.js"
 
 export const createSummaryLog = (
   summary,
 ) => `-------------- summary -----------------
-${createSummaryMessage(summary)}
+${createAllExecutionsSummary(summary)}
 total duration: ${msAsDuration(summary.duration)}
 ----------------------------------------`
 
-const createSummaryMessage = ({
+const createAllExecutionsSummary = ({
   executionCount,
   abortedCount,
   timedoutCount,
@@ -24,7 +25,7 @@ const createSummaryMessage = ({
 
   const executionLabel =
     executionCount === 1 ? `1 execution` : `${executionCount} executions`
-  return `${executionLabel}: ${createSummaryDetails({
+  return `${executionLabel}: ${createStatusSummary({
     executionCount,
     abortedCount,
     timedoutCount,
@@ -34,7 +35,32 @@ const createSummaryMessage = ({
   })}`
 }
 
-export const createSummaryDetails = ({
+export const createIntermediateSummary = ({
+  executionCount,
+  abortedCount,
+  timedoutCount,
+  erroredCount,
+  completedCount,
+  cancelledCount,
+  memoryHeap,
+}) => {
+  let intermediateSummary = createStatusSummary({
+    executionCount,
+    abortedCount,
+    timedoutCount,
+    erroredCount,
+    completedCount,
+    cancelledCount,
+  })
+
+  if (memoryHeap) {
+    intermediateSummary += ` / memory heap: ${formatByte(memoryHeap)}`
+  }
+
+  return intermediateSummary
+}
+
+const createStatusSummary = ({
   executionCount,
   abortedCount,
   timedoutCount,

package/src/internal/executing/executeConcurrently.js

@@ -1,4 +1,5 @@
 import { existsSync } from "node:fs"
+import { memoryUsage } from "node:process"
 import wrapAnsi from "wrap-ansi"
 import cuid from "cuid"
 import { loggerToLevels } from "@jsenv/logger"
@@ -17,6 +18,7 @@ import { launchAndExecute } from "../executing/launchAndExecute.js"
 import { reportToCoverage } from "./coverage/reportToCoverage.js"
 import { formatExecuting, formatExecutionResult } from "./executionLogs.js"
 import { createSummaryLog } from "./createSummaryLog.js"
+import { ensureGlobalGc } from "./gc.js"
 
 export const executeConcurrently = async (
   executionSteps,
@@ -28,16 +30,19 @@ export const executeConcurrently = async (
 
     projectDirectoryUrl,
     compileServer,
-
     babelPluginMap,
 
-    defaultMsAllocatedPerExecution = 30000,
-    cooldownBetweenExecutions = 0,
-    maxExecutionsInParallel = 1,
-    stopAfterExecute,
+    logSummary,
+    logMemoryHeapUsage,
     completedExecutionLogMerging,
     completedExecutionLogAbbreviation,
 
+    maxExecutionsInParallel,
+    defaultMsAllocatedPerExecution,
+    stopAfterExecute,
+    cooldownBetweenExecutions,
+    gcBetweenExecutions,
+
     coverage,
     coverageConfig,
     coverageIncludeMissing,
@@ -48,8 +53,6 @@ export const executeConcurrently = async (
 
     beforeExecutionCallback = () => {},
     afterExecutionCallback = () => {},
-
-    logSummary,
   },
 ) => {
   if (completedExecutionLogMerging && !process.stdout.isTTY) {
@@ -62,12 +65,15 @@ export const executeConcurrently = async (
   const executionSpinner = executionLogsEnabled && process.stdout.isTTY
 
   const startMs = Date.now()
-
   const report = {}
   const executionCount = executionSteps.length
 
   let transformReturnValue = (value) => value
 
+  if (gcBetweenExecutions) {
+    ensureGlobalGc()
+  }
+
   const coverageTempDirectoryUrl = resolveUrl(
     coverageTempDirectoryRelativeUrl,
     projectDirectoryUrl,
@@ -185,6 +191,9 @@ export const executeConcurrently = async (
             timedoutCount,
             erroredCount,
             completedCount,
+            ...(logMemoryHeapUsage
+              ? { memoryHeap: memoryUsage().heapUsed }
+              : {}),
           }),
         })
       }
@@ -249,6 +258,10 @@ export const executeConcurrently = async (
         completedCount++
       }
 
+      if (gcBetweenExecutions) {
+        global.gc()
+      }
+
       if (executionLogsEnabled) {
         let log = formatExecutionResult(afterExecutionInfo, {
           completedExecutionLogAbbreviation,
@@ -257,6 +270,7 @@ export const executeConcurrently = async (
           timedoutCount,
           erroredCount,
           completedCount,
+          ...(logMemoryHeapUsage ? { memoryHeap: memoryUsage().heapUsed } : {}),
         })
         log = `${log}
 

package/src/internal/executing/executePlan.js

@@ -24,13 +24,16 @@ export const executePlan = async (
     importResolutionMethod,
     importDefaultExtension,
 
+    logSummary,
+    logMemoryHeapUsage,
+    completedExecutionLogMerging,
+    completedExecutionLogAbbreviation,
+
     defaultMsAllocatedPerExecution,
     maxExecutionsInParallel,
+    gcBetweenExecutions,
     stopAfterExecute,
     cooldownBetweenExecutions,
-    completedExecutionLogMerging,
-    completedExecutionLogAbbreviation,
-    logSummary,
 
     coverage,
     coverageConfig,
@@ -169,13 +172,16 @@ export const executePlan = async (
 
       babelPluginMap: compileServer.babelPluginMap,
 
+      logSummary,
+      logMemoryHeapUsage,
+      completedExecutionLogMerging,
+      completedExecutionLogAbbreviation,
+
       defaultMsAllocatedPerExecution,
       maxExecutionsInParallel,
       stopAfterExecute,
+      gcBetweenExecutions,
       cooldownBetweenExecutions,
-      completedExecutionLogMerging,
-      completedExecutionLogAbbreviation,
-      logSummary,
 
       coverage,
       coverageConfig,

package/src/internal/executing/executionLogs.js

@@ -2,11 +2,18 @@ import { ANSI, UNICODE } from "@jsenv/log"
 
 import { msAsDuration } from "../logs/msAsDuration.js"
 import { EXECUTION_COLORS } from "./execution_colors.js"
-import { createSummaryDetails } from "./createSummaryLog.js"
+import { createIntermediateSummary } from "./createSummaryLog.js"
 
 export const formatExecuting = (
   { executionIndex },
-  { executionCount, abortedCount, timedoutCount, erroredCount, completedCount },
+  {
+    executionCount,
+    abortedCount,
+    timedoutCount,
+    erroredCount,
+    completedCount,
+    memoryHeap,
+  },
 ) => {
   const executionNumber = executionIndex + 1
   const description = ANSI.color(
@@ -16,12 +23,13 @@ export const formatExecuting = (
   const summary =
     executionIndex === 0
       ? ""
-      : `(${createSummaryDetails({
+      : `(${createIntermediateSummary({
           executionCount: executionIndex,
           abortedCount,
           timedoutCount,
           erroredCount,
           completedCount,
+          memoryHeap,
         })})`
 
   return formatExecution({
@@ -45,6 +53,7 @@ export const formatExecutionResult = (
     timedoutCount,
     erroredCount,
     completedCount,
+    memoryHeap,
   },
 ) => {
   const executionNumber = executionIndex + 1
@@ -57,12 +66,13 @@ export const formatExecutionResult = (
     allocatedMs,
   })
 
-  const summary = `(${createSummaryDetails({
+  const summary = `(${createIntermediateSummary({
     executionCount: executionNumber,
     abortedCount,
     timedoutCount,
     erroredCount,
     completedCount,
+    memoryHeap,
   })})`
 
   if (completedExecutionLogAbbreviation && status === "completed") {

package/src/internal/executing/gc.js

@@ -0,0 +1,9 @@
+import v8 from "node:v8"
+import { runInNewContext } from "node:vm"
+
+export const ensureGlobalGc = () => {
+  if (!global.gc) {
+    v8.setFlagsFromString("--expose_gc")
+    global.gc = runInNewContext("gc")
+  }
+}

package/src/internal/logs/byte.js

@@ -0,0 +1,10 @@
+import { createRequire } from "module"
+
+const require = createRequire(import.meta.url)
+
+// https://github.com/visionmedia/bytes.js/
+const bytes = require("bytes")
+
+export const formatByte = (metricValue) => {
+  return bytes(metricValue, { decimalPlaces: 2, unitSeparator: " " })
+}