@jsenv/core 41.4.6 → 41.4.8

package/dist/build/build.js

@@ -6551,7 +6551,13 @@ const jsenvPluginWebResolution = () => {
         if (ownerUrlInfo.originalUrl?.startsWith("http")) {
           return new URL(resource, ownerUrlInfo.originalUrl);
         }
-        const url = new URL(resource.slice(1), ownerUrlInfo.entryUrlInfo.url);
+        // "/x" is the web meaning of a root-relative url: the root of what is
+        // served, which is the source directory — not the directory the entry
+        // point happens to sit in.
+        const url = new URL(
+          resource.slice(1),
+          ownerUrlInfo.context.rootDirectoryUrl,
+        );
         return url;
       }
       // baseUrl happens second argument to new URL() is different from
@@ -10364,6 +10370,7 @@ const createBuildSpecifierManager = ({
   buildDirectoryUrl,
   assetsDirectory,
   buildUrlsGenerator,
+  entryKey,
   base,
   length = 8,
 
@@ -10402,6 +10409,7 @@ const createBuildSpecifierManager = ({
         urlInfo,
         ownerUrlInfo: reference.ownerUrlInfo,
         assetsDirectory,
+        entryKey,
       });
     }
 
@@ -11459,9 +11467,14 @@ const createBuildSpecifierManager = ({
           let contentKey;
           // if to guard for html where versioned build specifier is not generated
           if (buildSpecifierVersioned) {
-            const buildUrlVersioned = asBuildUrlVersioned({
-              buildSpecifierVersioned,
-              buildDirectoryUrl,
+            // The version goes on the build url, not on the specifier: a
+            // specifier is written for one importer to read (base: "./" makes
+            // it relative to that importer, base: "https://cdn…" makes it
+            // absolute elsewhere) and says nothing about where the file lands.
+            const buildUrlVersioned = injectVersionIntoBuildSpecifier({
+              buildSpecifier: buildUrl,
+              version: versionMap.get(urlInfo),
+              versioningMethod,
             });
             const buildRelativeUrlVersioned = urlToRelativeUrl(
               buildUrlVersioned,
@@ -11705,23 +11718,6 @@ const injectVersionIntoBuildSpecifier = ({
   );
 };
 
-const asBuildUrlVersioned = ({
-  buildSpecifierVersioned,
-  buildDirectoryUrl,
-}) => {
-  if (buildSpecifierVersioned[0] === "/") {
-    return new URL(buildSpecifierVersioned.slice(1), buildDirectoryUrl).href;
-  }
-  const buildUrl = new URL(buildSpecifierVersioned, buildDirectoryUrl).href;
-  if (buildUrl.startsWith(buildDirectoryUrl)) {
-    return buildUrl;
-  }
-  // it's likely "base" parameter was set to an url origin like "https://cdn.example.com"
-  // let's move url to build directory
-  const { pathname, search, hash } = new URL(buildSpecifierVersioned);
-  return `${buildDirectoryUrl}${pathname}${search}${hash}`;
-};
-
 const targetsAFileThatDoesNotExist = (url) => {
   if (!url.startsWith("file:")) {
     return false;
@@ -11759,12 +11755,41 @@ const createBuildUrlsGenerator = ({
   };
 
   const nameSetPerDirectoryMap = new Map();
-  const generate = (url, { urlInfo, ownerUrlInfo, assetsDirectory }) => {
-    const buildUrlFromMap = buildUrlMap.get(url);
+  const reserveName = (directoryPath, urlName) => {
+    let nameSet = nameSetPerDirectoryMap.get(directoryPath);
+    if (!nameSet) {
+      nameSet = new Set();
+      nameSetPerDirectoryMap.set(directoryPath, nameSet);
+    }
+    let [basename, extension] = splitFileExtension(urlName);
+    extension = extensionMappings[extension] || extension;
+    let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
+    let integer = 1;
+    while (nameSet.has(nameCandidate)) {
+      integer++;
+      nameCandidate = `${basename}${integer}${extension}`;
+    }
+    nameSet.add(nameCandidate);
+    return nameCandidate;
+  };
+  const generate = (
+    url,
+    { urlInfo, ownerUrlInfo, assetsDirectory, entryKey },
+  ) => {
+    // A url already inside the build directory names a chunk a bundler just
+    // produced, and each entry point is bundled on its own: two of them
+    // routinely produce a chunk of the same name holding different code (the
+    // shared dependencies of THAT entry point, exported under names decided by
+    // THAT bundle). They are told apart by the entry point they come from —
+    // sharing the file would leave one entry importing exports the file on disk
+    // does not have.
+    const insideBuildDirectory = urlIsOrIsInsideOf(url, buildDirectoryUrl);
+    const key = insideBuildDirectory ? `${entryKey} ${url}` : url;
+    const buildUrlFromMap = buildUrlMap.get(key);
     if (buildUrlFromMap) {
       return buildUrlFromMap;
     }
-    if (urlIsOrIsInsideOf(url, buildDirectoryUrl)) {
+    if (insideBuildDirectory) {
       if (ownerUrlInfo.searchParams.has("dynamic_import_id")) {
         const ownerDirectoryPath = determineDirectoryPath({
           sourceDirectoryUrl,
@@ -11776,11 +11801,18 @@ const createBuildUrlsGenerator = ({
         buildUrl = injectQueryParams(buildUrl, {
           dynamic_import_id: undefined,
         });
-        associateBuildUrl(url, buildUrl);
+        associateBuildUrl(key, buildUrl);
         return buildUrl;
       }
-      associateBuildUrl(url, url);
-      return url;
+      const urlObject = new URL(url);
+      const chunkDirectoryPath = urlToRelativeUrl(
+        new URL("./", urlObject),
+        buildDirectoryUrl,
+      );
+      const chunkName = reserveName(chunkDirectoryPath, urlToFilename(url));
+      const buildUrl = `${buildDirectoryUrl}${chunkDirectoryPath}${chunkName}${urlObject.search}${urlObject.hash}`;
+      associateBuildUrl(key, buildUrl);
+      return buildUrl;
     }
     if (urlInfo.type === "entry_build") {
       const buildUrl = new URL(urlInfo.filenameHint, buildDirectoryUrl).href;
@@ -11812,25 +11844,10 @@ const createBuildUrlsGenerator = ({
       urlInfo,
       ownerUrlInfo,
     });
-    let nameSet = nameSetPerDirectoryMap.get(directoryPath);
-    if (!nameSet) {
-      nameSet = new Set();
-      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);
-    extension = extensionMappings[extension] || extension;
-    let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
-    let integer = 1;
-    while (nameSet.has(nameCandidate)) {
-      integer++;
-      nameCandidate = `${basename}${integer}${extension}`;
-    }
-    const name = nameCandidate;
-    nameSet.add(name);
+    const name = reserveName(directoryPath, getUrlName(url, urlInfo));
     const buildUrl = `${buildDirectoryUrl}${directoryPath}${name}${search}${hash}`;
     associateBuildUrl(url, buildUrl);
     return buildUrl;
@@ -13217,6 +13234,7 @@ const prepareEntryPointBuild = async (
         base,
         assetsDirectory,
         buildUrlsGenerator,
+        entryKey: sourceRelativeUrl,
 
         versioning,
         versioningMethod,

package/dist/start_dev_server/start_dev_server.js

@@ -768,7 +768,9 @@ const parseUserAgentHeader = (userAgent) => {
  *     - "clients_list"    the whole registry (the dashboard renders it)
  *     - "client_log"      a single log line (a monitor appends it)
  *     - "client_activity" a single qualified activity (a monitor appends it)
- *     - "client_here"     a client just appeared/resumed (every page can toast it)
+ *     - "client_here"     a networked client just appeared/resumed (every page
+ *                         can toast it); never sent for the main client, which
+ *                         is the person reading the toast
  *     - "client_command"  pilot one client (navigate/reload its tab) from the
  *                         dashboard; the matching reporter runs it
  *   Server events are broadcast, so consumers filter what they care about.
@@ -783,7 +785,7 @@ const parseUserAgentHeader = (userAgent) => {
  *
  * The monitoring script is injected into EVERY cooked page, including our own
  * dashboard and monitor pages — so opening one of those counts as a connected
- * client, and any open page gets toasted when another client appears.
+ * client, and any open page gets toasted when another networked client appears.
  *
  * Pages:
  * - /.internal/clients     → dashboard listing every client seen
@@ -1114,12 +1116,25 @@ const jsenvPluginClientMonitoring = () => {
     pruneTabs(client);
     pruneClients();
 
-    if (firstEver) {
-      sendClientHere({ reason: "new", client: serializeClient(client) });
-      sendClientsList();
-    } else if (!wasOnline) {
-      // A report after a long quiet spell means the client was picked back up.
-      sendClientHere({ reason: "resumed", client: serializeClient(client) });
+    if (firstEver || !wasOnline) {
+      // The toast invites the reader to monitor the client that just appeared,
+      // so it is only worth showing for a client there is something to watch:
+      // one reaching the server over the network. The machine running the dev
+      // server is the person reading the toast — it browses over localhost, its
+      // devtools are one keystroke away and nothing is captured for it, so
+      // announcing it means interrupting someone about themselves. It happens
+      // more than one would think: the client id lives in localStorage, so the
+      // same browser gets a fresh id per origin (localhost vs 127.0.0.1 vs the
+      // LAN ip, another port) and in private windows, and each of those looks
+      // like a brand new client to the server.
+      if (!isLocalIp(client.ip)) {
+        sendClientHere({
+          // A report after a long quiet spell means the client was picked back
+          // up rather than newly seen.
+          reason: firstEver ? "new" : "resumed",
+          client: serializeClient(client),
+        });
+      }
       sendClientsList();
     }
 
@@ -3228,7 +3243,13 @@ const jsenvPluginWebResolution = () => {
         if (ownerUrlInfo.originalUrl?.startsWith("http")) {
           return new URL(resource, ownerUrlInfo.originalUrl);
         }
-        const url = new URL(resource.slice(1), ownerUrlInfo.entryUrlInfo.url);
+        // "/x" is the web meaning of a root-relative url: the root of what is
+        // served, which is the source directory — not the directory the entry
+        // point happens to sit in.
+        const url = new URL(
+          resource.slice(1),
+          ownerUrlInfo.context.rootDirectoryUrl,
+        );
         return url;
       }
       // baseUrl happens second argument to new URL() is different from
@@ -11154,7 +11175,16 @@ const devServerPluginServeSourceFiles = ({
         }
       }
     });
-    const clientRuntimeCompat = { [runtimeName]: runtimeVersion };
+    // A client we cannot identify (curl, fetch, a healthcheck, a proxy dropping
+    // the user agent) is assumed to be one of the runtimes the project targets.
+    // Treating it as a runtime supporting nothing would serve it the js module
+    // fallback, breaking tooling perfectly capable of ES modules; an actual
+    // ancient browser hiding its identity fails loudly instead, which is the
+    // cheaper of the two mistakes.
+    const clientRuntimeCompat =
+      runtimeName === "unknown"
+        ? runtimeCompat
+        : { [runtimeName]: runtimeVersion };
 
     kitchen = createKitchen({
       name: runtimeId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.4.6",
+  "version": "41.4.8",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {

package/src/build/build.js

@@ -1249,6 +1249,7 @@ const prepareEntryPointBuild = async (
         base,
         assetsDirectory,
         buildUrlsGenerator,
+        entryKey: sourceRelativeUrl,
 
         versioning,
         versioningMethod,

package/src/build/build_specifier_manager.js

@@ -39,6 +39,7 @@ export const createBuildSpecifierManager = ({
   buildDirectoryUrl,
   assetsDirectory,
   buildUrlsGenerator,
+  entryKey,
   base,
   length = 8,
 
@@ -77,6 +78,7 @@ export const createBuildSpecifierManager = ({
         urlInfo,
         ownerUrlInfo: reference.ownerUrlInfo,
         assetsDirectory,
+        entryKey,
       });
     }
 
@@ -1134,9 +1136,14 @@ export const createBuildSpecifierManager = ({
           let contentKey;
           // if to guard for html where versioned build specifier is not generated
           if (buildSpecifierVersioned) {
-            const buildUrlVersioned = asBuildUrlVersioned({
-              buildSpecifierVersioned,
-              buildDirectoryUrl,
+            // The version goes on the build url, not on the specifier: a
+            // specifier is written for one importer to read (base: "./" makes
+            // it relative to that importer, base: "https://cdn…" makes it
+            // absolute elsewhere) and says nothing about where the file lands.
+            const buildUrlVersioned = injectVersionIntoBuildSpecifier({
+              buildSpecifier: buildUrl,
+              version: versionMap.get(urlInfo),
+              versioningMethod,
             });
             const buildRelativeUrlVersioned = urlToRelativeUrl(
               buildUrlVersioned,
@@ -1380,23 +1387,6 @@ const injectVersionIntoBuildSpecifier = ({
   );
 };
 
-const asBuildUrlVersioned = ({
-  buildSpecifierVersioned,
-  buildDirectoryUrl,
-}) => {
-  if (buildSpecifierVersioned[0] === "/") {
-    return new URL(buildSpecifierVersioned.slice(1), buildDirectoryUrl).href;
-  }
-  const buildUrl = new URL(buildSpecifierVersioned, buildDirectoryUrl).href;
-  if (buildUrl.startsWith(buildDirectoryUrl)) {
-    return buildUrl;
-  }
-  // it's likely "base" parameter was set to an url origin like "https://cdn.example.com"
-  // let's move url to build directory
-  const { pathname, search, hash } = new URL(buildSpecifierVersioned);
-  return `${buildDirectoryUrl}${pathname}${search}${hash}`;
-};
-
 const targetsAFileThatDoesNotExist = (url) => {
   if (!url.startsWith("file:")) {
     return false;

package/src/build/build_urls_generator.js

@@ -31,12 +31,41 @@ export const createBuildUrlsGenerator = ({
   };
 
   const nameSetPerDirectoryMap = new Map();
-  const generate = (url, { urlInfo, ownerUrlInfo, assetsDirectory }) => {
-    const buildUrlFromMap = buildUrlMap.get(url);
+  const reserveName = (directoryPath, urlName) => {
+    let nameSet = nameSetPerDirectoryMap.get(directoryPath);
+    if (!nameSet) {
+      nameSet = new Set();
+      nameSetPerDirectoryMap.set(directoryPath, nameSet);
+    }
+    let [basename, extension] = splitFileExtension(urlName);
+    extension = extensionMappings[extension] || extension;
+    let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
+    let integer = 1;
+    while (nameSet.has(nameCandidate)) {
+      integer++;
+      nameCandidate = `${basename}${integer}${extension}`;
+    }
+    nameSet.add(nameCandidate);
+    return nameCandidate;
+  };
+  const generate = (
+    url,
+    { urlInfo, ownerUrlInfo, assetsDirectory, entryKey },
+  ) => {
+    // A url already inside the build directory names a chunk a bundler just
+    // produced, and each entry point is bundled on its own: two of them
+    // routinely produce a chunk of the same name holding different code (the
+    // shared dependencies of THAT entry point, exported under names decided by
+    // THAT bundle). They are told apart by the entry point they come from —
+    // sharing the file would leave one entry importing exports the file on disk
+    // does not have.
+    const insideBuildDirectory = urlIsOrIsInsideOf(url, buildDirectoryUrl);
+    const key = insideBuildDirectory ? `${entryKey} ${url}` : url;
+    const buildUrlFromMap = buildUrlMap.get(key);
     if (buildUrlFromMap) {
       return buildUrlFromMap;
     }
-    if (urlIsOrIsInsideOf(url, buildDirectoryUrl)) {
+    if (insideBuildDirectory) {
       if (ownerUrlInfo.searchParams.has("dynamic_import_id")) {
         const ownerDirectoryPath = determineDirectoryPath({
           sourceDirectoryUrl,
@@ -48,11 +77,18 @@ export const createBuildUrlsGenerator = ({
         buildUrl = injectQueryParams(buildUrl, {
           dynamic_import_id: undefined,
         });
-        associateBuildUrl(url, buildUrl);
+        associateBuildUrl(key, buildUrl);
         return buildUrl;
       }
-      associateBuildUrl(url, url);
-      return url;
+      const urlObject = new URL(url);
+      const chunkDirectoryPath = urlToRelativeUrl(
+        new URL("./", urlObject),
+        buildDirectoryUrl,
+      );
+      const chunkName = reserveName(chunkDirectoryPath, urlToFilename(url));
+      const buildUrl = `${buildDirectoryUrl}${chunkDirectoryPath}${chunkName}${urlObject.search}${urlObject.hash}`;
+      associateBuildUrl(key, buildUrl);
+      return buildUrl;
     }
     if (urlInfo.type === "entry_build") {
       const buildUrl = new URL(urlInfo.filenameHint, buildDirectoryUrl).href;
@@ -84,25 +120,10 @@ export const createBuildUrlsGenerator = ({
       urlInfo,
       ownerUrlInfo,
     });
-    let nameSet = nameSetPerDirectoryMap.get(directoryPath);
-    if (!nameSet) {
-      nameSet = new Set();
-      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);
-    extension = extensionMappings[extension] || extension;
-    let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
-    let integer = 1;
-    while (nameSet.has(nameCandidate)) {
-      integer++;
-      nameCandidate = `${basename}${integer}${extension}`;
-    }
-    const name = nameCandidate;
-    nameSet.add(name);
+    const name = reserveName(directoryPath, getUrlName(url, urlInfo));
     const buildUrl = `${buildDirectoryUrl}${directoryPath}${name}${search}${hash}`;
     associateBuildUrl(url, buildUrl);
     return buildUrl;

package/src/dev/dev_server_plugins/dev_server_plugin_serve_source_files.js

@@ -71,7 +71,16 @@ export const devServerPluginServeSourceFiles = ({
         }
       }
     });
-    const clientRuntimeCompat = { [runtimeName]: runtimeVersion };
+    // A client we cannot identify (curl, fetch, a healthcheck, a proxy dropping
+    // the user agent) is assumed to be one of the runtimes the project targets.
+    // Treating it as a runtime supporting nothing would serve it the js module
+    // fallback, breaking tooling perfectly capable of ES modules; an actual
+    // ancient browser hiding its identity fails loudly instead, which is the
+    // cheaper of the two mistakes.
+    const clientRuntimeCompat =
+      runtimeName === "unknown"
+        ? runtimeCompat
+        : { [runtimeName]: runtimeVersion };
 
     kitchen = createKitchen({
       name: runtimeId,

package/src/plugins/client_monitoring/jsenv_plugin_client_monitoring.js

@@ -22,7 +22,9 @@
  *     - "clients_list"    the whole registry (the dashboard renders it)
  *     - "client_log"      a single log line (a monitor appends it)
  *     - "client_activity" a single qualified activity (a monitor appends it)
- *     - "client_here"     a client just appeared/resumed (every page can toast it)
+ *     - "client_here"     a networked client just appeared/resumed (every page
+ *                         can toast it); never sent for the main client, which
+ *                         is the person reading the toast
  *     - "client_command"  pilot one client (navigate/reload its tab) from the
  *                         dashboard; the matching reporter runs it
  *   Server events are broadcast, so consumers filter what they care about.
@@ -37,7 +39,7 @@
  *
  * The monitoring script is injected into EVERY cooked page, including our own
  * dashboard and monitor pages — so opening one of those counts as a connected
- * client, and any open page gets toasted when another client appears.
+ * client, and any open page gets toasted when another networked client appears.
  *
  * Pages:
  * - /.internal/clients     → dashboard listing every client seen
@@ -370,12 +372,25 @@ export const jsenvPluginClientMonitoring = () => {
     pruneTabs(client);
     pruneClients();
 
-    if (firstEver) {
-      sendClientHere({ reason: "new", client: serializeClient(client) });
-      sendClientsList();
-    } else if (!wasOnline) {
-      // A report after a long quiet spell means the client was picked back up.
-      sendClientHere({ reason: "resumed", client: serializeClient(client) });
+    if (firstEver || !wasOnline) {
+      // The toast invites the reader to monitor the client that just appeared,
+      // so it is only worth showing for a client there is something to watch:
+      // one reaching the server over the network. The machine running the dev
+      // server is the person reading the toast — it browses over localhost, its
+      // devtools are one keystroke away and nothing is captured for it, so
+      // announcing it means interrupting someone about themselves. It happens
+      // more than one would think: the client id lives in localStorage, so the
+      // same browser gets a fresh id per origin (localhost vs 127.0.0.1 vs the
+      // LAN ip, another port) and in private windows, and each of those looks
+      // like a brand new client to the server.
+      if (!isLocalIp(client.ip)) {
+        sendClientHere({
+          // A report after a long quiet spell means the client was picked back
+          // up rather than newly seen.
+          reason: firstEver ? "new" : "resumed",
+          client: serializeClient(client),
+        });
+      }
       sendClientsList();
     }
 

package/src/plugins/resolution_web/jsenv_plugin_web_resolution.js

@@ -9,7 +9,13 @@ export const jsenvPluginWebResolution = () => {
         if (ownerUrlInfo.originalUrl?.startsWith("http")) {
           return new URL(resource, ownerUrlInfo.originalUrl);
         }
-        const url = new URL(resource.slice(1), ownerUrlInfo.entryUrlInfo.url);
+        // "/x" is the web meaning of a root-relative url: the root of what is
+        // served, which is the source directory — not the directory the entry
+        // point happens to sit in.
+        const url = new URL(
+          resource.slice(1),
+          ownerUrlInfo.context.rootDirectoryUrl,
+        );
         return url;
       }
       // baseUrl happens second argument to new URL() is different from