fimo 0.5.0-staging.2 → 0.6.0-experimental.1

package/assets/skills/fimo/SKILL.md

@@ -43,7 +43,7 @@ Workflow / CLI-side concerns (pushing schemas, generating images, managing label
 ## Decision Tree (specific tasks)
 
 - **Setting up Fimo in a new project** — pick the framework:
-  - React Router 7 framework mode → `references/setup-react-router.md`
+  - React Router framework mode (new projects use React Router 8) → `references/setup-react-router.md`
   - Plain Vite + React (or upgrading a legacy v3 project) → `references/setup-plain-vite.md`
 - Writing schema JSON / picking field types / Tiptap richtext → `references/content.md`
 - Writing form JSON / generated form client / form code → `references/forms.md`

package/assets/skills/fimo/references/locales.md

@@ -67,6 +67,14 @@ This helper exists so the Fimo UI route selector, preview navigation, labels, an
 
 Copyable examples live in `assets/react-router-locales/routes.ts` and `assets/react-router-locales/navigation.tsx`.
 
+## Existing Custom Locale Systems
+
+Before changing a multilingual app, inspect its locale provider, route table, language switcher, redirects, and current public URLs. Preserve that behavior while migrating.
+
+For React Router projects, prefer converging on one locale contract owned by `fimo-config.json`, `fimoRoutes()`, and `FimoLink`. Move existing providers and language-switcher UI into the framework root instead of replacing them or adding a second locale context. Keep route metadata canonical and reuse page modules across locales.
+
+If adopting the standard helper would change established public URLs, do not silently rewrite them. Keep the custom router temporarily, pass its resolved locale to `<FimoProviders locale={locale}>`, and ask the user to choose the canonical URLs and redirects before normalizing the route table.
+
 ## Links
 
 Use `FimoLink` for internal links that should preserve or switch locale:

package/assets/skills/fimo/references/setup-react-router.md

@@ -1,4 +1,4 @@
-# Setup Fimo on React Router 7
+# Setup Fimo on React Router 8
 
 This recipe describes the canonical Fimo + React Router framework-mode setup.
 It mirrors what `fimo init` scaffolds today; you can also apply it to an

package/assets/skills/fimo/references/ui.md

@@ -42,7 +42,7 @@ The template uses **Vite + React 19 + TypeScript + Tailwind v4 + shadcn/ui + rea
 
 ### Routing
 
-- This template uses React Router v7 framework mode (file-based route config in `src/routes.ts`). Use `<FimoLink>` from `fimo/react-router` for locale-aware internal links, especially in projects with more than one configured locale. Use React Router `<Link>` / `<NavLink>` only when you intentionally do not want Fimo's locale behavior. Never raw `<a href="/...">` for internal navigation because it causes full page reloads.
+- This template uses React Router 8 framework mode (file-based route config in `src/routes.ts`). Use `<FimoLink>` from `fimo/react-router` for locale-aware internal links, especially in projects with more than one configured locale. Use React Router `<Link>` / `<NavLink>` only when you intentionally do not want Fimo's locale behavior. Never raw `<a href="/...">` for internal navigation because it causes full page reloads.
 - Reserve `<a>` for external links, with `target="_blank" rel="noreferrer"`.
 
 ### Loading states

package/assets/skills/fimo-cli/references/content.md

@@ -20,6 +20,9 @@ Steps 1, 3, and 5 reference the project skill (`fimo`) for shape and React API.
 
 ```bash
 fimo schemas push [TypeName]      # push JSON to API (create or update). Omit TypeName to push all.
+                                  # Pushing all sends every schema as ONE atomic batch, so types that
+                                  # reference each other (even cycles) can be added in a single push.
+                                  # Files not present are never deleted — use `schemas delete` for that.
 fimo schemas list                 # list all registered schemas
 fimo schemas get <TypeName>       # get a single schema
 fimo schemas delete <TypeName>    # delete a schema

package/assets/skills/fimo-cli/references/locales.md

@@ -67,6 +67,12 @@ import { fimoRoutes } from 'fimo/react-router/routes';
 
 For custom frameworks, the project may implement its own URL scheme, but it still needs to pass the active locale into Fimo and keep canonical route metadata if it wants Fimo Studio route selection to work.
 
+## Migrate An Existing Locale System
+
+Inspect the existing locale provider, route table, switcher, redirects, and public URLs before editing configuration. Preserve working URL behavior during the migration.
+
+For React Router projects, prefer one contract based on `fimo-config.json`, `fimoRoutes()`, and `FimoLink`; migrate existing wrappers into the framework root instead of layering a second locale context. If that would change established URLs, keep the custom router temporarily, pass its active locale to `FimoProviders`, and ask the user to choose canonical URLs and redirects before rewriting routes.
+
 ## Labels And Content
 
 Labels and content are separate translated surfaces:

package/dist/cli/bundle.json

@@ -1,7 +1,7 @@
 {
   "bundled": true,
   "bundler": "esbuild",
-  "bundledAt": "2026-07-14T16:56:16.308Z",
+  "bundledAt": "2026-07-14T13:44:49.449Z",
   "cliVersion": "0.5.0",
   "external": [
     "oxc-parser",

package/dist/cli/index.js

@@ -20618,6 +20618,13 @@ var init_api = __esm({
         });
         return body.data;
       }
+      async upsertSchemas(projectId, contentTypes) {
+        const body = await this.request(this.tenantPath(projectId, "/schema/batch"), {
+          method: "POST",
+          body: JSON.stringify({ contentTypes })
+        });
+        return body.data;
+      }
       async deleteSchema(projectId, typeName) {
         const body = await this.request(this.tenantPath(projectId, `/schema/types/${typeName}`), {
           method: "DELETE"
@@ -109785,7 +109792,6 @@ init_dist();
 init_sync_schemas();
 import fs42 from "node:fs";
 import path46 from "node:path";
-init_api();
 init_project_context();
 init_project();
 function toApiShape(schema) {
@@ -109802,10 +109808,6 @@ function renderPrettyJson8(data2) {
   return JSON.stringify(data2, null, 2);
 }
 __name(renderPrettyJson8, "renderPrettyJson");
-function isAlreadyExistsError(error45) {
-  return error45 instanceof ApiRequestError && error45.status === 400 && /already exists/i.test(error45.detail);
-}
-__name(isAlreadyExistsError, "isAlreadyExistsError");
 async function schemaListCommand(options, cmd) {
   const { ctx, api } = await bootstrapProjectCommand(options, cmd);
   await requireOperation("cms.schema.list", { projectId: ctx.projectId, env: ctx.env });
@@ -109849,21 +109851,10 @@ async function schemaPushCommand(typeName, options, cmd) {
     return JSON.parse(fs42.readFileSync(filePath, "utf-8"));
   });
   syncSchemas({ cwd, verbose: false });
-  const results = [];
-  for (const schema of schemas3) {
-    const contentType = toApiShape(schema);
-    try {
-      const result = await api.createSchema(ctx.projectId, contentType);
-      results.push(result);
-    } catch (error45) {
-      if (isAlreadyExistsError(error45)) {
-        const result = await api.updateSchema(ctx.projectId, contentType.name, contentType);
-        results.push(result);
-      } else {
-        throw error45;
-      }
-    }
-  }
+  const results = await api.upsertSchemas(
+    ctx.projectId,
+    schemas3.map((schema) => toApiShape(schema))
+  );
   const payload = results.length === 1 ? results[0] : results;
   ui.result({ command: "schemas push", data: payload, render: /* @__PURE__ */ __name(() => renderPrettyJson8(payload), "render") });
 }

package/dist/runtime/paths/get-fimo-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-fimo-paths.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAoEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoGtF"}
+{"version":3,"file":"get-fimo-paths.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAkFhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoGtF"}

package/dist/runtime/paths/get-fimo-paths.js

@@ -7,6 +7,9 @@ import { getFimoLocales, localizeFimoPath } from '../i18n/locale.js';
 import { resolveSeoForPath } from '../seo/resolver.js';
 import { getConfigServer } from '../shared/fimo-config.server.js';
 const isValidationBuild = !!process.env.FIMO_VALIDATION_BUILD;
+const MAX_FETCH_ATTEMPTS = 3;
+const RETRYABLE_FETCH_STATUSES = new Set([502, 503, 504]);
+const RETRY_BASE_DELAY_MS = 250;
 function readEnvValue(rootDir, key) {
     if (process.env[key]) {
         return process.env[key];
@@ -42,12 +45,19 @@ async function fetchEntries(baseUrl, schema, rootDir, locale) {
     if (branch) {
         headers['X-Fimo-Branch'] = branch;
     }
-    const res = await fetch(url, { headers });
-    if (!res.ok) {
-        throw new Error(`Failed to fetch ${schema}: ${res.status}`);
+    for (let attempt = 1; attempt <= MAX_FETCH_ATTEMPTS; attempt += 1) {
+        const res = await fetch(url, { headers });
+        if (res.ok) {
+            const payload = (await res.json());
+            return Array.isArray(payload?.data) ? payload.data : [];
+        }
+        if (!RETRYABLE_FETCH_STATUSES.has(res.status) || attempt === MAX_FETCH_ATTEMPTS) {
+            const attemptDetail = attempt > 1 ? ` after ${attempt} attempts` : '';
+            throw new Error(`Failed to fetch ${schema}: ${res.status}${attemptDetail}`);
+        }
+        await new Promise((resolveDelay) => setTimeout(resolveDelay, RETRY_BASE_DELAY_MS * attempt));
     }
-    const payload = (await res.json());
-    return Array.isArray(payload?.data) ? payload.data : [];
+    throw new Error(`Failed to fetch ${schema}`);
 }
 // Glob-ish matcher for route keys: '*' matches one segment, '**' matches any.
 function compilePattern(pattern) {

package/dist/runtime/paths/get-fimo-paths.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=get-fimo-paths.test.d.ts.map

package/dist/runtime/paths/get-fimo-paths.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-fimo-paths.test.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.test.ts"],"names":[],"mappings":""}

package/dist/runtime/paths/get-fimo-paths.test.js

@@ -0,0 +1,69 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { getFimoPaths } from './get-fimo-paths.js';
+const roots = [];
+function createDynamicProject() {
+    const root = mkdtempSync(join(tmpdir(), 'fimo-paths-'));
+    roots.push(root);
+    writeFileSync(join(root, '.env'), 'VITE_API_URL=https://tenant.example.test\n');
+    writeFileSync(join(root, 'fimo-config.json'), JSON.stringify({
+        routes: {
+            'blog/post': {
+                path: '/blog/:slug',
+                params: {
+                    slug: {
+                        schema: 'BlogPost',
+                        queryField: 'slug',
+                        displayField: 'title',
+                    },
+                },
+            },
+        },
+    }));
+    return root;
+}
+function response(status, data = []) {
+    return new Response(JSON.stringify({ data }), {
+        status,
+        headers: { 'Content-Type': 'application/json' },
+    });
+}
+afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+    for (const root of roots.splice(0)) {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+describe('getFimoPaths content fetches', () => {
+    it.each([502, 503, 504])('recovers from a transient %s response', async (status) => {
+        vi.useFakeTimers();
+        const fetchMock = vi
+            .fn()
+            .mockResolvedValueOnce(response(status))
+            .mockResolvedValueOnce(response(200, [{ slug: 'hello-world' }]));
+        vi.stubGlobal('fetch', fetchMock);
+        const resultPromise = getFimoPaths({ cwd: createDynamicProject() });
+        await vi.runAllTimersAsync();
+        await expect(resultPromise).resolves.toContainEqual(expect.objectContaining({ routeKey: 'blog/post', path: '/blog/hello-world' }));
+        expect(fetchMock).toHaveBeenCalledTimes(2);
+    });
+    it('fails clearly after exhausting the transient retry budget', async () => {
+        vi.useFakeTimers();
+        const fetchMock = vi.fn().mockResolvedValue(response(503));
+        vi.stubGlobal('fetch', fetchMock);
+        const resultPromise = getFimoPaths({ cwd: createDynamicProject() });
+        const rejection = expect(resultPromise).rejects.toThrow('Failed to fetch BlogPost: 503 after 3 attempts');
+        await vi.runAllTimersAsync();
+        await rejection;
+        expect(fetchMock).toHaveBeenCalledTimes(3);
+    });
+    it('does not retry an author response', async () => {
+        const fetchMock = vi.fn().mockResolvedValue(response(400));
+        vi.stubGlobal('fetch', fetchMock);
+        await expect(getFimoPaths({ cwd: createDynamicProject() })).rejects.toThrow('Failed to fetch BlogPost: 400');
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+    });
+});

package/dist/runtime/seo/buildSeoForPath.d.ts

@@ -37,9 +37,7 @@ export declare function buildFimoMeta(args: {
     location: {
         pathname: string;
     };
-    matches: {
-        data?: unknown;
-    }[];
+    matches: readonly unknown[];
 }): ({
     title: string;
     name?: undefined;

package/dist/runtime/seo/buildSeoForPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildSeoForPath.d.ts","sourceRoot":"","sources":["../../../src/runtime/seo/buildSeoForPath.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAK1E,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAExF;AA+BD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAMrE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAAE,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,OAAO,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAUpG"}
+{"version":3,"file":"buildSeoForPath.d.ts","sourceRoot":"","sources":["../../../src/runtime/seo/buildSeoForPath.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAK1E,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAExF;AA+BD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAMrE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAAE,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAclG"}

package/dist/runtime/seo/buildSeoForPath.js

@@ -42,7 +42,10 @@ export function buildMetaForPath(pathname, routeData) {
 }
 export function buildFimoMeta(args) {
     const pathname = args.location.pathname;
-    const rootData = args.matches[0]?.data;
+    const firstMatch = args.matches[0];
+    const rootData = firstMatch && typeof firstMatch === 'object' && 'data' in firstMatch
+        ? firstMatch.data
+        : undefined;
     const routeData = rootData && typeof rootData === 'object' ? rootData.fimoMetaData : undefined;
     const seo = getSeoForPath(pathname, routeData);
     if (!seo) {

package/dist/scripts/resolve-routes.js

@@ -3,7 +3,7 @@
  *
  * Given a list of changed files, resolves which preview routes are affected
  * by walking the reverse import graph from changed files up to page entry points
- * referenced in src/routes.ts (RR v7 framework-mode config).
+ * referenced in src/routes.ts (React Router framework-mode config).
  *
  * Output (JSON):
  *   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.5.0-staging.2",
+  "version": "0.6.0-experimental.1",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -99,7 +99,7 @@
     "@tanstack/react-query": "^5.80.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router": "^7.0.0",
+    "react-router": "^7.0.0 || ^8.0.0",
     "vite": "^7.0.0 || ^8.0.0"
   },
   "engines": {

package/templates/react-router/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "react-router dev --port 5173",
-    "build": "react-router build && fimo export-static",
+    "build": "tsc --noEmit && react-router build && fimo export-static",
     "lint": "oxlint --deny-warnings",
     "typecheck": "tsc --noEmit",
     "preview": "vite preview --host 0.0.0.0 --port 4173"
@@ -13,7 +13,7 @@
   "dependencies": {
     "@base-ui/react": "^1.3.0",
     "@hookform/resolvers": "^5.2.2",
-    "@react-router/node": "^7.15.1",
+    "@react-router/node": "^8.2.0",
     "@tailwindcss/typography": "^0.5.19",
     "@tanstack/react-query": "^5.80.6",
     "class-variance-authority": "^0.7.1",
@@ -21,20 +21,20 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.5.0-staging.2",
+    "fimo": "0.6.0-experimental.1",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",
     "motion": "^12.36.0",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
-    "react": "^19.2.4",
+    "react": "^19.2.7",
     "react-day-picker": "^9.14.0",
-    "react-dom": "^19.2.4",
+    "react-dom": "^19.2.7",
     "react-error-boundary": "^6.0.0",
     "react-hook-form": "^7.72.1",
     "react-resizable-panels": "^4.9.0",
-    "react-router": "^7.15.1",
+    "react-router": "^8.2.0",
     "recharts": "^3.8.0",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.2.0",
@@ -42,7 +42,7 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.15.1",
+    "@react-router/dev": "^8.2.0",
     "@tailwindcss/vite": "^4.3.0",
     "@types/node": "^24.12.0",
     "@types/react": "^19.2.14",
@@ -52,5 +52,8 @@
     "tw-animate-css": "^1.4.0",
     "typescript": "5.9.3",
     "vite": "^8.0.13"
+  },
+  "engines": {
+    "node": ">=22.22.0"
   }
 }