@jsenv/core 40.3.2 → 40.4.0

package/dist/start_dev_server/start_dev_server.js

@@ -1,22 +1,21 @@
 import { WebSocketResponse, pickContentType, ServerEvents, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, serveDirectory, jsenvServiceErrorHandler, startServer } from "@jsenv/server";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
-import { lookupPackageDirectory, registerDirectoryLifecycle, urlToRelativeUrl, moveUrl, urlIsInsideOf, ensureWindowsDriveLetter, createDetailedMessage, stringifyUrlSite, generateContentFrame, validateResponseIntegrity, setUrlFilename, getCallerPosition, urlToBasename, urlToExtension, asSpecifierWithoutSearch, asUrlWithoutSearch, injectQueryParamsIntoSpecifier, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, urlToFileSystemPath, writeFileSync, createLogger, URL_META, applyNodeEsmResolution, RUNTIME_COMPAT, normalizeUrl, ANSI, CONTENT_TYPE, errorToHTML, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, compareFileUrls, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, isSpecifierForNodeBuiltin, updateJsonFileSync, jsenvPluginTranspilation, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog, readPackageAtOrNull } from "../jsenv_core_packages.js";
+import { lookupPackageDirectory, registerDirectoryLifecycle, urlToRelativeUrl, moveUrl, urlIsInsideOf, ensureWindowsDriveLetter, createDetailedMessage, stringifyUrlSite, generateContentFrame, validateResponseIntegrity, setUrlFilename, getCallerPosition, urlToBasename, urlToExtension, asSpecifierWithoutSearch, asUrlWithoutSearch, injectQueryParamsIntoSpecifier, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, urlToFileSystemPath, writeFileSync, createLogger, URL_META, applyNodeEsmResolution, RUNTIME_COMPAT, normalizeUrl, ANSI, CONTENT_TYPE, errorToHTML, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, compareFileUrls, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, isSpecifierForNodeBuiltin, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog, readPackageAtOrNull } from "./jsenv_core_packages.js";
 import { readFileSync, existsSync, readdirSync, lstatSync, realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { generateSourcemapFileUrl, createMagicSource, composeTwoSourcemaps, generateSourcemapDataUrl, SOURCEMAP } from "@jsenv/sourcemap";
 import { parseHtml, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, stringifyHtmlAst, applyBabelPlugins, generateUrlForInlineContent, parseJsWithAcorn, parseCssUrls, getHtmlNodeAttribute, getHtmlNodePosition, getHtmlNodeAttributePosition, setHtmlNodeAttributes, parseSrcSet, getUrlForContentInsideHtml, removeHtmlNodeText, setHtmlNodeText, getHtmlNodeText, analyzeScriptNode, visitHtmlNodes, parseJsUrls, getUrlForContentInsideJs, analyzeLinkNode, injectJsenvScript } from "@jsenv/ast";
 import { performance } from "node:perf_hooks";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
+import { jsenvPluginTranspilation } from "@jsenv/plugin-transpilation";
 import { randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
-import "strip-ansi";
-import "../jsenv_core_node_modules.js";
+import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
 import "node:tty";
 import "node:util";
 import "node:path";
-import "@jsenv/js-module-fallback";
 
 // default runtimeCompat corresponds to
 // "we can keep <script type="module"> intact":
@@ -239,6 +238,7 @@ ${reason}`,
   if (error.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
     error.message = createDetailedMessage(error.message, {
       "reference trace": reference.trace.message,
+      ...detailsFromFirstReference(reference),
     });
     return error;
   }
@@ -478,7 +478,11 @@ const detailsFromFirstReference = (reference) => {
 };
 const getFirstReferenceInProject = (reference) => {
   const ownerUrlInfo = reference.ownerUrlInfo;
-  if (!ownerUrlInfo.url.includes("/node_modules/")) {
+  if (
+    !ownerUrlInfo.url.includes("/node_modules/") &&
+    ownerUrlInfo.packageDirectoryUrl ===
+      ownerUrlInfo.context.packageDirectory.url
+  ) {
     return reference;
   }
   return getFirstReferenceInProject(ownerUrlInfo.firstReference);
@@ -2687,10 +2691,9 @@ const shouldHandleSourcemap = (urlInfo) => {
   return true;
 };
 
-const inlineContentClientFileUrl = new URL(
+const inlineContentClientFileUrl = import.meta.resolve(
   "../client/inline_content/inline_content.js",
-  import.meta.url,
-).href;
+);
 
 const createKitchen = ({
   name,
@@ -2699,12 +2702,14 @@ const createKitchen = ({
 
   rootDirectoryUrl,
   mainFilePath,
-  ignore,
-  ignoreProtocol = "remove",
-  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
   dev = false,
   build = false,
   runtimeCompat,
+
+  ignore,
+  ignoreProtocol = "remove",
+  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
+
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
@@ -2717,12 +2722,17 @@ const createKitchen = ({
   outDirectoryUrl,
   initialContext = {},
   packageDirectory,
+  packageDependencies,
 }) => {
   const logger = createLogger({ logLevel });
 
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
 
+  if (packageDependencies === "auto") {
+    packageDependencies = build && nodeRuntimeEnabled ? "ignore" : "include";
+  }
+
   const kitchen = {
     context: {
       ...initialContext,
@@ -2792,6 +2802,82 @@ const createKitchen = ({
     const protocolIsSupported = supportedProtocols.includes(protocol);
     return !protocolIsSupported;
   };
+  const isIgnoredBecauseInPackageDependencies = (() => {
+    if (packageDependencies === undefined) {
+      return FUNCTION_RETURNING_FALSE;
+    }
+    if (packageDependencies === "include") {
+      return FUNCTION_RETURNING_FALSE;
+    }
+    if (!packageDirectory.url) {
+      return FUNCTION_RETURNING_FALSE;
+    }
+    const rootPackageJSON = packageDirectory.read(packageDirectory.url);
+    if (!rootPackageJSON) {
+      return FUNCTION_RETURNING_FALSE;
+    }
+    const { dependencies = {}, optionalDependencies = {} } = rootPackageJSON;
+    const dependencyKeys = Object.keys(dependencies);
+    const optionalDependencyKeys = Object.keys(optionalDependencies);
+    const dependencySet = new Set([
+      ...dependencyKeys,
+      ...optionalDependencyKeys,
+    ]);
+    if (dependencySet.size === 0) {
+      return FUNCTION_RETURNING_FALSE;
+    }
+
+    let getEffect;
+    if (packageDependencies === "ignore") {
+      getEffect = (dependencyName) => {
+        if (!dependencySet.has(dependencyName)) {
+          return "include";
+        }
+        return "ignore";
+      };
+    } else if (typeof packageDependencies === "object") {
+      let defaultEffect = "ignore";
+      const dependencyEffectMap = new Map();
+      for (const dependencyKey of Object.keys(packageDependencies)) {
+        const dependencyEffect = packageDependencies[dependencyKey];
+        if (dependencyKey === "*") {
+          defaultEffect = dependencyEffect;
+        } else {
+          dependencyEffectMap.set(dependencyKey, dependencyEffect);
+        }
+      }
+      getEffect = (dependencyName) => {
+        if (!dependencySet.has(dependencyName)) {
+          return "include";
+        }
+        const dependencyEffect = packageDependencies[dependencyName];
+        if (dependencyEffect) {
+          return dependencyEffect;
+        }
+        return defaultEffect;
+      };
+    }
+    return (url) => {
+      if (!url.startsWith("file:")) {
+        return false;
+      }
+      const packageDirectoryUrl = packageDirectory.find(url);
+      if (!packageDirectoryUrl) {
+        return false;
+      }
+      const packageJSON = packageDirectory.read(packageDirectoryUrl);
+      const name = packageJSON?.name;
+      if (!name) {
+        return false;
+      }
+      const effect = getEffect(name);
+      if (effect !== "ignore") {
+        return false;
+      }
+      return true;
+    };
+  })();
+
   let isIgnoredByParam = () => false;
   if (ignore) {
     const associations = URL_META.resolveAssociations(
@@ -2811,7 +2897,11 @@ const createKitchen = ({
     };
   }
   const isIgnored = (url) => {
-    return isIgnoredByProtocol(url) || isIgnoredByParam(url);
+    return (
+      isIgnoredByProtocol(url) ||
+      isIgnoredByParam(url) ||
+      isIgnoredBecauseInPackageDependencies(url)
+    );
   };
   const resolveReference = (reference) => {
     const setReferenceUrl = (referenceUrl) => {
@@ -3302,6 +3392,8 @@ ${urlInfo.firstReference.trace.message}`;
   return kitchen;
 };
 
+const FUNCTION_RETURNING_FALSE = () => false;
+
 const debounceCook = (cook) => {
   const pendingDishes = new Map();
   return async (urlInfo, context) => {
@@ -8270,29 +8362,6 @@ const jsenvPluginPackageSideEffects = ({ packageDirectory }) => {
     return [];
   }
 
-  const normalizeSideEffectFileUrl = (url) => {
-    const urlRelativeToPackage = urlToRelativeUrl(url, packageDirectory.url);
-    return urlRelativeToPackage[0] === "."
-      ? urlRelativeToPackage
-      : `./${urlRelativeToPackage}`;
-  };
-
-  const updatePackageSideEffects = (sideEffectBuildFileUrls) => {
-    const packageJsonFileUrl = new URL("./package.json", packageDirectory.url)
-      .href;
-    const sideEffectRelativeUrlArray = [];
-    for (const sideEffectBuildUrl of sideEffectBuildFileUrls) {
-      sideEffectRelativeUrlArray.push(
-        normalizeSideEffectFileUrl(sideEffectBuildUrl),
-      );
-    }
-    updateJsonFileSync(packageJsonFileUrl, {
-      sideEffects: sideEffectRelativeUrlArray,
-    });
-  };
-
-  const sideEffectBuildFileUrls = [];
-
   const packageSideEffectsCacheMap = new Map();
   const readSideEffectInfoFromClosestPackage = (urlInfo) => {
     const closestPackageDirectoryUrl = urlInfo.packageDirectoryUrl;
@@ -8418,52 +8487,17 @@ const jsenvPluginPackageSideEffects = ({ packageDirectory }) => {
         return;
       }
     },
-    refineBuildUrlContent: (buildUrlInfo, { buildUrl }) => {
+    refineBuildUrlContent: (
+      buildUrlInfo,
+      { buildUrl, registerBuildSideEffectFile },
+    ) => {
       for (const sideEffect of buildUrlInfo.contentSideEffects) {
         if (sideEffect.has) {
-          sideEffectBuildFileUrls.push(buildUrl);
+          registerBuildSideEffectFile(buildUrl);
           return;
         }
       }
     },
-    refineBuild: (kitchen) => {
-      if (sideEffectBuildFileUrls.length === 0) {
-        return;
-      }
-      if (sideEffects === false) {
-        updatePackageSideEffects(sideEffectBuildFileUrls);
-        return;
-      }
-      const { buildDirectoryUrl } = kitchen.context;
-      const sideEffectFileUrlSet = new Set();
-      if (Array.isArray(sideEffects)) {
-        let packageNeedsUpdate = false;
-        for (const sideEffectFileRelativeUrl of sideEffects) {
-          const sideEffectFileUrl = new URL(
-            sideEffectFileRelativeUrl,
-            packageDirectory.url,
-          ).href;
-          if (
-            urlIsInsideOf(sideEffectFileUrl, buildDirectoryUrl) &&
-            !sideEffectBuildFileUrls.includes(sideEffectFileUrl)
-          ) {
-            packageNeedsUpdate = true;
-          } else {
-            sideEffectFileUrlSet.add(sideEffectFileUrl);
-          }
-        }
-        for (const sideEffectBuildUrl of sideEffectBuildFileUrls) {
-          if (sideEffectFileUrlSet.has(sideEffectBuildUrl)) {
-            continue;
-          }
-          packageNeedsUpdate = true;
-          sideEffectFileUrlSet.add(sideEffectBuildUrl);
-        }
-        if (packageNeedsUpdate) {
-          updatePackageSideEffects(sideEffectFileUrlSet);
-        }
-      }
-    },
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.3.2",
+  "version": "40.4.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -49,9 +49,9 @@
   ],
   "sideEffects": [
     "./src/kitchen/client/inline_content.js",
+    "./dist/client/new_stylesheet/new_stylesheet.js",
     "./dist/client/inline_content/inline_content.js",
-    "./dist/jsenv_core_node_modules.js",
-    "./dist/client/new_stylesheet/new_stylesheet.js"
+    "./dist/client/directory_listing/jsenv_core_node_modules.js"
   ],
   "scripts": {
     "eslint": "npx eslint .",
@@ -79,23 +79,14 @@
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/abort": "4.3.1",
-    "@jsenv/ast": "6.6.9",
-    "@jsenv/filesystem": "4.15.0",
-    "@jsenv/humanize": "1.5.0",
-    "@jsenv/importmap": "1.2.2",
-    "@jsenv/integrity": "0.0.2",
-    "@jsenv/js-module-fallback": "1.4.7",
-    "@jsenv/node-esm-resolution": "1.2.0",
-    "@jsenv/plugin-bundling": "2.9.3",
+    "@jsenv/ast": "6.6.10",
+    "@jsenv/js-module-fallback": "1.4.8",
+    "@jsenv/plugin-bundling": "2.9.4",
     "@jsenv/plugin-minification": "1.6.3",
-    "@jsenv/plugin-supervisor": "1.6.13",
-    "@jsenv/plugin-transpilation": "1.5.14",
-    "@jsenv/server": "16.0.8",
-    "@jsenv/sourcemap": "1.3.5",
-    "@jsenv/url-meta": "8.5.6",
-    "@jsenv/urls": "2.7.2",
-    "@jsenv/utils": "2.3.0"
+    "@jsenv/plugin-supervisor": "1.6.14",
+    "@jsenv/plugin-transpilation": "1.5.15",
+    "@jsenv/sourcemap": "1.3.6",
+    "@jsenv/server": "16.1.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-decorators": "7.25.9",
@@ -117,6 +108,15 @@
     "@jsenv/terminal-table": "workspace:*",
     "@jsenv/os-metrics": "workspace:*",
     "@jsenv/runtime-compat": "workspace:*",
+    "@jsenv/url-meta": "workspace:*",
+    "@jsenv/urls": "workspace:*",
+    "@jsenv/utils": "workspace:*",
+    "@jsenv/abort": "workspace:*",
+    "@jsenv/filesystem": "workspace:*",
+    "@jsenv/humanize": "workspace:*",
+    "@jsenv/importmap": "workspace:*",
+    "@jsenv/integrity": "workspace:*",
+    "@jsenv/node-esm-resolution": "workspace:*",
     "@playwright/browser-chromium": "1.51.1",
     "@playwright/browser-firefox": "1.51.1",
     "@playwright/browser-webkit": "1.51.1",
@@ -128,4 +128,4 @@
     "prettier-plugin-organize-imports": "4.1.0",
     "strip-ansi": "7.1.0"
   }
-}
+}

package/src/build/build.js

@@ -26,6 +26,7 @@ import {
   ensureEmptyDirectory,
   lookupPackageDirectory,
   readPackageAtOrNull,
+  updateJsonFileSync,
   writeFileSync,
 } from "@jsenv/filesystem";
 import {
@@ -636,6 +637,7 @@ export const build = async ({
             entryBuildInfo.buildFileVersions = result.buildFileVersions;
             entryBuildInfo.buildInlineContents = result.buildInlineContents;
             entryBuildInfo.buildManifest = result.buildManifest;
+            entryBuildInfo.buildSideEffectFiles = result.buildSideEffectFiles;
             entryBuildInfo.duration = Date.now() - entryPointBuildStartMs;
             onEntryPointBuildEnd();
           })();
@@ -658,11 +660,15 @@ export const build = async ({
     const buildFileVersions = {};
     const buildInlineContents = {};
     const buildManifest = {};
+    const buildSideEffectUrlSet = new Set();
     for (const [, entryBuildInfo] of entryBuildInfoMap) {
       Object.assign(buildFileContents, entryBuildInfo.buildFileContents);
       Object.assign(buildFileVersions, entryBuildInfo.buildFileVersions);
       Object.assign(buildInlineContents, entryBuildInfo.buildInlineContents);
       Object.assign(buildManifest, entryBuildInfo.buildManifest);
+      for (const buildSideEffectUrl of entryBuildInfo.buildSideEffectFiles) {
+        buildSideEffectUrlSet.add(buildSideEffectUrl);
+      }
     }
     if (writeOnFileSystem) {
       clearDirectorySync(buildDirectoryUrl, buildDirectoryCleanPatterns);
@@ -671,6 +677,70 @@ export const build = async ({
         const buildUrl = new URL(buildRelativeUrl, buildDirectoryUrl);
         writeFileSync(buildUrl, buildFileContents[buildRelativeUrl]);
       }
+      if (buildSideEffectUrlSet.size) {
+        const normalizeSideEffectFileUrl = (url) => {
+          const urlRelativeToPackage = urlToRelativeUrl(
+            url,
+            packageDirectory.url,
+          );
+          return urlRelativeToPackage[0] === "."
+            ? urlRelativeToPackage
+            : `./${urlRelativeToPackage}`;
+        };
+        const updatePackageSideEffects = (sideEffectUrlSet) => {
+          const packageJsonFileUrl = new URL(
+            "./package.json",
+            packageDirectory.url,
+          ).href;
+          const sideEffectRelativeUrlArray = [];
+          for (const sideEffectUrl of sideEffectUrlSet) {
+            sideEffectRelativeUrlArray.push(
+              normalizeSideEffectFileUrl(sideEffectUrl),
+            );
+          }
+          updateJsonFileSync(packageJsonFileUrl, {
+            sideEffects: sideEffectRelativeUrlArray,
+          });
+        };
+        const sideEffects = readPackageDirectory(
+          packageDirectory.url,
+        )?.sideEffects;
+        if (sideEffects === false) {
+          updatePackageSideEffects(buildSideEffectUrlSet);
+        } else if (Array.isArray(sideEffects)) {
+          const sideEffectUrlSet = new Set();
+          const packageSideEffectUrlSet = new Set();
+          for (const sideEffectFileRelativeUrl of sideEffects) {
+            const sideEffectFileUrl = new URL(
+              sideEffectFileRelativeUrl,
+              packageDirectory.url,
+            ).href;
+            packageSideEffectUrlSet.add(sideEffectFileUrl);
+          }
+          let hasSomeOutdatedSideEffectUrl = false;
+          for (const packageSideEffectUrl of packageSideEffectUrlSet) {
+            if (
+              urlIsInsideOf(packageSideEffectUrl, buildDirectoryUrl) &&
+              !buildSideEffectUrlSet.has(packageSideEffectUrl)
+            ) {
+              hasSomeOutdatedSideEffectUrl = true;
+            } else {
+              sideEffectUrlSet.add(packageSideEffectUrl);
+            }
+          }
+          let hasSomeNewSideEffectsUrl = false;
+          for (const buildSideEffectUrl of buildSideEffectUrlSet) {
+            if (packageSideEffectUrlSet.has(buildSideEffectUrl)) {
+              continue;
+            }
+            hasSomeNewSideEffectsUrl = true;
+            sideEffectUrlSet.add(buildSideEffectUrl);
+          }
+          if (hasSomeOutdatedSideEffectUrl || hasSomeNewSideEffectsUrl) {
+            updatePackageSideEffects(sideEffectUrlSet);
+          }
+        }
+      }
     }
     onBuildEnd({
       buildFileContents,
@@ -796,6 +866,7 @@ const entryPointDefaultParams = {
   assetManifest: false,
   assetManifestFileRelativeUrl: "asset-manifest.json",
   packageSideEffects: true,
+  packageDependencies: "auto", // "auto", "ignore", "include"
 };
 
 const prepareEntryPointBuild = async (
@@ -846,6 +917,7 @@ const prepareEntryPointBuild = async (
     assetManifest,
     assetManifestFileRelativeUrl,
     packageSideEffects,
+    packageDependencies,
   } = {
     ...entryPointDefaultParams,
     ...entryPointParams,
@@ -939,6 +1011,7 @@ const prepareEntryPointBuild = async (
       ? new URL("craft/", outDirectoryUrl)
       : undefined,
     packageDirectory,
+    packageDependencies,
   });
 
   let _getOtherEntryBuildInfo;
@@ -1038,6 +1111,7 @@ const prepareEntryPointBuild = async (
           ? new URL("shape/", outDirectoryUrl)
           : undefined,
         packageDirectory,
+        packageDependencies,
       });
       const buildSpecifierManager = createBuildSpecifierManager({
         rawKitchen,
@@ -1245,6 +1319,7 @@ const prepareEntryPointBuild = async (
         });
       }
 
+      const buildSideEffectFiles = [];
       refine: {
         finalKitchen.context.buildStep = "refine";
 
@@ -1332,6 +1407,9 @@ const prepareEntryPointBuild = async (
                 for (const refineBuildUrlContentCallback of refineBuildUrlContentCallbackSet) {
                   refineBuildUrlContentCallback(buildUrlInfo, {
                     buildUrl: buildSpecifierManager.getBuildUrl(buildUrlInfo),
+                    registerBuildSideEffectFile: (buildFileUrl) => {
+                      buildSideEffectFiles.push(buildFileUrl);
+                    },
                   });
                 }
               },
@@ -1362,6 +1440,7 @@ const prepareEntryPointBuild = async (
         buildFileVersions,
         buildInlineContents,
         buildManifest,
+        buildSideEffectFiles,
       };
     },
   };

package/src/build/build_specifier_manager.js

@@ -62,7 +62,6 @@ export const createBuildSpecifierManager = ({
       buildUrl = generateSourcemapFileUrl(parentBuildUrl);
       reference.generatedSpecifier = buildUrl;
     } else {
-      const url = reference.generatedUrl;
       const rawUrlInfo = rawKitchen.graph.getUrlInfo(reference.url);
       let urlInfo;
       if (rawUrlInfo) {
@@ -72,6 +71,7 @@ export const createBuildSpecifierManager = ({
         buildUrlInfo.subtype = reference.expectedSubtype;
         urlInfo = buildUrlInfo;
       }
+      const url = reference.generatedUrl;
       buildUrl = buildUrlsGenerator.generate(url, {
         urlInfo,
         ownerUrlInfo: reference.ownerUrlInfo,
@@ -249,7 +249,7 @@ export const createBuildSpecifierManager = ({
         js_classic: undefined, // TODO: add comment to explain who is using this
         entry_point: undefined,
         dynamic_import: undefined,
-        dynamic_import_id: undefined,
+        // dynamic_import_id: undefined,
       };
     },
     formatReference: (reference) => {

package/src/build/build_urls_generator.js

@@ -1,5 +1,10 @@
 // import { ANSI } from "@jsenv/humanize";
-import { urlIsInsideOf, urlToFilename, urlToRelativeUrl } from "@jsenv/urls";
+import {
+  injectQueryParams,
+  urlIsInsideOf,
+  urlToFilename,
+  urlToRelativeUrl,
+} from "@jsenv/urls";
 
 export const createBuildUrlsGenerator = ({
   // logger,
@@ -32,6 +37,20 @@ export const createBuildUrlsGenerator = ({
       return buildUrlFromMap;
     }
     if (urlIsInsideOf(url, buildDirectoryUrl)) {
+      if (ownerUrlInfo.searchParams.has("dynamic_import_id")) {
+        const ownerDirectoryPath = determineDirectoryPath({
+          sourceDirectoryUrl,
+          assetsDirectory,
+          urlInfo: ownerUrlInfo,
+        });
+        const buildRelativeUrl = urlToRelativeUrl(url, buildDirectoryUrl);
+        let buildUrl = `${buildDirectoryUrl}${ownerDirectoryPath}${buildRelativeUrl}`;
+        buildUrl = injectQueryParams(buildUrl, {
+          dynamic_import_id: undefined,
+        });
+        associateBuildUrl(url, buildUrl);
+        return buildUrl;
+      }
       associateBuildUrl(url, url);
       return url;
     }
@@ -52,7 +71,8 @@ export const createBuildUrlsGenerator = ({
       } else {
         directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
       }
-      const { search } = new URL(url);
+      const urlObject = new URL(url);
+      const { search } = urlObject;
       const buildUrl = `${buildDirectoryUrl}${directoryPath}${search}`;
       associateBuildUrl(url, buildUrl);
       return buildUrl;
@@ -70,6 +90,7 @@ export const createBuildUrlsGenerator = ({
       nameSetPerDirectoryMap.set(directoryPath, nameSet);
     }
     const urlObject = new URL(url);
+    injectQueryParams(urlObject, { dynamic_import_id: undefined });
     let { search, hash } = urlObject;
     let urlName = getUrlName(url, urlInfo);
     let [basename, extension] = splitFileExtension(urlName);
@@ -116,7 +137,7 @@ const determineDirectoryPath = ({
   sourceDirectoryUrl,
   assetsDirectory,
   urlInfo,
-  ownerUrlInfo,
+  ownerUrlInfo = urlInfo.firstReference.ownerUrlInfo,
 }) => {
   if (urlInfo.dirnameHint) {
     return urlInfo.dirnameHint;
@@ -128,13 +149,29 @@ const determineDirectoryPath = ({
     const parentDirectoryPath = determineDirectoryPath({
       sourceDirectoryUrl,
       assetsDirectory,
-      urlInfo: ownerUrlInfo || urlInfo.firstReference.ownerUrlInfo,
+      urlInfo: ownerUrlInfo,
     });
     return parentDirectoryPath;
   }
   const dynamicImportId = urlInfo.searchParams.get("dynamic_import_id");
   if (dynamicImportId) {
-    return `${assetsDirectory}${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;
+    }
+    const importIdPath = [...ancestorImportIds, dynamicImportId].join("/");
+    return `${assetsDirectory}${importIdPath}/`;
   }
   if (urlInfo.isEntryPoint && !urlInfo.isDynamicEntryPoint) {
     return "";

package/src/kitchen/errors.js

@@ -49,6 +49,7 @@ ${reason}`,
   if (error.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
     error.message = createDetailedMessage(error.message, {
       "reference trace": reference.trace.message,
+      ...detailsFromFirstReference(reference),
     });
     return error;
   }
@@ -288,7 +289,11 @@ const detailsFromFirstReference = (reference) => {
 };
 const getFirstReferenceInProject = (reference) => {
   const ownerUrlInfo = reference.ownerUrlInfo;
-  if (!ownerUrlInfo.url.includes("/node_modules/")) {
+  if (
+    !ownerUrlInfo.url.includes("/node_modules/") &&
+    ownerUrlInfo.packageDirectoryUrl ===
+      ownerUrlInfo.context.packageDirectory.url
+  ) {
     return reference;
   }
   return getFirstReferenceInProject(ownerUrlInfo.firstReference);