everything-dev 1.51.7 → 1.52.0

package/dist/cli/upgrade.cjs

@@ -1,9 +1,9 @@
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
-const require_merge = require('../merge.cjs');
 const require_config = require('../config.cjs');
 const require_timing = require('./timing.cjs');
 const require_shared_deps = require('../shared-deps.cjs');
 const require_save_config = require('../utils/save-config.cjs');
+const require_helpers = require('./utils/helpers.cjs');
 const require_cli_init = require('./init.cjs');
 const require_framework_version = require('./framework-version.cjs');
 const require_sync = require('./sync.cjs');
@@ -14,6 +14,7 @@ node_process = require_runtime.__toESM(node_process, 1);
 let _clack_prompts = require("@clack/prompts");
 _clack_prompts = require_runtime.__toESM(_clack_prompts, 1);
 let glob = require("glob");
+let node_child_process = require("node:child_process");
 
 //#region src/cli/upgrade.ts
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
@@ -48,7 +49,6 @@ const OBSOLETE_FILES = [
 	"ui/scripts/generate-metadata.ts",
 	".github/dependabot.yml",
 	".github/templates/dependabot.yml",
-	".github/renovate.json",
 	".github/workflows/packages-release.yml",
 	".github/workflows/publish.yml",
 	".github/workflows/release-sync.yml",
@@ -62,11 +62,8 @@ function extractSemver(value) {
 	if (!value) return null;
 	return value.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/)?.[0] ?? null;
 }
