@ditojs/build 2.93.0 → 2.95.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/build",
-  "version": "2.93.0",
+  "version": "2.95.0",
   "type": "module",
   "repository": "https://github.com/ditojs/dito/tree/main/packages/build",
   "author": "Jürg Lehni <juerg@scratchdisk.com> (http://scratchdisk.com)",
@@ -13,9 +13,7 @@
     "src/"
   ],
   "bin": {
-    "inline-assets": "./src/cli/inline-assets.js",
-    "pnpm-link": "./src/cli/pnpm-link.js",
-    "pnpm-unlink": "./src/cli/pnpm-unlink.js"
+    "inline-assets": "./src/cli/inline-assets.js"
   },
   "engines": {
     "node": ">= 24.0.0"
@@ -24,20 +22,20 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/utils": "^2.93.0",
-    "@vitejs/plugin-vue": "^6.0.5",
-    "autoprefixer": "^10.4.27",
+    "@ditojs/utils": "^2.95.0",
+    "@vitejs/plugin-vue": "^6.0.6",
+    "autoprefixer": "^10.5.0",
     "mime": "^4.1.0",
     "mini-svg-data-uri": "^1.4.4",
     "minimist": "^1.2.8",
-    "postcss": "^8.5.8",
+    "postcss": "^8.5.10",
     "postcss-html": "^1.8.1",
     "postcss-inset": "^1.0.0",
     "postcss-scss": "^4.0.9",
     "pug": "^3.0.4",
-    "sass": "^1.98.0",
-    "vite": "^8.0.3",
-    "vue": "^3.5.31"
+    "sass": "^1.99.0",
+    "vite": "^8.0.8",
+    "vue": "^3.5.32"
   },
-  "gitHead": "360bd6a84c617b7f9b3750c50865380be3dbde8e"
+  "gitHead": "0cd76446659c5d30c18df8091bedb20cd84fb330"
 }

package/src/cli/pnpm-link.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-
-import { link } from '../pnpm-linking.js'
-
-const names = process.argv.slice(2)
-if (names.length === 0) {
-  console.error('Usage: pnpm-link <repo> ...')
-  process.exit(1)
-}
-
-link(names)

package/src/cli/pnpm-unlink.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-import { execSync } from 'node:child_process'
-import { link, listLinks, unlink } from '../pnpm-linking.js'
-
-const names = process.argv.slice(2)
-const links = listLinks()
-
-// Determine which repos to unlink and which to keep.
-const toUnlink =
-  names.length > 0
-    ? links.filter(link => names.includes(link))
-    : links
-const toKeep = links.filter(link => !toUnlink.includes(link))
-
-// Remove linked symlinks so pnpm install can restore them.
-unlink(toUnlink)
-
-// Restore node_modules from the unchanged lockfile.
-execSync('pnpm install --frozen-lockfile', { stdio: 'inherit' })
-
-// Re-link repos that weren't specified for unlinking.
-if (toKeep.length > 0) {
-  link(toKeep)
-}

package/src/pnpm-linking.js

@@ -1,194 +0,0 @@
-/* eslint-disable no-console */
-import {
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  readlinkSync,
-  rmSync,
-  symlinkSync
-} from 'node:fs'
-import { relative, resolve } from 'node:path'
-
-// Resolve workspace package directories for a sibling workspace.  For
-// monorepos, parses pnpm-workspace.yaml to find all packages.  For
-// single-package repos, returns the workspace root.
-function getWorkspacePackages(name) {
-  const dir = resolve('..', name)
-  const workspaceFile = resolve(dir, 'pnpm-workspace.yaml')
-  if (!existsSync(workspaceFile)) {
-    return [{ dir, ...readPackageMeta(dir) }]
-  }
-  const content = readFileSync(workspaceFile, 'utf8')
-  const packages = []
-  for (const [, prefix] of content.matchAll(/- ['"]?(.+?)\/\*['"]?/g)) {
-    const pkgDir = resolve(dir, prefix)
-    for (const entry of readdirSync(pkgDir)) {
-      const pkgPath = resolve(pkgDir, entry)
-      if (existsSync(resolve(pkgPath, 'package.json'))) {
-        packages.push({ dir: pkgPath, ...readPackageMeta(pkgPath) })
-      }
-    }
-  }
-  return packages
-}
-
-function readPackageMeta(dir) {
-  const { name } = JSON.parse(
-    readFileSync(resolve(dir, 'package.json'), 'utf8')
-  )
-  const parts = name.split('/')
-  const scoped = parts.length === 2
-  return {
-    name,
-    // Subpath within node_modules (e.g. '@scope/pkg' -> ['@scope', 'pkg'])
-    moduleParts: scoped ? [parts[0], parts[1]] : [name],
-    // .pnpm directory prefix (e.g. '@scope/pkg' -> '@scope+pkg@')
-    pnpmPrefix: scoped ? `${parts[0]}+${parts[1]}@` : `${name}@`
-  }
-}
-
-// Yield [pkgDir, entry] pairs from .pnpm/ matching a package.
-function* getPnpmEntries(pnpmDir, { moduleParts, pnpmPrefix }) {
-  if (existsSync(pnpmDir)) {
-    for (const entry of readdirSync(pnpmDir)) {
-      if (entry.startsWith(pnpmPrefix)) {
-        const dir = resolve(pnpmDir, entry, 'node_modules', ...moduleParts)
-        if (existsSync(dir)) {
-          yield [dir, entry]
-        }
-      }
-    }
-  }
-}
-
-function replaceWithSymlink(target, pkgDir) {
-  rmSync(target, { recursive: true, force: true })
-  symlinkSync(pkgDir, target)
-}
-
-export function link(names) {
-  const linkedNames = new Set()
-  const repoDirs = []
-  const nodeModules = resolve('node_modules')
-  const pnpmDir = resolve(nodeModules, '.pnpm')
-
-  for (const name of names) {
-    repoDirs.push(resolve('..', name))
-
-    for (const meta of getWorkspacePackages(name)) {
-      linkedNames.add(meta.name)
-      const { moduleParts } = meta
-
-      // Replace the top-level symlink with a direct link to the local
-      // workspace.
-      const target = resolve(nodeModules, ...moduleParts)
-      if (moduleParts.length > 1) {
-        mkdirSync(resolve(nodeModules, moduleParts[0]), { recursive: true })
-      }
-      replaceWithSymlink(target, meta.dir)
-      console.log(`  linked ${meta.name} → ${meta.dir}`)
-
-      // Also replace real directories inside .pnpm/ so that other packages that
-      // depend on this one also resolve to the local workspace.
-      for (const [dir, entry] of getPnpmEntries(pnpmDir, meta)) {
-        if (!lstatSync(dir).isSymbolicLink()) {
-          replaceWithSymlink(dir, meta.dir)
-          console.log(`  linked .pnpm/${entry} → ${meta.dir}`)
-        }
-      }
-    }
-  }
-
-  // Symlink missing dependencies from linked repos into node_modules, so that
-  // bundlers with preserveSymlinks can resolve them from the symlink location.
-  function symlinkIfMissing(source, target, name) {
-    if (linkedNames.has(name)) return
-    // Use lstatSync to detect broken symlinks that existsSync would miss.
-    if (lstatSync(target, { throwIfNoEntry: false })) return
-    symlinkSync(source, target)
-    console.log(`  symlinked ${name}`)
-  }
-
-  for (const repoDir of repoDirs) {
-    const repoModules = resolve(repoDir, 'node_modules')
-    if (!existsSync(repoModules)) continue
-    for (const entry of readdirSync(repoModules)) {
-      if (entry.startsWith('.')) continue
-      if (entry.startsWith('@')) {
-        const scopeDir = resolve(repoModules, entry)
-        const localScopeDir = resolve(nodeModules, entry)
-        for (const scopedEntry of readdirSync(scopeDir)) {
-          mkdirSync(localScopeDir, { recursive: true })
-          symlinkIfMissing(
-            resolve(scopeDir, scopedEntry),
-            resolve(localScopeDir, scopedEntry),
-            `${entry}/${scopedEntry}`
-          )
-        }
-      } else {
-        symlinkIfMissing(
-          resolve(repoModules, entry),
-          resolve(nodeModules, entry),
-          entry
-        )
-      }
-    }
-  }
-}
-
-export function unlink(names) {
-  const nodeModules = resolve('node_modules')
-  const pnpmDir = resolve(nodeModules, '.pnpm')
-
-  for (const name of names) {
-    for (const meta of getWorkspacePackages(name)) {
-      // Remove the top-level linked symlink.
-      rmSync(resolve(nodeModules, ...meta.moduleParts), { force: true })
-      console.log(`  unlinked ${meta.name}`)
-
-      // Remove linked symlinks inside .pnpm/.
-      for (const [dir, entry] of getPnpmEntries(pnpmDir, meta)) {
-        if (lstatSync(dir).isSymbolicLink()) {
-          rmSync(dir, { force: true })
-          console.log(`  unlinked .pnpm/${entry}`)
-        }
-      }
-    }
-  }
-}
-
-export function listLinks() {
-  const nodeModules = resolve('node_modules')
-  const parentDir = resolve('..')
-  const repos = new Set()
-
-  function checkEntry(target) {
-    const stat = lstatSync(target, { throwIfNoEntry: false })
-    if (!stat?.isSymbolicLink()) return
-    const linkTarget = readlinkSync(target)
-    const resolved = resolve(target, '..', linkTarget)
-    // A linked symlink points outside node_modules
-    if (!resolved.startsWith(nodeModules)) {
-      const rel = relative(parentDir, resolved)
-      if (!rel.startsWith('..')) {
-        repos.add(rel.split('/')[0])
-      }
-    }
-  }
-
-  for (const entry of readdirSync(nodeModules)) {
-    if (entry.startsWith('.')) continue
-    if (entry.startsWith('@')) {
-      const scopeDir = resolve(nodeModules, entry)
-      for (const scopedEntry of readdirSync(scopeDir)) {
-        checkEntry(resolve(scopeDir, scopedEntry))
-      }
-    } else {
-      checkEntry(resolve(nodeModules, entry))
-    }
-  }
-
-  return [...repos]
-}