@jsenv/core 40.5.3 → 40.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.5.3",
+  "version": "40.6.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -38,14 +38,15 @@
   },
   "packageManager": "npm@11.2.0",
   "workspaces": [
-    "./packages/independent/*",
-    "./packages/independent/backend/*",
-    "./packages/independent/frontend/*",
-    "./packages/independent/tooling/*",
-    "./packages/independent/shared/*",
+    "./packages/back_and_front/*",
+    "./packages/backend/*",
+    "./packages/frontend/*",
     "./packages/internal/*",
+    "./packages/private/*",
+    "./packages/private/oto/packages/*",
     "./packages/related/*",
-    "./packages/related/cli/*"
+    "./packages/related/cli/*",
+    "./packages/tooling/*"
   ],
   "sideEffects": [
     "./src/kitchen/client/inline_content.js",
@@ -72,10 +73,11 @@
     "test:packages:ci": "CI=1 npm run workspace:test",
     "test:only_dev_server_errors": "node --conditions=dev:jsenv ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
     "dev": "node --watch --conditions=dev:jsenv ./scripts/dev/dev.mjs",
-    "dev:route-inspector": "node --watch --conditions=dev:jsenv ./packages/independent/backend/server/tests/route_inspector/start_server.js",
+    "dev:route-inspector": "node --watch --conditions=dev:jsenv ./packages/backend/server/tests/route_inspector/start_server.js",
     "playwright:install": "npx playwright install-deps && npx playwright install",
     "https:setup": "npx @jsenv/https-local setup",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "oto:start": "npm run start -w oto"
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
@@ -85,48 +87,48 @@
     "@jsenv/plugin-minification": "1.7.0",
     "@jsenv/plugin-supervisor": "1.6.17",
     "@jsenv/plugin-transpilation": "1.5.18",
-    "@jsenv/sourcemap": "1.3.7",
-    "@jsenv/server": "16.1.2"
+    "@jsenv/server": "16.1.2",
+    "@jsenv/sourcemap": "1.3.7"
   },
   "devDependencies": {
     "@babel/plugin-syntax-decorators": "7.25.9",
     "@babel/plugin-syntax-import-attributes": "7.26.0",
     "@babel/plugin-syntax-optional-chaining-assign": "7.25.9",
+    "@jsenv/abort": "workspace:*",
     "@jsenv/assert": "workspace:*",
     "@jsenv/cli": "workspace:*",
     "@jsenv/core": "./",
     "@jsenv/eslint-config-relax": "workspace:*",
     "@jsenv/file-size-impact": "workspace:*",
+    "@jsenv/filesystem": "workspace:*",
     "@jsenv/https-local": "workspace:*",
+    "@jsenv/humanize": "workspace:*",
+    "@jsenv/importmap": "workspace:*",
+    "@jsenv/integrity": "workspace:*",
     "@jsenv/md-up": "workspace:*",
     "@jsenv/monorepo": "workspace:*",
+    "@jsenv/node-esm-resolution": "workspace:*",
+    "@jsenv/os-metrics": "workspace:*",
     "@jsenv/performance-impact": "workspace:*",
     "@jsenv/plugin-as-js-classic": "workspace:*",
     "@jsenv/router": "workspace:*",
+    "@jsenv/runtime-compat": "workspace:*",
     "@jsenv/snapshot": "workspace:*",
-    "@jsenv/test": "workspace:*",
     "@jsenv/terminal-table": "workspace:*",
-    "@jsenv/os-metrics": "workspace:*",
-    "@jsenv/runtime-compat": "workspace:*",
+    "@jsenv/test": "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",
     "babel-plugin-transform-async-to-promises": "0.8.18",
     "eslint": "9.24.0",
-    "open": "10.1.0",
+    "open": "10.1.1",
     "playwright": "1.51.1",
+    "preact": "10.26.5",
     "prettier": "3.5.3",
     "prettier-plugin-organize-imports": "4.1.0",
-    "strip-ansi": "7.1.0",
-    "preact": "10.26.5"
+    "strip-ansi": "7.1.0"
   }
 }

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -46,8 +46,7 @@ export const jsenvPluginNodeEsmResolution = (
         if (config === true) {
           resolver = nodeEsmResolverDefault;
         } else if (config === false) {
-          // resolverMap.set(urlType, () => null);
-          continue;
+          resolver = null;
         } else if (typeof config === "object") {
           resolver = resolverFromObject(config, { kitchenContext, urlType });
         } else {
@@ -62,6 +61,9 @@ export const jsenvPluginNodeEsmResolution = (
           resolverMap.set(urlType, resolver);
         }
       }
+      if (!anyTypeResolver) {
+        anyTypeResolver = nodeEsmResolverDefault;
+      }
 
       if (!resolverMap.has("js_module")) {
         resolverMap.set("js_module", nodeEsmResolverDefault);
@@ -87,8 +89,11 @@ export const jsenvPluginNodeEsmResolution = (
       }
       const urlType = urlTypeFromReference(reference);
       const resolver = resolverMap.get(urlType);
-      if (resolver) {
-        return resolver(reference);
+      if (resolver !== undefined) {
+        if (typeof resolver === "function") {
+          return resolver(reference);
+        }
+        return resolver;
       }
       if (anyTypeResolver) {
         return anyTypeResolver(reference);

package/src/plugins/resolution_node_esm/node_esm_resolver.js

@@ -51,13 +51,32 @@ export const createNodeEsmResolver = ({
       return null; // let it to jsenv_web_resolution
     }
     const { specifier } = reference;
-    const conditions = buildPackageConditions(specifier, parentUrl);
-    const { url, type, isMain, packageDirectoryUrl } = applyNodeEsmResolution({
+    // specifiers like "#something" have a special meaning for Node.js
+    // but can also be used in .css and .html files for example and should not be modified
+    // by node esm resolution
+    const webResolutionFallback =
+      ownerUrlInfo.type !== "js_module" ||
+      reference.type === "sourcemap_comment";
+    const conditions = buildPackageConditions(specifier, parentUrl, {
+      webResolutionFallback,
+    });
+    let resolution;
+    const nodeEsmResolutionParams = {
       conditions,
       parentUrl,
       specifier,
       preservesSymlink,
-    });
+    };
+    if (webResolutionFallback) {
+      try {
+        resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
+      } catch {
+        return null; // delegate to web_resolution plugin
+      }
+    } else {
+      resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
+    }
+    const { url, type, isMain, packageDirectoryUrl } = resolution;
     // try to give a more meaningful filename after build
     if (isMain && packageDirectoryUrl) {
       const basename = urlToBasename(url);
@@ -126,12 +145,26 @@ const createBuildPackageConditions = (
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   const processArgConditions = readCustomConditionsFromProcessArgs();
-  const devResolver = (specifier, importer) => {
+  const devResolver = (specifier, importer, { webResolutionFallback }) => {
     if (isBareSpecifier(specifier)) {
-      const { url } = applyNodeEsmResolution({
-        specifier,
-        parentUrl: importer,
-      });
+      let url;
+      if (webResolutionFallback) {
+        try {
+          const resolution = applyNodeEsmResolution({
+            specifier,
+            parentUrl: importer,
+          });
+          url = resolution.url;
+        } catch {
+          url = new URL(specifier, importer).href;
+        }
+      } else {
+        const resolution = applyNodeEsmResolution({
+          specifier,
+          parentUrl: importer,
+        });
+        url = resolution.url;
+      }
       return !url.includes("/node_modules/");
     }
     return !importer.includes("/node_modules/");
@@ -235,12 +268,12 @@ const createBuildPackageConditions = (
   }
 
   const conditionCandidateArray = Object.keys(conditionResolvers);
-  return (specifier, importer) => {
+  return (specifier, importer, params) => {
     const conditions = [];
     for (const conditionCandidate of conditionCandidateArray) {
       const conditionResolver = conditionResolvers[conditionCandidate];
       if (typeof conditionResolver === "function") {
-        if (conditionResolver(specifier, importer)) {
+        if (conditionResolver(specifier, importer, params)) {
           conditions.push(conditionCandidate);
         }
       } else if (conditionResolver) {