@jsenv/plugin-bundling 2.1.6 → 2.1.9

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "2.1.6",
+  "version": "2.1.9",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jsenv/jsenv-core",
+    "url": "https://github.com/jsenv/core",
     "directory": "packages/jsenv-plugin-bundling"
   },
   "publishConfig": {
@@ -24,14 +24,14 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/babel-plugins": "1.1.5",
-    "@jsenv/log": "3.3.4",
+    "@jsenv/babel-plugins": "1.1.6",
+    "@jsenv/log": "3.3.5",
     "@jsenv/url-meta": "8.1.0",
     "@jsenv/urls": "2.0.0",
     "@jsenv/sourcemap": "1.0.10",
-    "acorn-import-assertions": "1.8.0",
-    "lightningcss": "1.19.0",
-    "rollup": "3.20.4"
+    "acorn-import-assertions": "1.9.0",
+    "lightningcss": "1.20.0",
+    "rollup": "3.21.8"
   },
   "peerDependencies": {
     "@jsenv/core": "*"

package/src/css/css_bundling_lightning_css.js

@@ -1,29 +1,31 @@
-import { fileURLToPath, pathToFileURL } from "node:url"
+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 }) => {
-  const bundledCssUrlInfos = {}
-  const { bundleAsync } = await import("lightningcss")
-  const targets = runtimeCompatToTargets(context.runtimeCompat)
+  const bundledCssUrlInfos = {};
+  const { bundleAsync } = await import("lightningcss");
+  const targets = runtimeCompatToTargets(context.runtimeCompat);
   for (const cssUrlInfo of cssUrlInfos) {
+    const filename = fileUrlConverter.asFilePath(cssUrlInfo.originalUrl);
     const { code, map } = await bundleAsync({
-      filename: fileURLToPath(cssUrlInfo.originalUrl),
+      filename,
       targets,
       minify: false,
       resolver: {
         read: (specifier) => {
-          const fileUrlObject = pathToFileURL(specifier)
-          const fileUrl = String(fileUrlObject)
-          const urlInfo = context.urlGraph.getUrlInfo(fileUrl)
-          return urlInfo.content
+          const fileUrlObject = fileUrlConverter.asFileUrl(specifier);
+          const fileUrl = String(fileUrlObject);
+          const urlInfo = context.urlGraph.getUrlInfo(fileUrl);
+          return urlInfo.content;
         },
         resolve(specifier, from) {
-          const fileUrlObject = new URL(specifier, pathToFileURL(from))
-          const filePath = fileURLToPath(fileUrlObject)
-          return filePath
+          const fileUrlObject = new URL(specifier, pathToFileURL(from));
+          const filePath = fileURLToPath(fileUrlObject);
+          return filePath;
         },
       },
-    })
+    });
     bundledCssUrlInfos[cssUrlInfo.url] = {
       data: {
         bundlerName: "lightningcss",
@@ -31,26 +33,26 @@ export const bundleCss = async ({ cssUrlInfos, context }) => {
       contentType: "text/css",
       content: String(code),
       sourcemap: map,
-    }
+    };
   }
-  return bundledCssUrlInfos
-}
+  return bundledCssUrlInfos;
+};
 
 const runtimeCompatToTargets = (runtimeCompat) => {
-  const targets = {}
-  ;["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
-    const version = runtimeCompat[runtimeName]
+  const targets = {};
+  ["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
+    const version = runtimeCompat[runtimeName];
     if (version) {
-      targets[runtimeName] = versionToBits(version)
+      targets[runtimeName] = versionToBits(version);
     }
-  })
-  return targets
-}
+  });
+  return targets;
+};
 
 const versionToBits = (version) => {
   const [major, minor = 0, patch = 0] = version
     .split("-")[0]
     .split(".")
-    .map((v) => parseInt(v, 10))
-  return (major << 16) | (minor << 8) | patch
-}
+    .map((v) => parseInt(v, 10));
+  return (major << 16) | (minor << 8) | patch;
+};

package/src/{js_module/file_url_converter.js → file_url_converter.js}

@@ -1,21 +1,21 @@
-import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/urls"
+import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/urls";
 
 export const fileUrlConverter = {
   asFilePath: (fileUrl) => {
-    const filePath = urlToFileSystemPath(fileUrl)
-    const urlObject = new URL(fileUrl)
-    const { searchParams } = urlObject
-    return `${filePath}${stringifyQuery(searchParams)}`
+    const filePath = urlToFileSystemPath(fileUrl);
+    const urlObject = new URL(fileUrl);
+    const { searchParams } = urlObject;
+    return `${filePath}${stringifyQuery(searchParams)}`;
   },
   asFileUrl: (filePath) => {
     return decodeURIComponent(fileSystemPathToUrl(filePath)).replace(
       /[=](?=&|$)/g,
       "",
-    )
+    );
   },
-}
+};
 
 const stringifyQuery = (searchParams) => {
-  const search = searchParams.toString()
-  return search ? `?${search}` : ""
-}
+  const search = searchParams.toString();
+  return search ? `?${search}` : "";
+};

package/src/js_classic/bundle_js_classic.js

@@ -8,5 +8,5 @@
 // import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 
 export const bundleJsClassic = () => {
-  return {}
-}
+  return {};
+};

package/src/js_module/bundle_js_modules.js

@@ -1,12 +1,12 @@
-import { pathToFileURL } from "node:url"
+import { pathToFileURL } from "node:url";
 
-import { URL_META } from "@jsenv/url-meta"
-import { isFileSystemPath } from "@jsenv/urls"
-import { createDetailedMessage } from "@jsenv/log"
-import { sourcemapConverter } from "@jsenv/sourcemap"
-import { globalThisClientFileUrl } from "@jsenv/core/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js"
+import { URL_META } from "@jsenv/url-meta";
+import { isFileSystemPath } from "@jsenv/urls";
+import { createDetailedMessage } from "@jsenv/log";
+import { sourcemapConverter } from "@jsenv/sourcemap";
+import { globalThisClientFileUrl } from "@jsenv/core/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js";
 
