@tailor-platform/erp-kit 0.2.2 → 0.4.0

package/src/modules/primitives/docs/commands/SetBaseCurrency.md

@@ -2,44 +2,34 @@
 
 ## Overview
 
-SetBaseCurrency changes the organization's base currency to a different active currency. The base currency serves as the default for financial reporting, consolidation, and serves as the reference point for exchange rate conversions. This command supports scenarios such as corporate restructuring or relocating headquarters to a different country.
+**Deprecated.** Base currency assignment is per company and owned by the organization module's company lifecycle. The primitives module owns the currency catalog but does not manage base currency designation. New implementations should use the organization module's company-level base currency assignment instead of this command.
+
+Previously, SetBaseCurrency changed a single organization-wide base currency. This model has been replaced by per-company base currency assignment in the organization module, which correctly supports multi-company deployments where each legal entity may have a different functional currency.
 
 ## Business Rules
 
-- Target currency must exist in the system
-- Target currency must be in Active status
-- Only one currency can be base currency at a time
-- Setting the current base currency as base returns success with no change
-- Previous base currency remains active but loses base currency designation
-- Exchange rates may need to be recalculated or new rates added after changing base currency
+- This command is deprecated and must not be used in new implementations
+- Base currency assignment is per company, owned by the organization module
+- The primitives module provides the currency catalog; it does not designate a global base currency
+- Deactivation of a currency is blocked if any company references it as base currency (cross-module invariant with organization)
 
 ## Process Flow
 
 ```mermaid
 flowchart TD
-    A[Receive set base request] --> B{Currency exists?}
-    B -->|No| C[Return error: not found]
-    B -->|Yes| D{Currency active?}
-    D -->|No| E[Return error: cannot set inactive currency as base]
-    D -->|Yes| F{Already base currency?}
-    F -->|Yes| G[Return success: no change needed]
-    F -->|No| H[Remove base flag from current base]
-    H --> I[Set base flag on target currency]
-    I --> J[Return updated currency]
+    A[SetBaseCurrency called] --> B[Return deprecation error]
+    B --> C[Caller should use organization module company-level base currency assignment]
 ```
 
 ## External Dependencies
 
-- None
+- [organization](../../../organization/README.md) — Owns per-company base currency assignment
 
 ## Error Scenarios
 
-- **CURRENCY_NOT_FOUND**: Specified currency ID does not exist
-- **CANNOT_SET_INACTIVE_AS_BASE_CURRENCY**: Target currency is not in Active status, must be activated first
+- **SET_BASE_CURRENCY_DEPRECATED**: This command is deprecated; use the organization module's company-level base currency assignment
 
 ## Test Cases
 
-- throws when currency doesn
-- throws when currency is inactive
-- returns currency unchanged when already base
-- changes base currency
+- Calling SetBaseCurrency returns a deprecation error directing the caller to the organization module
+- No currency is modified when SetBaseCurrency is invoked

package/src/modules/primitives/docs/commands/SetReferenceUnit.md

@@ -43,7 +43,7 @@ flowchart TD
 
 ## Test Cases
 
-- throws when unit doesn
+- throws when unit doesn't exist
 - throws when unit is not in specified category
 - returns category unchanged when unit is already reference
 - changes reference unit and recalculates conversion factors

package/src/modules/primitives/docs/features/currency-definitions.md

@@ -2,7 +2,9 @@
 
 ## Overview
 
-Currency Definitions establish the monetary units available for use across the ERP system. Each currency record contains the ISO 4217 code, display symbol, name, and decimal precision. One currency is designated as the base currency for the organization, serving as the default for reporting and consolidation.
+Currency Definitions establish the monetary units available for use across the ERP system. Each currency record contains the ISO 4217 code, display symbol, name, and decimal precision. The primitives module owns the **currency master data** — the catalog of available currencies, their metadata, and exchange rates.
+
+In a multi-company setup, each company assigns one of these currencies as its **base/functional currency** via the organization module's company record. The primitives module does not own the company→currency mapping; it provides the currency catalog that organization references. There is no global "base currency" concept at the primitives level — base currency assignment is always per company, owned by the organization module.
 
 This feature provides the foundation for all multi-currency operations in sales, purchasing, and accounting.
 
