@jsenv/plugin-bundling 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,14 +24,14 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/babel-plugins": "1.1.3",
-    "@jsenv/log": "3.3.3",
+    "@jsenv/babel-plugins": "1.1.5",
+    "@jsenv/log": "3.3.4",
     "@jsenv/url-meta": "7.0.2",
     "@jsenv/urls": "1.2.8",
-    "@jsenv/sourcemap": "1.0.8",
+    "@jsenv/sourcemap": "1.0.9",
     "acorn-import-assertions": "1.8.0",
-    "lightningcss": "1.18.0",
-    "rollup": "3.10.1"
+    "lightningcss": "1.19.0",
+    "rollup": "3.19.1"
   },
   "peerDependencies": {
     "@jsenv/core": "*"

package/src/js_module/bundle_js_modules.js

@@ -3,8 +3,11 @@ import { pathToFileURL } from "node:url"
 import { URL_META } from "@jsenv/url-meta"
 import { isFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/log"
-import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
+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"
 
@@ -24,7 +27,9 @@ export const bundleJsModules = async ({
     sourcemaps,
   } = context
   const {
+    vendorsChunk = true,
     babelHelpersChunk = true,
+    customChunks = {},
     include,
     preserveDynamicImport = false,
     strictExports = false,
@@ -34,6 +39,54 @@ export const bundleJsModules = async ({
     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,
+    )
+    manualChunks = (id) => {
+      if (rollupOutput.manualChunks) {
+        const manualChunkName = rollupOutput.manualChunks(id)
+        if (manualChunkName) {
+          return manualChunkName
+        }
+      }
+      const url = fileUrlConverter.asFileUrl(id)
+      const meta = URL_META.applyAssociations({ url, associations })
+      const chunkName = Object.keys(meta).find((key) => meta[key])
+      return chunkName || null
+    }
+  }
+
   const resultRef = { current: null }
   try {
     await applyRollupPlugins({
@@ -52,7 +105,6 @@ export const bundleJsModules = async ({
           runtimeCompat,
           sourcemaps,
           include,
-          babelHelpersChunk,
           preserveDynamicImport,
           strictExports,
           resultRef,
@@ -65,8 +117,8 @@ export const bundleJsModules = async ({
             return
           }
           if (warning.code === "THIS_IS_UNDEFINED") {
-            const urlInfo = urlGraph.getUrlInfo(pathToFileURL(warning.id).href)
-            if (urlInfo && urlInfo.data.isBabelClientFile) {
+            const fileUrl = pathToFileURL(warning.id).href
+            if (fileUrl === globalThisClientFileUrl) {
               return
             }
           }
@@ -92,6 +144,7 @@ export const bundleJsModules = async ({
           symbols: context.isSupportedOnCurrentClients("symbols"),
         },
         ...rollupOutput,
+        manualChunks,
       },
     })
     return resultRef.current.jsModuleBundleUrlInfos
@@ -116,7 +169,6 @@ const rollupPluginJsenv = ({
   sourcemaps,
 
   include,
-  babelHelpersChunk,
   preserveDynamicImport,
   strictExports,
 
@@ -227,8 +279,6 @@ const rollupPluginJsenv = ({
     },
     outputOptions: (outputOptions) => {
       // const sourcemapFile = buildDirectoryUrl
-      const { manualChunks } = outputOptions
-
       Object.assign(outputOptions, {
         format,
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
@@ -259,32 +309,6 @@ const rollupPluginJsenv = ({
           const name = nameFromUrlInfo || `${chunkInfo.name}.js`
           return insideJs ? `${assetsDirectory}js/${name}` : `${name}`
         },
-        manualChunks: (id) => {
-          if (manualChunks) {
-            const chunkId = manualChunks(id)
-            if (chunkId) {
-              return chunkId
-            }
-          }
-          if (babelHelpersChunk) {
-            const fileUrl = fileUrlConverter.asFileUrl(id)
-            if (
-              fileUrl.endsWith(
-                "babel-plugin-transform-async-to-promises/helpers.mjs",
-              )
-            ) {
-              return "babel_helpers"
-            }
-            if (babelHelperNameFromUrl(fileUrl)) {
-              return "babel_helpers"
-            }
-            const urlInfo = urlGraph.getUrlInfo(fileUrl)
-            if (urlInfo && urlInfo.data.isBabelClientFile) {
-              return "babel_helpers"
-            }
-          }
-          return null
-        },
         // https://rollupjs.org/guide/en/#outputpaths
         // paths: (id) => {
         //   return id