-import { fileUrlConverter } from "./file_url_converter.js"
+import { fileUrlConverter } from "../file_url_converter.js";
 
 export const bundleJsModules = async ({
   jsModuleUrlInfos,
@@ -15,6 +15,7 @@ export const bundleJsModules = async ({
   chunks = {},
   strictExports = false,
   preserveDynamicImport = false,
+  augmentDynamicImportUrlSearchParams = () => {},
   rollup,
   rollupInput = {},
   rollupOutput = {},
@@ -29,32 +30,32 @@ export const bundleJsModules = async ({
     urlGraph,
     runtimeCompat,
     sourcemaps,
-  } = context
+  } = context;
 
-  let manualChunks
+  let manualChunks;
   if (Object.keys(chunks).length) {
-    const associations = URL_META.resolveAssociations(chunks, rootDirectoryUrl)
+    const associations = URL_META.resolveAssociations(chunks, rootDirectoryUrl);
     manualChunks = (id) => {
       if (rollupOutput.manualChunks) {
-        const manualChunkName = rollupOutput.manualChunks(id)
+        const manualChunkName = rollupOutput.manualChunks(id);
         if (manualChunkName) {
-          return manualChunkName
+          return manualChunkName;
         }
       }
-      const url = fileUrlConverter.asFileUrl(id)
-      const urlObject = new URL(url)
-      urlObject.search = ""
-      const urlWithoutSearch = urlObject.href
+      const url = fileUrlConverter.asFileUrl(id);
+      const urlObject = new URL(url);
+      urlObject.search = "";
+      const urlWithoutSearch = urlObject.href;
       const meta = URL_META.applyAssociations({
         url: urlWithoutSearch,
         associations,
-      })
-      const chunkName = Object.keys(meta).find((key) => meta[key])
-      return chunkName || null
-    }
+      });
+      const chunkName = Object.keys(meta).find((key) => meta[key]);
+      return chunkName || null;
+    };
   }
 
-  const resultRef = { current: null }
+  const resultRef = { current: null };
   try {
     await applyRollupPlugins({
       rollup,
@@ -73,6 +74,7 @@ export const bundleJsModules = async ({
           sourcemaps,
           include,
           preserveDynamicImport,
+          augmentDynamicImportUrlSearchParams,
           strictExports,
           resultRef,
         }),
@@ -81,29 +83,25 @@ export const bundleJsModules = async ({
         input: [],
         onwarn: (warning) => {
           if (warning.code === "CIRCULAR_DEPENDENCY") {
-            return
+            return;
           }
           if (warning.code === "THIS_IS_UNDEFINED") {
-            const fileUrl = pathToFileURL(warning.id).href
+            const fileUrl = pathToFileURL(warning.id).href;
             if (fileUrl === globalThisClientFileUrl) {
-              return
+              return;
             }
           }
           if (warning.code === "EVAL") {
             // ideally we should disable only for jsenv files
-            return
+            return;
           }
-          logger.warn(String(warning))
+          logger.warn(String(warning));
         },
         ...rollupInput,
       },
       rollupOutput: {
         compact: context.minification,
-        // cannot be enabled otherwise:
-        // - rollup rename InlineContent export into one letter export like "n"
-        // - inline content detection cannot detect new InlineContent() calls
-        // -> inline content is not detected, among other things url are not versioned
-        minifyInternalExports: false, // context.minification,
+        minifyInternalExports: context.minification,
         generatedCode: {
           arrowFunctions: context.isSupportedOnCurrentClients("arrow_function"),
           constBindings: context.isSupportedOnCurrentClients("const_bindings"),
@@ -117,18 +115,18 @@ export const bundleJsModules = async ({
         ...rollupOutput,
         manualChunks,
       },
-    })
-    return resultRef.current.jsModuleBundleUrlInfos
+    });
+    return resultRef.current.jsModuleBundleUrlInfos;
   } catch (e) {
     if (e.code === "MISSING_EXPORT") {
       const detailedMessage = createDetailedMessage(e.message, {
         frame: e.frame,
-      })
-      throw new Error(detailedMessage, { cause: e })
+      });
+      throw new Error(detailedMessage, { cause: e });
     }
-    throw e
+    throw e;
   }
-}
+};
 
 const rollupPluginJsenv = ({
   // logger,
@@ -141,48 +139,49 @@ const rollupPluginJsenv = ({
 
   include,
   preserveDynamicImport,
+  augmentDynamicImportUrlSearchParams,
   strictExports,
 
   resultRef,
 }) => {
   let _rollupEmitFile = () => {
-    throw new Error("not implemented")
-  }
+    throw new Error("not implemented");
+  };
   const format = jsModuleUrlInfos.some((jsModuleUrlInfo) =>
     jsModuleUrlInfo.filename.endsWith(".cjs"),
   )
     ? "cjs"
-    : "esm"
+    : "esm";
   const emitChunk = (chunk) => {
     return _rollupEmitFile({
       type: "chunk",
       ...chunk,
-    })
-  }
-  let importCanBeBundled = () => true
+    });
+  };
+  let importCanBeBundled = () => true;
   if (include) {
     const associations = URL_META.resolveAssociations(
       { bundle: include },
       rootDirectoryUrl,
-    )
+    );
     importCanBeBundled = (url) => {
-      return URL_META.applyAssociations({ url, associations }).bundle
-    }
+      return URL_META.applyAssociations({ url, associations }).bundle;
+    };
   }
