@jsenv/core 41.4.28 → 41.4.29

package/dist/build/build.js

@@ -12154,6 +12154,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,
@@ -12176,23 +12195,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 "";
@@ -12943,12 +12963,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;

package/dist/build/jsenv_core_packages.js

@@ -6786,6 +6786,7 @@ const featuresCompatMap = {
     samsung: "15",
     firefox: "108",
     safari: "16.4",
+    ios_safari: "16.4",
   },
   import_type_json: {
     chrome: "123",
@@ -6812,6 +6813,7 @@ const featuresCompatMap = {
     safari: "4",
     ios_safari: "5",
     android: "4.4",
+    samsung: "4",
   },
   // https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker#browser_compatibility
   worker_type_module: {
@@ -6829,6 +6831,7 @@ const featuresCompatMap = {
     opera: "27",
     ios_safari: "11.3",
     android: "12.12",
+    samsung: "4",
   },
   service_worker_type_module: {
     chrome: "80",
@@ -6881,6 +6884,7 @@ const featuresCompatMap = {
     ios_safari: "9",
     android: "4",
     node: "4",
+    samsung: "4",
   },
   arrow_function: {
     chrome: "47",
@@ -7016,7 +7020,7 @@ const inferRuntimeCompatFromClosestPackage = async (
     if (!browserslistQuery) {
       return null;
     }
-    const namespace = await import("./browserslist_index_1/browserslist_index2.js");
+    const namespace = await import("../browserslist_index/browserslist_index.js");
     const browserslist = namespace.default;
     const browserslistResult = browserslist(browserslistQuery);
     const runtimeCompat = {};

package/dist/start_dev_server/jsenv_core_packages.js

@@ -5034,6 +5034,7 @@ const featuresCompatMap = {
     samsung: "15",
     firefox: "108",
     safari: "16.4",
+    ios_safari: "16.4",
   },
   import_type_json: {
     chrome: "123",
@@ -5060,6 +5061,7 @@ const featuresCompatMap = {
     safari: "4",
     ios_safari: "5",
     android: "4.4",
+    samsung: "4",
   },
   // https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker#browser_compatibility
   worker_type_module: {
@@ -5077,6 +5079,7 @@ const featuresCompatMap = {
     opera: "27",
     ios_safari: "11.3",
     android: "12.12",
+    samsung: "4",
   },
   service_worker_type_module: {
     chrome: "80",
@@ -5129,6 +5132,7 @@ const featuresCompatMap = {
     ios_safari: "9",
     android: "4",
     node: "4",
+    samsung: "4",
   },
   arrow_function: {
     chrome: "47",
@@ -5264,7 +5268,7 @@ const inferRuntimeCompatFromClosestPackage = async (
     if (!browserslistQuery) {
       return null;
     }
-    const namespace = await import("./browserslist_index/browserslist_index.js");
+    const namespace = await import("../browserslist_index/browserslist_index.js");
     const browserslist = namespace.default;
     const browserslistResult = browserslist(browserslistQuery);
     const runtimeCompat = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.4.28",
+  "version": "41.4.29",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -75,7 +75,7 @@
   "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.4",

package/src/build/build.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;

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 "";