@jsenv/core 32.1.2 → 32.2.1

package/dist/main.js

@@ -17152,6 +17152,7 @@ const addRelationshipWithPackageJson = ({
  * - "css_@import"
  * - "css_url"
  * - "js_import"
+ * - "js_import_script"
  * - "js_url"
  * - "js_inline_content"
  * - "sourcemap_comment"
@@ -17173,21 +17174,19 @@ const jsenvPluginUrlResolution = ({
   Object.keys(urlResolution).forEach(urlType => {
     const resolver = urlResolution[urlType];
     if (typeof resolver !== "object") {
-      throw new Error(`Unexpected urlResolution configuration:
-"${urlType}" resolution value must be an object, got ${resolver}`);
+      throw new Error(`urlResolution values must be objects, got ${resolver} on "${urlType}"`);
     }
     let {
       web,
       node_esm,
       ...rest
     } = resolver;
-    const unexpectedKey = Object.keys(rest)[0];
-    if (unexpectedKey) {
-      throw new Error(`Unexpected urlResolution configuration:
-"${urlType}" resolution key must be "web" or "node_esm", found "${Object.keys(rest)[0]}"`);
+    const unexpectedKeys = Object.keys(rest);
+    if (unexpectedKeys.length) {
+      throw new TypeError(`${unexpectedKeys.join(",")}: there is no such configuration on "${urlType}"`);
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_module";
+      node_esm = urlType === "js_import";
     }
     if (web === undefined) {
       web = true;
@@ -17207,11 +17206,20 @@ const jsenvPluginUrlResolution = ({
       resolvers[urlType] = resolveUrlUsingWebResolution;
     }
   });
+  const nodeEsmResolverDefault = createNodeEsmResolver({
+    runtimeCompat,
+    preservesSymlink: true
+  });
   if (!resolvers.js_module) {
-    resolvers.js_module = createNodeEsmResolver({
-      runtimeCompat,
-      preservesSymlink: true
-    });
+    resolvers.js_module = nodeEsmResolverDefault;
+  }
+  if (!resolvers.js_classic) {
+    resolvers.js_classic = (reference, context) => {
+      if (reference.subtype === "self_import_scripts_arg") {
+        return nodeEsmResolverDefault(reference, context);
+      }
+      return resolveUrlUsingWebResolution(reference);
+    };
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "32.1.2",
+  "version": "32.2.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -21,6 +21,7 @@
  * - "css_@import"
  * - "css_url"
  * - "js_import"
+ * - "js_import_script"
  * - "js_url"
  * - "js_inline_content"
  * - "sourcemap_comment"
@@ -49,22 +50,20 @@ export const jsenvPluginUrlResolution = ({
     const resolver = urlResolution[urlType]
     if (typeof resolver !== "object") {
       throw new Error(
-        `Unexpected urlResolution configuration:
-"${urlType}" resolution value must be an object, got ${resolver}`,
+        `urlResolution values must be objects, got ${resolver} on "${urlType}"`,
       )
     }
     let { web, node_esm, ...rest } = resolver
-    const unexpectedKey = Object.keys(rest)[0]
-    if (unexpectedKey) {
-      throw new Error(
-        `Unexpected urlResolution configuration:
-"${urlType}" resolution key must be "web" or "node_esm", found "${
-          Object.keys(rest)[0]
-        }"`,
+    const unexpectedKeys = Object.keys(rest)
+    if (unexpectedKeys.length) {
+      throw new TypeError(
+        `${unexpectedKeys.join(
+          ",",
+        )}: there is no such configuration on "${urlType}"`,
       )
     }
     if (node_esm === undefined) {
-      node_esm = urlType === "js_module"
+      node_esm = urlType === "js_import"
     }
     if (web === undefined) {
       web = true
@@ -82,11 +81,20 @@ export const jsenvPluginUrlResolution = ({
     }
   })
 
+  const nodeEsmResolverDefault = createNodeEsmResolver({
+    runtimeCompat,
+    preservesSymlink: true,
+  })
   if (!resolvers.js_module) {
-    resolvers.js_module = createNodeEsmResolver({
-      runtimeCompat,
-      preservesSymlink: true,
-    })
+    resolvers.js_module = nodeEsmResolverDefault
+  }
+  if (!resolvers.js_classic) {
+    resolvers.js_classic = (reference, context) => {
+      if (reference.subtype === "self_import_scripts_arg") {
+        return nodeEsmResolverDefault(reference, context)
+      }
+      return resolveUrlUsingWebResolution(reference, context)
+    }
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution