uniweb 0.12.19 → 0.12.21

package/README.md

@@ -351,7 +351,7 @@ A future version will let markdown in a git repo and content in the Uniweb apps
 | `uniweb export` | Produce a self-contained `dist/` for any static host. You upload it yourself. `--host=<adapter>` adds host-specific helper files. |
 | `uniweb publish @org/name` | Publish a foundation to the registry (path 2). |
 | `uniweb build` | Inspect a build locally. For shipping, use `deploy` or `export`. |
-| `uniweb update` | Reconcile workspace state with the CLI: self-update the global install, align `@uniweb/*` deps in every `package.json` to the CLI's matrix, refresh `AGENTS.md`. Refuses to outpace declared deps with a stale doc. |
+| `uniweb update` | Align this project with the CLI you're running: bump `@uniweb/*` deps in every `package.json` to the CLI's matrix (then install), and refresh `AGENTS.md`. Pins to *this* CLI's matrix — run `npx uniweb@latest update` to align to the latest release. Updating the CLI itself is your package manager's job (`npm i -g uniweb@latest`). |
 
 `--host=<adapter>` is the same option across `deploy`, `export`, and `add ci`. Built-in adapters: `cloudflare-pages`, `netlify`, `github-pages`, `vercel`, `s3-cloudfront`, `generic-static`. Each adapter implements only the operations it supports — `add ci` is currently `github-pages`-only because it's the only one that needs a workflow file in the repo.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.12.19",
+  "version": "0.12.21",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -41,13 +41,13 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
+    "@uniweb/runtime": "0.8.14",
     "@uniweb/core": "0.7.11",