@@ -21,20 +23,18 @@ Currency definitions ensure consistent monetary handling across all business ope
 
 ```mermaid
 flowchart TD
-    A[Define Currency] --> B{Is First Currency?}
-    B -->|Yes| C[Set as Base Currency]
-    B -->|No| D[Add to Available Currencies]
-    C --> E[Currency Active]
-    D --> E
-    E --> F[Available for Transactions]
-    F --> G[Products Can Set Prices]
-    F --> H[Orders Can Use Currency]
-    F --> I[Exchange Rates Can Reference]
+    A[Define Currency] --> B[Add to Currency Catalog]
+    B --> C[Currency Active]
+    C --> D[Available for Transactions]
+    D --> E[Products Can Set Prices]
+    D --> F[Orders Can Use Currency]
+    D --> G[Exchange Rates Can Reference]
+    D --> H[Companies Can Assign as Base Currency]
 ```
 
 ## Scenario Patterns
 
-- **Initial Setup**: Administrator defines base currency (e.g., USD) and common trading currencies (EUR, GBP, JPY) during system initialization
+- **Initial Setup**: Administrator defines common currencies (e.g., USD, EUR, GBP, JPY) in the currency catalog during system initialization. Base currency assignment is performed per company via the organization module
 - **Market Expansion**: Business enters new market and adds local currency (e.g., BRL for Brazil expansion)
 - **Currency Deactivation**: Obsolete currency (e.g., legacy national currency replaced by EUR) is deactivated to prevent new transactions while preserving historical data
 - **Precision Configuration**: Cryptocurrency or precious metal tracking requires higher decimal precision than standard currencies
@@ -43,9 +43,8 @@ flowchart TD
 
 - Creating a currency with valid ISO 4217 code should succeed
 - Currency codes must be unique (no duplicate USD)
-- First currency created should automatically become base currency
-- Changing base currency should be allowed only with proper authorization
-- Deactivating the base currency should be prevented
+- The primitives module does not designate a global base currency; base currency assignment is per company and owned by the organization module
+- A currency that is assigned as base currency by any company cannot be deactivated (enforced via cross-module check with the organization module)
 - Currency with active transactions should not be deletable (only deactivatable)
 - Decimal places must be non-negative integer (0-4 typical range)
 

package/src/modules/primitives/docs/models/Currency.md

@@ -2,7 +2,7 @@
 
 ## Description
 
-Currency defines a monetary unit available for use across the ERP system. Each currency contains the ISO 4217 code, display symbol, name, and decimal precision. One currency is designated as the base currency for the organization, serving as the default for reporting and consolidation.
+Currency defines a monetary unit available for use across the ERP system. Each currency contains the ISO 4217 code, display symbol, name, and decimal precision. The primitives module owns the currency catalog; base/functional currency assignment is per company and owned by the organization module.
 
 Examples: USD (US Dollar), EUR (Euro), JPY (Japanese Yen).
 
@@ -19,7 +19,7 @@ stateDiagram-v2
     [*] --> Active: create
     Active --> Inactive: deactivate
     Inactive --> Active: activate
-    note right of Active: Base currency cannot be deactivated
+    note right of Active: Currency assigned as base currency by any company cannot be deactivated
 ```
 
 ### Command Definitions
@@ -40,8 +40,7 @@ stateDiagram-v2
 ### Invariants
 
 - ISO 4217 code must be unique across all currencies
-- Only one currency can be designated as base currency
-- Base currency cannot be deactivated
+- A currency assigned as base currency by any company (via the organization module) cannot be deactivated
 
 ### Relationships
 

package/src/modules/primitives/docs/queries/ConvertAmount.md

@@ -49,8 +49,8 @@ flowchart TD
 
 ## Test Cases
 
-- returns error when source currency doesn
-- returns error when target currency doesn
+- returns error when source currency doesn't exist
+- returns error when target currency doesn't exist
 - returns error when source currency is inactive
 - returns error when target currency is inactive
 - returns error when no exchange rate exists for the currency pair

package/src/modules/primitives/docs/queries/ConvertQuantity.md

@@ -42,8 +42,8 @@ flowchart TD
 
 ## Test Cases
 
-- returns error when source unit doesn
-- returns error when target unit doesn
+- returns error when source unit doesn't exist
+- returns error when target unit doesn't exist
 - returns error when source unit is inactive
 - returns error when target unit is inactive
 - returns error when units belong to different categories

package/src/modules/primitives/lib/errors.generated.ts

@@ -110,3 +110,8 @@ export const InactiveUnitError = createDomainError(
   "InactiveUnitError", "PRIMITIVES_INACTIVE_UNIT",
   (identifier: string) => `Either source or target unit is inactive: ${identifier}`,
 );
+
+export const SetBaseCurrencyDeprecatedError = createDomainError(
+  "SetBaseCurrencyDeprecatedError", "PRIMITIVES_SET_BASE_CURRENCY_DEPRECATED",
+  (_identifier: string) => `SetBaseCurrency is deprecated; use the organization module's company-level base currency assignment`,
+);

