@jsenv/plugin-bundling 2.2.1 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,11 +26,11 @@
   "dependencies": {
     "@jsenv/log": "3.4.0",
     "@jsenv/url-meta": "8.1.0",
-    "@jsenv/urls": "2.0.0",
-    "@jsenv/sourcemap": "1.0.10",
+    "@jsenv/urls": "2.1.0",
+    "@jsenv/sourcemap": "1.1.0",
     "acorn-import-assertions": "1.9.0",
-    "lightningcss": "1.21.0",
-    "rollup": "3.24.0"
+    "lightningcss": "1.21.5",
+    "rollup": "3.26.2"
   },
   "peerDependencies": {
     "@jsenv/core": "*"

package/src/css/css_bundling_lightning_css.js

@@ -2,10 +2,10 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { fileUrlConverter } from "../file_url_converter.js";
 
 // Do not use until https://github.com/parcel-bundler/parcel-css/issues/181
-export const bundleCss = async ({ cssUrlInfos, context }) => {
+export const bundleCss = async (cssUrlInfos) => {
   const bundledCssUrlInfos = {};
   const { bundleAsync } = await import("lightningcss");
-  const targets = runtimeCompatToTargets(context.runtimeCompat);
+  const targets = runtimeCompatToTargets(cssUrlInfos[0].context.runtimeCompat);
   for (const cssUrlInfo of cssUrlInfos) {
     const filename = fileUrlConverter.asFilePath(cssUrlInfo.originalUrl);
     const { code, map } = await bundleAsync({
@@ -16,7 +16,7 @@ export const bundleCss = async ({ cssUrlInfos, context }) => {
         read: (specifier) => {
           const fileUrlObject = fileUrlConverter.asFileUrl(specifier);
           const fileUrl = String(fileUrlObject);
-          const urlInfo = context.urlGraph.getUrlInfo(fileUrl);
+          const urlInfo = cssUrlInfo.graph.getUrlInfo(fileUrl);
           return urlInfo.content;
         },
         resolve(specifier, from) {

package/src/js_module/bundle_js_modules.js

@@ -5,29 +5,35 @@ import { sourcemapConverter } from "@jsenv/sourcemap";
 
 import { fileUrlConverter } from "../file_url_converter.js";
 
-export const bundleJsModules = async ({
+export const bundleJsModules = async (
   jsModuleUrlInfos,
-  context,
-  include,
-  chunks = {},
-  strictExports = false,
-  preserveDynamicImport = false,
-  augmentDynamicImportUrlSearchParams = () => {},
-  rollup,
-  rollupInput = {},
-  rollupOutput = {},
-  rollupPlugins = [],
-}) => {
+  {
+    buildDirectoryUrl,
+    include,
+    chunks = {},
+    strictExports = false,
+    preserveDynamicImport = false,
+    augmentDynamicImportUrlSearchParams = () => {},
+    rollup,
+    rollupInput = {},
+    rollupOutput = {},
+    rollupPlugins = [],
+  },
+) => {
   const {
     signal,
     logger,
     rootDirectoryUrl,
-    buildDirectoryUrl,
     assetsDirectory,
-    urlGraph,
     runtimeCompat,
     sourcemaps,
-  } = context;
+    minification,
+    isSupportedOnCurrentClients,
+  } = jsModuleUrlInfos[0].context;
+  const graph = jsModuleUrlInfos[0].graph;
+  if (buildDirectoryUrl === undefined) {
+    buildDirectoryUrl = jsModuleUrlInfos[0].context.buildDirectoryUrl;
+  }
 
   let manualChunks;
   if (Object.keys(chunks).length) {
@@ -64,7 +70,7 @@ export const bundleJsModules = async ({
           rootDirectoryUrl,
           buildDirectoryUrl,
           assetsDirectory,
-          urlGraph,
+          graph,
           jsModuleUrlInfos,
 
           runtimeCompat,
@@ -91,17 +97,16 @@ export const bundleJsModules = async ({
         ...rollupInput,
       },
       rollupOutput: {
-        compact: context.minification,
-        minifyInternalExports: context.minification,
+        compact: minification,
+        minifyInternalExports: minification,
         generatedCode: {
-          arrowFunctions: context.isSupportedOnCurrentClients("arrow_function"),
-          constBindings: context.isSupportedOnCurrentClients("const_bindings"),
-          objectShorthand: context.isSupportedOnCurrentClients(
+          arrowFunctions: isSupportedOnCurrentClients("arrow_function"),
+          constBindings: isSupportedOnCurrentClients("const_bindings"),
+          objectShorthand: isSupportedOnCurrentClients(
             "object_properties_shorthand",
           ),
-          reservedNamesAsProps:
-            context.isSupportedOnCurrentClients("reserved_words"),
-          symbols: context.isSupportedOnCurrentClients("symbols"),
+          reservedNamesAsProps: isSupportedOnCurrentClients("reserved_words"),
+          symbols: isSupportedOnCurrentClients("symbols"),
         },
         ...rollupOutput,
         manualChunks,
@@ -124,7 +129,7 @@ const rollupPluginJsenv = ({
   rootDirectoryUrl,
   buildDirectoryUrl,
   assetsDirectory,
-  urlGraph,
+  graph,
   jsModuleUrlInfos,
   sourcemaps,
 
@@ -174,16 +179,35 @@ const rollupPluginJsenv = ({
           });
           return;
         }
+        let preserveSignature;
+        if (strictExports) {
+          preserveSignature = "strict";
+        } else {
+          // When referenced only once we can enable allow-extension
+          // otherwise stick to strict exports to ensure all importers
+          // receive the correct exports
+          let firstStrongRef = null;
+          let hasMoreThanOneStrongRefFromOther = false;
+          for (const referenceFromOther of jsModuleUrlInfo.referenceFromOthersSet) {
+            if (referenceFromOther.isWeak) {
+              continue;
+            }
+            if (firstStrongRef) {
+              hasMoreThanOneStrongRefFromOther = true;
+              break;
+            }
+            firstStrongRef = referenceFromOther;
+          }
+          preserveSignature = hasMoreThanOneStrongRefFromOther
+            ? "strict"
+            : "allow-extension";
+        }
         emitChunk({
           id,
           implicitlyLoadedAfterOneOf: previousNonEntryPointModuleId
             ? [previousNonEntryPointModuleId]
             : null,
-          preserveSignature: strictExports
-            ? "strict"
-            : jsModuleUrlInfo.dependents.size < 2
-            ? "allow-extension"
-            : "strict",
+          preserveSignature,
         });
         previousNonEntryPointModuleId = id;
       });
@@ -324,7 +348,7 @@ const rollupPluginJsenv = ({
       if (!importCanBeBundled(url)) {
         return { id: url, external: true };
       }
-      const urlInfo = urlGraph.getUrlInfo(url);
+      const urlInfo = graph.getUrlInfo(url);
       if (!urlInfo) {
         // happen when excluded by referenceAnalysis.include
         return { id: url, external: true };
@@ -337,7 +361,7 @@ const rollupPluginJsenv = ({
     },
     async load(rollupId) {
       const fileUrl = fileUrlConverter.asFileUrl(rollupId);
-      const urlInfo = urlGraph.getUrlInfo(fileUrl);
+      const urlInfo = graph.getUrlInfo(fileUrl);
       return {
         code: urlInfo.content,
         map:

package/src/jsenv_plugin_bundling.js

@@ -10,31 +10,21 @@ export const jsenvPluginBundling = ({
   const bundle = {};
 
   if (css) {
-    bundle.css = (cssUrlInfos, context) => {
-      return bundleCss({
-        cssUrlInfos,
-        context,
-      });
+    bundle.css = (cssUrlInfos) => {
+      return bundleCss(cssUrlInfos);
     };
   }
   if (js_classic) {
-    bundle.js_classic = (jsClassicUrlInfos, context) => {
-      return bundleJsClassic({
-        jsClassicUrlInfos,
-        context,
-      });
+    bundle.js_classic = (jsClassicUrlInfos) => {
+      return bundleJsClassic(jsClassicUrlInfos);
     };
   }
   if (js_module) {
     if (js_module === true) {
       js_module = {};
     }
-    bundle.js_module = (jsModuleUrlInfos, context) => {
-      return bundleJsModules({
-        jsModuleUrlInfos,
-        context,
-        ...js_module,
-      });
+    bundle.js_module = (jsModuleUrlInfos) => {
+      return bundleJsModules(jsModuleUrlInfos, js_module);
     };
   }