@jsenv/core 41.4.27 → 41.4.29

package/dist/start_dev_server/start_dev_server.js

@@ -1,7 +1,7 @@
 import { WebSocketResponse, pickContentType, ServerEvents, serverPluginErrorHandler, fetchDirectory, composeTwoResponses, serverPluginCORS, jsenvAccessControlAllowedHeaders, startServer } from "@jsenv/server";
 import { existsSync, readFileSync, realpathSync, readdirSync, lstatSync, statSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { urlToRelativeUrl, registerFileLifecycle, lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, errorToHTML, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, URL_META, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, collectFiles, registerDirectoryLifecycle, readEntryStatSync, applyFileSystemMagicResolution, getExtensionsToTry, urlToFilename, asUrlWithoutSearch, ensurePathnameTrailingSlash, compareFileUrls, setUrlExtension, createDetailedMessage, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, formatError, assertAndNormalizeDirectoryUrl, createTaskLog } from "./jsenv_core_packages.js";
+import { urlToRelativeUrl, registerFileLifecycle, lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, errorToHTML, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, URL_META, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, collectFiles, registerDirectoryLifecycle, readEntryStatSync, applyFileSystemMagicResolution, getExtensionsToTry, urlToFilename, asUrlWithoutSearch, ensurePathnameTrailingSlash, compareFileUrls, setUrlExtension, createDetailedMessage, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, formatError, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, inferRuntimeCompatFromClosestPackage, createTaskLog } from "./jsenv_core_packages.js";
 import { createPluginsController } from "@jsenv/server/src/plugins_controller.js";
 import { parseHtml, injectJsenvScript, stringifyHtmlAst, parseCssUrls, getHtmlNodeAttribute, getHtmlNodePosition, getHtmlNodeAttributePosition, setHtmlNodeAttributes, parseSrcSet, getUrlForContentInsideHtml, removeHtmlNodeText, setHtmlNodeText, getHtmlNodeText, analyzeScriptNode, visitHtmlNodes, parseJsUrls, getUrlForContentInsideJs, renderCssTemplateLiteral, applyBabelPlugins, visitJsAst, getImportMetaPropertyName, visitJsAstUntil, analyzeLinkNode, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, generateUrlForInlineContent, parseJsWithAcorn } from "@jsenv/ast";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
@@ -17,20 +17,6 @@ import "node:tty";
 import "node:util";
 import "node:path";
 
-// default runtimeCompat corresponds to
-// "we can keep <script type="module"> intact":
-// so script_type_module + dynamic_import + import_meta
-const defaultRuntimeCompat = {
-  // android: "8",
-  chrome: "64",
-  edge: "79",
-  firefox: "67",
-  ios: "12",
-  opera: "51",
-  safari: "11.3",
-  samsung: "9.2",
-};
-
 const createEventEmitter = () => {
   const callbackSet = new Set();
   const on = (callback) => {
@@ -12121,10 +12107,11 @@ const startDevServer = async ({
   // a test wants them all, hence 0 there.
   serverTiming = { minDuration: EXECUTED_BY_TEST_PLAN ? 0 : 0.5 },
 
-  // runtimeCompat is the runtimeCompat for the build
-  // when specified, dev server use it to warn in case
-  // code would be supported during dev but not after build
-  runtimeCompat = defaultRuntimeCompat,
+  // The runtimeCompat the build will use: the dev server warns when code works
+  // in dev but would not survive that build, and transpiles what those runtimes
+  // lack. Left out, it is inferred exactly as build() infers it, so the two
+  // never disagree on what they target.
+  runtimeCompat,
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
@@ -12195,6 +12182,12 @@ const startDevServer = async ({
   }
   // params normalization
   {
+    if (runtimeCompat === undefined) {
+      runtimeCompat =
+        (await inferRuntimeCompatFromClosestPackage(sourceDirectoryUrl, {
+          runtimeType: "browser",
+        })) || browserDefaultRuntimeCompat;
+    }
     if (clientAutoreload === true) {
       clientAutoreload = {};
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.4.27",
+  "version": "41.4.29",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -75,10 +75,10 @@
   "dependencies": {
     "@jsenv/ast": "6.9.3",
     "@jsenv/js-module-fallback": "1.5.2",
-    "@jsenv/plugin-bundling": "2.10.18",
+    "@jsenv/plugin-bundling": "2.10.19",
     "@jsenv/plugin-minification": "1.7.11",
     "@jsenv/plugin-supervisor": "1.8.14",
-    "@jsenv/plugin-transpilation": "1.6.3",
+    "@jsenv/plugin-transpilation": "1.6.4",
     "@jsenv/server": "17.6.3",
     "@jsenv/sourcemap": "1.4.2",
     "react-table": "7.8.0"

package/src/build/build.js

@@ -70,7 +70,7 @@ import { isBareSpecifier } from "../helpers/bare_specifier.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { renderBuildDoneLog } from "./build_content_report.js";
-import { defaultRuntimeCompat, logsDefault } from "./build_params.js";
+import { logsDefault } from "./build_params.js";
 import { createBuildSpecifierManager } from "./build_specifier_manager.js";
 import { createBuildUrlsGenerator } from "./build_urls_generator.js";
 import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js";
@@ -679,12 +679,10 @@ entryPoints: {
     for (const entryPoint of entryPointArray) {
       let { runtimeCompat } = entryPoint.params;
       if (runtimeCompat === undefined) {
-        const runtimeCompatFromPackage = inferRuntimeCompatFromClosestPackage(
-          entryPoint.sourceUrl,
-          {
+        const runtimeCompatFromPackage =
+          await inferRuntimeCompatFromClosestPackage(entryPoint.sourceUrl, {
             runtimeType: entryPoint.runtimeType,
-          },
-        );
+          });
         if (runtimeCompatFromPackage) {
           entryPoint.params.runtimeCompat = runtimeCompat =
             runtimeCompatFromPackage;
@@ -981,7 +979,7 @@ entryPoints: {
 const entryPointDefaultParams = {
   buildRelativeUrl: undefined,
   mode: undefined,
-  runtimeCompat: defaultRuntimeCompat,
+  runtimeCompat: undefined,
   plugins: [],
   mappings: undefined,
   assetsDirectory: undefined,

package/src/build/build_params.js

@@ -1,16 +1,3 @@
-// default runtimeCompat corresponds to
-// "we can keep <script type="module"> intact":
-// so script_type_module + dynamic_import + import_meta
-export const defaultRuntimeCompat = {
-  // android: "8",
-  chrome: "64",
-  edge: "79",
-  firefox: "67",
-  ios: "12",
-  opera: "51",
-  safari: "11.3",
-  samsung: "9.2",
-};
 export const logsDefault = {
   level: "info",
   animated: true,

package/src/build/build_urls_generator.js

@@ -154,6 +154,25 @@ const splitFileExtension = (filename) => {
   return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)];
 };
 
+const resolveImportIdPath = (ownerUrlInfo, dynamicImportId) => {
+  const ancestorImportIds = [];
+  let ancestorUrlInfo = ownerUrlInfo;
+  let currentImportId = dynamicImportId;
+  while (ancestorUrlInfo) {
+    const ancestorDynamicImportId =
+      ancestorUrlInfo.searchParams.get("dynamic_import_id");
+    if (!ancestorDynamicImportId) {
+      break;
+    }
+    if (ancestorDynamicImportId !== currentImportId) {
+      ancestorImportIds.push(ancestorDynamicImportId);
+      currentImportId = ancestorDynamicImportId;
+    }
+    ancestorUrlInfo = ancestorUrlInfo.firstReference?.ownerUrlInfo;
+  }
+  return [...ancestorImportIds, dynamicImportId].join("/");
+};
+
 const determineDirectoryPath = ({
   sourceDirectoryUrl,
   assetsDirectory,
@@ -176,23 +195,24 @@ const determineDirectoryPath = ({
   }
   const dynamicImportId = urlInfo.searchParams.get("dynamic_import_id");
   if (dynamicImportId) {
-    const ancestorImportIds = [];
-    let ancestorUrlInfo = ownerUrlInfo;
-    let currentImportId = dynamicImportId;
-    while (ancestorUrlInfo) {
-      const ancestorDynamicImportId =
-        ancestorUrlInfo.searchParams.get("dynamic_import_id");
-      if (!ancestorDynamicImportId) {
-        break;
-      }
-      if (ancestorDynamicImportId !== currentImportId) {
-        ancestorImportIds.push(ancestorDynamicImportId);
-        currentImportId = ancestorDynamicImportId;
-      }
-      ancestorUrlInfo = ancestorUrlInfo.firstReference?.ownerUrlInfo;
+    // Inside the isolated group that asked for it — but only while ONE did.
+    // A chunk several groups reach belongs to none of them: put inside the
+    // first asker it would move the day another one asks first, and the others
+    // would import it out of a sibling's directory.
+    const importIdPathSet = new Set();
+    for (const referenceFromOther of urlInfo.referenceFromOthersSet) {
+      importIdPathSet.add(
+        resolveImportIdPath(referenceFromOther.ownerUrlInfo, dynamicImportId),
+      );
+    }
+    if (importIdPathSet.size === 0) {
+      importIdPathSet.add(resolveImportIdPath(ownerUrlInfo, dynamicImportId));
+    }
+    if (importIdPathSet.size === 1) {
+      const [importIdPath] = importIdPathSet;
+      return `${assetsDirectory}${importIdPath}/`;
     }
-    const importIdPath = [...ancestorImportIds, dynamicImportId].join("/");
-    return `${assetsDirectory}${importIdPath}/`;
+    return `${assetsDirectory}${dynamicImportId}/`;
   }
   if (urlInfo.isEntryPoint && !urlInfo.isDynamicEntryPoint) {
     return "";

package/src/dev/start_dev_server.js

@@ -13,10 +13,13 @@ import {
   urlToFileSystemPath,
   urlToRelativeUrl,
 } from "@jsenv/urls";
+import {
+  browserDefaultRuntimeCompat,
+  inferRuntimeCompatFromClosestPackage,
+} from "@jsenv/runtime-compat";
 import { existsSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 
-import { defaultRuntimeCompat } from "../build/build_params.js";
 import { createEventEmitter } from "../helpers/event_emitter.js";
 import { watchDependencies } from "../helpers/watch_dependencies.js";
 import { jsenvCoreDirectoryUrl } from "../jsenv_core_directory_url.js";
@@ -104,10 +107,11 @@ export const startDevServer = async ({
   // a test wants them all, hence 0 there.
   serverTiming = { minDuration: EXECUTED_BY_TEST_PLAN ? 0 : 0.5 },
 
-  // runtimeCompat is the runtimeCompat for the build
-  // when specified, dev server use it to warn in case
-  // code would be supported during dev but not after build
-  runtimeCompat = defaultRuntimeCompat,
+  // The runtimeCompat the build will use: the dev server warns when code works
+  // in dev but would not survive that build, and transpiles what those runtimes
+  // lack. Left out, it is inferred exactly as build() infers it, so the two
+  // never disagree on what they target.
+  runtimeCompat,
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
@@ -179,6 +183,12 @@ export const startDevServer = async ({
   }
   // params normalization
   {
+    if (runtimeCompat === undefined) {
+      runtimeCompat =
+        (await inferRuntimeCompatFromClosestPackage(sourceDirectoryUrl, {
+          runtimeType: "browser",
+        })) || browserDefaultRuntimeCompat;
+    }
     if (clientAutoreload === true) {
       clientAutoreload = {};
     }