@jsenv/plugin-bundling 2.8.5 → 2.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@jsenv/humanize": "1.3.1",
-    "@jsenv/url-meta": "8.5.5",
-    "@jsenv/urls": "2.7.0",
-    "@jsenv/sourcemap": "1.3.3",
+    "@jsenv/humanize": "1.4.0",
+    "@jsenv/url-meta": "8.5.6",
+    "@jsenv/urls": "2.7.1",
+    "@jsenv/sourcemap": "1.3.4",
     "lightningcss": "1.29.2",
     "rollup": "4.35.0"
   },

package/src/js_module/bundle_js_modules.js

@@ -1,6 +1,5 @@
 import { lookupPackageDirectory, readPackageAtOrNull } from "@jsenv/filesystem";
 import { createDetailedMessage } from "@jsenv/humanize";
-import { applyNodeEsmResolution } from "@jsenv/node-esm-resolution";
 import { isSpecifierForNodeBuiltin } from "@jsenv/node-esm-resolution/src/node_builtin_specifiers.js";
 import { sourcemapConverter } from "@jsenv/sourcemap";
 import { URL_META } from "@jsenv/url-meta";
@@ -8,6 +7,7 @@ import {
   injectQueryParams,
   isFileSystemPath,
   urlToBasename,
+  urlToRelativeUrl,
 } from "@jsenv/urls";
 import { readFileSync } from "node:fs";
 import { fileUrlConverter } from "../file_url_converter.js";
@@ -36,6 +36,8 @@ export const bundleJsModules = async (
     sourcemaps,
     isSupportedOnCurrentClients,
     getPluginMeta,
+    kitchen,
+    assetsDirectory,
   } = jsModuleUrlInfos[0].context;
   const graph = jsModuleUrlInfos[0].graph;
   if (buildDirectoryUrl === undefined) {
@@ -79,8 +81,8 @@ export const bundleJsModules = async (
           workspaces = packageJSON.workspaces;
         }
       }
