@jsenv/core 39.3.10 → 39.3.12

package/dist/jsenv_core.js

@@ -1465,7 +1465,7 @@ const isValidUrl$1 = (url) => {
     // eslint-disable-next-line no-new
     new URL(url);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -1826,7 +1826,7 @@ const validateDirectoryUrl = (value) => {
     } else {
       try {
         urlString = String(new URL(value));
-      } catch (e) {
+      } catch {
         return {
           valid: false,
           value,
@@ -1834,6 +1834,12 @@ const validateDirectoryUrl = (value) => {
         };
       }
     }
+  } else if (
+    value &&
+    typeof value === "object" &&
+    typeof value.href === "string"
+  ) {
+    value = value.href;
   } else {
     return {
       valid: false,
@@ -1876,7 +1882,7 @@ const validateFileUrl = (value, baseUrl) => {
     } else {
       try {
         urlString = String(new URL(value, baseUrl));
-      } catch (e) {
+      } catch {
         return {
           valid: false,
           value,
@@ -1987,7 +1993,7 @@ const baseUrlFallback = fileSystemPathToUrl$1(process.cwd());
 const ensureWindowsDriveLetter = (url, baseUrl) => {
   try {
     url = String(new URL(url));
-  } catch (e) {
+  } catch {
     throw new Error(`absolute url expect but got ${url}`);
   }
 
@@ -1997,7 +2003,7 @@ const ensureWindowsDriveLetter = (url, baseUrl) => {
 
   try {
     baseUrl = String(new URL(baseUrl));
-  } catch (e) {
+  } catch {
     throw new Error(
       `absolute baseUrl expect but got ${baseUrl} to ensure windows drive letter on ${url}`,
     );
@@ -2847,7 +2853,7 @@ const resolveAssociations = (associations, baseUrl) => {
         let patternResolved;
         try {
           patternResolved = String(new URL(pattern, baseUrl));
-        } catch (e) {
+        } catch {
           // it's not really an url, no need to perform url resolution nor encoding
           patternResolved = pattern;
         }
@@ -7826,7 +7832,7 @@ const getMtimeResponse = async ({ headers, sourceStat }) => {
     let cachedModificationDate;
     try {
       cachedModificationDate = new Date(headers["if-modified-since"]);
-    } catch (e) {
+    } catch {
       return {
         status: 400,
         statusText: "if-modified-since header is not a valid date",
@@ -7928,7 +7934,7 @@ const asUrlString = (value) => {
     try {
       const urlObject = new URL(value);
       return String(urlObject);
-    } catch (e) {
+    } catch {
       return null;
     }
   }
@@ -9606,7 +9612,6 @@ const babelPluginBabelHelpersAsJsenvImports = (
   };
 };
 
-/* eslint-disable camelcase */
 // copied from
 // https://github.com/babel/babel/blob/e498bee10f0123bb208baa228ce6417542a2c3c4/packages/babel-compat-data/data/plugins.json#L1
 // https://github.com/babel/babel/blob/master/packages/babel-compat-data/data/plugins.json#L1
@@ -17104,20 +17109,44 @@ const jsenvPluginInlineContentFetcher = () => {
       if (!urlInfo.isInline) {
         return null;
       }
-      // - we must use last reference because
-      //   when updating the file, first reference is the previous version
-      // - we cannot use urlInfo.lastReference because it can be the reference created by "http_request"
+      let isDirectRequestToFile;
+      if (urlInfo.context.request) {
+        const requestedUrl = new URL(
+          urlInfo.context.request.resource.slice(1),
+          urlInfo.context.rootDirectoryUrl,
+        ).href;
+        isDirectRequestToFile = requestedUrl === urlInfo.url;
+      }
+      /*
+       * We want to find inline content but it's not straightforward
+       *
+       * For some reason (that would be great to investigate)
+       * urlInfo corresponding to inline content has several referenceFromOthersSet
+       * so the latest version is the last reference
+       * BUT the last reference is the "http_request"
+       * so it's more likely the before last reference that contains the latest version
+       *
+       * BUT the is an exception when using supervisor as the before last reference
+       * is the one fetched by the browser that is already cooked
+       * we must re-cook from the original content, not from the already cooked content
+       * Otherwise references are already resolved and
+       * - "/node_modules/package/file.js" instead of "package/file.js"
+       * - meaning we would not create the implicit dependency to package.json
+       * - resulting in a reload of the browser (as implicit reference to package.json is gone)
+       * -> can create infinite loop of reloads
+       */
       let lastInlineReference;
       let originalContent = urlInfo.originalContent;
       for (const reference of urlInfo.referenceFromOthersSet) {
-        if (reference.isInline) {
-          if (
-            urlInfo.originalContent === undefined &&
-            originalContent === undefined
-          ) {
-            originalContent = reference.content;
-          }
-          lastInlineReference = reference;
+        if (!reference.isInline) {
+          continue;
+        }
+        if (urlInfo.originalContent === undefined) {
+          originalContent = reference.content;
+        }
+        lastInlineReference = reference;
+        if (isDirectRequestToFile) {
+          break;
         }
       }
       const { prev } = lastInlineReference;
@@ -17139,12 +17168,6 @@ const jsenvPluginInlineContentFetcher = () => {
       return {
         originalContent,
         content:
-          // we must favor original content to re-apply the same plugin logic
-          // so that the same references are generated
-          // without this we would try to resolve references like
-          // "/node_modules/package/file.js" instead of "package/file.js"
-          // meaning we would not create the implicit dependency to package.json
-          // resulting in a reload of the browser (as implicit reference to package.json is gone)
           originalContent === undefined
             ? lastInlineReference.content
             : originalContent,
@@ -17209,7 +17232,7 @@ const isValidUrl = (url) => {
     // eslint-disable-next-line no-new
     new URL(url);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -17257,7 +17280,7 @@ const defaultReadPackageJson = (packageUrl) => {
   const string = String(buffer);
   try {
     return JSON.parse(string);
-  } catch (e) {
+  } catch {
     throw new Error(`Invalid package configuration`);
   }
 };
@@ -17505,7 +17528,7 @@ const applyPackageSpecifierResolution = (specifier, resolutionContext) => {
       type: "absolute_specifier",
       url: urlObject.href,
     };
-  } catch (e) {
+  } catch {
     // bare specifier
     const browserFieldResolution = applyBrowserFieldResolution(
       specifier,
@@ -20495,7 +20518,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     extension = extensionMappings[extension] || extension;
     let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
     let integer = 1;
-    // eslint-disable-next-line no-constant-condition
     while (true) {
       if (!names.includes(nameCandidate)) {
         names.push(nameCandidate);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.3.10",
+  "version": "39.3.12",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -43,7 +43,7 @@
     "./packages/related/cli/*"
   ],
   "scripts": {
-    "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
+    "eslint": "npx eslint .",
     "test": "node --conditions=development ./scripts/test/test.mjs",
     "build": "node --conditions=development ./scripts/build/build.mjs",
     "workspace:test": "npm run test --workspaces --if-present -- --workspace",
@@ -69,18 +69,18 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/ast": "6.2.16",
-    "@jsenv/filesystem": "4.10.1",
+    "@jsenv/filesystem": "4.10.2",
     "@jsenv/humanize": "1.2.8",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.2",
     "@jsenv/js-module-fallback": "1.3.37",
-    "@jsenv/node-esm-resolution": "1.0.5",
+    "@jsenv/node-esm-resolution": "1.0.6",
     "@jsenv/plugin-bundling": "2.7.7",
     "@jsenv/plugin-minification": "1.5.5",
     "@jsenv/plugin-supervisor": "1.5.18",
     "@jsenv/plugin-transpilation": "1.4.21",
     "@jsenv/runtime-compat": "1.3.1",
-    "@jsenv/server": "15.2.19",
+    "@jsenv/server": "15.3.0",
     "@jsenv/sourcemap": "1.2.23",
     "@jsenv/url-meta": "8.5.1",
     "@jsenv/urls": "2.5.2",
@@ -91,6 +91,7 @@
     "@babel/eslint-parser": "7.25.1",
     "@babel/plugin-syntax-import-attributes": "7.24.7",
     "@babel/plugin-syntax-optional-chaining-assign": "7.24.7",
+    "@eslint/compat": "1.1.1",
     "@jsenv/assert": "./packages/independent/assert/",
     "@jsenv/cli": "./packages/related/cli/",
     "@jsenv/core": "./",
@@ -102,18 +103,14 @@
     "@jsenv/plugin-as-js-classic": "./packages/related/plugin-as-js-classic/",
     "@jsenv/snapshot": "./packages/independent/snapshot/",
     "@jsenv/test": "./packages/related/test/",
-    "@playwright/browser-chromium": "1.45.3",
-    "@playwright/browser-firefox": "1.45.3",
-    "@playwright/browser-webkit": "1.45.3",
+    "@playwright/browser-chromium": "1.46.0",
+    "@playwright/browser-firefox": "1.46.0",
+    "@playwright/browser-webkit": "1.46.0",
     "babel-plugin-transform-async-to-promises": "0.8.18",
-    "eslint": "8.56.0",
-    "eslint-plugin-html": "8.1.1",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-react": "7.35.0",
-    "eslint-plugin-regexp": "2.6.0",
-    "marked": "13.0.3",
+    "eslint": "9.8.0",
+    "marked": "14.0.0",
     "open": "10.1.0",
-    "playwright": "1.45.3",
+    "playwright": "1.46.0",
     "prettier": "3.3.3",
     "prettier-plugin-organize-imports": "4.0.0",
     "strip-ansi": "7.1.0"

package/src/build/build_urls_generator.js

@@ -69,7 +69,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     extension = extensionMappings[extension] || extension;
     let nameCandidate = `${basename}${extension}`; // reconstruct name in case extension was normalized
     let integer = 1;
-    // eslint-disable-next-line no-constant-condition
     while (true) {
       if (!names.includes(nameCandidate)) {
         names.push(nameCandidate);

package/src/kitchen/kitchen.js

@@ -9,7 +9,6 @@ import {
   urlIsInsideOf,
 } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
-
 import { jsenvPluginHtmlSyntaxErrorFallback } from "../plugins/html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js";
 import { createPluginController } from "../plugins/plugin_controller.js";
 import {

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -41,20 +41,44 @@ const jsenvPluginInlineContentFetcher = () => {
       if (!urlInfo.isInline) {
         return null;
       }
-      // - we must use last reference because
-      //   when updating the file, first reference is the previous version
-      // - we cannot use urlInfo.lastReference because it can be the reference created by "http_request"
+      let isDirectRequestToFile;
+      if (urlInfo.context.request) {
+        const requestedUrl = new URL(
+          urlInfo.context.request.resource.slice(1),
+          urlInfo.context.rootDirectoryUrl,
+        ).href;
+        isDirectRequestToFile = requestedUrl === urlInfo.url;
+      }
+      /*
+       * We want to find inline content but it's not straightforward
+       *
+       * For some reason (that would be great to investigate)
+       * urlInfo corresponding to inline content has several referenceFromOthersSet
+       * so the latest version is the last reference
+       * BUT the last reference is the "http_request"
+       * so it's more likely the before last reference that contains the latest version
+       *
+       * BUT the is an exception when using supervisor as the before last reference
+       * is the one fetched by the browser that is already cooked
+       * we must re-cook from the original content, not from the already cooked content
+       * Otherwise references are already resolved and
+       * - "/node_modules/package/file.js" instead of "package/file.js"
+       * - meaning we would not create the implicit dependency to package.json
+       * - resulting in a reload of the browser (as implicit reference to package.json is gone)
+       * -> can create infinite loop of reloads
+       */
       let lastInlineReference;
       let originalContent = urlInfo.originalContent;
       for (const reference of urlInfo.referenceFromOthersSet) {
-        if (reference.isInline) {
-          if (
-            urlInfo.originalContent === undefined &&
-            originalContent === undefined
-          ) {
-            originalContent = reference.content;
-          }
-          lastInlineReference = reference;
+        if (!reference.isInline) {
+          continue;
+        }
+        if (urlInfo.originalContent === undefined) {
+          originalContent = reference.content;
+        }
+        lastInlineReference = reference;
+        if (isDirectRequestToFile) {
+          break;
         }
       }
       const { prev } = lastInlineReference;
@@ -76,12 +100,6 @@ const jsenvPluginInlineContentFetcher = () => {
       return {
         originalContent,
         content:
-          // we must favor original content to re-apply the same plugin logic
-          // so that the same references are generated
-          // without this we would try to resolve references like
-          // "/node_modules/package/file.js" instead of "package/file.js"
-          // meaning we would not create the implicit dependency to package.json
-          // resulting in a reload of the browser (as implicit reference to package.json is gone)
           originalContent === undefined
             ? lastInlineReference.content
             : originalContent,