package/src/modules/product-management/README.md

@@ -31,7 +31,7 @@ The Product Management module serves as the Product Information Management (PIM)
 - Channel/marketplace definitions and listing management (sales-channel module)
 - Inventory tracking and stock levels (inventory module)
 - Product images and digital asset management
-- Supplier-specific product information (supplier-management module)
+- Supplier-specific product information (business-partner module)
 - Bill of Materials (manufacturing module)
 
 ### Scope Decision Rationale

package/src/modules/user-management/docs/commands/CreatePermission.md

@@ -11,16 +11,16 @@ Permissions are assigned to roles, which are then assigned to users. This indire
 - Permission key must follow `resource:action` format (lowercase letters, colon separator)
 - Permission key must be unique across all permissions
 - Description is optional but recommended for clarity
-- Generates PERMISSION_ASSIGNED audit event when assigned to a role (via assignPermissionToRole)
+- Permission assignment to roles is handled by AssignPermissionToRole command
 
 ## Process Flow
 
 ```mermaid
 flowchart TD
     A[Receive create request] --> B{Validate key format}
-    B -->|Invalid| C[Return error: INVALID_KEY_FORMAT]
+    B -->|Invalid| C[Return error: INVALID_PERMISSION_KEY_FORMAT]
     B -->|Valid| D{Key unique?}
-    D -->|No| E[Return error: PERMISSION_ALREADY_EXISTS]
+    D -->|No| E[Return error: DUPLICATE_PERMISSION_KEY]
     D -->|Yes| F[Create permission record]
     F --> G[Return created permission]
 ```

package/src/modules/user-management/docs/commands/CreateRole.md

@@ -20,7 +20,7 @@ flowchart TD
     A[Receive create request] --> B{Name provided?}
     B -->|No| C[Return error: MISSING_REQUIRED_FIELD]
     B -->|Yes| D{Name unique?}
