@jsenv/plugin-bundling 1.1.1 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-bundling",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,14 +24,14 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/babel-plugins": "1.1.2",
+    "@jsenv/babel-plugins": "1.1.3",
     "@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"
+    "rollup": "3.10.1"
   },
   "peerDependencies": {
     "@jsenv/core": "*"

package/src/js_module/bundle_js_modules.js

@@ -227,6 +227,8 @@ const rollupPluginJsenv = ({
     },
     outputOptions: (outputOptions) => {
       // const sourcemapFile = buildDirectoryUrl
+      const { manualChunks } = outputOptions
+
       Object.assign(outputOptions, {
         format,
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
@@ -258,6 +260,12 @@ const rollupPluginJsenv = ({
           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 (

package/src/css/css_bundling_postcss.js

@@ -1,139 +0,0 @@
-/*
- * Each @import found in css is replaced by the file content
- * - There is no need to worry about urls (such as background-image: url())
- *   because they are absolute (file://*) and will be made relative again by jsenv build
- * - The sourcemap are not generated but ideally they should be
- *   It can be quite challenging, see "bundle_sourcemap.js"
- */
-
-import { createMagicSource } from "@jsenv/sourcemap"
-import { applyPostCss, postCssPluginUrlVisitor } from "@jsenv/ast"
-
-import { sortByDependencies } from "./sort_by_dependencies.js"
-
-export const bundleCss = async ({ cssUrlInfos, context }) => {
-  const bundledCssUrlInfos = {}
-  const cssBundleInfos = await performCssBundling({
-    cssEntryUrlInfos: cssUrlInfos,
-    context,
-  })
-  cssUrlInfos.forEach((cssUrlInfo) => {
-    bundledCssUrlInfos[cssUrlInfo.url] = {
-      data: {
-        bundlerName: "postcss",
-      },
-      contentType: "text/css",
-      content: cssBundleInfos[cssUrlInfo.url].bundleContent,
-    }
-  })
-  return bundledCssUrlInfos
-}
-
-const performCssBundling = async ({ cssEntryUrlInfos, context }) => {
-  const cssBundleInfos = await loadCssUrls({
-    cssEntryUrlInfos,
-    context,
-  })
-  const cssUrlsSorted = sortByDependencies(cssBundleInfos)
-  cssUrlsSorted.forEach((cssUrl) => {
-    const cssBundleInfo = cssBundleInfos[cssUrl]
-    const magicSource = createMagicSource(cssBundleInfo.content)
-    cssBundleInfo.cssUrls.forEach((cssUrl) => {
-      if (cssUrl.type === "@import") {
-        magicSource.replace({
-          start: cssUrl.atRuleStart,
-          end: cssUrl.atRuleEnd,
-          replacement: cssBundleInfos[cssUrl.url].bundleContent,
-        })
-      }
-    })
-    const { content } = magicSource.toContentAndSourcemap()
-    cssBundleInfo.bundleContent = content.trim()
-  })
-  return cssBundleInfos
-}
-
-const parseCssUrls = async ({ css, url }) => {
-  const cssUrls = []
-  await applyPostCss({
-    sourcemaps: false,
-    plugins: [
-      postCssPluginUrlVisitor({
-        urlVisitor: ({
-          type,
-          specifier,
-          specifierStart,
-          specifierEnd,
-          atRuleStart,
-          atRuleEnd,
-        }) => {
-          cssUrls.push({
-            type,
-            url: new URL(specifier, url).href,
-            specifierStart,
-            specifierEnd,
-            atRuleStart,
-            atRuleEnd,
-          })
-        },
-      }),
-    ],
-    url,
-    content: css,
-  })
-
-  return cssUrls
-}
-
-const loadCssUrls = async ({ cssEntryUrlInfos, context }) => {
-  const cssBundleInfos = {}
-  const promises = []
-  const promiseMap = new Map()
-
-  const load = (cssUrlInfo) => {
-    const promiseFromData = promiseMap.get(cssUrlInfo.url)
-    if (promiseFromData) return promiseFromData
-    const promise = _load(cssUrlInfo)
-    promises.push(promise)
-    promiseMap.set(cssUrlInfo.url, promise)
-    return promise
-  }
-
-  const _load = async (cssUrlInfo) => {
-    const cssUrls = await parseCssUrls({
-      css: cssUrlInfo.content,
-      url: cssUrlInfo.url,
-    })
-    const cssBundleInfo = {
-      content: cssUrlInfo.content,
-      cssUrls,
-      dependencies: [],
-    }
-    cssBundleInfos[cssUrlInfo.url] = cssBundleInfo
-    cssUrls.forEach((cssUrl) => {
-      if (cssUrl.type === "@import") {
-        cssBundleInfo.dependencies.push(cssUrl.url)
-        const importedCssUrlInfo = context.urlGraph.getUrlInfo(cssUrl.url)
-        load(importedCssUrlInfo)
-      }
-    })
-  }
-
-  cssEntryUrlInfos.forEach((cssEntryUrlInfo) => {
-    load(cssEntryUrlInfo)
-  })
-
-  const waitAll = async () => {
-    if (promises.length === 0) {
-      return
-    }
-    const promisesToWait = promises.slice()
-    promises.length = 0
-    await Promise.all(promisesToWait)
-    await waitAll()
-  }
-  await waitAll()
-  promiseMap.clear()
-
-  return cssBundleInfos
-}

package/src/css/sort_by_dependencies.js

@@ -1,28 +0,0 @@
-export const sortByDependencies = (nodes) => {
-  const visited = []
-  const sorted = []
-  const circular = []
-  const visit = (url) => {
-    const isSorted = sorted.includes(url)
-    if (isSorted) {
-      return
-    }
-    const isVisited = visited.includes(url)
-    if (isVisited) {
-      if (!circular.includes(url)) {
-        circular.push(url)
-      }
-    } else {
-      visited.push(url)
-      nodes[url].dependencies.forEach((dependencyUrl) => {
-        visit(dependencyUrl, url)
-      })
-      sorted.push(url)
-    }
-  }
-  Object.keys(nodes).forEach((url) => {
-    visit(url)
-  })
-  sorted.circular = circular
-  return sorted
-}