@jsenv/plugin-bundling 1.2.2 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "1.2.2",
+  "version": "2.0.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@jsenv/babel-plugins": "1.1.5",
     "@jsenv/log": "3.3.4",
-    "@jsenv/url-meta": "7.0.2",
+    "@jsenv/url-meta": "7.1.0",
     "@jsenv/urls": "1.2.8",
     "@jsenv/sourcemap": "1.0.9",
     "acorn-import-assertions": "1.8.0",

package/src/js_classic/bundle_js_classic.js

@@ -0,0 +1,12 @@
+/*
+ * TODO:
+ * js classic might contain importScripts or self.importScripts calls
+ * (when it's inside worker, service worker, etc...)
+ * ideally we should bundle it when urlInfo.subtype === "worker"
+ */
+
+// import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+
+export const bundleJsClassic = () => {
+  return {}
+}

package/src/js_module/bundle_js_modules.js

@@ -3,18 +3,22 @@ import { pathToFileURL } from "node:url"
 import { URL_META } from "@jsenv/url-meta"
 import { isFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/log"
-import { babelHelperClientDirectoryUrl } from "@jsenv/babel-plugins"
 import { sourcemapConverter } from "@jsenv/sourcemap"
-import { newStylesheetClientFileUrl } from "@jsenv/core/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js"
 import { globalThisClientFileUrl } from "@jsenv/core/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js"
-import { regeneratorRuntimeClientFileUrl } from "@jsenv/core/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js"
 
 import { fileUrlConverter } from "./file_url_converter.js"
 
 export const bundleJsModules = async ({
   jsModuleUrlInfos,
   context,
-  options,
+  include,
+  chunks = {},
+  strictExports = false,
+  preserveDynamicImport = false,
+  rollup,
+  rollupInput = {},
+  rollupOutput = {},
+  rollupPlugins = [],
 }) => {
   const {
     signal,
@@ -26,53 +30,10 @@ export const bundleJsModules = async ({
     runtimeCompat,
     sourcemaps,
   } = context
-  const {
-    vendorsChunk = true,
-    babelHelpersChunk = true,
-    customChunks = {},
-    include,
-    preserveDynamicImport = false,
-    strictExports = false,
-    rollup,
-    rollupInput = {},
-    rollupOutput = {},
-    rollupPlugins = [],
-  } = options
-
-  const chunksAssociations = {
-    ...(vendorsChunk
-      ? {
-          vendors: {
-            "./**/node_modules/": true,
-            [newStylesheetClientFileUrl]: true,
-            [globalThisClientFileUrl]: true,
-            [regeneratorRuntimeClientFileUrl]: true,
-          },
-        }
-      : {}),
-    ...(babelHelpersChunk
-      ? {
-          babel_helpers: {
-            [babelHelperClientDirectoryUrl]: true,
-            [newStylesheetClientFileUrl]: true,
-            [globalThisClientFileUrl]: true,
-            [regeneratorRuntimeClientFileUrl]: true,
-            "./**/babel-plugin-transform-async-to-promises/helpers.mjs": true,
-          },
-        }
-      : {}),
-    ...customChunks,
-  }
 
   let manualChunks
-  if (
-    typeof customChunks === "object" &&
-    Object.keys(chunksAssociations).length
-  ) {
-    const associations = URL_META.resolveAssociations(
-      chunksAssociations,
-      rootDirectoryUrl,
-    )
+  if (Object.keys(chunks).length) {
+    const associations = URL_META.resolveAssociations(chunks, rootDirectoryUrl)
     manualChunks = (id) => {
       if (rollupOutput.manualChunks) {
         const manualChunkName = rollupOutput.manualChunks(id)
@@ -132,7 +93,11 @@ export const bundleJsModules = async ({
       },
       rollupOutput: {
         compact: context.minification,
-        minifyInternalExports: 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,
         generatedCode: {
           arrowFunctions: context.isSupportedOnCurrentClients("arrow_function"),
           constBindings: context.isSupportedOnCurrentClients("const_bindings"),

package/src/jsenv_plugin_bundling.js

@@ -1,5 +1,5 @@
 import { bundleCss } from "./css/css_bundling_lightning_css.js"
-import { bundleJsClassicWorkers } from "./js_classic_workers/bundle_js_classic_workers.js"
+import { bundleJsClassic } from "./js_classic/bundle_js_classic.js"
 import { bundleJsModules } from "./js_module/bundle_js_modules.js"
 
 export const jsenvPluginBundling = ({
@@ -7,37 +7,40 @@ export const jsenvPluginBundling = ({
   js_classic = {},
   js_module = {},
 } = {}) => {
+  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 = {}
+    }
+    bundle.js_module = (jsModuleUrlInfos, context) => {
+      return bundleJsModules({
+        jsModuleUrlInfos,
+        context,
+        ...js_module,
+      })
+    }
+  }
+
   return {
     name: "jsenv:bundling",
     appliesDuring: "build",
-    bundle: {
-      css: css
-        ? (cssUrlInfos, context) => {
-            return bundleCss({
-              cssUrlInfos,
-              context,
-              options: css === true ? {} : css,
-            })
-          }
-        : undefined,
-      js_classic: js_classic
-        ? (jsClassicUrlInfos, context) => {
-            return bundleJsClassicWorkers({
-              jsClassicUrlInfos,
-              context,
-              options: js_classic === true ? {} : js_classic,
-            })
-          }
-        : undefined,
-      js_module: js_module
-        ? (jsModuleUrlInfos, context) => {
-            return bundleJsModules({
-              jsModuleUrlInfos,
-              context,
-              options: js_module === true ? {} : js_module,
-            })
-          }
-        : undefined,
-    },
+    bundle,
   }
 }

package/src/js_classic_workers/bundle_js_classic_workers.js

@@ -1,13 +0,0 @@
-/*
- * TODO:
- * for each js_classic where subtype is a worker
- * take the url info and find importScripts calls
- * and replace them with the corresponding url info file content
- * we'll ikely need to save the importScripts node location to be able to do that
- */
-
-// import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-
-export const bundleJsClassicWorkers = () => {
-  return {}
-}