-    D -->|No| E[Return error: ROLE_ALREADY_EXISTS]
+    D -->|No| E[Return error: DUPLICATE_ROLE_NAME]
     D -->|Yes| F[Create role record]
     F --> G[Return created role]
 ```

package/src/modules/user-management/docs/queries/ListRolePermissionsByRole.md

@@ -0,0 +1,39 @@
+# ListRolePermissionsByRole
+
+## Overview
+
+ListRolePermissionsByRole retrieves all permissions assigned to a specific role. This query supports the permission check flow in RBAC, where after resolving a user's roles, the system resolves each role's permissions to determine whether the user has the required permission for an action.
+
+## Business Rules
+
+- Accepts a roleId as input
+- Returns all Permission records associated with the role via RolePermission join records
+- Returns an empty array when the role has no permission assignments — not an error
+- The role must exist; a non-existent roleId returns an error
+
+## Process Flow
+
+```mermaid
+flowchart TD
+    A[Receive roleId] --> B{Role exists?}
+    B -->|No| C[Return error: ROLE_NOT_FOUND]
+    B -->|Yes| D[SELECT permissions via RolePermission where roleId = input]
+    D --> E{Any permissions found?}
+    E -->|Yes| F[Return permission records]
+    E -->|No| G[Return empty array]
+```
+
+## External Dependencies
+
+- None
+
+## Error Scenarios
+
+- **ROLE_NOT_FOUND**: Specified roleId does not exist
+
+## Test Cases
+
+- returns all permissions assigned to role
+- returns empty array when role has no permissions
+- returns error when roleId does not exist
+- returns multiple permissions when role has multiple permission assignments

package/src/modules/user-management/docs/queries/ListUserRolesByUser.md

@@ -0,0 +1,39 @@
+# ListUserRolesByUser
+
+## Overview
+
+ListUserRolesByUser retrieves all roles assigned to a specific user. This query supports the permission check flow in RBAC, where the system first resolves a user's roles, then resolves the permissions attached to those roles to determine whether the user has a required permission.
+
+## Business Rules
+
+- Accepts a userId as input
+- Returns all Role records associated with the user via UserRole join records
+- Returns an empty array when the user has no role assignments — not an error
+- The user must exist; a non-existent userId returns an error
+
+## Process Flow
+
+```mermaid
+flowchart TD
+    A[Receive userId] --> B{User exists?}
+    B -->|No| C[Return error: USER_NOT_FOUND]
+    B -->|Yes| D[SELECT roles via UserRole where userId = input]
+    D --> E{Any roles found?}
+    E -->|Yes| F[Return role records]
+    E -->|No| G[Return empty array]
+```
+
+## External Dependencies
+
+- None
+
+## Error Scenarios
+
+- **USER_NOT_FOUND**: Specified userId does not exist
+
+## Test Cases
+
+- returns all roles assigned to user
+- returns empty array when user has no roles
+- returns error when userId does not exist
+- returns multiple roles when user has multiple role assignments

package/src/modules/user-management/generated/enums.ts

@@ -1,18 +1,3 @@
-/**
- * Type of audit event
- */
-export const AuditEventEventType = {
-  "USER_CREATED": "USER_CREATED",
-  "USER_ACTIVATED": "USER_ACTIVATED",
-  "USER_DEACTIVATED": "USER_DEACTIVATED",
-  "USER_REACTIVATED": "USER_REACTIVATED",
-  "ROLE_ASSIGNED": "ROLE_ASSIGNED",
-  "ROLE_REVOKED": "ROLE_REVOKED",
-  "PERMISSION_ASSIGNED": "PERMISSION_ASSIGNED",
-  "PERMISSION_REVOKED": "PERMISSION_REVOKED"
-} as const;
-export type AuditEventEventType = (typeof AuditEventEventType)[keyof typeof AuditEventEventType];
-
 /**
  * User status
  */

package/src/modules/user-management/generated/kysely-tailordb.ts

@@ -13,17 +13,6 @@ import {
 
 export interface Namespace {
   "main-db": {
-    AuditEvent: {
-      id: Generated<string>;
-      eventType: "USER_CREATED" | "USER_ACTIVATED" | "USER_DEACTIVATED" | "USER_REACTIVATED" | "ROLE_ASSIGNED" | "ROLE_REVOKED" | "PERMISSION_ASSIGNED" | "PERMISSION_REVOKED";
-      actorId: string;
-      targetId: string | null;
-      targetType: string | null;
-      payload: string | null;
-      createdAt: Generated<Timestamp>;
-      updatedAt: Timestamp | null;
-    }
-
     Permission: {
       id: Generated<string>;
       key: string;

package/src/shared/createContext.ts

@@ -3,7 +3,7 @@ import type { CommandContext } from "./types";
 interface ResolverContext {
   user: {
     id: string;
-    attributes: { permissions?: string[] } | null;
+    attributes: { permissions?: string[]; companyId?: string | null } | null;
   };
 }
 
@@ -11,5 +11,6 @@ export function createContext(context: ResolverContext): CommandContext {
   return {
     actorId: context.user.id,
     permissions: [...new Set(context.user.attributes?.permissions ?? [])],
+    companyId: context.user.attributes?.companyId,
   };
 }

package/src/shared/defineQuery.ts

@@ -1,4 +1,7 @@
 import type { QueryContext } from "./types";
+import type { Result } from "./result";
+import { requirePermission } from "./requirePermission";
+import type { InsufficientPermissionError } from "./errors";
 
 export type Query<TInput, TResult> = (
   db: unknown,
@@ -6,10 +9,42 @@ export type Query<TInput, TResult> = (
   ctx: QueryContext,
 ) => Promise<TResult>;
 
+type QueryResult<TReturn> =
+  TReturn extends Result<infer _V, infer _E>
+    ? TReturn | Result<never, InstanceType<typeof InsufficientPermissionError>>
+    : TReturn;
+
+// Overload: no permission
+export function defineQuery<TInput, TResult>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  impl: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
+): Query<TInput, TResult>;
+
+// Overload: with permission
 export function defineQuery<TInput, TResult>(
+  permission: string,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   impl: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
-): Query<TInput, TResult> {
+): Query<TInput, QueryResult<TResult>>;
+
+// Implementation
+export function defineQuery<TInput, TResult>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  permissionOrImpl: string | ((db: any, input: TInput, ctx: QueryContext) => Promise<TResult>),
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  maybeImpl?: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+): Query<TInput, any> {
+  if (typeof permissionOrImpl === "string") {
+    const permission = permissionOrImpl;
+    const impl = maybeImpl!;
+    return async (db, input, ctx) => {
+      const check = requirePermission(ctx, permission);
+      if (!check.ok) return check;
+      return impl(db, input, ctx);
+    };
+  }
+  const impl = permissionOrImpl;
   return async (db, input, ctx) => {
     return impl(db, input, ctx);
   };

package/src/shared/requirePermission.ts

@@ -1,13 +1,13 @@
-import type { CommandContext } from "./types";
+import type { CommandContext, QueryContext } from "./types";
 import type { Result } from "./result";
 import { InsufficientPermissionError } from "./errors";
 import { ok, err } from "./result";
 
 export function requirePermission(
-  ctx: CommandContext,
+  ctx: CommandContext | QueryContext,
   key: string,
 ): Result<void, InstanceType<typeof InsufficientPermissionError>> {
-  if (!ctx.permissions.includes(key)) {
+  if (!ctx.permissions?.includes(key)) {
     return err(new InsufficientPermissionError(ctx.actorId, key));
   }
   return ok(undefined);

package/src/shared/types.ts

@@ -1,10 +1,13 @@
 export interface QueryContext {
   actorId: string;
+  permissions?: readonly string[];
+  companyId?: string | null;
 }
 
 export interface CommandContext {
   actorId: string;
   permissions: readonly string[];
+  companyId?: string | null;
 }
 
 // Strips write methods (updateTable, insertInto, deleteFrom) from a Kysely DB instance.

package/templates/scaffold/app/backend/package.json

@@ -15,16 +15,17 @@
   "dependencies": {
     "@tailor-platform/erp-kit": "workspace:*",
     "@tailor-platform/function-kysely-tailordb": "0.1.3",
-    "@tailor-platform/sdk": "1.25.1",
-    "kysely": "0.28.10"
+    "@tailor-platform/sdk": "1.25.2",
+    "kysely": "0.28.11"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.4",
-    "@tailor-platform/function-types": "0.8.1",
-    "@types/node": "24.10.9",
-    "eslint": "9.39.4",
+    "@eslint/js": "10.0.1",
+    "@tailor-platform/function-types": "0.8.2",
+    "@types/node": "24.12.0",
+    "@typescript-eslint/parser": "^8.57.0",
+    "eslint": "10.0.3",
     "eslint-import-resolver-typescript": "4.4.4",
-    "eslint-plugin-import-x": "4.16.1",
+    "eslint-plugin-import-x": "4.16.2",
     "typescript": "5.9.3",
     "typescript-eslint": "8.57.0"
   }

package/templates/scaffold/app/frontend/eslint.config.js

@@ -31,6 +31,18 @@ export default defineConfig([
     rules: {
       "import-x/order": "error",
       "import-x/no-unresolved": ["error", { ignore: ["^@tailor-platform/"] }],
+      "no-restricted-imports": [
+        "error",
+        {
+          paths: [
+            {
+              name: "@tailor-platform/app-shell",
+              importNames: ["useToast"],
+              message: "Import useToast from '@/hooks/use-toast' instead.",
+            },
+          ],
+        },
+      ],
     },
   },
   {

package/templates/scaffold/app/frontend/package.json

@@ -7,6 +7,7 @@
     "dev": "vite",
     "preview": "vite preview",
     "generate": "node --env-file=.env ./scripts/generate-graphql.mjs",
+    "gql-tada:check": "gql-tada check -c tsconfig.app.json",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "typecheck": "tsc --noEmit"
@@ -19,35 +20,37 @@
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "gql.tada": "1.9.0",
-    "lucide-react": "0.563.0",
+    "lucide-react": "0.577.0",
     "react": "19.2.4",
     "react-dom": "19.2.4",
-    "react-hook-form": "7.71.1",
-    "tailwind-merge": "3.4.0",
+    "react-hook-form": "7.71.2",
+    "tailwind-merge": "3.5.0",
     "urql": "5.0.1",
     "zod": "4.3.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.4",
+    "@eslint/js": "10.0.1",
+    "@rolldown/plugin-babel": "0.2.1",
     "@tailor-platform/app-shell-vite-plugin": "0.1.0",
-    "@tailwindcss/vite": "4.1.18",
-    "@types/node": "25.1.0",
-    "@types/react": "19.2.10",
+    "@tailwindcss/vite": "4.2.1",
+    "@types/node": "25.5.0",
+    "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "@vitejs/plugin-react": "5.1.2",
+    "@typescript-eslint/parser": "^8.57.0",
+    "@vitejs/plugin-react": "6.0.1",
     "babel-plugin-react-compiler": "1.0.0",
-    "eslint": "9.39.4",
+    "eslint": "10.0.3",
     "eslint-import-resolver-typescript": "4.4.4",
-    "eslint-plugin-import-x": "4.16.1",
-    "eslint-plugin-react-dom": "2.13.0",
+    "eslint-plugin-import-x": "4.16.2",
+    "eslint-plugin-react-dom": "3.0.0",
     "eslint-plugin-react-hooks": "7.0.1",
-    "eslint-plugin-react-x": "2.13.0",
-    "globals": "17.2.0",
-    "shadcn": "^3.8.4",
-    "tailwindcss": "4.1.18",
+    "eslint-plugin-react-x": "3.0.0",
+    "globals": "17.4.0",
+    "shadcn": "^4.0.0",
+    "tailwindcss": "4.2.1",
     "tw-animate-css": "1.4.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.57.0",
-    "vite": "7.3.1"
+    "vite": "8.0.0"
   }
 }

package/templates/scaffold/app/frontend/src/hooks/use-toast.ts

@@ -0,0 +1,30 @@
+// eslint-disable-next-line no-restricted-imports -- this is the wrapper itself
+import { useToast as useBaseToast } from "@tailor-platform/app-shell";
+import type { CombinedError } from "urql";
+
+// Extract a human-readable error message from a urql CombinedError.
+// Backend resolver errors are wrapped as "rpc error: code = ... desc = Error: <message>"
+// inside extensions.attr.error. This function extracts <message> when available.
+function getErrorMessage(error: CombinedError): string {
+  const gqlError = error.graphQLErrors[0];
+  const attrError = (gqlError?.extensions as Record<string, Record<string, string>> | undefined)
+    ?.attr?.error;
+  if (attrError) {
+    const match = /desc = Error: (.+?)(?:\n|$)/.exec(attrError);
+    if (match) return match[1];
+  }
+  return error.message;
+}
+
+// Wraps useToast so that toast.error() accepts a CombinedError directly
+// and automatically extracts the human-readable message.
+export function useToast() {
+  const toast = useBaseToast();
+  return {
+    ...toast,
+    error: (error: string | CombinedError) => {
+      const message = typeof error === "string" ? error : getErrorMessage(error);
+      toast.error(message);
+    },
+  };
+}

package/templates/scaffold/app/frontend/src/pages/user-management/user/create/components/create-user-form.tsx

@@ -1,9 +1,10 @@
-import { useNavigate, useToast } from "@tailor-platform/app-shell";
+import { useNavigate } from "@tailor-platform/app-shell";
 import { useMutation } from "urql";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import { graphql } from "@/graphql";
+import { useToast } from "@/hooks/use-toast";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import {
@@ -46,7 +47,7 @@ export const CreateUserForm = () => {
   const onSubmit = (values: FormValues) => {
     void createUser(values, { additionalTypenames: ["User"] }).then((result) => {
       if (result.error) {
-        toast.error(result.error.message);
+        toast.error(result.error);
         return;
       }
       toast.success("User created successfully");

package/templates/scaffold/app/frontend/vite.config.ts

@@ -1,16 +1,16 @@
 import path from "node:path";
 import tailwindcss from "@tailwindcss/vite";
-import react from "@vitejs/plugin-react";
+import react, { reactCompilerPreset } from "@vitejs/plugin-react";
+import babel from "@rolldown/plugin-babel";
 import { appShellRoutes } from "@tailor-platform/app-shell-vite-plugin";
 import { defineConfig } from "vite";
 
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [
-    react({
-      babel: {
-        plugins: [["babel-plugin-react-compiler"]],
-      },
+    react(),
+    babel({
+      presets: [reactCompilerPreset()],
     }),
     tailwindcss(),
     appShellRoutes(),