@idevconn/create-icore 0.5.2 → 0.6.1

package/templates/apps/microservices/payment/webpack.config.js

@@ -1,4 +1,5 @@
 const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
+const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin');
 const { join } = require('path');
 
 module.exports = {
@@ -9,6 +10,31 @@ module.exports = {
       devtoolModuleFilenameTemplate: '[absolute-resource-path]',
     }),
   },
+  resolve: {
+    // Resolve @icore/* via tsconfig paths so webpack can bundle them inline.
+    // nx skips its own tsconfig-paths plugin on "TS solution" workspaces, so we
+    // wire the standalone plugin explicitly (it follows extends → tsconfig.base).
+    plugins: [new TsconfigPathsPlugin({ configFile: join(__dirname, 'tsconfig.app.json') })],
+  },
+  // Keep every npm package external EXCEPT @icore/* workspace packages, which
+  // are bundled inline. @icore/* are workspace-internal: at runtime the package
+  // manager symlinks them to their TS source dir (not the compiled dist), so an
+  // external require('@icore/shared') fails ("Cannot find module './env'").
+  // Bundling removes runtime workspace resolution entirely — works identically
+  // on yarn / npm / pnpm.
+  externals: [
+    function ({ request }, callback) {
+      if (
+        !request ||
+        request.startsWith('.') ||
+        request.startsWith('/') ||
+        request.startsWith('@icore/')
+      ) {
+        return callback(); // bundle inline
+      }
+      return callback(null, 'commonjs ' + request); // keep external
+    },
+  ],
   plugins: [
     new NxAppWebpackPlugin({
       target: 'node',
@@ -19,6 +45,10 @@ module.exports = {
       optimization: false,
       outputHashing: 'none',
       generatePackageJson: true,
+      // Keep our externals (above) authoritative — do not let the plugin add
+      // its own nodeExternals that would re-externalize @icore/*.
+      mergeExternals: true,
+      externalDependencies: [],
       sourceMap: true,
     }),
   ],

package/templates/apps/microservices/upload/.env.example

@@ -4,6 +4,11 @@ UPLOAD_HOST=127.0.0.1
 UPLOAD_PORT=4002
 # UPLOAD_REDIS_URL=redis://localhost:6379
 # UPLOAD_NATS_URL=nats://localhost:4222
+# UPLOAD_MQTT_URL=mqtt://localhost:1883
+# UPLOAD_RMQ_URL=amqp://localhost:5672
+# UPLOAD_RMQ_QUEUE=upload_queue
+# UPLOAD_KAFKA_BROKERS=localhost:9092
+# UPLOAD_KAFKA_CLIENT_ID=upload
 
 # Which concrete StorageStrategy to instantiate
 STORAGE_PROVIDER=supabase

package/templates/apps/microservices/upload/tsconfig.json

@@ -11,6 +11,11 @@
     }
   ],
   "compilerOptions": {
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "module": "node16",
+    "moduleResolution": "node16",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "target": "es2021"
   }
 }

package/templates/apps/microservices/upload/webpack.config.js

@@ -1,4 +1,5 @@
 const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
+const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin');
 const { join } = require('path');
 
 module.exports = {
@@ -9,6 +10,31 @@ module.exports = {
       devtoolModuleFilenameTemplate: '[absolute-resource-path]',
     }),
   },
