everything-dev 1.12.2 → 1.12.4

package/src/cli/upgrade.ts

@@ -2,10 +2,30 @@ import { existsSync, readFileSync, rmSync, statSync, writeFileSync } from "node:
 import { join } from "node:path";
 import { glob } from "glob";
 import type { UpgradeOptions, UpgradeResult } from "../contract";
+import { readInstalledFrameworkVersion } from "./framework-version";
 import { runBunInstall, runTypesGen } from "./init";
 import { syncTemplate } from "./sync";
 
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
+const LEGACY_UI_IMPORT_REWRITES = [
+  ['from "@/auth"', 'from "@/app"'],
+  ["from '@/auth'", "from '@/app'"],
+  ['from "@/lib/use-api-client"', 'from "@/app"'],
+  ["from '@/lib/use-api-client'", "from '@/app'"],
+  ['from "@/lib/api-client"', 'from "@/app"'],
+  ["from '@/lib/api-client'", "from '@/app'"],
+] as const;
+const OBSOLETE_FILES = [
+  "ui/src/auth.ts",
+  "ui/src/auth-types.gen.ts",
+  "ui/src/lib/api-client.ts",
+  "ui/src/lib/use-api-client.ts",
+  "ui/src/api-contract.ts",
+  "ui/src/api-contract.gen.ts",
+  "ui/src/lib/auth-client.ts",
+  "ui/src/lib/session.ts",
+  "ui/scripts/generate-metadata.ts",
+];
 
 interface NpmPackageInfo {
   version: string;
@@ -26,95 +46,71 @@ async function fetchLatestNpmVersion(packageName: string): Promise<string | null
 }
 
 function readInstalledVersion(projectDir: string, packageName: string): string | undefined {
-  const pkgPath = join(projectDir, "package.json");
-  if (!existsSync(pkgPath)) return undefined;
-  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as Record<string, unknown>;
-  const deps = (pkg.dependencies ?? {}) as Record<string, string>;
-  const devDeps = (pkg.devDependencies ?? {}) as Record<string, string>;
-  const version = deps[packageName] || devDeps[packageName];
-  if (!version) return undefined;
-  return version.replace(/^[\^~>=]+/, "");
+  return readInstalledFrameworkVersion(projectDir, packageName);
 }
 