-function readJsonFile(filePath) {
-	return JSON.parse((0, node_fs.readFileSync)(filePath, "utf-8"));
-}
 function readRootPackageJson(projectDir) {
-	return readJsonFile((0, node_path.join)(projectDir, "package.json"));
+	return require_helpers.readJsonFile((0, node_path.join)(projectDir, "package.json"));
 }
 function readRootCatalogEntry(projectDir, packageName) {
 	return readRootPackageJson(projectDir).workspaces?.catalog?.[packageName];
@@ -148,23 +145,23 @@ function packageObjectNeedsCatalogRefs(pkg, packageNames) {
 	return false;
 }
 function packageFileNeedsCatalogRefs(filePath, packageNames) {
-	return packageObjectNeedsCatalogRefs(readJsonFile(filePath), packageNames);
+	return packageObjectNeedsCatalogRefs(require_helpers.readJsonFile(filePath), packageNames);
 }
 function updatePackageFileCatalogRefs(filePath, packageNames) {
-	const pkg = readJsonFile(filePath);
+	const pkg = require_helpers.readJsonFile(filePath);
 	const modified = syncPackageObjectCatalogRefs(pkg, packageNames);
 	if (modified) (0, node_fs.writeFileSync)(filePath, `${JSON.stringify(pkg, null, 2)}\n`);
 	return modified;
 }
 function updatePackageFileAuthCoreRef(filePath) {
-	const pkg = readJsonFile(filePath);
+	const pkg = require_helpers.readJsonFile(filePath);
 	const modified = ensureAuthCoreCatalogRef(pkg);
 	if (modified) (0, node_fs.writeFileSync)(filePath, `${JSON.stringify(pkg, null, 2)}\n`);
 	return modified;
 }
 function syncRootCatalogWithParent(projectDir, parentCatalog) {
 	const pkgPath = (0, node_path.join)(projectDir, "package.json");
-	const pkg = readJsonFile(pkgPath);
+	const pkg = require_helpers.readJsonFile(pkgPath);
 	let modified = syncPackageObjectCatalogRefs(pkg, Object.keys(parentCatalog));
 	if (!pkg.workspaces || typeof pkg.workspaces !== "object") {
 		pkg.workspaces = {
@@ -192,7 +189,7 @@ async function readExtendedRootSource(projectDir) {
 		extendsChain: []
 	};
 	const localConfig = JSON.parse((0, node_fs.readFileSync)(configPath, "utf-8"));
-	let extendsRef = getExtendsRef(localConfig);
+	let extendsRef = require_helpers.getExtendsRef(localConfig);
 	if (!extendsRef?.startsWith("bos://")) return {
 		catalog: {},
 		repository: typeof localConfig.repository === "string" ? localConfig.repository : void 0,
@@ -206,7 +203,7 @@ async function readExtendedRootSource(projectDir) {
 		if (visited.has(extendsRef)) throw new Error(`Circular extends detected while resolving upgrade source: ${extendsRef}`);
 		visited.add(extendsRef);
 		extendsChain.push(extendsRef);
-		const parsed = parseBosRef(extendsRef);
+		const parsed = require_helpers.parseBosRef(extendsRef);
 		if (!parsed) break;
 		rootRef = extendsRef;
 		let parentConfig;
@@ -216,11 +213,11 @@ async function readExtendedRootSource(projectDir) {
 			break;
 		}
 		if (typeof parentConfig.repository === "string") repository = parentConfig.repository;
-		const nextExtendsRef = getExtendsRef(parentConfig);
+		const nextExtendsRef = require_helpers.getExtendsRef(parentConfig);
 		if (!nextExtendsRef?.startsWith("bos://")) break;
 		extendsRef = nextExtendsRef;
 	}
-	const parsed = parseBosRef(rootRef);
+	const parsed = require_helpers.parseBosRef(rootRef);
 	if (!parsed) return {
 		catalog: {},
 		repository,
@@ -236,18 +233,6 @@ async function readExtendedRootSource(projectDir) {
 		extendsChain: source.extendsChain.length > 0 ? source.extendsChain : extendsChain
 	};
 }
-function getExtendsRef(config) {
-	if (typeof config.extends === "string") return config.extends;
-	if (config.extends && typeof config.extends === "object") return require_merge.resolveExtendsRef(config.extends, "production");
-}
-function parseBosRef(ref) {
-	const match = ref.match(/^bos:\/\/([^/]+)\/(.+)$/);
-	if (!match?.[1] || !match[2]) return null;
-	return {
-		account: match[1],
-		gateway: match[2]
-	};
-}
 function parseTargetedRef(ref) {
 	const hashIndex = ref.indexOf("#");
 	if (hashIndex === -1) return { configRef: ref };
@@ -446,9 +431,9 @@ async function loadParentPluginOptions(projectDir) {
 	const configPath = (0, node_path.join)(projectDir, "bos.config.json");
 	if (!(0, node_fs.existsSync)(configPath)) return null;
 	const localConfig = JSON.parse((0, node_fs.readFileSync)(configPath, "utf-8"));
-	const extendsRef = getExtendsRef(localConfig);
+	const extendsRef = require_helpers.getExtendsRef(localConfig);
 	if (!extendsRef?.startsWith("bos://")) return null;
-	const parsed = parseBosRef(extendsRef);
+	const parsed = require_helpers.parseBosRef(extendsRef);
 	if (!parsed) return null;
 	let parentConfig;
 	try {
@@ -528,8 +513,8 @@ async function migrateChildRootPackageJson(projectDir) {
 	const configPath = (0, node_path.join)(projectDir, "bos.config.json");
 	const pkgPath = (0, node_path.join)(projectDir, "package.json");
 	if (!(0, node_fs.existsSync)(configPath) || !(0, node_fs.existsSync)(pkgPath)) return false;
-	if (!getExtendsRef(readJsonFile(configPath))?.startsWith("bos://")) return false;
-	const pkg = readJsonFile(pkgPath);
+	if (!require_helpers.getExtendsRef(require_helpers.readJsonFile(configPath))?.startsWith("bos://")) return false;
+	const pkg = require_helpers.readJsonFile(pkgPath);
 	let changed = false;
 	if (pkg.private !== true) {
 		pkg.private = true;
@@ -564,7 +549,11 @@ async function migrateChildRootPackageJson(projectDir) {
 		scripts[key] = value;
 		changed = true;
 	}
-	for (const obsoleteScript of ["sync-catalog", "init"]) if (obsoleteScript in scripts) {
+	for (const obsoleteScript of [
+		...require_cli_init.getParentOnlyScriptKeys(projectDir),
+		"sync-catalog",
+		"init"
+	]) if (obsoleteScript in scripts) {
 		delete scripts[obsoleteScript];
 		changed = true;
 	}
@@ -630,7 +619,7 @@ async function rewriteLegacyUiImports(projectDir) {
 	}
 	return migrated;
 }
-const LEGACY_DIST_IMPORT_REWRITES = [["from \"everything-dev/dist/", "from \"everything-dev/"], ["from 'everything-dev/dist/", "from 'everything-dev/"]];
+const LEGACY_DIST_IMPORT_REWRITES = [["from \"everything-dev/", "from \"everything-dev/"], ["from 'everything-dev/", "from 'everything-dev/"]];
 function escapeRegex(s) {
 	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -775,6 +764,73 @@ async function rewriteLegacyDistImports(projectDir) {
 	}
 	return migrated;
 }
+async function runMigrationPhase(projectDir, options, parentSource) {
+	const timings = [];
+	const migratedBosConfigs = await require_timing.timePhase(timings, "migrate bos configs", () => migrateBosConfigFiles(projectDir));
+	const migratedRootPackageJson = await require_timing.timePhase(timings, "migrate root package", () => migrateChildRootPackageJson(projectDir));
+	let syncResult;
+	let addedPlugins = [];
+	if (!options.noSync && parentSource.extendsChain.length > 0) {
+		addedPlugins = await require_timing.timePhase(timings, "discover parent plugins", async () => {
+			if (options.dryRun) return [];
+			return addSelectedParentPlugins(projectDir);
+		});
+		syncResult = await require_timing.timePhase(timings, "sync template", () => require_sync.syncTemplate(projectDir, {
+			dryRun: false,
+			noInstall: true,
+			json: false
+		}));
+	}
+	await require_timing.timePhase(timings, "sync shared deps", async () => {
+		const configResult = await require_config.loadResolvedConfig({ cwd: projectDir });
+		if (!configResult) throw new Error("No bos.config.json found in current directory");
+		return require_shared_deps.syncResolvedSharedDeps({
+			configDir: projectDir,
+			hostMode: "local",
+			bosConfig: configResult.config
+		});
+	});
+	if (!options.noInstall) await require_timing.timePhase(timings, "generate types", () => require_cli_init.runTypesGen(projectDir));
+	const migratedFiles = await require_timing.timePhase(timings, "clean obsolete files", async () => {
+		const nextMigratedFiles = [
+			...migratedBosConfigs,
+			...migratedRootPackageJson ? ["package.json"] : [],
+			...await rewriteLegacyUiImports(projectDir),
+			...await rewriteLegacyPluginScopedLayerPatterns(projectDir),
+			...await rewriteLegacyDistImports(projectDir)
+		];
+		for (const file of OBSOLETE_FILES) {
+			const filePath = (0, node_path.join)(projectDir, file);
+			if ((0, node_fs.existsSync)(filePath)) {
+				(0, node_fs.rmSync)(filePath);
+				nextMigratedFiles.push(file);
+			}
+		}
+		const legacyPluginDbFiles = await (0, glob.glob)("plugins/*/src/db/{migrator,load-migrations}.ts", {
+			cwd: projectDir,
+			nodir: true,
+			dot: false,
+			absolute: false
+		});
+		for (const file of legacyPluginDbFiles) {
+			(0, node_fs.rmSync)((0, node_path.join)(projectDir, file));
+			nextMigratedFiles.push(file);
+		}
+		return nextMigratedFiles;
+	});
+	let changelogUrl;
+	const mainPkg = parentSource.catalog["everything-dev"];
+	if (mainPkg) changelogUrl = buildChangelogUrl(void 0, mainPkg, parentSource.repository);
+	return {
+		status: "upgraded",
+		packages: [],
+		sync: syncResult,
+		migrated: migratedFiles.length > 0 ? migratedFiles : void 0,
+		selectedPlugins: addedPlugins.length > 0 ? addedPlugins : void 0,
+		timings,
+		changelogUrl
+	};
+}
 async function upgradeTemplate(projectDir, options) {
 	const timings = [];
 	if (!(0, node_fs.existsSync)((0, node_path.join)(projectDir, "package.json"))) return {
@@ -789,7 +845,7 @@ async function upgradeTemplate(projectDir, options) {
 	const currentCatalogEntries = readRootPackageJson(projectDir).workspaces?.catalog ?? {};
 	const workspacePkgPaths = await findWorkspacePackageJsons(projectDir);
 	const hasCatalogRefRewrites = inheritedCatalogPackageNames.length > 0 && (packageObjectNeedsCatalogRefs(readRootPackageJson(projectDir), inheritedCatalogPackageNames) || workspacePkgPaths.some((pkgPath) => packageFileNeedsCatalogRefs(pkgPath, inheritedCatalogPackageNames)));
-	const hasAuthCoreRefRewrites = packageObjectNeedsAuthCoreCatalogRef(readRootPackageJson(projectDir)) || workspacePkgPaths.some((pkgPath) => packageObjectNeedsAuthCoreCatalogRef(readJsonFile(pkgPath)));
+	const hasAuthCoreRefRewrites = packageObjectNeedsAuthCoreCatalogRef(readRootPackageJson(projectDir)) || workspacePkgPaths.some((pkgPath) => packageObjectNeedsAuthCoreCatalogRef(require_helpers.readJsonFile(pkgPath)));
 	const { packages, catalogVersionUpdates } = await require_timing.timePhase(timings, "check package versions", async () => {
 		const nextPackages = [];
 		for (const name of FRAMEWORK_PACKAGES) {
@@ -839,79 +895,81 @@ async function upgradeTemplate(projectDir, options) {
 			changelogUrl
 		};
 	}
+	if (options.migrationsOnly) return await runMigrationPhase(projectDir, options, parentSource);
 	await require_timing.timePhase(timings, "apply package updates", async () => {
 		if (inheritedCatalogPackageNames.length > 0) syncRootCatalogWithParent(projectDir, sourceRootCatalog);
 		if (inheritedCatalogPackageNames.length > 0) for (const pkgPath of workspacePkgPaths) updatePackageFileCatalogRefs(pkgPath, inheritedCatalogPackageNames);
 	});
-	const migratedBosConfigs = await require_timing.timePhase(timings, "migrate bos configs", () => migrateBosConfigFiles(projectDir));
-	const migratedRootPackageJson = await require_timing.timePhase(timings, "migrate root package", () => migrateChildRootPackageJson(projectDir));
-	let syncResult;
-	let addedPlugins = [];
-	if (!options.noSync) {
-		addedPlugins = await require_timing.timePhase(timings, "discover parent plugins", async () => {
-			if (options.dryRun) return [];
-			return addSelectedParentPlugins(projectDir);
-		});
-		syncResult = await require_timing.timePhase(timings, "sync template", () => require_sync.syncTemplate(projectDir, {
-			dryRun: false,
-			noInstall: true
-		}));
-		if (inheritedCatalogPackageNames.length > 0) syncRootCatalogWithParent(projectDir, sourceRootCatalog);
-	}
-	const sharedSync = await require_timing.timePhase(timings, "sync shared deps", async () => {
-		const configResult = await require_config.loadResolvedConfig({ cwd: projectDir });
-		if (!configResult) throw new Error("No bos.config.json found in current directory");
-		return require_shared_deps.syncResolvedSharedDeps({
-			configDir: projectDir,
-			hostMode: "local",
-			bosConfig: configResult.config
-		});
-	});
-	if ((hasUpdates || addedPlugins.length > 0 || sharedSync.catalogChanged) && !options.noInstall) {
-		await require_timing.timePhase(timings, "install dependencies", () => require_cli_init.runBunInstallForUpgrade(projectDir));
-		await require_timing.timePhase(timings, "generate types", () => require_cli_init.runTypesGen(projectDir));
-	}
-	const migratedFiles = await require_timing.timePhase(timings, "clean obsolete files", async () => {
-		const nextMigratedFiles = [
-			...migratedBosConfigs,
-			...migratedRootPackageJson ? ["package.json"] : [],
-			...await rewriteLegacyUiImports(projectDir),
-			...await rewriteLegacyPluginScopedLayerPatterns(projectDir),
-			...await rewriteLegacyDistImports(projectDir)
-		];
-		for (const file of OBSOLETE_FILES) {
-			const filePath = (0, node_path.join)(projectDir, file);
-			if ((0, node_fs.existsSync)(filePath)) {
-				(0, node_fs.rmSync)(filePath);
-				nextMigratedFiles.push(file);
-			}
-		}
-		const legacyPluginDbFiles = await (0, glob.glob)("plugins/*/src/db/{migrator,load-migrations}.ts", {
+	const needsInstall = (hasUpdates || hasCatalogUpdates) && !options.noInstall;
+	if (needsInstall) await require_timing.timePhase(timings, "install dependencies", () => require_cli_init.runBunInstallForUpgrade(projectDir));
+	if (needsInstall && hasFrameworkUpdates) {
+		const childResult = (0, node_child_process.spawnSync)((0, node_path.join)(projectDir, "node_modules", ".bin", "bos"), [
+			"upgrade",
+			"--migrations-only",
+			"--no-install",
+			...options.noSync ? ["--no-sync"] : [],
+			"--json"
+		], {
 			cwd: projectDir,
-			nodir: true,
-			dot: false,
-			absolute: false
+			stdio: [
+				"inherit",
+				"pipe",
+				"pipe"
+			],
+			encoding: "utf-8",
+			env: {
+				...node_process.default.env,
+				BOS_NO_BANNER: "1"
+			}
 		});
-		for (const file of legacyPluginDbFiles) {
-			(0, node_fs.rmSync)((0, node_path.join)(projectDir, file));
-			nextMigratedFiles.push(file);
-		}
-		return nextMigratedFiles;
-	});
-	let changelogUrl;
+		if (childResult.status !== 0) return {
+			status: "error",
+			packages: [...packages, ...catalogVersionUpdates.map((u) => ({
+				name: u.name,
+				from: u.from,
+				to: u.to
+			}))],
+			timings,
+			error: `Migration phase failed: ${childResult.stderr || childResult.stdout || "Unknown error"}`
+		};
+		try {
+			const childUpgrade = JSON.parse(childResult.stdout);
+			const mainPkg = packages.find((p) => p.name === "everything-dev");
+			const changelogUrl = mainPkg?.from && mainPkg.from !== mainPkg.to ? buildChangelogUrl(mainPkg.from, mainPkg.to, parentSource.repository) : void 0;
+			return {
+				...childUpgrade,
+				packages: [...packages, ...catalogVersionUpdates.map((u) => ({
+					name: u.name,
+					from: u.from,
+					to: u.to
+				}))],
+				timings: [...timings, ...childUpgrade.timings ?? []],
+				changelogUrl
+			};
+		} catch {
+			return {
+				status: "error",
+				packages: [...packages, ...catalogVersionUpdates.map((u) => ({
+					name: u.name,
+					from: u.from,
+					to: u.to
+				}))],
+				timings,
+				error: "Failed to parse migration phase output"
+			};
+		}
+	}
+	const migrationResult = await runMigrationPhase(projectDir, options, parentSource);
 	const mainPkg = packages.find((p) => p.name === "everything-dev");
-	if (mainPkg?.from && mainPkg.from !== mainPkg.to) changelogUrl = buildChangelogUrl(mainPkg.from, mainPkg.to, parentSource.repository);
+	const changelogUrl = mainPkg?.from && mainPkg.from !== mainPkg.to ? buildChangelogUrl(mainPkg.from, mainPkg.to, parentSource.repository) : void 0;
 	return {
-		status: "upgraded",
+		...migrationResult,
 		packages: [...packages, ...catalogVersionUpdates.map((u) => ({
 			name: u.name,
 			from: u.from,
 			to: u.to
 		}))],
-		sync: syncResult,
-		migrated: migratedFiles.length > 0 ? migratedFiles : void 0,
-		selectedPlugins: addedPlugins.length > 0 ? addedPlugins : void 0,
-		timings,
+		timings: [...timings, ...migrationResult.timings ?? []],
 		changelogUrl
 	};
 }