@jsenv/plugin-bundling 2.8.1 → 2.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,8 +24,8 @@
   "dependencies": {
     "@jsenv/humanize": "1.3.1",
     "@jsenv/url-meta": "8.5.4",
-    "@jsenv/urls": "2.6.2",
-    "@jsenv/sourcemap": "1.3.1",
+    "@jsenv/urls": "2.6.3",
+    "@jsenv/sourcemap": "1.3.2",
     "lightningcss": "1.29.2",
     "rollup": "4.35.0"
   },

package/src/js_module/bundle_js_modules.js

@@ -1,9 +1,10 @@
-import { lookupPackageDirectory } from "@jsenv/filesystem";
+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";
-import { fileSystemPathToUrl, isFileSystemPath } from "@jsenv/urls";
+import { isFileSystemPath } from "@jsenv/urls";
 import { readFileSync } from "node:fs";
 import { fileUrlConverter } from "../file_url_converter.js";
 
@@ -38,44 +39,44 @@ export const bundleJsModules = async (
 
   let manualChunks;
   if (chunks) {
-    if (chunks.vendors) {
-      chunks.vendors = {
-        "file:///**/node_modules/": true,
-        ...chunks.vendors,
-      };
-    } else {
-      chunks.vendors = {
-        "file:///**/node_modules/": true,
-      };
-    }
+    let workspaces;
+    let packageName;
     const packageDirectoryUrl = lookupPackageDirectory(rootDirectoryUrl);
     if (packageDirectoryUrl) {
-      try {
-        const packageFileContent = readFileSync(
-          new URL("package.json", packageDirectoryUrl),
-          "utf8",
-        );
-        const packageJSON = JSON.parse(packageFileContent);
-        const workspaces = packageJSON.workspaces;
-        if (workspaces) {
-          const workspacePatterns = {};
-          for (const workspace of workspaces) {
-            const workspacePattern = new URL(
-              workspace.endsWith("/*") ? workspace.slice(0, -1) : workspace,
-              packageDirectoryUrl,
-            ).href;
-            workspacePatterns[workspacePattern] = true;
-          }
-          if (chunks.workspaces) {
-            chunks.workspaces = {
-              ...workspacePatterns,
-              ...chunks.workspaces,
-            };
-          } else {
-            chunks.workspaces = workspacePatterns;
-          }
-        }
-      } catch {}
+      const packageJSON = readPackageAtOrNull(packageDirectoryUrl);
+      if (packageJSON) {
+        packageName = packageJSON.name;
+        workspaces = packageJSON.workspaces;
+      }
+    }
+    let nodeModuleChunkName = "node_modules";
+    let packagesChunkName = "packages";
+
+    if (packageName) {
+      let packageNameAsFilename = packageName
+        .replaceAll("@", "")
+        .replaceAll("-", "_")
+        .replaceAll("/", "_");
+      nodeModuleChunkName = `${packageNameAsFilename}_node_modules`;
+      packagesChunkName = `${packageNameAsFilename}_packages`;
+    }
+    chunks[nodeModuleChunkName] = {
+      "file:///**/node_modules/": true,
+      ...chunks.vendors,
+    };
+    if (workspaces) {
+      const workspacePatterns = {};
+      for (const workspace of workspaces) {
+        const workspacePattern = new URL(
+          workspace.endsWith("/*") ? workspace.slice(0, -1) : workspace,
+          packageDirectoryUrl,
+        ).href;
+        workspacePatterns[workspacePattern] = true;
+      }
+      chunks[packagesChunkName] = {
+        ...workspacePatterns,
+        ...chunks.workspaces,
+      };
     }
 
     const associations = URL_META.resolveAssociations(chunks, rootDirectoryUrl);
@@ -149,7 +150,8 @@ export const bundleJsModules = async (
           }
           if (
             warning.code === "EMPTY_BUNDLE" &&
-            warning.names.join("") === "vendors"
+            (warning.names.join("").endsWith("node_modules") ||
+              warning.names.join("").endsWith("packages"))
           ) {
             return;
           }
@@ -191,8 +193,9 @@ const rollupPluginJsenv = ({
   buildDirectoryUrl,
   graph,
   jsModuleUrlInfos,
-  sourcemaps,
 
+  runtimeCompat,
+  sourcemaps,
   include,
   preserveDynamicImport,
   augmentDynamicImportUrlSearchParams,
@@ -226,7 +229,13 @@ const rollupPluginJsenv = ({
   }
 
   const getOriginalUrl = (rollupFileInfo) => {
-    if (rollupFileInfo.isEntry) {
+    if (
+      // - explicitely emitted by emitChunk
+      // - import.meta.resolve("")
+      rollupFileInfo.isEntry ||
+      // - new URL("", import.meta.url)
+      rollupFileInfo.isImplicitEntry
+    ) {
       const { facadeModuleId } = rollupFileInfo;
       if (facadeModuleId) {
         return fileUrlConverter.asFileUrl(facadeModuleId);
@@ -240,6 +249,94 @@ const rollupPluginJsenv = ({
     return new URL(rollupFileInfo.fileName, buildDirectoryUrl).href;
   };
 
+  const packageSideEffectsCacheMap = new Map();
+  const readClosestPackageJsonSideEffects = (url) => {
+    const packageDirectoryUrl = lookupPackageDirectory(url);
+    if (!packageDirectoryUrl) {
+      return undefined;
+    }
+    const fromCache = packageSideEffectsCacheMap.get(packageDirectoryUrl);
+    if (fromCache) {
+      return fromCache.value;
+    }
+    try {
+      const packageFileContent = readFileSync(
+        new URL("./package.json", packageDirectoryUrl),
+        "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;
+    } catch {
+      packageSideEffectsCacheMap.set(packageDirectoryUrl, { value: undefined });
+      return undefined;
+    }
+  };
+  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}`);
+      // double ignore we must keep the import
+      return null;
+    }
+    if (isSpecifierForNodeBuiltin(url)) {
+      return false;
+    }
+    const closestPackageJsonSideEffects =
+      readClosestPackageJsonSideEffects(url);
+    if (closestPackageJsonSideEffects === undefined) {
+      // console.log(`may have side effect: ${url}`);
+      return null;
+    }
+    if (typeof closestPackageJsonSideEffects === "function") {
+      const haveSideEffect = closestPackageJsonSideEffects(url);
+      // if (haveSideEffect) {
+      //   console.log(`have side effect: ${url}`);
+      // }
+      return haveSideEffect;
+    }
+    return closestPackageJsonSideEffects;
+  };
+  const getModuleSideEffects = (url, importer) => {
+    if (!url.startsWith("ignore:")) {
+      return inferSideEffectsFromResolvedUrl(url);
+    }
+    url = url.slice("ignore:".length);
+    if (url.startsWith("file:")) {
+      return inferSideEffectsFromResolvedUrl(url);
+    }
+    try {
+      const result = applyNodeEsmResolution({
+        conditions: packageConditions,
+        parentUrl: importer,
+        specifier: url,
+      });
+      return inferSideEffectsFromResolvedUrl(result.url);
+    } catch {
+      return null;
+    }
+  };
+
   return {
     name: "jsenv",
     async buildStart() {
@@ -476,22 +573,43 @@ const rollupPluginJsenv = ({
       } else {
         url = new URL(specifier, importer).href;
       }
+
       if (!url.startsWith("file:")) {
-        return { id: url, external: true };
+        return {
+          id: url,
+          external: true,
+          moduleSideEffects: getModuleSideEffects(url, importer),
+        };
       }
       if (!importCanBeBundled(url)) {
-        return { id: url, external: true };
+        return {
+          id: url,
+          external: true,
+          moduleSideEffects: getModuleSideEffects(url, importer),
+        };
       }
       const urlInfo = graph.getUrlInfo(url);
       if (!urlInfo) {
         // happen when excluded by referenceAnalysis.include
-        return { id: url, external: true };
+        return {
+          id: url,
+          external: true,
+          moduleSideEffects: getModuleSideEffects(url, importer),
+        };
       }
       if (url.startsWith("ignore:")) {
-        return { id: url, external: true };
+        return {
+          id: url,
+          external: true,
+          moduleSideEffects: getModuleSideEffects(url, importer),
+        };
       }
       const filePath = fileUrlConverter.asFilePath(url);
-      return filePath;
+      return {
+        id: filePath,
+        external: false,
+        moduleSideEffects: getModuleSideEffects(url, importer),
+      };
     },
     async load(rollupId) {
       const fileUrl = fileUrlConverter.asFileUrl(rollupId);
@@ -519,81 +637,10 @@ const applyRollupPlugins = async ({
     rollup = rollupModule.rollup;
   }
 
-  const packageSideEffectsCacheMap = new Map();
-  const readClosestPackageJsonSideEffects = (url) => {
-    const packageDirectoryUrl = lookupPackageDirectory(url);
-    if (!packageDirectoryUrl) {
-      return undefined;
-    }
-    const fromCache = packageSideEffectsCacheMap.get(packageDirectoryUrl);
-    if (fromCache) {
-      return fromCache.value;
-    }
-    try {
-      const packageFileContent = readFileSync(
-        new URL("./package.json", packageDirectoryUrl),
-        "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;
-    } catch {
-      packageSideEffectsCacheMap.set(packageDirectoryUrl, { value: undefined });
-      return undefined;
-    }
-  };
-
   const rollupReturnValue = await rollup({
     ...rollupInput,
     treeshake: {
       ...rollupInput.treeshake,
-      moduleSideEffects: (id, external) => {
-        if (id.startsWith("ignore:node:")) {
-          return false;
-        }
-        if (isSpecifierForNodeBuiltin(id)) {
-          return false;
-        }
-        if (id.startsWith("ignore:")) {
-          return null;
-        }
-        const url = id.startsWith("file:") ? id : fileSystemPathToUrl(id);
-        const closestPackageJsonSideEffects =
-          readClosestPackageJsonSideEffects(url);
-        if (closestPackageJsonSideEffects !== undefined) {
-          if (typeof closestPackageJsonSideEffects === "function") {
-            return closestPackageJsonSideEffects(url);
-          }
-          return closestPackageJsonSideEffects;
-        }
-        const moduleSideEffects = rollupInput.treeshake?.moduleSideEffects;
-        if (moduleSideEffects) {
-          if (typeof moduleSideEffects === "function") {
-            return moduleSideEffects(id, external);
-          }
-          return moduleSideEffects;
-        }
-        return null;
-      },
     },
     plugins: rollupPlugins,
   });