-function isBumpedableVersion(value: string | undefined): boolean {
-  if (!value) return false;
-  if (value === "workspace:*") return false;
-  if (value.startsWith("catalog:")) return false;
+function setCatalogRef(field: Record<string, string> | undefined, packageName: string): boolean {
+  if (!field || !(packageName in field)) return false;
+  if (field[packageName] === "catalog:" || field[packageName].startsWith("file:")) return false;
+  field[packageName] = "catalog:";
   return true;
 }
 
-function bumpDepField(
-  field: Record<string, string> | undefined,
-  packageName: string,
-  newVersion: string,
-): boolean {
-  if (!field) return false;
-  if (!(packageName in field)) return false;
-  const current = field[packageName];
-  if (!isBumpedableVersion(current)) return false;
-  field[packageName] = `^${newVersion}`;
-  return true;
-}
+function updateWorkspacePackageRefInFile(filePath: string, packageName: string): boolean {
+  const pkg = JSON.parse(readFileSync(filePath, "utf-8")) as Record<string, unknown>;
+  let modified = false;
 
-function bumpCatalog(
-  catalog: Record<string, string> | undefined,
-  packageName: string,
-  newVersion: string,
-): boolean {
-  if (!catalog) return false;
-  if (!(packageName in catalog)) return false;
-  const current = catalog[packageName];
-  if (!isBumpedableVersion(current)) return false;
-  catalog[packageName] = `^${newVersion}`;
-  return true;
-}
+  for (const fieldName of ["dependencies", "devDependencies", "peerDependencies"] as const) {
+    const field = pkg[fieldName] as Record<string, string> | undefined;
+    if (setCatalogRef(field, packageName)) {
+      modified = true;
+    }
+  }
 
-interface BumpResult {
-  modified: boolean;
-  fields: string[];
+  if (modified) {
+    writeFileSync(filePath, `${JSON.stringify(pkg, null, 2)}\n`);
+  }
+  return modified;
 }
 
-function bumpPackageJson(
-  pkg: Record<string, unknown>,
+function updateRootPackageVersion(
+  projectDir: string,
   packageName: string,
   newVersion: string,
-): BumpResult {
-  const fields: string[] = [];
+): boolean {
+  const pkgPath = join(projectDir, "package.json");
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as Record<string, unknown>;
+  let modified = false;
 
   for (const fieldName of ["dependencies", "devDependencies", "peerDependencies"] as const) {
     const field = pkg[fieldName] as Record<string, string> | undefined;
-    if (bumpDepField(field, packageName, newVersion)) {
-      fields.push(fieldName);
+    if (setCatalogRef(field, packageName)) {
+      modified = true;
     }
   }
 
-  const workspaces = pkg.workspaces as { catalog?: Record<string, string> } | undefined;
-  if (workspaces?.catalog && bumpCatalog(workspaces.catalog, packageName, newVersion)) {
-    fields.push("workspaces.catalog");
+  if (!pkg.workspaces || typeof pkg.workspaces !== "object") {
+    pkg.workspaces = { packages: [], catalog: {} };
+    modified = true;
   }
 
-  return { modified: fields.length > 0, fields };
-}
+  const workspaces = pkg.workspaces as { packages?: string[]; catalog?: Record<string, string> };
+  if (!workspaces.catalog || typeof workspaces.catalog !== "object") {
+    workspaces.catalog = {};
+    modified = true;
+  }
 
-function updatePackageVersionInFile(
-  filePath: string,
-  packageName: string,
-  newVersion: string,
-): boolean {
-  const pkg = JSON.parse(readFileSync(filePath, "utf-8")) as Record<string, unknown>;
-  const result = bumpPackageJson(pkg, packageName, newVersion);
-  if (result.modified) {
-    writeFileSync(filePath, `${JSON.stringify(pkg, null, 2)}\n`);
+  const nextVersion = `^${newVersion}`;
+  if (workspaces.catalog[packageName] !== nextVersion) {
+    workspaces.catalog[packageName] = nextVersion;
+    modified = true;
   }
-  return result.modified;
-}
 
-function updatePackageVersion(
-  projectDir: string,
-  packageName: string,
-  newVersion: string,
-): boolean {
-  return updatePackageVersionInFile(join(projectDir, "package.json"), packageName, newVersion);
+  if (modified) {
+    writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+  }
+
+  return modified;
 }
 
 async function findWorkspacePackageJsons(projectDir: string): Promise<string[]> {
@@ -163,6 +159,33 @@ function buildChangelogUrl(
   return `https://github.com/${owner}/${repo}/compare/v${oldVersion}...v${newVersion}`;
 }
 
+async function rewriteLegacyUiImports(projectDir: string): Promise<string[]> {
+  const files = await glob("ui/src/**/*.{ts,tsx}", {
+    cwd: projectDir,
+    nodir: true,
+    dot: false,
+    absolute: false,
+  });
+  const migrated: string[] = [];
+
+  for (const file of files) {
+    const filePath = join(projectDir, file);
+    const original = readFileSync(filePath, "utf-8");
+    let next = original;
+
+    for (const [from, to] of LEGACY_UI_IMPORT_REWRITES) {
+      next = next.replaceAll(from, to);
+    }
+
+    if (next !== original) {
+      writeFileSync(filePath, next);
+      migrated.push(file);
+    }
+  }
+
+  return migrated;
+}
+
 export async function upgradeTemplate(
   projectDir: string,
   options: UpgradeOptions,
@@ -217,7 +240,7 @@ export async function upgradeTemplate(
 
   for (const pkg of packages) {
     if (pkg.from !== undefined && pkg.from !== pkg.to) {
-      updatePackageVersion(projectDir, pkg.name, pkg.to);
+      updateRootPackageVersion(projectDir, pkg.name, pkg.to);
     }
   }
 
@@ -225,7 +248,7 @@ export async function upgradeTemplate(
   for (const pkgPath of workspacePkgPaths) {
     for (const pkg of packages) {
       if (pkg.from !== undefined && pkg.from !== pkg.to) {
-        updatePackageVersionInFile(pkgPath, pkg.name, pkg.to);
+        updateWorkspacePackageRefInFile(pkgPath, pkg.name);
       }
     }
   }
@@ -244,9 +267,8 @@ export async function upgradeTemplate(
     });
   }
 
-  const migratedFiles: string[] = [];
-  const obsoleteFiles = ["ui/src/lib/auth-client.ts", "ui/src/lib/session.ts"];
-  for (const file of obsoleteFiles) {
+  const migratedFiles = await rewriteLegacyUiImports(projectDir);
+  for (const file of OBSOLETE_FILES) {
     const filePath = join(projectDir, file);
     if (existsSync(filePath)) {
       rmSync(filePath);

package/src/config.ts

@@ -126,7 +126,11 @@ function resolveDevelopmentTarget(
   development: string | undefined,
   production: string | undefined,
   baseDir: string,
+  forceSource?: "local" | "remote",
 ): RuntimeTarget {
+  if (forceSource === "remote") {
+    return resolveRuntimeTarget(production, baseDir, "remote");
+  }
   const devTarget = resolveRuntimeTarget(development, baseDir);
   if (devTarget.source === "local" && (!devTarget.localPath || !existsSync(devTarget.localPath))) {
     return resolveRuntimeTarget(production, baseDir, "remote");
@@ -134,37 +138,70 @@ function resolveDevelopmentTarget(
   return devTarget;
 }
 
-function buildRuntimeConfig(
+export interface BuildRuntimeConfigOptions {
+  plugins?: Record<string, RuntimePluginConfig>;
+  hostSource?: "local" | "remote";
+  uiSource?: "local" | "remote";
+  apiSource?: "local" | "remote";
+  authSource?: "local" | "remote";
+  proxy?: string;
+}
+
+export function buildRuntimeConfig(
   config: BosConfig,
   baseDir: string,
   env: "development" | "production",
-  options?: { plugins?: Record<string, RuntimePluginConfig> },
+  options?: BuildRuntimeConfigOptions,
 ): RuntimeConfig {
   const uiConfig = config.app.ui;
   const apiConfig = config.app.api;
   const authConfig = config.app.auth;
   const uiRuntime =
     env === "development"
-      ? resolveDevelopmentTarget(uiConfig.development, uiConfig.production, baseDir)
+      ? resolveDevelopmentTarget(
+          uiConfig.development,
+          uiConfig.production,
+          baseDir,
+          options?.uiSource,
+        )
       : resolveRuntimeTarget(uiConfig.production, baseDir, "remote");
   const apiRuntime =
     env === "development"
-      ? resolveDevelopmentTarget(apiConfig.development, apiConfig.production, baseDir)
+      ? resolveDevelopmentTarget(
+          apiConfig.development,
+          apiConfig.production,
+          baseDir,
+          options?.apiSource,
+        )
       : resolveRuntimeTarget(apiConfig.production, baseDir, "remote");
   const authRuntime = authConfig
     ? env === "development"
-      ? resolveDevelopmentTarget(authConfig.development, authConfig.production, baseDir)
+      ? resolveDevelopmentTarget(
+          authConfig.development,
+          authConfig.production,
+          baseDir,
+          options?.authSource,
+        )
       : resolveRuntimeTarget(authConfig.production, baseDir, "remote")
     : undefined;
 
   const hostConfig = config.app.host;
   const hostRuntime =
     env === "development"
-      ? resolveDevelopmentTarget(hostConfig.development, hostConfig.production, baseDir)
+      ? resolveDevelopmentTarget(
+          hostConfig.development,
+          hostConfig.production,
+          baseDir,
+          options?.hostSource,
+        )
       : resolveRuntimeTarget(hostConfig.production, baseDir, "remote");
 
   const hostListeningUrl = resolveDevelopmentHostUrl(hostConfig.development);
 
+  const hostIsRemote = hostRuntime.source === "remote";
+  const uiIsRemote = uiRuntime.source === "remote";
+  const apiIsRemote = apiRuntime.source === "remote";
+
   return {
     env,
     account: config.account,
@@ -178,9 +215,9 @@ function buildRuntimeConfig(
       localPath: hostRuntime.localPath,
       port: hostRuntime.port ?? DEFAULT_HOST_PORT,
       secrets: hostConfig.secrets,
-      integrity: env === "production" ? hostConfig.integrity : undefined,
+      integrity: hostIsRemote ? hostConfig.integrity : undefined,
       source: hostRuntime.source,
-      remoteUrl: hostRuntime.source === "remote" ? hostRuntime.url : undefined,
+      remoteUrl: hostIsRemote ? hostRuntime.url : undefined,
     },
     shared: config.shared,
     ui: {
@@ -189,9 +226,9 @@ function buildRuntimeConfig(
       entry: uiRuntime.url ? `${uiRuntime.url}/mf-manifest.json` : "/mf-manifest.json",
       localPath: uiRuntime.localPath,
       port: uiRuntime.port,
-      ssrUrl: uiConfig.ssr,
-      ssrIntegrity: env === "production" ? uiConfig.ssrIntegrity : undefined,
-      integrity: env === "production" ? uiConfig.integrity : undefined,
+      ssrUrl: uiIsRemote ? uiConfig.ssr : undefined,
+      ssrIntegrity: uiIsRemote ? uiConfig.ssrIntegrity : undefined,
+      integrity: uiIsRemote ? uiConfig.integrity : undefined,
       source: uiRuntime.source,
     },
     api: {
@@ -201,10 +238,10 @@ function buildRuntimeConfig(
       localPath: apiRuntime.localPath,
       port: apiRuntime.port,
       source: apiRuntime.source,
-      proxy: apiConfig.proxy,
+      proxy: options?.proxy ?? apiConfig.proxy,
       variables: apiConfig.variables,
       secrets: apiConfig.secrets,
-      integrity: env === "production" ? apiConfig.integrity : undefined,
+      integrity: apiIsRemote ? apiConfig.integrity : undefined,
     },
     auth: authConfig
       ? {
@@ -217,7 +254,7 @@ function buildRuntimeConfig(
           proxy: authConfig.proxy,
           variables: authConfig.variables,
           secrets: authConfig.secrets,
-          integrity: env === "production" ? authConfig.integrity : undefined,
+          integrity: authRuntime!.source === "remote" ? authConfig.integrity : undefined,
         }
       : undefined,
     plugins:

package/src/host.ts

@@ -37,6 +37,7 @@ function buildClientRuntimeConfig(runtimeConfig: RuntimeConfig): ClientRuntimeCo
     apiBase: "/api",
     rpcBase: "/api/rpc",
     authAvailable: !!runtimeConfig.auth,
+    repository: runtimeConfig.repository,
     ui: runtimeConfig.ui
       ? {
           name: runtimeConfig.ui.name,

package/src/internal/manifest-normalizer.ts

@@ -13,6 +13,7 @@ type NormalizationSpec = {
 
 type NormalizeManifestOptions = {
   resolveCatalogRefs: boolean;
+  preserveCatalogRefs?: boolean;
   excludeFrameworkWorkspaces?: boolean;
   removeWorkspaceDeps?: string[];
   removeWorkspaces?: boolean;
@@ -74,6 +75,17 @@ function normalizeDependencyMap(
   let modified = false;
 
   for (const [name, version] of Object.entries(map)) {
+    if (
+      options.preserveCatalogRefs &&
+      FRAMEWORK_PACKAGES.includes(name as (typeof FRAMEWORK_PACKAGES)[number])
+    ) {
+      if (version !== "catalog:") {
+        map[name] = "catalog:";
+        modified = true;
+      }
+      continue;
+    }
+
     if (version === "workspace:*") {
       const frameworkVersion = spec.frameworkVersions[name];
       if (frameworkVersion) {
@@ -237,6 +249,7 @@ export function stageReleasePackage(opts: {
 
   normalizePackageManifest(pkg, spec, {
     resolveCatalogRefs: true,
+    preserveCatalogRefs: false,
     removeWorkspaces: true,
     removePublishScripts: true,
   });

package/src/ui/runtime.ts

@@ -1,4 +1,3 @@
-import { getNetworkIdForAccount } from "../network";
 import type { ClientRuntimeConfig } from "../types";
 
 export type { ClientRuntimeInfo } from "../types";
@@ -21,16 +20,8 @@ export function getRuntimeConfig(): ClientRuntimeConfig {
   return window.__RUNTIME_CONFIG__;
 }
 
-export function getActiveRuntime(runtimeConfig?: Partial<ClientRuntimeConfig>) {
-  return runtimeConfig?.runtime;
-}
-
-export function getRuntimeBasePath(runtimeConfig?: Partial<ClientRuntimeConfig>) {
-  return getActiveRuntime(runtimeConfig)?.runtimeBasePath || "/";
-}
-
 export function buildRuntimeHref(pathname: string, runtimeConfig?: Partial<ClientRuntimeConfig>) {
-  const basePath = getRuntimeBasePath(runtimeConfig);
+  const basePath = runtimeConfig?.runtime?.runtimeBasePath ?? "/";
   if (basePath === "/") {
     return pathname;
   }
@@ -49,41 +40,3 @@ export function buildPublishedAccountHref(accountId: string) {
 export function buildPublishedGatewayHref(accountId: string, gatewayId: string) {
   return `${buildPublishedAccountHref(accountId)}/${encodeURIComponent(gatewayId)}`;
 }
-
-export function getAssetsUrl(config?: Partial<ClientRuntimeConfig>): string {
-  const cfg = config ?? getRuntimeConfig();
-  return cfg?.assetsUrl ?? "";
-}
-
-export function getHostUrl(config?: Partial<ClientRuntimeConfig>): string {
-  const cfg = config ?? getRuntimeConfig();
-  if (typeof window === "undefined") return "";
-  return cfg?.hostUrl ?? window.location.origin;
-}
-
-export function getApiBaseUrl(config?: Partial<ClientRuntimeConfig>): string {
-  const cfg = config ?? getRuntimeConfig();
-  const base = cfg?.rpcBase;
-  if (typeof window === "undefined") return "/api/rpc";
-  return base ? `${window.location.origin}${base}` : `${window.location.origin}/api/rpc`;
-}
-
-export function getAccount(config?: Partial<ClientRuntimeConfig>): string {
-  const cfg = config ?? getRuntimeConfig();
-  return cfg?.account ?? "every.near";
-}
-
-export function getNetworkId(config?: Partial<ClientRuntimeConfig>): "mainnet" | "testnet" {
-  const cfg = config ?? getRuntimeConfig();
-  return cfg?.networkId ?? getNetworkIdForAccount(cfg?.account ?? "every.near");
-}
-
-export function getRepository(config?: Partial<ClientRuntimeConfig>): string | undefined {
-  const cfg = config ?? getRuntimeConfig();
-  return cfg?.repository;
-}
-
-export function getCspNonce(config?: Partial<ClientRuntimeConfig>): string | undefined {
-  const cfg = config ?? getRuntimeConfig();
-  return cfg?.cspNonce;
-}