-    "@uniweb/kit": "0.9.11",
-    "@uniweb/runtime": "0.8.13"
+    "@uniweb/kit": "0.9.13"
   },
   "peerDependencies": {
-    "@uniweb/build": "0.14.4",
-    "@uniweb/content-reader": "1.1.10",
+    "@uniweb/build": "0.14.5",
+    "@uniweb/content-reader": "1.1.11",
     "@uniweb/semantic-parser": "1.1.17"
   },
   "peerDependenciesMeta": {

package/src/commands/doctor.js

@@ -10,6 +10,8 @@ import { loadDeployYml } from '@uniweb/build/site'
 import { listAdapters } from '@uniweb/build/hosts'
 import { getCliVersion } from '../versions.js'
 import { readAgentsVersion } from '../utils/agents-stamp.js'
+import { writeJsonPreservingStyle } from '../utils/json-file.js'
+import { surveyWorkspaceDeps } from '../utils/dep-survey.js'
 import { discoverFoundations, discoverSites } from '../utils/discover.js'
 import { findWorkspaceRoot } from '../utils/workspace.js'
 
@@ -204,9 +206,10 @@ export async function doctor(args = []) {
         const union = Array.from(new Set([...ymlPackages, ...pkgWorkspaces])).sort()
         writeFileSync(ymlPath, yaml.dump({ packages: union }, { flowLevel: -1, quotingType: '"' }))
         const rootPkgPath = join(workspaceDir, 'package.json')
-        const rootPkg = JSON.parse(readFileSync(rootPkgPath, 'utf-8'))
+        const rootPkgSrc = readFileSync(rootPkgPath, 'utf-8')
+        const rootPkg = JSON.parse(rootPkgSrc)
         rootPkg.workspaces = union
-        writeFileSync(rootPkgPath, JSON.stringify(rootPkg, null, 2) + '\n')
+        writeJsonPreservingStyle(rootPkgPath, rootPkg, rootPkgSrc)
         issue.fixed = true
         fixed(`wrote union [${union.join(', ')}] to both manifests`)
       } else {
@@ -364,7 +367,7 @@ export async function doctor(args = []) {
         const sitePkgPath = join(sitePath, 'package.json')
         const updatedPkg = { ...sitePkg }
         updatedPkg.dependencies = { ...(updatedPkg.dependencies || {}), [foundationName]: expectedPath }
-        writeFileSync(sitePkgPath, JSON.stringify(updatedPkg, null, 2) + '\n')
+        writeJsonPreservingStyle(sitePkgPath, updatedPkg)
         issue.fixed = true
         fixed(`added "${foundationName}": "${expectedPath}" to ${relative(workspaceDir, sitePkgPath)}`)
       } else {
@@ -391,7 +394,7 @@ export async function doctor(args = []) {
           const sitePkgPath = join(sitePath, 'package.json')
           const updatedPkg = { ...sitePkg }
           updatedPkg.dependencies = { ...(updatedPkg.dependencies || {}), [foundationName]: expectedPath }
-          writeFileSync(sitePkgPath, JSON.stringify(updatedPkg, null, 2) + '\n')
+          writeJsonPreservingStyle(sitePkgPath, updatedPkg)
           issue.fixed = true
           fixed(`updated "${foundationName}" to "${expectedPath}" in ${relative(workspaceDir, sitePkgPath)}`)
         } else {
@@ -672,11 +675,27 @@ export async function doctor(args = []) {
     }
   }
 
+  const cliVersion = getCliVersion()
+
+  // Check @uniweb/* dep alignment with the running CLI
+  log('')
+  const depSurvey = await surveyWorkspaceDeps(workspaceDir)
+  const behindDeps = depSurvey.rows.filter(r => r.status === 'behind')
+  if (behindDeps.length > 0) {
+    const names = [...new Set(behindDeps.map(r => r.name))].sort()
+    warn(`${behindDeps.length} workspace dep declaration${behindDeps.length === 1 ? '' : 's'} lag the CLI (v${cliVersion}): ${names.join(', ')}`)
+    info(`Run: uniweb update`)
+    issues.push({ type: 'warn', message: `${behindDeps.length} @uniweb/* dep declaration(s) behind CLI v${cliVersion}` })
+  } else if (depSurvey.anyAhead) {
+    success(`@uniweb/* deps are aligned or ahead of the CLI (v${cliVersion})`)
+  } else {
+    success(`@uniweb/* deps are aligned with the CLI (v${cliVersion})`)
+  }
+
   // Check AGENTS.md freshness
   log('')
   const agentsPath = join(workspaceDir, 'AGENTS.md')
   const agentsVersion = readAgentsVersion(agentsPath)
-  const cliVersion = getCliVersion()
 
   if (!existsSync(agentsPath)) {
     warn('AGENTS.md not found')

package/src/commands/publish.js

@@ -34,7 +34,7 @@
  */
 
 import { existsSync } from 'node:fs'
-import { readFile, writeFile, mkdir } from 'node:fs/promises'
+import { readFile, mkdir } from 'node:fs/promises'
 import { resolve, join } from 'node:path'
 import { execSync } from 'node:child_process'
 
@@ -42,6 +42,7 @@ import { resolveFoundationSrcPath, classifyPackage } from '@uniweb/build'
 import { createLocalRegistry, RemoteRegistry } from '../utils/registry.js'
 import { ensureAuth, readAuth, writeAuth, decodeJwtPayload } from '../utils/auth.js'
 import { getRegistryUrl, getBackendUrl } from '../utils/config.js'
+import { writeJsonPreservingStyleAsync } from '../utils/json-file.js'
 import { findWorkspaceRoot, findFoundations, findSites, promptSelect } from '../utils/workspace.js'
 import { isNonInteractive, getCliPrefix } from '../utils/interactive.js'
 
@@ -225,7 +226,12 @@ export async function publish(args = []) {
   //    intends the NEW one. Without rebuilding we'd ship inconsistent
   //    bytes (schema says one version, registry record says another).
   const distDir = join(foundationDir, 'dist')
+  // @uniweb/build@0.14.0+ emits dist/entry.js (Phase 5 of CDN migration);
+  // older builds emitted dist/foundation.js. Accept either so a single CLI
+  // works against both old and new foundations during the rollout window.
+  const entryJs = join(distDir, 'entry.js')
   const foundationJs = join(distDir, 'foundation.js')
+  const hasMainArtifact = () => existsSync(entryJs) || existsSync(foundationJs)
   const schemaJson = join(distDir, 'meta', 'schema.json')
 
   // Pre-read package.json so we can compare its version against the
@@ -335,7 +341,7 @@ export async function publish(args = []) {
     }
   }
 
-  let needsBuild = !existsSync(foundationJs) || !existsSync(schemaJson)
+  let needsBuild = !hasMainArtifact() || !existsSync(schemaJson)
   let buildReason = needsBuild ? 'no dist/ found' : null
 
   if (!needsBuild) {
@@ -446,8 +452,8 @@ export async function publish(args = []) {
     })
     console.log('')
 
-    if (!existsSync(foundationJs) || !existsSync(schemaJson)) {
-      error('Build did not produce dist/foundation.js and dist/meta/schema.json')
+    if (!hasMainArtifact() || !existsSync(schemaJson)) {
+      error('Build did not produce dist/entry.js (or legacy dist/foundation.js) and dist/meta/schema.json')
       process.exit(1)
     }
   }
@@ -676,7 +682,7 @@ export async function publish(args = []) {
   if (writeBackId) {
     pkg.uniweb = pkg.uniweb || {}
     pkg.uniweb.id = foundationName
-    await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
+    await writeJsonPreservingStyleAsync(pkgPath, pkg)
     info(`Wrote ${colors.cyan}uniweb.id: "${foundationName}"${colors.reset} to ${colors.dim}package.json${colors.reset}`)
   }
 
@@ -846,7 +852,7 @@ export async function publish(args = []) {
       if (writeBackId) {
         pkg.uniweb = pkg.uniweb || {}
         pkg.uniweb.id = foundationName
-        await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
+        await writeJsonPreservingStyleAsync(pkgPath, pkg)
         info(`Wrote ${colors.cyan}uniweb.id: "${foundationName}"${colors.reset} to ${colors.dim}package.json${colors.reset}`)
       }
       console.log('')

package/src/commands/rename.js

@@ -54,6 +54,7 @@ import {
   updateRootScripts,
 } from '../utils/config.js'
 import { discoverFoundations, discoverSites } from '../utils/discover.js'
+import { writeJsonPreservingStyleAsync } from '../utils/json-file.js'
 import { getExistingPackageNames, validatePackageName } from '../utils/names.js'
 import { detectPackageManager, installCmd } from '../utils/pm.js'
 import { getCliPrefix } from '../utils/interactive.js'
@@ -184,9 +185,10 @@ async function validateRenameName(rootDir, newName) {
  * Rewrite the `name` field in a package.json file.
  */
 async function rewritePackageJsonName(pkgPath, newName) {
-  const pkg = JSON.parse(await readFile(pkgPath, 'utf-8'))
+  const src = await readFile(pkgPath, 'utf-8')
+  const pkg = JSON.parse(src)
   pkg.name = newName
-  await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
+  await writeJsonPreservingStyleAsync(pkgPath, pkg, src)
 }
 
 // ─── Foundation rename ───────────────────────────────────────────
@@ -234,11 +236,13 @@ async function renameFoundation(rootDir, oldName, newName, prefix) {
   for (const site of sites) {
     const sitePkgPath = join(rootDir, site.path, 'package.json')
     const siteYmlPath = join(rootDir, site.path, 'site.yml')
-    let pkg, ymlData
+    let pkg, pkgSrc, ymlData
     try {
-      pkg = JSON.parse(await readFile(sitePkgPath, 'utf-8'))
+      pkgSrc = await readFile(sitePkgPath, 'utf-8')
+      pkg = JSON.parse(pkgSrc)
     } catch {
       pkg = null
+      pkgSrc = null
     }
     try {
       ymlData = yaml.load(await readFile(siteYmlPath, 'utf-8')) || {}
@@ -252,6 +256,7 @@ async function renameFoundation(rootDir, oldName, newName, prefix) {
         path: site.path,
         name: site.name,
         pkg,
+        pkgSrc,
         sitePkgPath,
         siteYmlPath,
         ymlData,
@@ -295,7 +300,7 @@ async function renameFoundation(rootDir, oldName, newName, prefix) {
       s.pkg.dependencies[newName] = oldValue.startsWith('file:')
         ? `file:${newRel}`
         : oldValue  // npm-pinned, leave it; rename-then-republish is out of scope.
-      await writeFile(s.sitePkgPath, JSON.stringify(s.pkg, null, 2) + '\n')
+      await writeJsonPreservingStyleAsync(s.sitePkgPath, s.pkg, s.pkgSrc)
     }
     if (s.ymlMatches) {
       const newYmlData = { ...s.ymlData, foundation: newName }