-  const urlImporters = {}
+  const urlImporters = {};
 
   return {
     name: "jsenv",
     async buildStart() {
-      _rollupEmitFile = (...args) => this.emitFile(...args)
-      let previousNonEntryPointModuleId
+      _rollupEmitFile = (...args) => this.emitFile(...args);
+      let previousNonEntryPointModuleId;
       jsModuleUrlInfos.forEach((jsModuleUrlInfo) => {
-        const id = jsModuleUrlInfo.url
+        const id = jsModuleUrlInfo.url;
         if (jsModuleUrlInfo.isEntryPoint) {
           emitChunk({
             id,
-          })
-          return
+          });
+          return;
         }
         emitChunk({
           id,
@@ -194,33 +193,33 @@ const rollupPluginJsenv = ({
             : jsModuleUrlInfo.dependents.size < 2
             ? "allow-extension"
             : "strict",
-        })
-        previousNonEntryPointModuleId = id
-      })
+        });
+        previousNonEntryPointModuleId = id;
+      });
     },
     async generateBundle(outputOptions, rollupResult) {
-      _rollupEmitFile = (...args) => this.emitFile(...args)
+      _rollupEmitFile = (...args) => this.emitFile(...args);
 
-      const jsModuleBundleUrlInfos = {}
+      const jsModuleBundleUrlInfos = {};
       Object.keys(rollupResult).forEach((fileName) => {
-        const rollupFileInfo = rollupResult[fileName]
+        const rollupFileInfo = rollupResult[fileName];
         // there is 3 types of file: "placeholder", "asset", "chunk"
         if (rollupFileInfo.type === "chunk") {
           const sourceUrls = Object.keys(rollupFileInfo.modules).map((id) =>
             fileUrlConverter.asFileUrl(id),
-          )
+          );
 
-          let url
-          let originalUrl
+          let url;
+          let originalUrl;
           if (rollupFileInfo.facadeModuleId) {
-            url = fileUrlConverter.asFileUrl(rollupFileInfo.facadeModuleId)
-            originalUrl = url
+            url = fileUrlConverter.asFileUrl(rollupFileInfo.facadeModuleId);
+            originalUrl = url;
           } else {
-            url = new URL(rollupFileInfo.fileName, buildDirectoryUrl).href
+            url = new URL(rollupFileInfo.fileName, buildDirectoryUrl).href;
             if (rollupFileInfo.isDynamicEntry) {
-              originalUrl = sourceUrls[sourceUrls.length - 1]
+              originalUrl = sourceUrls[sourceUrls.length - 1];
             } else {
-              originalUrl = url
+              originalUrl = url;
             }
           }
 
@@ -240,13 +239,13 @@ const rollupPluginJsenv = ({
             contentType: "text/javascript",
             content: rollupFileInfo.code,
             sourcemap: rollupFileInfo.map,
-          }
-          jsModuleBundleUrlInfos[url] = jsModuleBundleUrlInfo
+          };
+          jsModuleBundleUrlInfos[url] = jsModuleBundleUrlInfo;
         }
-      })
+      });
       resultRef.current = {
         jsModuleBundleUrlInfos,
-      }
+      };
     },
     outputOptions: (outputOptions) => {
       // const sourcemapFile = buildDirectoryUrl
@@ -256,87 +255,98 @@ const rollupPluginJsenv = ({
         sourcemap: sourcemaps === "file" || sourcemaps === "inline",
         // sourcemapFile,
         sourcemapPathTransform: (relativePath) => {
-          return new URL(relativePath, buildDirectoryUrl).href
+          return new URL(relativePath, buildDirectoryUrl).href;
         },
         entryFileNames: () => {
-          return `[name].js`
+          return `[name].js`;
         },
         chunkFileNames: (chunkInfo) => {
           const insideJs = willBeInsideJsDirectory({
             chunkInfo,
             fileUrlConverter,
             jsModuleUrlInfos,
-          })
-          let nameFromUrlInfo
+          });
+          let nameFromUrlInfo;
           if (chunkInfo.facadeModuleId) {
-            const url = fileUrlConverter.asFileUrl(chunkInfo.facadeModuleId)
+            const url = fileUrlConverter.asFileUrl(chunkInfo.facadeModuleId);
             const urlInfo = jsModuleUrlInfos.find(
               (jsModuleUrlInfo) => jsModuleUrlInfo.url === url,
-            )
+            );
             if (urlInfo) {
-              nameFromUrlInfo = urlInfo.filename
+              nameFromUrlInfo = urlInfo.filename;
             }
           }
-          const name = nameFromUrlInfo || `${chunkInfo.name}.js`
-          return insideJs ? `${assetsDirectory}js/${name}` : `${name}`
+          const name = nameFromUrlInfo || `${chunkInfo.name}.js`;
+          return insideJs ? `${assetsDirectory}js/${name}` : `${name}`;
         },
         // https://rollupjs.org/guide/en/#outputpaths
         // paths: (id) => {
         //   return id
         // },