+  resolve: {
+    // Resolve @icore/* via tsconfig paths so webpack can bundle them inline.
+    // nx skips its own tsconfig-paths plugin on "TS solution" workspaces, so we
+    // wire the standalone plugin explicitly (it follows extends → tsconfig.base).
+    plugins: [new TsconfigPathsPlugin({ configFile: join(__dirname, 'tsconfig.app.json') })],
+  },
+  // Keep every npm package external EXCEPT @icore/* workspace packages, which
+  // are bundled inline. @icore/* are workspace-internal: at runtime the package
+  // manager symlinks them to their TS source dir (not the compiled dist), so an
+  // external require('@icore/shared') fails ("Cannot find module './env'").
+  // Bundling removes runtime workspace resolution entirely — works identically
+  // on yarn / npm / pnpm.
+  externals: [
+    function ({ request }, callback) {
+      if (
+        !request ||
+        request.startsWith('.') ||
+        request.startsWith('/') ||
+        request.startsWith('@icore/')
+      ) {
+        return callback(); // bundle inline
+      }
+      return callback(null, 'commonjs ' + request); // keep external
+    },
+  ],
   plugins: [
     new NxAppWebpackPlugin({
       target: 'node',
@@ -19,6 +45,10 @@ module.exports = {
       optimization: false,
       outputHashing: 'none',
       generatePackageJson: true,
+      // Keep our externals (above) authoritative — do not let the plugin add
+      // its own nodeExternals that would re-externalize @icore/*.
+      mergeExternals: true,
+      externalDependencies: [],
       sourceMap: true,
     }),
   ],

package/templates/apps/templates/client-antd/src/components/AccessDeniedPage.tsx

@@ -10,7 +10,7 @@ export function AccessDeniedPage() {
       title={t('error.accessDenied')}
       subTitle={t('error.unknown')}
       extra={
-        <Link to="/_dashboard/dashboard">
+        <Link to="/dashboard">
           <Button type="primary">Dashboard</Button>
         </Link>
       }

package/templates/apps/templates/client-antd/src/components/layout/LayoutHeader.tsx

@@ -36,7 +36,7 @@ export function LayoutHeader() {
     { type: 'divider' },
     {
       key: 'profile',
-      label: <Link to="/_dashboard/profile">{t('nav.profile')}</Link>,
+      label: <Link to="/profile">{t('nav.profile')}</Link>,
     },
     {
       key: 'logout',

package/templates/apps/templates/client-antd/src/components/layout/LayoutSider.tsx

@@ -19,17 +19,17 @@ export function LayoutSider() {
     {
       key: 'dashboard',
       icon: <DashboardOutlined />,
-      label: <Link to="/_dashboard/dashboard">{t('nav.dashboard')}</Link>,
+      label: <Link to="/dashboard">{t('nav.dashboard')}</Link>,
     },
     {
       key: 'notes',
       icon: <FileTextOutlined />,
-      label: <Link to="/_dashboard/notes">{t('notes.title')}</Link>,
+      label: <Link to="/notes">{t('notes.title')}</Link>,
     },
     {
       key: 'profile',
       icon: <UserOutlined />,
-      label: <Link to="/_dashboard/profile">{t('nav.profile')}</Link>,
+      label: <Link to="/profile">{t('nav.profile')}</Link>,
     },
   ];
 

package/templates/apps/templates/client-antd/src/routes/_dashboard/dashboard.tsx

@@ -1,7 +1,7 @@
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { Button, Card } from 'antd';
 import { useAuthStore } from '@icore/template-shared';
-import { PageLayout } from '../../components/PageLayout';
+import { PageLayout } from '@/components/PageLayout';
 
 function DashboardHome() {
   const user = useAuthStore((s) => s.user);
@@ -11,7 +11,7 @@ function DashboardHome() {
         title="Hello, world"
         style={{ maxWidth: 600 }}
         extra={
-          <Link to="/_dashboard/profile">
+          <Link to="/profile">
             <Button type="link">Go to profile →</Button>
           </Link>
         }

package/templates/apps/templates/client-antd/src/routes/_dashboard/notes.tsx

@@ -3,14 +3,14 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, Form, Input, Modal, Popconfirm, Space, Table, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { PageLayout } from '../../components/PageLayout';
+import { PageLayout } from '@/components/PageLayout';
 import {
   useCreateNote,
   useDeleteNote,
   useNotesList,
   useUpdateNote,
   type Note,
-} from '../../queries/notes';
+} from '@/queries/notes';
 
 const PAGE_SIZE = 20;
 

package/templates/apps/templates/client-antd/src/routes/_dashboard/profile.tsx

@@ -3,8 +3,8 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { Button, Form, Input } from 'antd';
 import { useDraft, useNotify, useAuthStore } from '@icore/template-shared';
-import { PageLayout } from '../../components/PageLayout';
-import { api } from '../../main';
+import { PageLayout } from '@/components/PageLayout';
+import { api } from '@/main';
 
 interface ProfilePayload {
   uid: string;

package/templates/apps/templates/client-antd/src/routes/auth.callback.tsx

@@ -49,7 +49,7 @@ function CallbackPage() {
       .then((session) => {
         setAuth(session);
         setStatus('done');
-        void navigate({ to: '/_dashboard/dashboard' });
+        void navigate({ to: '/dashboard' });
       })
       .catch((err) => {
         setStatus('error');

package/templates/apps/templates/client-antd/src/routes/auth.oauth.callback.tsx

@@ -32,7 +32,7 @@ function OAuthCallbackPage() {
       user: { id: userId, email },
     });
     setStatus('done');
-    void navigate({ to: '/_dashboard/dashboard' });
+    void navigate({ to: '/dashboard' });
   }, []);
 
   return (

package/templates/apps/templates/client-antd/src/routes/login.tsx

@@ -41,7 +41,7 @@ function LoginPage() {
       });
       setAuth(session);
       notify.success(t('auth.login'));
-      await navigate({ to: '/_dashboard/dashboard' });
+      await navigate({ to: '/dashboard' });
     } catch (err) {
       notify.error(err instanceof Error ? err.message : t('error.unknown'));
     }

package/templates/apps/templates/client-antd/tsconfig.json

@@ -8,7 +8,12 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "types": ["vite/client", "vitest"]
+    "types": ["vite/client", "vitest"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "baseUrl": "."
   },
   "files": [],
   "include": [],

package/templates/apps/templates/client-antd-e2e/src/icore.spec.ts

@@ -14,12 +14,12 @@ test.describe('icore client-antd smoke', () => {
   });
 
   test('protected route redirects to login when unauthenticated', async ({ page }) => {
-    await page.goto('/_dashboard/dashboard');
+    await page.goto('/dashboard');
     await expect(page).toHaveURL(/\/login$/);
   });
 
   test('profile route redirects to login when unauthenticated', async ({ page }) => {
-    await page.goto('/_dashboard/profile');
+    await page.goto('/profile');
     await expect(page).toHaveURL(/\/login$/);
   });
 });

package/templates/apps/templates/client-mui/src/components/AccessDeniedPage.tsx

@@ -16,7 +16,7 @@ export function AccessDeniedPage() {
         {t('error.unknown')}
       </Typography>
       <Box>
-        <Button component={Link} to="/_dashboard/dashboard" variant="contained">
+        <Button component={Link} to="/dashboard" variant="contained">
           Dashboard
         </Button>
       </Box>

package/templates/apps/templates/client-mui/src/components/layout/LayoutHeader.tsx

@@ -91,7 +91,7 @@ export function LayoutHeader() {
                 {user?.email ?? ''}
               </Typography>
             </MenuItem>
-            <MenuItem component={Link} to="/_dashboard/profile" onClick={handleMenuClose}>
+            <MenuItem component={Link} to="/profile" onClick={handleMenuClose}>
               {t('nav.profile')}
             </MenuItem>
             <MenuItem onClick={handleLogout} sx={{ color: 'error.main' }}>

package/templates/apps/templates/client-mui/src/components/layout/LayoutSider.tsx

@@ -25,33 +25,21 @@ export function LayoutSider() {
       }}
     >
       <List>
-        <ListItemButton
-          component={Link}
-          to="/_dashboard/dashboard"
-          selected={pathname === '/dashboard'}
-        >
+        <ListItemButton component={Link} to="/dashboard" selected={pathname === '/dashboard'}>
           <ListItemIcon>
             <DashboardOutlinedIcon />
           </ListItemIcon>
           <ListItemText primary={t('nav.dashboard')} />
         </ListItemButton>
 
-        <ListItemButton
-          component={Link}
-          to="/_dashboard/notes"
-          selected={pathname.includes('/notes')}
-        >
+        <ListItemButton component={Link} to="/notes" selected={pathname.includes('/notes')}>
           <ListItemIcon>
             <NoteOutlinedIcon />
           </ListItemIcon>
           <ListItemText primary={t('notes.title')} />
         </ListItemButton>
 
-        <ListItemButton
-          component={Link}
-          to="/_dashboard/profile"
-          selected={pathname === '/profile'}
-        >
+        <ListItemButton component={Link} to="/profile" selected={pathname === '/profile'}>
           <ListItemIcon>
             <PersonOutlineIcon />
           </ListItemIcon>

package/templates/apps/templates/client-mui/src/routes/_dashboard/dashboard.tsx

@@ -1,7 +1,7 @@
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { Card, CardContent, CardHeader, Typography } from '@mui/material';
 import { useAuthStore } from '@icore/template-shared';
-import { PageLayout } from '../../components/PageLayout';
+import { PageLayout } from '@/components/PageLayout';
 
 function DashboardHome() {
   const user = useAuthStore((s) => s.user);
@@ -13,11 +13,7 @@ function DashboardHome() {
           subheader="Edit this page in src/routes/_dashboard/dashboard.tsx"
         />
         <CardContent>
-          <Typography
-            component={Link}
-            to="/_dashboard/profile"
-            sx={{ textDecoration: 'underline' }}
-          >
+          <Typography component={Link} to="/profile" sx={{ textDecoration: 'underline' }}>
             Go to profile →
           </Typography>
         </CardContent>

package/templates/apps/templates/client-mui/src/routes/_dashboard/notes.tsx

@@ -22,14 +22,14 @@ import {
 } from '@mui/material';
 import EditIcon from '@mui/icons-material/Edit';
 import DeleteIcon from '@mui/icons-material/Delete';
-import { PageLayout } from '../../components/PageLayout';
+import { PageLayout } from '@/components/PageLayout';
 import {
   useCreateNote,
   useDeleteNote,
   useNotesList,
   useUpdateNote,
   type Note,
-} from '../../queries/notes';
+} from '@/queries/notes';
 
 const PAGE_SIZE = 20;
 

package/templates/apps/templates/client-mui/src/routes/_dashboard/profile.tsx

@@ -3,8 +3,8 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { Box, Button, TextField } from '@mui/material';
 import { useDraft, useNotify, useAuthStore } from '@icore/template-shared';
-import { PageLayout } from '../../components/PageLayout';
-import { api } from '../../main';
+import { PageLayout } from '@/components/PageLayout';
+import { api } from '@/main';
 
 interface ProfilePayload {
   uid: string;
@@ -45,7 +45,7 @@ function ProfilePage() {
     onError: (err) => notify.error(err instanceof Error ? err.message : 'save_failed'),
   });
 
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+  function handleSubmit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
     save.mutate(name);
   }

package/templates/apps/templates/client-mui/src/routes/auth.callback.tsx

@@ -49,7 +49,7 @@ function CallbackPage() {
       .then((session) => {
         setAuth(session);
         setStatus('done');
-        void navigate({ to: '/_dashboard/dashboard' });
+        void navigate({ to: '/dashboard' });
       })
       .catch((err) => {
         setStatus('error');

package/templates/apps/templates/client-mui/src/routes/auth.oauth.callback.tsx

@@ -32,7 +32,7 @@ function OAuthCallbackPage() {
       user: { id: userId, email },
     });
     setStatus('done');
-    void navigate({ to: '/_dashboard/dashboard' });
+    void navigate({ to: '/dashboard' });
   }, []);
 
   return (

package/templates/apps/templates/client-mui/src/routes/login.tsx

@@ -32,7 +32,7 @@ function LoginPage() {
   const [sentEmail, setSentEmail] = useState('');
   const [submitting, setSubmitting] = useState(false);
 
-  async function handlePasswordSubmit(e: React.FormEvent<HTMLFormElement>) {
+  async function handlePasswordSubmit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
     setSubmitting(true);
     try {
@@ -47,7 +47,7 @@ function LoginPage() {
       });
       setAuth(session);
       notify.success(t('auth.login'));
-      await navigate({ to: '/_dashboard/dashboard' });
+      await navigate({ to: '/dashboard' });
     } catch (err) {
       notify.error(err instanceof Error ? err.message : t('error.unknown'));
     } finally {
@@ -55,7 +55,7 @@ function LoginPage() {
     }
   }
 
-  async function handleMagicLinkSubmit(e: React.FormEvent<HTMLFormElement>) {
+  async function handleMagicLinkSubmit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
     setSubmitting(true);
     try {

package/templates/apps/templates/client-mui/tsconfig.json

@@ -8,7 +8,12 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "types": ["vite/client", "vitest"]
+    "types": ["vite/client", "vitest"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "baseUrl": "."
   },
   "files": [],
   "include": [],

package/templates/apps/templates/client-mui-e2e/src/icore.spec.ts

@@ -14,12 +14,12 @@ test.describe('icore client-mui smoke', () => {
   });
 
   test('protected route redirects to login when unauthenticated', async ({ page }) => {
-    await page.goto('/_dashboard/dashboard');
+    await page.goto('/dashboard');
     await expect(page).toHaveURL(/\/login$/);
   });
 
   test('profile route redirects to login when unauthenticated', async ({ page }) => {
-    await page.goto('/_dashboard/profile');
+    await page.goto('/profile');
     await expect(page).toHaveURL(/\/login$/);
   });
 });

package/templates/apps/templates/client-shadcn/src/components/AccessDeniedPage.tsx

@@ -7,7 +7,7 @@ export function AccessDeniedPage() {
     <div className="min-h-[60vh] flex flex-col items-center justify-center gap-2 text-center px-6">
       <h1 className="text-2xl font-semibold">{t('error.accessDenied')}</h1>
       <p className="text-muted-foreground">{t('error.unknown')}</p>
-      <Link to="/_dashboard/dashboard" className="mt-4 underline">
+      <Link to="/dashboard" className="mt-4 underline">
         ← Dashboard
       </Link>
     </div>

package/templates/apps/templates/client-shadcn/src/components/layout/LayoutSider.tsx

@@ -15,7 +15,7 @@ export function LayoutSider() {
     >
       <nav className="flex flex-col gap-1 p-2 flex-1">
         <Link
-          to="/_dashboard/dashboard"
+          to="/dashboard"
           activeOptions={{ exact: true }}
           className="flex items-center gap-2 px-2 py-2 rounded hover:bg-muted text-sm text-foreground transition-colors [&.active]:bg-muted [&.active]:font-medium"
         >
@@ -23,14 +23,14 @@ export function LayoutSider() {
           {!collapsed && <span>{t('nav.dashboard')}</span>}
         </Link>
         <Link
-          to="/_dashboard/notes"
+          to="/notes"
           className="flex items-center gap-2 px-2 py-2 rounded hover:bg-muted text-sm text-foreground transition-colors [&.active]:bg-muted [&.active]:font-medium"
         >
           <StickyNote size={16} className="shrink-0" />
           {!collapsed && <span>{t('notes.title')}</span>}
         </Link>
         <Link
-          to="/_dashboard/profile"
+          to="/profile"
           className="flex items-center gap-2 px-2 py-2 rounded hover:bg-muted text-sm text-foreground transition-colors [&.active]:bg-muted [&.active]:font-medium"
         >
           <User size={16} className="shrink-0" />

package/templates/apps/templates/client-shadcn/src/components/notes/DeleteNoteConfirm.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { Button } from '../ui/button';
-import type { Note } from '../../queries/notes';
+import type { Note } from '@/queries/notes';
 
 interface Props {
   note: Note | null;

package/templates/apps/templates/client-shadcn/src/components/notes/NoteDialog.tsx

@@ -1,9 +1,9 @@
-import { FormEvent, useEffect, useState } from 'react';
+import { SyntheticEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button } from '../ui/button';
 import { Input } from '../ui/input';
 import { Label } from '../ui/label';
-import type { Note } from '../../queries/notes';
+import type { Note } from '@/queries/notes';
 
 interface Props {
   open: boolean;
@@ -27,7 +27,7 @@ export function NoteDialog({ open, initial, saving, onClose, onSubmit }: Props)
 
   if (!open) return null;
 
-  function handleSubmit(e: FormEvent) {
+  function handleSubmit(e: SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
     onSubmit({ title, body });
   }

package/templates/apps/templates/client-shadcn/src/components/notes/NotesTable.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { Button } from '../ui/button';
-import type { Note } from '../../queries/notes';
+import type { Note } from '@/queries/notes';
 
 interface Props {
   items: Note[];

package/templates/apps/templates/client-shadcn/src/components/ui/button.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Slot } from '@radix-ui/react-slot';
 import { cva, type VariantProps } from 'class-variance-authority';
-import { cn } from '../../lib/utils';
+import { cn } from '@/lib/utils';
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',

package/templates/apps/templates/client-shadcn/src/components/ui/card.tsx

@@ -4,7 +4,7 @@
 // vendored design-system primitives that always travel together are kept
 // in a single file matching the upstream shadcn source structure.
 import * as React from 'react';
-import { cn } from '../../lib/utils';
+import { cn } from '@/lib/utils';
 
 const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
   ({ className, ...props }, ref) => (

package/templates/apps/templates/client-shadcn/src/components/ui/input.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { cn } from '../../lib/utils';
+import { cn } from '@/lib/utils';
 
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
 

package/templates/apps/templates/client-shadcn/src/components/ui/label.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as LabelPrimitive from '@radix-ui/react-label';
 import { cva, type VariantProps } from 'class-variance-authority';
-import { cn } from '../../lib/utils';
+import { cn } from '@/lib/utils';
 
 const labelVariants = cva(
   'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',

package/templates/apps/templates/client-shadcn/src/routes/_dashboard/dashboard.tsx

@@ -1,13 +1,7 @@
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { useAuthStore } from '@icore/template-shared';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '../../components/ui/card';
-import { PageLayout } from '../../components/PageLayout';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { PageLayout } from '@/components/PageLayout';
 
 function DashboardHome() {
   const user = useAuthStore((s) => s.user);
@@ -19,7 +13,7 @@ function DashboardHome() {
           <CardDescription>Edit this page in src/routes/_dashboard/dashboard.tsx</CardDescription>
         </CardHeader>
         <CardContent>
-          <Link to="/_dashboard/profile" className="underline">
+          <Link to="/profile" className="underline">
             Go to profile →
           </Link>
         </CardContent>

package/templates/apps/templates/client-shadcn/src/routes/_dashboard/notes.tsx

@@ -1,18 +1,18 @@
 import { createFileRoute } from '@tanstack/react-router';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PageLayout } from '../../components/PageLayout';
-import { Button } from '../../components/ui/button';
-import { NotesTable } from '../../components/notes/NotesTable';
-import { NoteDialog } from '../../components/notes/NoteDialog';
-import { DeleteNoteConfirm } from '../../components/notes/DeleteNoteConfirm';
+import { PageLayout } from '@/components/PageLayout';
+import { Button } from '@/components/ui/button';
+import { NotesTable } from '@/components/notes/NotesTable';
+import { NoteDialog } from '@/components/notes/NoteDialog';
+import { DeleteNoteConfirm } from '@/components/notes/DeleteNoteConfirm';
 import {
   useCreateNote,
   useDeleteNote,
   useNotesList,
   useUpdateNote,
   type Note,
-} from '../../queries/notes';
+} from '@/queries/notes';
 
 const PAGE_SIZE = 20;