-      let nodeModuleChunkName = "node_modules";
-      let packagesChunkName = "packages";
+      let nodeModuleChunkName = `node_modules`;
+      let packagesChunkName = `packages`;
 
       if (packageName) {
         let packageNameAsFilename = packageName
@@ -90,6 +92,11 @@ export const bundleJsModules = async (
         nodeModuleChunkName = `${packageNameAsFilename}_node_modules`;
         packagesChunkName = `${packageNameAsFilename}_packages`;
       }
+      if (assetsDirectory) {
+        nodeModuleChunkName = `${assetsDirectory}${nodeModuleChunkName}`;
+        packagesChunkName = `${assetsDirectory}${packagesChunkName}`;
+      }
+
       chunks[nodeModuleChunkName] = {
         "file:///**/node_modules/": true,
         ...chunks.vendors,
@@ -159,6 +166,7 @@ export const bundleJsModules = async (
             graph,
             jsModuleUrlInfos,
             PATH_AND_URL_CONVERTER,
+            kitchen,
 
             runtimeCompat,
             sourcemaps,
@@ -237,7 +245,7 @@ const rollupPluginJsenv = ({
   jsModuleUrlInfos,
   PATH_AND_URL_CONVERTER,
 
-  runtimeCompat,
+  kitchen,
   sourcemaps,
   include,
   preserveDynamicImports,
@@ -315,34 +323,39 @@ const rollupPluginJsenv = ({
         "utf8",
       );
       const packageJSON = JSON.parse(packageFileContent);
-      const value = packageJSON.sideEffects;
-      if (Array.isArray(value)) {
-        const sideEffectPatterns = {};
-        for (const v of value) {
-          sideEffectPatterns[v] = true;
-        }
-        const associations = URL_META.resolveAssociations(
-          { sideEffects: sideEffectPatterns },
-          packageDirectoryUrl,
-        );
-        const isMatching = (url) => {
-          const meta = URL_META.applyAssociations({ url, associations });
-          return meta.sideEffects || false;
-        };
-        packageSideEffectsCacheMap.set(packageDirectoryUrl, {
-          value: isMatching,
-        });
-      } else {
-        packageSideEffectsCacheMap.set(packageDirectoryUrl, { value });
-      }
-      return value;
+      return storePackageSideEffect(packageDirectoryUrl, packageJSON);
     } catch {
+      return storePackageSideEffect(packageDirectoryUrl, null);
+    }
+  };
+  const storePackageSideEffect = (packageDirectoryUrl, packageJson) => {
+    if (!packageJson) {
       packageSideEffectsCacheMap.set(packageDirectoryUrl, { value: undefined });
       return undefined;
     }
+    const value = packageJson.sideEffects;
+    if (Array.isArray(value)) {
+      const sideEffectPatterns = {};
+      for (const v of value) {
+        sideEffectPatterns[v] = true;
+      }
+      const associations = URL_META.resolveAssociations(
+        { sideEffects: sideEffectPatterns },
+        packageDirectoryUrl,
+      );
+      const isMatching = (url) => {
+        const meta = URL_META.applyAssociations({ url, associations });
+        return meta.sideEffects || false;
+      };
+      packageSideEffectsCacheMap.set(packageDirectoryUrl, {
+        value: isMatching,
+      });
+      return isMatching;
+    }
+    packageSideEffectsCacheMap.set(packageDirectoryUrl, { value });
+    return value;
   };
-  const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
-  const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
+
   const inferSideEffectsFromResolvedUrl = (url) => {
     if (url.startsWith("ignore:")) {
       // console.log(`may have side effect: ${url}`);
@@ -376,12 +389,11 @@ const rollupPluginJsenv = ({
       return inferSideEffectsFromResolvedUrl(url);
     }
     try {
-      const result = applyNodeEsmResolution({
-        conditions: packageConditions,
-        parentUrl: importer,
-        specifier: url,
-      });
-      return inferSideEffectsFromResolvedUrl(result.url);
+      const result = kitchen.resolve(url, importer);
+      if (result.packageDirectoryUrl) {
+        storePackageSideEffect(result.packageDirectoryUrl, result.packageJson);
+      }
+      return inferSideEffectsFromResolvedUrl(url);
     } catch {
       return null;
     }
@@ -482,7 +494,22 @@ const rollupPluginJsenv = ({
               continue;
             }
             const importUrl = getOriginalUrl(importRollupFileInfo);
-            const rollupSpecifier = `./${importRollupFileInfo.fileName}`;
+            const importerBuildUrl = new URL(
+              rollupFileInfo.fileName,
+              buildDirectoryUrl,
+            ).href;
+            const urlToImport = new URL(
+              importRollupFileInfo.fileName,
+              buildDirectoryUrl,
+            ).href;
+            const specifierRelative = urlToRelativeUrl(
+              urlToImport,
+              importerBuildUrl,
+            );
+            const rollupSpecifier =
+              specifierRelative[0] === "."
+                ? specifierRelative
+                : `./${specifierRelative}`;
             specifierToUrlMap.set(rollupSpecifier, importUrl);
           }
         }
@@ -552,6 +579,7 @@ const rollupPluginJsenv = ({
                     reference.specifier,
                   );
                   if (!specifierBeforeRollup) {
+                    // process.emitWarning?
                     console.warn(
                       `cannot remap "${reference.specifier}" back to specifier before rollup, this is unexpected.`,
                     );
@@ -706,6 +734,14 @@ const rollupPluginJsenv = ({
           };
         }
       }
+      const urlInfo = graph.getUrlInfo(resolvedUrl);
+      if (urlInfo.type === "entry_build") {
+        return {
+          id: resolvedUrl,
+          external: true,
+          moduleSideEffects: getModuleSideEffects(resolvedUrl, importer),
+        };
+      }
       return {
         id: PATH_AND_URL_CONVERTER.asFilePath(resolvedUrl),
         external: false,