@jsenv/core 40.5.3 → 40.6.1

package/src/kitchen/kitchen.js

@@ -37,7 +37,28 @@ export const createKitchen = ({
 
   ignore,
   ignoreProtocol = "remove",
-  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
+  supportedProtocols = [
+    "file:",
+    "data:",
+    // eslint-disable-next-line no-script-url
+    "javascript:",
+    "virtual:",
+    "ignore:",
+    "http:",
+    "https:",
+    "chrome:",
+    "chrome-extension:",
+    "chrome-untrusted:",
+    "isolated-app:",
+  ],
+  includedProtocols = [
+    "file:",
+    "data:",
+    "virtual:",
+    "ignore:",
+    "http:",
+    "https:",
+  ],
 
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
@@ -57,6 +78,9 @@ export const createKitchen = ({
 
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
+  if (nodeRuntimeEnabled) {
+    supportedProtocols.push("node:");
+  }
 
   if (packageDependencies === "auto") {
     packageDependencies = build && nodeRuntimeEnabled ? "ignore" : "include";
@@ -128,8 +152,11 @@ export const createKitchen = ({
 
   const isIgnoredByProtocol = (url) => {
     const { protocol } = new URL(url);
-    const protocolIsSupported = supportedProtocols.includes(protocol);
-    return !protocolIsSupported;
+    const protocolIsIncluded = includedProtocols.includes(protocol);
+    if (protocolIsIncluded) {
+      return false;
+    }
+    return true;
   };
   const isIgnoredBecauseInPackageDependencies = (() => {
     if (packageDependencies === undefined) {
@@ -336,6 +363,21 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       }
       reference.generatedUrl = reference.url;
       reference.generatedSearchParams = reference.searchParams;
+      if (dev) {
+        let url = reference.url;
+        let { protocol } = new URL(url);
+        if (protocol === "ignore:") {
+          url = url.slice("ignore:".length);
+          protocol = new URL(url, "http://example.com").protocol;
+        }
+        if (!supportedProtocols.includes(protocol)) {
+          const protocolNotSupportedError = new Error(
+            `Unsupported protocol "${protocol}" for url "${url}"`,
+          );
+          protocolNotSupportedError.code = "PROTOCOL_NOT_SUPPORTED";
+          throw protocolNotSupportedError;
+        }
+      }
       return reference;
     } catch (error) {
       throw createResolveUrlError({

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -88,6 +88,9 @@ export const jsenvPluginProtocolFile = ({
       name: "jsenv:directory_as_json",
       appliesDuring: "*",
       fetchUrlContent: (urlInfo) => {
+        if (!urlInfo.url.startsWith("file:")) {
+          return null;
+        }
         const { firstReference } = urlInfo;
         let { fsStat } = firstReference;
         if (!fsStat) {

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) {