-      })
+      });
     },
     // https://rollupjs.org/guide/en/#resolvedynamicimport
     resolveDynamicImport: (specifier, importer) => {
       if (preserveDynamicImport) {
-        let urlObject
+        let urlObject;
         if (specifier[0] === "/") {
-          urlObject = new URL(specifier.slice(1), rootDirectoryUrl)
+          urlObject = new URL(specifier.slice(1), rootDirectoryUrl);
         } else {
           if (isFileSystemPath(importer)) {
-            importer = fileUrlConverter.asFileUrl(importer)
+            importer = fileUrlConverter.asFileUrl(importer);
           }
-          urlObject = new URL(specifier, importer)
+          urlObject = new URL(specifier, importer);
         }
-        urlObject.searchParams.set("as_js_classic", "")
-        return { external: true, id: urlObject.href }
+        const searchParamsToAdd =
+          augmentDynamicImportUrlSearchParams(urlObject);
+        if (searchParamsToAdd) {
+          Object.keys(searchParamsToAdd).forEach((key) => {
+            const value = searchParamsToAdd[key];
+            if (value === undefined) {
+              urlObject.searchParams.delete(key);
+            } else {
+              urlObject.searchParams.set(key, value);
+            }
+          });
+        }
+        return { external: true, id: urlObject.href };
       }
-      return null
+      return null;
     },
     resolveId: (specifier, importer = rootDirectoryUrl) => {
       if (isFileSystemPath(importer)) {
-        importer = fileUrlConverter.asFileUrl(importer)
+        importer = fileUrlConverter.asFileUrl(importer);
       }
-      let url
+      let url;
       if (specifier[0] === "/") {
-        url = new URL(specifier.slice(1), rootDirectoryUrl).href
+        url = new URL(specifier.slice(1), rootDirectoryUrl).href;
       } else {
-        url = new URL(specifier, importer).href
+        url = new URL(specifier, importer).href;
       }
-      const existingImporter = urlImporters[url]
+      const existingImporter = urlImporters[url];
       if (!existingImporter) {
-        urlImporters[url] = importer
+        urlImporters[url] = importer;
       }
       if (!url.startsWith("file:")) {
-        return { id: url, external: true }
+        return { id: url, external: true };
       }
       if (!importCanBeBundled(url)) {
-        return { id: url, external: true }
+        return { id: url, external: true };
       }
-      const urlInfo = urlGraph.getUrlInfo(url)
+      const urlInfo = urlGraph.getUrlInfo(url);
       if (!urlInfo) {
-        // happen when excluded by urlAnalysis.include
-        return { id: url, external: true }
+        // happen when excluded by referenceAnalysis.include
+        return { id: url, external: true };
       }
       if (!urlInfo.shouldHandle) {
-        return { id: url, external: true }
+        return { id: url, external: true };
       }
-      const filePath = fileUrlConverter.asFilePath(url)
-      return filePath
+      const filePath = fileUrlConverter.asFilePath(url);
+      return filePath;
     },
     async load(rollupId) {
-      const fileUrl = fileUrlConverter.asFileUrl(rollupId)
-      const urlInfo = urlGraph.getUrlInfo(fileUrl)
+      const fileUrl = fileUrlConverter.asFileUrl(rollupId);
+      const urlInfo = urlGraph.getUrlInfo(fileUrl);
       return {
         code: urlInfo.content,
         map:
@@ -344,10 +354,10 @@ const rollupPluginJsenv = ({
           urlInfo.sourcemap
             ? sourcemapConverter.toFilePaths(urlInfo.sourcemap)
             : null,
-      }
+      };
     },
-  }
-}
+  };
+};
 
 const applyRollupPlugins = async ({
   rollup,
@@ -356,10 +366,10 @@ const applyRollupPlugins = async ({
   rollupOutput,
 }) => {
   if (!rollup) {
-    const rollupModule = await import("rollup")
-    rollup = rollupModule.rollup
+    const rollupModule = await import("rollup");
+    rollup = rollupModule.rollup;
   }
-  const { importAssertions } = await import("acorn-import-assertions")
+  const { importAssertions } = await import("acorn-import-assertions");
   const rollupReturnValue = await rollup({
     ...rollupInput,
     plugins: rollupPlugins,
@@ -367,10 +377,10 @@ const applyRollupPlugins = async ({
       importAssertions,
       ...(rollupInput.acornInjectPlugins || []),
     ],
-  })
-  const rollupOutputArray = await rollupReturnValue.generate(rollupOutput)
-  return rollupOutputArray
-}
+  });
+  const rollupOutputArray = await rollupReturnValue.generate(rollupOutput);
+  return rollupOutputArray;
+};
 
 const willBeInsideJsDirectory = ({
   chunkInfo,
@@ -383,19 +393,19 @@ const willBeInsideJsDirectory = ({
   // both will be inside the js/ directory
   if (!chunkInfo.facadeModuleId) {
     // generated by rollup
-    return true
+    return true;
   }
-  const url = fileUrlConverter.asFileUrl(chunkInfo.facadeModuleId)
+  const url = fileUrlConverter.asFileUrl(chunkInfo.facadeModuleId);
   const jsModuleUrlInfo = jsModuleUrlInfos.find(
     (jsModuleUrlInfo) => jsModuleUrlInfo.url === url,
-  )
+  );
   if (!jsModuleUrlInfo) {
     // generated by rollup
-    return true
+    return true;
   }
   if (!jsModuleUrlInfo.isEntryPoint) {
     // not an entry point, jsenv will put it inside js/ directory
-    return true
+    return true;
   }
-  return false
-}
+  return false;
+};

package/src/jsenv_plugin_bundling.js

@@ -1,46 +1,46 @@
-import { bundleCss } from "./css/css_bundling_lightning_css.js"
-import { bundleJsClassic } from "./js_classic/bundle_js_classic.js"
-import { bundleJsModules } from "./js_module/bundle_js_modules.js"
+import { bundleCss } from "./css/css_bundling_lightning_css.js";
+import { bundleJsClassic } from "./js_classic/bundle_js_classic.js";
+import { bundleJsModules } from "./js_module/bundle_js_modules.js";
 
 export const jsenvPluginBundling = ({
   css = {},
   js_classic = {},
   js_module = {},
 } = {}) => {
-  const bundle = {}
+  const bundle = {};
 
   if (css) {
     bundle.css = (cssUrlInfos, context) => {
       return bundleCss({
         cssUrlInfos,
         context,
-      })
-    }
+      });
+    };
   }
   if (js_classic) {
     bundle.js_classic = (jsClassicUrlInfos, context) => {
       return bundleJsClassic({
         jsClassicUrlInfos,
         context,
-      })
-    }
+      });
+    };
   }
   if (js_module) {
     if (js_module === true) {
-      js_module = {}
+      js_module = {};
     }
     bundle.js_module = (jsModuleUrlInfos, context) => {
       return bundleJsModules({
         jsModuleUrlInfos,
         context,
         ...js_module,
-      })
-    }
+      });
+    };
   }
 
   return {
     name: "jsenv:bundling",
     appliesDuring: "build",
     bundle,
-  }
-}
+  };
+};

package/src/main.js

@@ -1,2 +1,2 @@
-export { jsenvPluginBundling } from "./jsenv_plugin_bundling.js"
-export { bundleJsModules } from "./js_module/bundle_js_modules.js"
+export { jsenvPluginBundling } from "./jsenv_plugin_bundling.js";
+export { bundleJsModules } from "./js_module/bundle_js_modules.js";