@jsenv/core 27.0.0 → 27.0.3

package/dist/main.js

@@ -19850,7 +19850,7 @@ const rollupPluginJsenv = ({
     outputOptions: outputOptions => {
       // const sourcemapFile = buildDirectoryUrl
       Object.assign(outputOptions, {
-        format: "esm",
+        format: jsModuleUrlInfos.some(jsModuleUrlInfo => jsModuleUrlInfo.filename.endsWith(".cjs")) ? "cjs" : "esm",
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
         sourcemap: sourcemaps === "file" || sourcemaps === "inline",
         // sourcemapFile,
@@ -21446,6 +21446,7 @@ const createUrlInfo = url => {
     content: undefined,
     sourcemap: null,
     sourcemapReference: null,
+    sourcemapIsWrong: false,
     timing: {},
     headers: {}
   };
@@ -21891,7 +21892,8 @@ const createUrlInfoTransformer = ({
       type,
       contentType,
       content,
-      sourcemap
+      sourcemap,
+      sourcemapIsWrong
     } = transformations;
 
     if (type) {
@@ -21910,7 +21912,17 @@ const createUrlInfoTransformer = ({
       const sourcemapNormalized = normalizeSourcemap(urlInfo, sourcemap);
       const finalSourcemap = await composeTwoSourcemaps(urlInfo.sourcemap, sourcemapNormalized);
       const finalSourcemapNormalized = normalizeSourcemap(urlInfo, finalSourcemap);
-      urlInfo.sourcemap = finalSourcemapNormalized;
+      urlInfo.sourcemap = finalSourcemapNormalized; // A plugin is allowed to modify url content
+      // without returning a sourcemap
+      // This is the case for preact and react plugins.
+      // They are currently generating wrong source mappings
+      // when used.
+      // Generating the correct sourcemap in this situation
+      // is a nightmare no-one could solve in years so
+      // jsenv won't emit a warning and use the following strategy:
+      // "no sourcemap is better than wrong sourcemap"
+
+      urlInfo.sourcemapIsWrong = sourcemapIsWrong;
     }
   };
 
@@ -21939,16 +21951,18 @@ const createUrlInfoTransformer = ({
 
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ");
 
-      if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier = generateSourcemapDataUrl(sourcemap);
-      }
+      if (!urlInfo.sourcemapIsWrong) {
+        if (sourcemaps === "inline") {
+          sourcemapReference.generatedSpecifier = generateSourcemapDataUrl(sourcemap);
+        }
 
-      if (sourcemaps === "file" || sourcemaps === "inline") {
-        urlInfo.content = SOURCEMAP.writeComment({
-          contentType: urlInfo.contentType,
-          content: urlInfo.content,
-          specifier: sourcemaps === "file" && sourcemapsRelativeSources ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
-        });
+        if (sourcemaps === "file" || sourcemaps === "inline") {
+          urlInfo.content = SOURCEMAP.writeComment({
+            contentType: urlInfo.contentType,
+            content: urlInfo.content,
+            specifier: sourcemaps === "file" && sourcemapsRelativeSources ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
+          });
+        }
       }
     } else if (urlInfo.sourcemapReference) {
       // in the end we don't use the sourcemap placeholder
@@ -25478,6 +25492,7 @@ const executePlan = async (plan, {
     });
 
     if (!keepRunning) {
+      logger.debug("stopAfterAllSignal.notify()");
       await stopAfterAllSignal.notify();
     }
 
@@ -25888,7 +25903,7 @@ const createRuntimeFromPlaywright = ({
 
   runtime.run = async ({
     signal = new AbortController().signal,
-    // logger,
+    logger,
     rootDirectoryUrl,
     fileRelativeUrl,
     server,
@@ -25947,10 +25962,10 @@ const createRuntimeFromPlaywright = ({
         };
 
         browser.on("disconnected", disconnectedCallback);
-      }) : Promise.resolve(); // for some reason without this 100ms timeout
+      }) : Promise.resolve(); // for some reason without this 150ms timeout
       // browser.close() never resolves (playwright does not like something)
 
-      await new Promise(resolve => setTimeout(resolve, 100));
+      await new Promise(resolve => setTimeout(resolve, 150));
 
       try {
         await browser.close();
@@ -26148,6 +26163,7 @@ const createRuntimeFromPlaywright = ({
             stopAfterAllSignal.notify = async () => {
               await notifyPrevious();
               browser.removeListener("disconnected", disconnectedCallback);
+              logger.debug(`stopAfterAllSignal notified -> closing ${browserName}`);
               await closeBrowser();
             };
           }
@@ -29162,7 +29178,9 @@ const startBuildServer = async ({
       throw new TypeError(`buildIndexPath must be a string, got ${buildIndexPath}`);
     }
 
-    if (buildIndexPath[0] !== "/") {
+    if (buildIndexPath[0] === "/") {
+      buildIndexPath = buildIndexPath.slice(1);
+    } else {
       const buildIndexUrl = new URL(buildIndexPath, buildDirectoryUrl).href;
 
       if (!buildIndexUrl.startsWith(buildDirectoryUrl)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0",
+  "version": "27.0.3",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -43,26 +43,26 @@
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
-    "test-packages": "npm run test --workspaces --if-present -- --workspace",
+    "test:coverage": "npm run test -- --coverage",
     "build": "node --conditions=development ./scripts/build/build.mjs",
-    "start_file_server": "node ./scripts/dev/start_file_server.mjs",
-    "workspace-versions": "node ./scripts/publish/workspace_versions.mjs",
-    "workspace-publish": "node ./scripts/publish/workspace_publish.mjs",
+    "workspace:test": "npm run test --workspaces --if-present -- --workspace",
+    "workspace:versions": "node ./scripts/publish/workspace_versions.mjs",
+    "workspace:publish": "node ./scripts/publish/workspace_publish.mjs",
     "performances": "node --expose-gc ./scripts/performance/generate_performance_report.mjs --log --once",
     "file-size": "node ./scripts/file_size/file_size.mjs --log",
+    "start_file_server": "node ./scripts/dev/start_file_server.mjs",
     "prettier": "prettier --write .",
     "playwright-install": "npx playwright install-deps && npx playwright install",
     "certificate-install": "node ./scripts/dev/install_certificate_authority.mjs",
-    "test-with-coverage": "npm run test -- --coverage",
     "prepublishOnly": "npm run build"
   },
   "optionalDependencies": {
     "playwright": "1.x"
   },
   "dependencies": {
-    "@babel/plugin-proposal-dynamic-import": "7.16.7",
+    "@babel/plugin-proposal-dynamic-import": "7.18.6",
     "@babel/plugin-transform-modules-systemjs": "7.18.6",
-    "@babel/plugin-transform-modules-umd": "7.18.0",
+    "@babel/plugin-transform-modules-umd": "7.18.6",
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/ast": "1.1.1",
@@ -96,12 +96,12 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.18.2",
-    "@babel/plugin-syntax-import-assertions": "7.17.12",
+    "@babel/plugin-syntax-import-assertions": "7.18.6",
     "@jsenv/assert": "2.6.0",
-    "@jsenv/eslint-config": "16.0.9",
+    "@jsenv/eslint-config": "16.1.0",
     "@jsenv/file-size-impact": "13.0.1",
     "@jsenv/https-local": "2.1.0",
-    "@jsenv/package-workspace": "0.4.0",
+    "@jsenv/package-workspace": "0.4.1",
     "@jsenv/performance-impact": "3.0.1",
     "eslint": "8.19.0",
     "eslint-plugin-html": "6.2.0",

package/src/build/start_build_server.js

@@ -69,7 +69,9 @@ export const startBuildServer = async ({
         `buildIndexPath must be a string, got ${buildIndexPath}`,
       )
     }
-    if (buildIndexPath[0] !== "/") {
+    if (buildIndexPath[0] === "/") {
+      buildIndexPath = buildIndexPath.slice(1)
+    } else {
       const buildIndexUrl = new URL(buildIndexPath, buildDirectoryUrl).href
       if (!buildIndexUrl.startsWith(buildDirectoryUrl)) {
         throw new Error(

package/src/execute/runtimes/browsers/from_playwright.js

@@ -30,7 +30,7 @@ export const createRuntimeFromPlaywright = ({
   let browserAndContextPromise
   runtime.run = async ({
     signal = new AbortController().signal,
-    // logger,
+    logger,
     rootDirectoryUrl,
     fileRelativeUrl,
     server,
@@ -82,9 +82,9 @@ export const createRuntimeFromPlaywright = ({
             browser.on("disconnected", disconnectedCallback)
           })
         : Promise.resolve()
-      // for some reason without this 100ms timeout
+      // for some reason without this 150ms timeout
       // browser.close() never resolves (playwright does not like something)
-      await new Promise((resolve) => setTimeout(resolve, 100))
+      await new Promise((resolve) => setTimeout(resolve, 150))
       try {
         await browser.close()
       } catch (e) {
@@ -275,6 +275,9 @@ export const createRuntimeFromPlaywright = ({
               stopAfterAllSignal.notify = async () => {
                 await notifyPrevious()
                 browser.removeListener("disconnected", disconnectedCallback)
+                logger.debug(
+                  `stopAfterAllSignal notified -> closing ${browserName}`,
+                )
                 await closeBrowser()
               }
             }

package/src/omega/url_graph/url_info_transformations.js

@@ -117,7 +117,8 @@ export const createUrlInfoTransformer = ({
     if (!transformations) {
       return
     }
-    const { type, contentType, content, sourcemap } = transformations
+    const { type, contentType, content, sourcemap, sourcemapIsWrong } =
+      transformations
     if (type) {
       urlInfo.type = type
     }
@@ -138,6 +139,16 @@ export const createUrlInfoTransformer = ({
         finalSourcemap,
       )
       urlInfo.sourcemap = finalSourcemapNormalized
+      // A plugin is allowed to modify url content
+      // without returning a sourcemap
+      // This is the case for preact and react plugins.
+      // They are currently generating wrong source mappings
+      // when used.
+      // Generating the correct sourcemap in this situation
+      // is a nightmare no-one could solve in years so
+      // jsenv won't emit a warning and use the following strategy:
+      // "no sourcemap is better than wrong sourcemap"
+      urlInfo.sourcemapIsWrong = sourcemapIsWrong
     }
   }
 
@@ -162,19 +173,21 @@ export const createUrlInfoTransformer = ({
         })
       }
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ")
-      if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier =
-          generateSourcemapDataUrl(sourcemap)
-      }
-      if (sourcemaps === "file" || sourcemaps === "inline") {
-        urlInfo.content = SOURCEMAP.writeComment({
-          contentType: urlInfo.contentType,
-          content: urlInfo.content,
-          specifier:
-            sourcemaps === "file" && sourcemapsRelativeSources
-              ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
-              : sourcemapReference.generatedSpecifier,
-        })
+      if (!urlInfo.sourcemapIsWrong) {
+        if (sourcemaps === "inline") {
+          sourcemapReference.generatedSpecifier =
+            generateSourcemapDataUrl(sourcemap)
+        }
+        if (sourcemaps === "file" || sourcemaps === "inline") {
+          urlInfo.content = SOURCEMAP.writeComment({
+            contentType: urlInfo.contentType,
+            content: urlInfo.content,
+            specifier:
+              sourcemaps === "file" && sourcemapsRelativeSources
+                ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
+                : sourcemapReference.generatedSpecifier,
+          })
+        }
       }
     } else if (urlInfo.sourcemapReference) {
       // in the end we don't use the sourcemap placeholder

package/src/omega/url_graph.js

@@ -215,6 +215,7 @@ const createUrlInfo = (url) => {
 
     sourcemap: null,
     sourcemapReference: null,
+    sourcemapIsWrong: false,
     timing: {},
     headers: {},
   }

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -147,7 +147,11 @@ const rollupPluginJsenv = ({
     outputOptions: (outputOptions) => {
       // const sourcemapFile = buildDirectoryUrl
       Object.assign(outputOptions, {
-        format: "esm",
+        format: jsModuleUrlInfos.some((jsModuleUrlInfo) =>
+          jsModuleUrlInfo.filename.endsWith(".cjs"),
+        )
+          ? "cjs"
+          : "esm",
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
         sourcemap: sourcemaps === "file" || sourcemaps === "inline",
         // sourcemapFile,

package/src/test/execute_plan.js

@@ -457,6 +457,7 @@ export const executePlan = async (
       },
     })
     if (!keepRunning) {
+      logger.debug("stopAfterAllSignal.notify()")
       await stopAfterAllSignal.notify()
     }