everything-dev 1.12.4 → 1.14.0

package/src/cli/sync.ts

@@ -10,6 +10,13 @@ import {
 import { dirname, join } from "node:path";
 import { glob } from "glob";
 import type { SyncOptions, SyncResult } from "../contract";
+import {
+  isPlainObject as isPlainObjectFromMerge,
+  mergeBosConfigWithTemplate,
+  resolveExtendsRef,
+} from "../merge";
+import type { BosPluginRef } from "../types";
+import { isPathExcluded } from "../utils/path-match";
 import {
   personalizeConfig,
   readTemplatekeep,
@@ -24,6 +31,8 @@ const FRAMEWORK_OWNED_SYNC_FILES = new Set([
   "biome.json",
   "bos.config.json",
   "package.json",
+  ".github/renovate.json",
+  ".github/workflows/ci.yml",
   ".github/workflows/release-sync.yml",
   "ui/package.json",
   "ui/postcss.config.mjs",
@@ -67,22 +76,6 @@ export function readLocalSyncExcludes(projectDir: string): string[] {
   return readExcludeFile(join(projectDir, ".bos", "sync-local-exclude"));
 }
 
-function isExcluded(filePath: string, excludePatterns: string[]): boolean {
-  for (const pattern of excludePatterns) {
-    if (pattern.endsWith("/**")) {
-      const prefix = pattern.slice(0, -3);
-      if (filePath.startsWith(`${prefix}/`) || filePath === prefix) return true;
-    } else if (pattern.endsWith("/*")) {
-      const prefix = pattern.slice(0, -2);
-      const slashIdx = filePath.indexOf("/", prefix.length + 1);
-      if (filePath.startsWith(`${prefix}/`) && slashIdx === -1) return true;
-    } else if (filePath === pattern || filePath.startsWith(`${pattern}/`)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 function computeLocalHash(projectDir: string, filePath: string): string | null {
   const fullPath = join(projectDir, filePath);
   if (!existsSync(fullPath)) return null;
@@ -111,78 +104,6 @@ function backupFiles(projectDir: string, filePaths: string[]): string | null {
   return backupDir;
 }
 
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
-function mergeJsonValues(local: unknown, template: unknown): unknown {
-  if (isPlainObject(local) && isPlainObject(template)) {
-    const merged: Record<string, unknown> = {};
-    // Preserve local key order first
-    for (const key of Object.keys(local)) {
-      merged[key] = mergeJsonValues(local[key], template[key]);
-    }
-    // Append any new template keys at the end
-    for (const key of Object.keys(template)) {
-      if (!(key in merged)) {
-        merged[key] = template[key];
-      }
-    }
-    return merged;
-  }
-  // For arrays and primitives, local always wins
-  return local ?? template;
-}
-
-function mergeBosConfig(
-  local: Record<string, unknown>,
-  template: Record<string, unknown>,
-): Record<string, unknown> {
-  const merged: Record<string, unknown> = {};
-
-  // 1. extends always first
-  if (local.extends !== undefined) merged.extends = local.extends;
-  else if (template.extends !== undefined) merged.extends = template.extends;
-
-  // 2. Fixed trailing group: app, plugins, shared
-  const TRAIL_GROUP = ["app", "plugins", "shared"];
-
-  const localKeys = Object.keys(local).filter((k) => k !== "extends");
-  const templateKeys = Object.keys(template).filter(
-    (k) => k !== "extends" && !localKeys.includes(k),
-  );
-
-  // Find the first trailing-group key present locally ("app" comes first in the group)
-  const firstTrailIndex = localKeys.findIndex((k) => TRAIL_GROUP.includes(k));
-
-  const orderedKeys: string[] = [];
-
-  if (firstTrailIndex >= 0) {
-    // Keys before the trail group stay in local order
-    orderedKeys.push(...localKeys.slice(0, firstTrailIndex));
-    // New template keys inserted right before the trail group
-    orderedKeys.push(...templateKeys);
-    // Trail group keys (app, plugins, shared) in canonical order, preserving local if present
-    for (const trailKey of TRAIL_GROUP) {
-      if (localKeys.includes(trailKey)) orderedKeys.push(trailKey);
-    }
-  } else {
-    // No trail group found locally — keep local order then append new keys and trail group
-    orderedKeys.push(...localKeys);
-    orderedKeys.push(...templateKeys);
-    for (const trailKey of TRAIL_GROUP) {
-      if (templateKeys.includes(trailKey)) orderedKeys.push(trailKey);
-    }
-  }
-
-  // 3. Merge values for each key
-  for (const key of orderedKeys) {
-    merged[key] = mergeJsonValues(local[key], template[key]);
-  }
-
-  return merged;
-}
-
 function mergeStringMaps(
   local: Record<string, string> | undefined,
   template: Record<string, string> | undefined,
@@ -328,7 +249,7 @@ function writeSyncedFile(sourceDir: string, projectDir: string, filePath: string
     if (localContent) {
       const local = JSON.parse(localContent) as Record<string, unknown>;
       const template = JSON.parse(templateContent) as Record<string, unknown>;
-      const merged = mergeBosConfig(local, template);
+      const merged = mergeBosConfigWithTemplate(local, template);
       writeFileSync(dest, `${JSON.stringify(merged, null, 2)}\n`);
       return;
     }
@@ -351,11 +272,20 @@ function writeSyncedFile(sourceDir: string, projectDir: string, filePath: string
 }
 
 export async function syncTemplate(projectDir: string, options: SyncOptions): Promise<SyncResult> {
+  // Sync reads the raw bos.config.json (not the resolved config) because it needs
+  // the user's explicit local settings: their extends ref, selected plugins, etc.
+  // The resolved config is the merged result and would include inherited parent
+  // values that the user didn't explicitly choose, which would break sync filtering.
   const localConfig = JSON.parse(
     readFileSync(join(projectDir, "bos.config.json"), "utf-8"),
   ) as Record<string, unknown>;
 
-  const extendsRef = localConfig.extends as string | undefined;
+  let extendsRef: string | undefined;
+  if (typeof localConfig.extends === "string") {
+    extendsRef = localConfig.extends;
+  } else if (isPlainObjectFromMerge(localConfig.extends)) {
+    extendsRef = resolveExtendsRef(localConfig.extends as Record<string, string>, "production");
+  }
   if (!extendsRef?.startsWith("bos://")) {
     return {
       status: "error",
@@ -421,8 +351,9 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
 
     const pluginRoutes: Record<string, string[]> = {};
     if (parentConfig.plugins) {
-      for (const [key, ref] of Object.entries(parentConfig.plugins)) {
-        if (ref.routes && ref.routes.length > 0) {
+      for (const [key, entry] of Object.entries(parentConfig.plugins)) {
+        const ref: BosPluginRef | null = entry && typeof entry !== "string" ? entry : null;
+        if (ref?.routes && ref.routes.length > 0) {
           pluginRoutes[key] = ref.routes;
         }
       }
@@ -439,7 +370,7 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
     for (const filePath of allTemplateFiles) {
       const pluginMatch = filePath.match(/^plugins\/([^/]+)/);
       if (pluginMatch && !childPlugins.includes(pluginMatch[1])) continue;
-      if (isExcluded(filePath, excludedRoutePatterns)) continue;
+      if (isPathExcluded(filePath, excludedRoutePatterns)) continue;
       filteredFiles.add(filePath);
     }
 
@@ -453,7 +384,7 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
           absolute: false,
         });
         for (const match of matches) {
-          if (!isExcluded(match, excludedRoutePatterns)) {
+          if (!isPathExcluded(match, excludedRoutePatterns)) {
             filteredFiles.add(match);
           }
         }
@@ -469,7 +400,7 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
     for (const filePath of filteredFiles) {
       const destPath = toDestPath(filePath);
       const frameworkOwned = isFrameworkOwnedSyncFile(destPath);
-      if (isExcluded(destPath, excludePatterns) && !frameworkOwned) continue;
+      if (isPathExcluded(destPath, excludePatterns) && !frameworkOwned) continue;
 
       const localHash = computeLocalHash(projectDir, destPath);
       const sourceContent = readFileSync(join(sourceDir, filePath));
@@ -515,7 +446,7 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
     }
 
     const filesToWrite = [...updated, ...added].filter(
-      (f) => isFrameworkOwnedSyncFile(f) || !isExcluded(f, excludePatterns),
+      (f) => isFrameworkOwnedSyncFile(f) || !isPathExcluded(f, excludePatterns),
     );
 
     const destToSource = new Map<string, string>();

package/src/cli/upgrade.ts

@@ -7,6 +7,19 @@ import { runBunInstall, runTypesGen } from "./init";
 import { syncTemplate } from "./sync";
 
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
+
+const CATALOG_TOOL_PACKAGES = [
+  "@rspack/core",
+  "@rspack/cli",
+  "@rsbuild/core",
+  "@rsbuild/plugin-react",
+  "@module-federation/enhanced",
+  "@module-federation/node",
+  "@module-federation/rsbuild-plugin",
+  "@module-federation/runtime-core",
+  "@module-federation/sdk",
+  "@module-federation/dts-plugin",
+] as const;
 const LEGACY_UI_IMPORT_REWRITES = [
   ['from "@/auth"', 'from "@/app"'],
   ["from '@/auth'", "from '@/app'"],
@@ -25,6 +38,8 @@ const OBSOLETE_FILES = [
   "ui/src/lib/auth-client.ts",
   "ui/src/lib/session.ts",
   "ui/scripts/generate-metadata.ts",
+  ".github/dependabot.yml",
+  ".github/templates/dependabot.yml",
 ];
 
 interface NpmPackageInfo {
@@ -113,6 +128,28 @@ function updateRootPackageVersion(
   return modified;
 }
 
+function updateRootCatalogVersion(
+  projectDir: string,
+  packageName: string,
+  newVersion: string,
+): boolean {
+  const pkgPath = join(projectDir, "package.json");
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as Record<string, unknown>;
+
+  if (!pkg.workspaces || typeof pkg.workspaces !== "object") return false;
+  const workspaces = pkg.workspaces as { catalog?: Record<string, string> };
+  if (!workspaces.catalog || typeof workspaces.catalog !== "object") return false;
+
+  if (!(packageName in workspaces.catalog)) return false;
+
+  const nextVersion = `^${newVersion}`;
+  if (workspaces.catalog[packageName] === nextVersion) return false;
+
+  workspaces.catalog[packageName] = nextVersion;
+  writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+  return true;
+}
+
 async function findWorkspacePackageJsons(projectDir: string): Promise<string[]> {
   const rootPkgPath = join(projectDir, "package.json");
   if (!existsSync(rootPkgPath)) return [];
@@ -213,7 +250,19 @@ export async function upgradeTemplate(
     packages.push({ name, from: installed, to: latest });
   }
 
-  const hasUpdates = packages.some((p) => p.from !== p.to && p.from !== undefined);
+  const catalogVersionUpdates: Array<{ name: string; from: string | undefined; to: string }> = [];
+  for (const name of CATALOG_TOOL_PACKAGES) {
+    const installed = readInstalledVersion(projectDir, name);
+    if (!installed) continue;
+    const latest = await fetchLatestNpmVersion(name);
+    if (!latest) continue;
+    if (installed === latest) continue;
+    catalogVersionUpdates.push({ name, from: installed, to: latest });
+  }
+
+  const hasFrameworkUpdates = packages.some((p) => p.from !== p.to && p.from !== undefined);
+  const hasCatalogUpdates = catalogVersionUpdates.length > 0;
+  const hasUpdates = hasFrameworkUpdates || hasCatalogUpdates;
 
   if (options.dryRun) {
     let changelogUrl: string | undefined;
@@ -233,7 +282,10 @@ export async function upgradeTemplate(
 
     return {
       status: "dry-run",
-      packages,
+      packages: [
+        ...packages,
+        ...catalogVersionUpdates.map((u) => ({ name: u.name, from: u.from, to: u.to })),
+      ],
       changelogUrl,
     };
   }
@@ -244,6 +296,10 @@ export async function upgradeTemplate(
     }
   }
 
+  for (const update of catalogVersionUpdates) {
+    updateRootCatalogVersion(projectDir, update.name, update.to);
+  }
+
   const workspacePkgPaths = await findWorkspacePackageJsons(projectDir);
   for (const pkgPath of workspacePkgPaths) {
     for (const pkg of packages) {
@@ -251,6 +307,9 @@ export async function upgradeTemplate(
         updateWorkspacePackageRefInFile(pkgPath, pkg.name);
       }
     }
+    for (const update of catalogVersionUpdates) {
+      updateWorkspacePackageRefInFile(pkgPath, update.name);
+    }
   }
 
   if (hasUpdates && !options.noInstall) {
@@ -291,7 +350,10 @@ export async function upgradeTemplate(
 
   return {
     status: "upgraded",
-    packages,
+    packages: [
+      ...packages,
+      ...catalogVersionUpdates.map((u) => ({ name: u.name, from: u.from, to: u.to })),
+    ],
     sync: syncResult,
     migrated: migratedFiles.length > 0 ? migratedFiles : undefined,
     changelogUrl,

package/src/cli.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 import { findCommandDescriptor } from "./cli/catalog";
 import { printHelp } from "./cli/help";
 import { parseCommandInput } from "./cli/parse";