Merge branch 'main' into feat/auth/loading-component

Author: erickteowarang

.github/workflows/ci-e2e.yaml

@@ -20,6 +20,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+      # Running in a container causes git "dubious ownership" errors because the
+      # workspace owner differs from the container user. Mark it as safe so that
+      # lefthook install (triggered by pnpm prepare) can run git commands.
+      - name: Fix git ownership
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
         with:
           run_install: false

e2e/package.json

@@ -18,8 +18,8 @@
     "@types/react-dom": "catalog:",
     "@vitejs/plugin-react": "catalog:",
     "dotenv": "^16.5.0",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "tailwindcss": "catalog:",
     "typescript": "catalog:",
     "vite": "catalog:"

examples/nextjs-app/package.json

@@ -12,8 +12,8 @@
     "@hookform/resolvers": "^5.2.2",
     "@tailor-platform/app-shell": "workspace:*",
     "next": "16.2.6",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "react-hook-form": "^7.71.2",
     "zod": "^4.4.3"
   },

examples/vite-app/package.json

@@ -12,8 +12,8 @@
   "dependencies": {
     "@tailor-platform/app-shell": "workspace:*",
     "lucide-react": "^1.8.0",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "tailwindcss": "catalog:"
   },
   "devDependencies": {

lefthook.yml

@@ -0,0 +1,10 @@
+pre-commit:
+  parallel: true
+  commands:
+    oxfmt:
+      glob: "*.{ts,tsx,js,jsx,mjs,cjs,json,jsonc,md,mdx,yaml,yml,css,html}"
+      # --no-error-on-unmatched-pattern: oxfmt has built-in ignore rules (lock files,
+      # CHANGELOGs, etc.) that may exclude all staged files after lefthook's glob
+      # matches them. Without this flag, oxfmt exits with code 2 when no files remain.
+      run: pnpm exec oxfmt --no-error-on-unmatched-pattern {staged_files}
+      stage_fixed: true

package.json

@@ -10,10 +10,12 @@
     "fmt": "oxfmt",
     "fmt:check": "oxfmt --check",
     "changeset:create": "changeset",
-    "changeset:publish": "pnpm build && changeset publish"
+    "changeset:publish": "pnpm build && changeset publish",
+    "prepare": "lefthook install"
   },
   "devDependencies": {
     "@changesets/cli": "^2.31.0",
+    "lefthook": "2.1.6",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "turbo": "^2.9.14"

packages/core/package.json

@@ -63,7 +63,7 @@
     "react-hook-form": "^7.71.2",
     "react-router": "^7.14.1",
     "sonner": "^2.0.7",
-    "tailwind-merge": "^3.5.0"
+    "tailwind-merge": "^3.6.0"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "catalog:",
@@ -77,16 +77,16 @@
     "@vitejs/plugin-react": "catalog:",
     "happy-dom": "^20.6.2",
     "postcss": "^8",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "tailwindcss": "catalog:",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5",
     "vite": "catalog:",
     "vite-plugin-dts": "^4.5.0",
     "vite-plugin-externalize-deps": "^0.10.0",
     "vite-tsconfig-paths": "^6.1.1",
-    "vitest": "^4.1.4"
+    "vitest": "catalog:"
   },
   "peerDependencies": {
     "react": ">= 19",

packages/core/src/components/sidebar/default-sidebar.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen, cleanup, waitFor } from "@testing-library/react";
-import { describe, it, expect, afterEach } from "vitest";
+import { describe, it, expect, afterEach, assert } from "vitest";
 import { MemoryRouter } from "react-router";
 import { SidebarProvider } from "@/components/sidebar";
 import { AppShellConfigContext, type RootConfiguration } from "@/contexts/appshell-context";
@@ -129,16 +129,17 @@ describe("DefaultSidebar auto-generation", () => {
       </AppShell>,
     );
 
-    await waitFor(() => {
-      expect(screen.getAllByText("Overview").length).toBeGreaterThan(0);
+    // waitFor retries until the callback stops throwing, so the assert
+    // must stay inside to wait for the deferred nav items to render.
+    const overviewLink = await waitFor(() => {
+      const sidebar = document.querySelector('[data-slot="sidebar"]')!;
+      const links = sidebar.querySelectorAll("a");
+      const link = Array.from(links).find((el) => el.textContent === "Overview");
+      assert(link, "Expected 'Overview' link to be rendered in the sidebar");
+      return link;
     });
 
-    const sidebar = document.querySelector('[data-slot="sidebar"]')!;
-    const links = sidebar.querySelectorAll("a");
-    const overviewLink = Array.from(links).find((link) => link.textContent === "Overview");
-
-    expect(overviewLink).toBeDefined();
-    expect(overviewLink!.className).toContain("astw:bg-sidebar-accent");
+    expect(overviewLink.className).toContain("astw:bg-sidebar-accent");
   });
 
   it("excludes componentless resources from sidebar links", async () => {

packages/sdk-plugin/package.json

@@ -43,9 +43,9 @@
     "@tailor-platform/app-shell": "workspace:*",
     "@tailor-platform/sdk": "^1.45.1",
     "oxlint": "catalog:",
-    "tsdown": "^0.21.7",
+    "tsdown": "catalog:",
     "typescript": "^5",
-    "vitest": "^4"
+    "vitest": "catalog:"
   },
   "peerDependencies": {
     "@tailor-platform/sdk": ">= 1.0.0"

packages/vite-plugin/package.json

@@ -48,10 +48,10 @@
   },
   "devDependencies": {
     "@types/node": "catalog:",
-    "tsdown": "^0.21.7",
+    "tsdown": "catalog:",
     "typescript": "^5",
     "vite": "catalog:",
-    "vitest": "^4.1.4"
+    "vitest": "catalog:"
   },
   "peerDependencies": {
     "vite": ">= 5"