@jsenv/plugin-bundling 1.0.5 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/ast": "2.0.0",
     "@jsenv/babel-plugins": "1.1.2",
     "@jsenv/log": "3.3.3",
     "@jsenv/url-meta": "7.0.2",
     "@jsenv/urls": "1.2.8",
     "@jsenv/sourcemap": "1.0.8",
     "acorn-import-assertions": "1.8.0",
+    "lightningcss": "1.18.0",
     "rollup": "3.9.1"
   },
   "peerDependencies": {

package/src/css/css_bundling_lightning_css.js

@@ -1,16 +1,39 @@
-import { fileURLToPath } from "node:url"
+import { fileURLToPath, pathToFileURL } from "node:url"
 
 // Do not use until https://github.com/parcel-bundler/parcel-css/issues/181
-export const bundleCss = async (urlInfo, context) => {
-  const { bundle } = await import("lightningcss")
-
+export const bundleCss = async ({ cssUrlInfos, context }) => {
+  const bundledCssUrlInfos = {}
+  const { bundleAsync } = await import("lightningcss")
   const targets = runtimeCompatToTargets(context.runtimeCompat)
-  const { code, map } = bundle({
-    filename: fileURLToPath(urlInfo.originalUrl),
-    targets,
-    minify: false,
-  })
-  return { code, map }
+  for (const cssUrlInfo of cssUrlInfos) {
+    const { code, map } = await bundleAsync({
+      filename: fileURLToPath(cssUrlInfo.originalUrl),
+      targets,
+      minify: false,
+      resolver: {
+        read: (specifier) => {
+          const fileUrlObject = pathToFileURL(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
+        },
+      },
+    })
+    bundledCssUrlInfos[cssUrlInfo.url] = {
+      data: {
+        bundlerName: "lightningcss",
+      },
+      contentType: "text/css",
+      content: String(code),
+      sourcemap: map,
+    }
+  }
+  return bundledCssUrlInfos
 }
 
 const runtimeCompatToTargets = (runtimeCompat) => {

package/src/js_module/bundle_js_modules.js

@@ -79,6 +79,18 @@ export const bundleJsModules = async ({
         ...rollupInput,
       },
       rollupOutput: {
+        compact: context.minification,
+        minifyInternalExports: context.minification,
+        generatedCode: {
+          arrowFunctions: context.isSupportedOnCurrentClients("arrow_function"),
+          constBindings: context.isSupportedOnCurrentClients("const_bindings"),
+          objectShorthand: context.isSupportedOnCurrentClients(
+            "object_properties_shorthand",
+          ),
+          reservedNamesAsProps:
+            context.isSupportedOnCurrentClients("reserved_words"),
+          symbols: context.isSupportedOnCurrentClients("symbols"),
+        },
         ...rollupOutput,
       },
     })

package/src/jsenv_plugin_bundling.js

@@ -1,4 +1,4 @@
-import { bundleCss } from "./css/css_bundling_postcss.js"
+import { bundleCss } from "./css/css_bundling_lightning_css.js"
 import { bundleJsClassicWorkers } from "./js_classic_workers/bundle_js_classic_workers.js"
 import { bundleJsModules } from "./js_module/bundle_js_modules.js"