@stacksjs/actions 0.70.193 → 0.70.194

package/dist/upgrade/packages.d.ts

@@ -17,6 +17,21 @@ export declare function applyBumps(pkg: PkgJson, target: string, lockstep: Set<s
  * Handles resolution, package.json rewrite, and reinstall; then `process.exit`s.
  */
 export declare function upgradeStacksPackages(projectRoot: string, options: PackageUpgradeOptions): Promise<never>;
+/**` pointed at them by workspace
+ * reference. Delete that directory to move onto published packages and those
+ * references resolve to nothing: `bun install` fails outright with
+ * "@stacksjs/utils@workspace:* failed to resolve", and the app cannot install
+ * at all until every one of them is rewritten by hand.
+ */
+export declare function resolveManifestSpec(name: string, spec: string, target: string): string | null;
+/*` dependencies, and an upgrade that ignores them leaves the app
+ * describing two different framework versions at once - or, after a vendored
+ * core is removed, unable to install.
+ *
+ * Returns what changed so the caller can report it. Writes nothing when
+ * `dryRun` is set.
+ */
+export declare function reconcileVendoredManifests(projectRoot: string, target: string, options?: { dryRun?: boolean }): ManifestChange[];
 export declare interface PackageUpgradeOptions {
   version?: string
   canary?: boolean
@@ -30,3 +45,10 @@ declare interface PkgJson {
   devDependencies?: Record<string, string>
   [key: string]: unknown
 }
+/** One manifest the reconcile rewrote, for reporting. */
+export declare interface ManifestChange {
+  file: string
+  name: string
+  from: string
+  to: string
+}

package/dist/upgrade/packages.js

@@ -1,5 +1,5 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { join, relative } from "node:path";
 import process from "node:process";
 import { runCommand } from "@stacksjs/cli";
 export function hasStacksDependency(pkg) {
@@ -95,8 +95,8 @@ export async function upgradeStacksPackages(projectRoot, options) {
   if (current)
     console.log(`  current \`stacks\` constraint: ${current}
 `);
-  const lockstep = lockstepPackages(metaDeps, target), changes = applyBumps(pkg, target, lockstep);
-  if (changes.length === 0 && !options.force) {
+  const lockstep = lockstepPackages(metaDeps, target), changes = applyBumps(pkg, target, lockstep), manifestChanges = reconcileVendoredManifests(projectRoot, target, { dryRun: options.dryRun });
+  if (changes.length === 0 && manifestChanges.length === 0 && !options.force) {
     console.log(`\u2714 Already up to date \u2014 every framework dependency matches the target.
 `);
     process.exit(0);
@@ -108,6 +108,13 @@ export async function upgradeStacksPackages(projectRoot, options) {
       console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}`);
     console.log("");
   }
+  if (manifestChanges.length > 0) {
+    console.log(`  Vendored manifests under storage/framework (${manifestChanges.length}):`);
+    const width = Math.max(...manifestChanges.map((c) => c.name.length));
+    for (const c of manifestChanges)
+      console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}   ${c.file}`);
+    console.log("");
+  }
   if (options.dryRun) {
     console.log(`  --dry-run: no files were written and nothing was installed.
 `);
@@ -138,3 +145,78 @@ export async function upgradeStacksPackages(projectRoot, options) {
 `);
   process.exit(0);
 }
+export function resolveManifestSpec(name, spec, target) {
+  if (name !== "stacks" && !name.startsWith("@stacksjs/"))
+    return null;
+  if (spec.startsWith("workspace:"))
+    return `^${target}`;
+  if (baseVersion(spec) === target)
+    return null;
+  if (!/^[\^~]?\d/.test(spec))
+    return null;
+  return `${/^[\^~]/.test(spec) ? spec[0] : ""}${target}`;
+}
+export function reconcileVendoredManifests(projectRoot, target, options = {}) {
+  const root = join(projectRoot, "storage/framework");
+  if (!existsSync(root))
+    return [];
+  const changes = [], walk = (dir) => {
+    let entries;
+    try {
+      entries = readdirSync(dir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (entry === "node_modules" || entry === "dist" || entry === ".git")
+        continue;
+      const full = join(dir, entry);
+      let stat;
+      try {
+        stat = statSync(full);
+      } catch {
+        continue;
+      }
+      if (stat.isDirectory()) {
+        walk(full);
+        continue;
+      }
+      if (entry !== "package.json")
+        continue;
+      let raw;
+      try {
+        raw = readFileSync(full, "utf-8");
+      } catch {
+        continue;
+      }
+      let pkg;
+      try {
+        pkg = JSON.parse(raw);
+      } catch {
+        continue;
+      }
+      let touched = !1;
+      for (const field of ["dependencies", "devDependencies"]) {
+        const deps = pkg[field];
+        if (!deps)
+          continue;
+        for (const [name, spec] of Object.entries(deps)) {
+          const next = resolveManifestSpec(name, spec, target);
+          if (!next)
+            continue;
+          changes.push({ file: relative(projectRoot, full), name, from: spec, to: next });
+          deps[name] = next;
+          touched = !0;
+        }
+      }
+      if (touched && !options.dryRun) {
+        const suffix = raw.endsWith(`
+`) ? `
+` : "";
+        writeFileSync(full, `${JSON.stringify(pkg, null, 2)}${suffix}`);
+      }
+    }
+  };
+  walk(root);
+  return changes;
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/actions",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.193",
+  "version": "0.70.194",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "contributors": [
@@ -62,31 +62,31 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/config": "0.70.193",
+    "@stacksjs/config": "0.70.194",
     "@stacksjs/bumpx": "^0.2.6",
     "@stacksjs/bunpress": "^0.1.18",
     "@stacksjs/logsmith": "^0.2.3",
-    "@stacksjs/registry": "0.70.193",
-    "@stacksjs/ts-cloud": "^0.7.60",
+    "@stacksjs/registry": "0.70.194",
+    "@stacksjs/ts-cloud": "^0.7.78",
     "@stacksjs/ts-md": "^0.1.1"
   },
   "devDependencies": {
-    "@stacksjs/api": "0.70.193",
-    "@stacksjs/cli": "0.70.193",
-    "@stacksjs/database": "0.70.193",
+    "@stacksjs/api": "0.70.194",
+    "@stacksjs/cli": "0.70.194",
+    "@stacksjs/database": "0.70.194",
     "@stacksjs/tlsx": "^0.13.2",
     "better-dx": "^0.2.17",
-    "@stacksjs/dns": "0.70.193",
-    "@stacksjs/enums": "0.70.193",
-    "@stacksjs/env": "0.70.193",
-    "@stacksjs/error-handling": "0.70.193",
-    "@stacksjs/logging": "0.70.193",
-    "@stacksjs/path": "0.70.193",
-    "@stacksjs/security": "0.70.193",
-    "@stacksjs/storage": "0.70.193",
-    "@stacksjs/strings": "0.70.193",
-    "@stacksjs/utils": "0.70.193",
-    "@stacksjs/validation": "0.70.193"
+    "@stacksjs/dns": "0.70.194",
+    "@stacksjs/enums": "0.70.194",
+    "@stacksjs/env": "0.70.194",
+    "@stacksjs/error-handling": "0.70.194",
+    "@stacksjs/logging": "0.70.194",
+    "@stacksjs/path": "0.70.194",
+    "@stacksjs/security": "0.70.194",
+    "@stacksjs/storage": "0.70.194",
+    "@stacksjs/strings": "0.70.194",
+    "@stacksjs/utils": "0.70.194",
+    "@stacksjs/validation": "0.70.194"
   },
   "peerDependencies": {
     "pickier": "^0.1.35"