@ditojs/build 3.2.6 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/build",
-  "version": "3.2.6",
+  "version": "3.3.1",
   "type": "module",
   "repository": "https://github.com/ditojs/dito/tree/main/packages/build",
   "author": "Jürg Lehni <juerg@scratchdisk.com> (http://scratchdisk.com)",
@@ -24,19 +24,19 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/utils": "^3.2.6",
+    "@ditojs/utils": "^3.3.1",
     "@vitejs/plugin-vue": "^6.0.9",
     "autoprefixer": "^10.6.1",
     "mime": "^4.1.0",
     "mini-svg-data-uri": "^1.4.4",
     "minimist": "^1.2.8",
-    "postcss": "^8.5.28",
+    "postcss": "^8.5.29",
     "postcss-html": "^2.0.0",
     "postcss-scss": "^4.0.9",
     "pug": "^3.0.4",
     "sass": "^1.105.1",
-    "vite": "^8.3.2",
+    "vite": "^8.3.4",
     "vue": "^3.5.43"
   },
-  "gitHead": "d9868ae96d60a70b5e7ba89a5fc91e07b267a0d5"
+  "gitHead": "f0a879dd39a5de82475d88766f302266a99c072d"
 }

package/src/css.js

@@ -3,7 +3,7 @@ import mime from 'mime'
 import svgToDataUri from 'mini-svg-data-uri'
 
 export function getDataUri(filePath) {
-  const content = fs.readFileSync(filePath, 'utf8')
+  const content = fs.readFileSync(filePath)
   const type = mime.getType(filePath)
   return type === 'image/svg+xml'
     ? svgToDataUri(content.toString('utf8'))

package/src/rollup.js

@@ -37,6 +37,31 @@ export function getRollupExternalsFromDependencies({
   return externals
 }
 
+// Dito.js packages expose their sources through a `/src` export, so that other
+// Dito.js packages can bundle them, e.g. `@ditojs/ui/src` in `@ditojs/admin`:
+const bundledSourcesRegexp = /^@ditojs\/[^/]+\/src(\/|$)/
+
+export function getPackageName(id) {
+  // Relative and absolute paths and virtual modules aren't packages:
+  if (/^[./\0]/.test(id) || /^[a-z]+:/i.test(id)) return null
+  const parts = id.split('/')
+  return id.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0]
+}
+
+// Style sheets, optionally followed by a query, e.g. `tippy.js/dist/tippy.css`
+// or `vue-color/style.css?inline`:
+const styleSheetRegexp = /\.(css|scss|sass|less|styl|stylus|pcss|postcss)(\?|$)/
+
+export function isRollupExternal(id, externals) {
+  if (externals[id]) return true
+  if (bundledSourcesRegexp.test(id)) return false
+  // Style sheets of external packages are bundled into the CSS output:
+  if (styleSheetRegexp.test(id)) return false
+  // Subpaths of external packages are external too, e.g. `@tiptap/pm/model`:
+  const packageName = getPackageName(id)
+  return !!packageName && packageName !== id && !!externals[packageName]
+}
+
 export function matchModuleIdentifier(id, pattern) {
   const regexp = new RegExp(`^${escapeRegexp(pattern).replace('\\*', '(.*)')}$`)
   const match = id.match(regexp)

package/src/vite.js

@@ -1,7 +1,10 @@
 import { defineConfig as viteDefineConfig } from 'vite'
 import createVuePlugin from '@vitejs/plugin-vue'
 import { getPostCssConfig } from './postcss.js'
-import { getRollupExternalsFromDependencies } from './rollup.js'
+import {
+  getRollupExternalsFromDependencies,
+  isRollupExternal
+} from './rollup.js'
 
 export function defineViteConfig({
   defineConfig = viteDefineConfig,
@@ -17,6 +20,8 @@ export function defineViteConfig({
     include = [],
     exclude = []
   } = {},
+  // Options merged into `build.rollupOptions.output`, e.g. `exports`:
+  rollupOutput = {},
   ...rest
 } = {}) {
   const externals = (
@@ -46,10 +51,12 @@ export function defineViteConfig({
             cssFileName: name
           },
           rollupOptions: {
-            external: id => !!externals[id],
+            external: id => isRollupExternal(id, externals),
             output: {
               manualChunks: undefined,
-              globals: externals
+              // Use the module identifiers as UMD globals, including subpaths:
+              globals: id => id,
+              ...rollupOutput
             }
           }
         }