@idevconn/create-icore 0.10.0 → 0.10.2

package/dist/cli.js

@@ -410,6 +410,7 @@ async function rewriteRootPackageJson(targetDir, opts) {
   const pkg = JSON.parse(raw);
   pkg["name"] = opts.projectName;
   pkg["version"] = "0.0.1";
+  pkg["icoreVersion"] = true ? "0.10.2" : "unknown";
   pkg["private"] = true;
   delete pkg.description;
   const transportDeps = TRANSPORT_DEPS[opts.transport];
@@ -677,6 +678,7 @@ var AUTH_ONLY_PATHS = [
   "apps/api/src/app/abilities",
   "libs/shared/src/abilities",
   "apps/client/src/components/auth",
+  "apps/client/src/components/AccessDeniedPage.tsx",
   "apps/client/src/routes/login.tsx",
   "apps/client/src/routes/auth.callback.tsx",
   "apps/client/src/routes/auth.oauth.callback.tsx",
@@ -813,6 +815,121 @@ export * from './lib/draft/index.js';
 export * from './lib/landing/LandingPage.js';
 export * from './lib/stores/theme.store.js';
 `;
+var SHADCN_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+interface PageLayoutProps {
+  title: string;
+  description?: string;
+  actions?: ReactNode;
+  children: ReactNode;
+}
+
+export function PageLayout({ title, description, actions, children }: PageLayoutProps) {
+  const { t } = useTranslation();
+  const isLoading = useLoading();
+
+  useDraft(false);
+
+  return (
+    <div className="p-4 md:p-6 space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <h1 className="text-xl font-semibold text-foreground">{title}</h1>
+          {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        </div>
+        {actions && <div>{actions}</div>}
+      </div>
+
+      {isLoading && (
+        <div
+          role="status"
+          aria-label={t('common.loading')}
+          className="fixed inset-0 z-50 flex items-center justify-center bg-background/60 backdrop-blur-sm"
+        >
+          <div className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+        </div>
+      )}
+
+      {children}
+    </div>
+  );
+}
+`;
+var ANTD_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Descriptions, Spin } from 'antd';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <div style={{ padding: 24 }}>
+      <Descriptions title={title} extra={extra} style={{ marginBottom: 16 }}>
+        {description ? <Descriptions.Item>{description}</Descriptions.Item> : null}
+      </Descriptions>
+      <Spin spinning={loading}>
+        <div>{children}</div>
+      </Spin>
+    </div>
+  );
+}
+`;
+var MUI_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Box, LinearProgress, Stack, Typography } from '@mui/material';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <Box sx={{ p: 3 }}>
+      <Stack
+        direction="row"
+        justifyContent="space-between"
+        alignItems="flex-start"
+        spacing={2}
+        mb={3}
+      >
+        <Box>
+          <Typography variant="h4" component="h1">
+            {title}
+          </Typography>
+          {description ? (
+            <Typography variant="body2" color="text.secondary" mt={0.5}>
+              {description}
+            </Typography>
+          ) : null}
+        </Box>
+        {extra ? (
+          <Stack direction="row" spacing={1}>
+            {extra}
+          </Stack>
+        ) : null}
+      </Stack>
+      {loading ? <LinearProgress sx={{ mb: 2 }} /> : null}
+      <Box>{children}</Box>
+    </Box>
+  );
+}
+`;
 var SHADCN_MAIN_TSX = `import './globals.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
@@ -913,7 +1030,7 @@ export const Route = createFileRoute('/')({
   ),
 });
 `;
-var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const LOCALES: { code: IcoreLocale; label: string }[] = [
@@ -925,7 +1042,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -1059,7 +1176,7 @@ export const Route = createFileRoute('/')({
 });
 `;
 var ANTD_LAYOUT_HEADER_TSX = `import { Button, Layout, Space } from 'antd';
-import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
@@ -1073,7 +1190,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -1245,7 +1362,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   return (
@@ -1289,19 +1406,22 @@ var UI_VARIANTS = {
     "apps/client/src/main.tsx": SHADCN_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": SHADCN_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": SHADCN_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": SHADCN_PAGE_LAYOUT_TSX
   },
   antd: {
     "apps/client/src/main.tsx": ANTD_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": ANTD_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": ANTD_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": ANTD_PAGE_LAYOUT_TSX
   },
   mui: {
     "apps/client/src/main.tsx": MUI_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": MUI_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": MUI_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": MUI_PAGE_LAYOUT_TSX
   }
 };
 async function applyAuthNoneVariants(targetDir, ui) {
@@ -2188,6 +2308,9 @@ async function scaffold(rawOpts, templatesDir2) {
     await writePnpmWorkspace(opts.targetDir);
     await rewritePnpmWorkspaceDeps(opts.targetDir);
   }
+  if (opts.packageManager === "npm") {
+    await writeFile9(join10(opts.targetDir, ".npmrc"), "legacy-peer-deps=true\n");
+  }
   await patchGitignoreForPm(opts.targetDir, opts.packageManager);
   await writeAiFiles(opts.targetDir, opts);
   if (opts.install) runInstall(opts.targetDir, opts.packageManager);

package/dist/index.cjs

@@ -121,6 +121,7 @@ async function rewriteRootPackageJson(targetDir, opts) {
   const pkg = JSON.parse(raw);
   pkg["name"] = opts.projectName;
   pkg["version"] = "0.0.1";
+  pkg["icoreVersion"] = typeof ICORE_OWN_VERSION !== "undefined" ? ICORE_OWN_VERSION : "unknown";
   pkg["private"] = true;
   delete pkg.description;
   const transportDeps = TRANSPORT_DEPS[opts.transport];
@@ -388,6 +389,7 @@ var AUTH_ONLY_PATHS = [
   "apps/api/src/app/abilities",
   "libs/shared/src/abilities",
   "apps/client/src/components/auth",
+  "apps/client/src/components/AccessDeniedPage.tsx",
   "apps/client/src/routes/login.tsx",
   "apps/client/src/routes/auth.callback.tsx",
   "apps/client/src/routes/auth.oauth.callback.tsx",
@@ -524,6 +526,121 @@ export * from './lib/draft/index.js';
 export * from './lib/landing/LandingPage.js';
 export * from './lib/stores/theme.store.js';
 `;
+var SHADCN_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+interface PageLayoutProps {
+  title: string;
+  description?: string;
+  actions?: ReactNode;
+  children: ReactNode;
+}
+
+export function PageLayout({ title, description, actions, children }: PageLayoutProps) {
+  const { t } = useTranslation();
+  const isLoading = useLoading();
+
+  useDraft(false);
+
+  return (
+    <div className="p-4 md:p-6 space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <h1 className="text-xl font-semibold text-foreground">{title}</h1>
+          {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        </div>
+        {actions && <div>{actions}</div>}
+      </div>
+
+      {isLoading && (
+        <div
+          role="status"
+          aria-label={t('common.loading')}
+          className="fixed inset-0 z-50 flex items-center justify-center bg-background/60 backdrop-blur-sm"
+        >
+          <div className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+        </div>
+      )}
+
+      {children}
+    </div>
+  );
+}
+`;
+var ANTD_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Descriptions, Spin } from 'antd';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <div style={{ padding: 24 }}>
+      <Descriptions title={title} extra={extra} style={{ marginBottom: 16 }}>
+        {description ? <Descriptions.Item>{description}</Descriptions.Item> : null}
+      </Descriptions>
+      <Spin spinning={loading}>
+        <div>{children}</div>
+      </Spin>
+    </div>
+  );
+}
+`;
+var MUI_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Box, LinearProgress, Stack, Typography } from '@mui/material';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <Box sx={{ p: 3 }}>
+      <Stack
+        direction="row"
+        justifyContent="space-between"
+        alignItems="flex-start"
+        spacing={2}
+        mb={3}
+      >
+        <Box>
+          <Typography variant="h4" component="h1">
+            {title}
+          </Typography>
+          {description ? (
+            <Typography variant="body2" color="text.secondary" mt={0.5}>
+              {description}
+            </Typography>
+          ) : null}
+        </Box>
+        {extra ? (
+          <Stack direction="row" spacing={1}>
+            {extra}
+          </Stack>
+        ) : null}
+      </Stack>
+      {loading ? <LinearProgress sx={{ mb: 2 }} /> : null}
+      <Box>{children}</Box>
+    </Box>
+  );
+}
+`;
 var SHADCN_MAIN_TSX = `import './globals.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
@@ -624,7 +741,7 @@ export const Route = createFileRoute('/')({
   ),
 });
 `;
-var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const LOCALES: { code: IcoreLocale; label: string }[] = [
@@ -636,7 +753,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -770,7 +887,7 @@ export const Route = createFileRoute('/')({
 });
 `;
 var ANTD_LAYOUT_HEADER_TSX = `import { Button, Layout, Space } from 'antd';
-import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
@@ -784,7 +901,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -956,7 +1073,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   return (
@@ -1000,19 +1117,22 @@ var UI_VARIANTS = {
     "apps/client/src/main.tsx": SHADCN_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": SHADCN_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": SHADCN_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": SHADCN_PAGE_LAYOUT_TSX
   },
   antd: {
     "apps/client/src/main.tsx": ANTD_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": ANTD_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": ANTD_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": ANTD_PAGE_LAYOUT_TSX
   },
   mui: {
     "apps/client/src/main.tsx": MUI_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": MUI_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": MUI_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": MUI_PAGE_LAYOUT_TSX
   }
 };
 async function applyAuthNoneVariants(targetDir, ui) {
@@ -1892,6 +2012,9 @@ async function scaffold(rawOpts, templatesDir) {
     await writePnpmWorkspace(opts.targetDir);
     await rewritePnpmWorkspaceDeps(opts.targetDir);
   }
+  if (opts.packageManager === "npm") {
+    await (0, import_promises9.writeFile)((0, import_node_path9.join)(opts.targetDir, ".npmrc"), "legacy-peer-deps=true\n");
+  }
   await patchGitignoreForPm(opts.targetDir, opts.packageManager);
   await writeAiFiles(opts.targetDir, opts);
   if (opts.install) runInstall(opts.targetDir, opts.packageManager);

package/dist/index.js

@@ -78,6 +78,7 @@ async function rewriteRootPackageJson(targetDir, opts) {
   const pkg = JSON.parse(raw);
   pkg["name"] = opts.projectName;
   pkg["version"] = "0.0.1";
+  pkg["icoreVersion"] = typeof ICORE_OWN_VERSION !== "undefined" ? ICORE_OWN_VERSION : "unknown";
   pkg["private"] = true;
   delete pkg.description;
   const transportDeps = TRANSPORT_DEPS[opts.transport];
@@ -345,6 +346,7 @@ var AUTH_ONLY_PATHS = [
   "apps/api/src/app/abilities",
   "libs/shared/src/abilities",
   "apps/client/src/components/auth",
+  "apps/client/src/components/AccessDeniedPage.tsx",
   "apps/client/src/routes/login.tsx",
   "apps/client/src/routes/auth.callback.tsx",
   "apps/client/src/routes/auth.oauth.callback.tsx",
@@ -481,6 +483,121 @@ export * from './lib/draft/index.js';
 export * from './lib/landing/LandingPage.js';
 export * from './lib/stores/theme.store.js';
 `;
+var SHADCN_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+interface PageLayoutProps {
+  title: string;
+  description?: string;
+  actions?: ReactNode;
+  children: ReactNode;
+}
+
+export function PageLayout({ title, description, actions, children }: PageLayoutProps) {
+  const { t } = useTranslation();
+  const isLoading = useLoading();
+
+  useDraft(false);
+
+  return (
+    <div className="p-4 md:p-6 space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <h1 className="text-xl font-semibold text-foreground">{title}</h1>
+          {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        </div>
+        {actions && <div>{actions}</div>}
+      </div>
+
+      {isLoading && (
+        <div
+          role="status"
+          aria-label={t('common.loading')}
+          className="fixed inset-0 z-50 flex items-center justify-center bg-background/60 backdrop-blur-sm"
+        >
+          <div className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+        </div>
+      )}
+
+      {children}
+    </div>
+  );
+}
+`;
+var ANTD_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Descriptions, Spin } from 'antd';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <div style={{ padding: 24 }}>
+      <Descriptions title={title} extra={extra} style={{ marginBottom: 16 }}>
+        {description ? <Descriptions.Item>{description}</Descriptions.Item> : null}
+      </Descriptions>
+      <Spin spinning={loading}>
+        <div>{children}</div>
+      </Spin>
+    </div>
+  );
+}
+`;
+var MUI_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Box, LinearProgress, Stack, Typography } from '@mui/material';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <Box sx={{ p: 3 }}>
+      <Stack
+        direction="row"
+        justifyContent="space-between"
+        alignItems="flex-start"
+        spacing={2}
+        mb={3}
+      >
+        <Box>
+          <Typography variant="h4" component="h1">
+            {title}
+          </Typography>
+          {description ? (
+            <Typography variant="body2" color="text.secondary" mt={0.5}>
+              {description}
+            </Typography>
+          ) : null}
+        </Box>
+        {extra ? (
+          <Stack direction="row" spacing={1}>
+            {extra}
+          </Stack>
+        ) : null}
+      </Stack>
+      {loading ? <LinearProgress sx={{ mb: 2 }} /> : null}
+      <Box>{children}</Box>
+    </Box>
+  );
+}
+`;
 var SHADCN_MAIN_TSX = `import './globals.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
@@ -581,7 +698,7 @@ export const Route = createFileRoute('/')({
   ),
 });
 `;
-var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const LOCALES: { code: IcoreLocale; label: string }[] = [
@@ -593,7 +710,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -727,7 +844,7 @@ export const Route = createFileRoute('/')({
 });
 `;
 var ANTD_LAYOUT_HEADER_TSX = `import { Button, Layout, Space } from 'antd';
-import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
@@ -741,7 +858,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -913,7 +1030,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   return (
@@ -957,19 +1074,22 @@ var UI_VARIANTS = {
     "apps/client/src/main.tsx": SHADCN_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": SHADCN_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": SHADCN_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": SHADCN_PAGE_LAYOUT_TSX
   },
   antd: {
     "apps/client/src/main.tsx": ANTD_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": ANTD_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": ANTD_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": ANTD_PAGE_LAYOUT_TSX
   },
   mui: {
     "apps/client/src/main.tsx": MUI_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": MUI_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": MUI_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": MUI_PAGE_LAYOUT_TSX
   }
 };
 async function applyAuthNoneVariants(targetDir, ui) {
@@ -1849,6 +1969,9 @@ async function scaffold(rawOpts, templatesDir) {
     await writePnpmWorkspace(opts.targetDir);
     await rewritePnpmWorkspaceDeps(opts.targetDir);
   }
+  if (opts.packageManager === "npm") {
+    await writeFile9(join9(opts.targetDir, ".npmrc"), "legacy-peer-deps=true\n");
+  }
   await patchGitignoreForPm(opts.targetDir, opts.packageManager);
   await writeAiFiles(opts.targetDir, opts);
   if (opts.install) runInstall(opts.targetDir, opts.packageManager);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idevconn/create-icore",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Bootstrap a new project from the iCore scaffold (Nx + NestJS + React + Vite + shadcn/Tailwind, swappable auth + storage providers).",
   "license": "Apache-2.0",
   "author": "iDEVconn",

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

@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@ant-design/icons": "^6.2.5",
-    "antd": "^6.4.4"
+    "antd": "^6.4.5"
   }
 }

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

@@ -13,13 +13,13 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 ];
 
 export function LayoutHeader() {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const user = useAuthStore((s) => s.user);
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleLogout() {

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

@@ -32,7 +32,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleMenuOpen(event: React.MouseEvent<HTMLElement>) {

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

@@ -12,14 +12,14 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 ];
 
 export function LayoutHeader() {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const user = useAuthStore((s) => s.user);
   const logout = useAuthStore((s) => s.logout);
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleLogout() {

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

@@ -16,7 +16,7 @@ export function LayoutSider() {
 
   return (
     <aside
-      className={`relative flex flex-col border-r border-[--color-border] bg-[--color-card] transition-all duration-200 ${
+      className={`relative flex flex-col border-e border-[--color-border] bg-[--color-card] transition-all duration-200 ${
         collapsed ? 'w-14' : 'w-52'
       }`}
     >
@@ -41,9 +41,13 @@ export function LayoutSider() {
         type="button"
         onClick={() => setCollapsed((c) => !c)}
         aria-label={collapsed ? 'Expand sidebar' : 'Collapse sidebar'}
-        className="absolute -right-3 top-5 z-10 flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-[--color-border] bg-[--color-card] text-[--color-muted-foreground] shadow-sm hover:text-[--color-foreground] transition-colors"
+        className="absolute -end-3 top-5 z-10 flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-[--color-border] bg-[--color-card] text-[--color-muted-foreground] shadow-sm hover:text-[--color-foreground] transition-colors"
       >
-        {collapsed ? <ChevronRight size={12} /> : <ChevronLeft size={12} />}
+        {collapsed ? (
+          <ChevronRight size={12} className="rtl:scale-x-[-1]" />
+        ) : (
+          <ChevronLeft size={12} className="rtl:scale-x-[-1]" />
+        )}
       </button>
     </aside>
   );

package/templates/apps/templates/client-shadcn/src/routes/index.tsx

@@ -4,12 +4,12 @@ import { LandingPage } from '@icore/template-shared';
 // All version strings are injected at build time by vite.config.mts
 // (reads root package.json via fs.readFileSync so they stay accurate
 // even when workspace packages are bumped independently).
-const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
+const ICORE_VERSION = (import.meta.env.VITE_ICORE_VERSION as string | undefined) ?? '0.0.0-dev';
 
 export const Route = createFileRoute('/')({
   component: () => (
     <LandingPage
-      coreVersion={APP_VERSION}
+      coreVersion={ICORE_VERSION}
       uiLibrary="shadcn"
       deps={[
         { name: 'react', version: (import.meta.env.VITE_DEP_REACT as string) ?? '?' },

package/templates/apps/templates/client-shadcn/vite.config.mts

@@ -19,12 +19,26 @@ import {
 const rootPackageJsonPath = new URL('../../../package.json', import.meta.url);
 const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath, 'utf-8')) as {
   version: string;
+  icoreVersion?: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+};
+
+const selfPackageJson = JSON.parse(
+  fs.readFileSync(new URL('./package.json', import.meta.url), 'utf-8'),
+) as {
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
 };
 
 function depVersion(name: string): string {
-  return rootPackageJson.dependencies?.[name] ?? rootPackageJson.devDependencies?.[name] ?? '?';
+  return (
+    rootPackageJson.dependencies?.[name] ??
+    rootPackageJson.devDependencies?.[name] ??
+    selfPackageJson.dependencies?.[name] ??
+    selfPackageJson.devDependencies?.[name] ??
+    '?'
+  );
 }
 
 export default defineConfig(() => ({
@@ -37,6 +51,9 @@ export default defineConfig(() => ({
   },
   define: {
     ...commonDefines(rootPackageJson),
+    'import.meta.env.VITE_ICORE_VERSION': JSON.stringify(
+      rootPackageJson.icoreVersion ?? rootPackageJson.version,
+    ),
     'import.meta.env.VITE_DEP_TAILWINDCSS': JSON.stringify(depVersion('tailwindcss')),
   },
   plugins: [

package/templates/libs/auth-strategies/firebase/package.json

@@ -10,6 +10,7 @@
     "@icore/shared": "*",
     "@nestjs/common": "^11.1.27",
     "@nestjs/config": "^4.0.4",
+    "firebase-admin": "^14.1.0",
     "tslib": "^2.8.1"
   },
   "devDependencies": {

package/templates/libs/auth-strategies/firebase/src/lib/firebase-auth.module.ts

@@ -1,6 +1,7 @@
 import { Module, DynamicModule } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { getFirebaseAdmin, FIREBASE_ADMIN_REQUIRED_ENV } from '@icore/firebase-admin';
+import { getAuth } from 'firebase-admin/auth';
 import { buildStrategyWithFallback, FakeAuthStrategy } from '@icore/shared';
 import type { AuthStrategy } from '@icore/shared';
 import { FirebaseAuthStrategy } from './firebase-auth.strategy';
@@ -28,7 +29,7 @@ export class FirebaseAuthModule {
                 const identityToolkit = new HttpIdentityToolkitClient(
                   cfg.getOrThrow<string>('FIREBASE_WEB_API_KEY'),
                 );
-                return new FirebaseAuthStrategy({ identityToolkit, adminAuth: app.auth() });
+                return new FirebaseAuthStrategy({ identityToolkit, adminAuth: getAuth(app) });
               },
               fake: () => new FakeAuthStrategy(),
             }),

package/templates/libs/auth-strategies/mongodb/package.json

@@ -17,7 +17,7 @@
     "bcrypt": "^6.0.0",
     "jsonwebtoken": "^9.0.3",
     "mongodb-memory-server": "^11.2.0",
-    "mongoose": "^9.7.1",
+    "mongoose": "^9.7.2",
     "tslib": "^2.8.1"
   }
 }

package/templates/libs/db-strategies/firestore/package.json

@@ -10,6 +10,7 @@
     "@icore/shared": "*",
     "@nestjs/common": "^11.1.27",
     "@nestjs/config": "^4.0.4",
+    "firebase-admin": "^14.1.0",
     "tslib": "^2.8.1"
   },
   "devDependencies": {

package/templates/libs/db-strategies/firestore/src/lib/firestore-db.module.ts

@@ -1,6 +1,7 @@
 import { Module, DynamicModule } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { getFirebaseAdmin, FIREBASE_ADMIN_REQUIRED_ENV } from '@icore/firebase-admin';
+import { getFirestore } from 'firebase-admin/firestore';
 import { buildStrategyWithFallback, FakeDBStrategy } from '@icore/shared';
 import type { DBStrategy } from '@icore/shared';
 import { FirestoreDBStrategy } from './firestore-db.strategy';
@@ -25,7 +26,7 @@ export class FirestoreDbModule {
               build: () => {
                 const app = getFirebaseAdmin(cfg);
                 return new FirestoreDBStrategy({
-                  db: app.firestore() as unknown as ConstructorParameters<
+                  db: getFirestore(app) as unknown as ConstructorParameters<
                     typeof FirestoreDBStrategy
                   >[0]['db'],
                 });

package/templates/libs/db-strategies/mongodb/package.json

@@ -11,7 +11,7 @@
     "@nestjs/config": "^4.0.4",
     "@nestjs/mongoose": "^11.0.4",
     "mongodb-memory-server": "^11.2.0",
-    "mongoose": "^9.7.1",
+    "mongoose": "^9.7.2",
     "tslib": "^2.8.1"
   }
 }

package/templates/libs/firebase-admin/package.json

@@ -6,7 +6,7 @@
   "main": "./src/index.js",
   "types": "./src/index.ts",
   "dependencies": {
-    "firebase-admin": "^13.10.0",
+    "firebase-admin": "^14.1.0",
     "tslib": "^2.8.1"
   }
 }

package/templates/libs/firebase-admin/src/lib/__tests__/firebase-admin.unit.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-const { apps, cert, initializeApp, app } = vi.hoisted(() => {
+const { apps, cert, initializeApp, getApp, getApps } = vi.hoisted(() => {
   const apps: unknown[] = [];
   return {
     apps,
@@ -10,17 +10,16 @@ const { apps, cert, initializeApp, app } = vi.hoisted(() => {
       apps.push(created);
       return created;
     }),
-    app: vi.fn(() => apps[0]),
+    getApp: vi.fn(() => apps[0]),
+    getApps: vi.fn(() => apps),
   };
 });
 
-vi.mock('firebase-admin', () => ({
-  get apps() {
-    return apps;
-  },
-  app,
+vi.mock('firebase-admin/app', () => ({
+  cert,
   initializeApp,
-  credential: { cert },
+  getApp,
+  getApps,
 }));
 
 import { FIREBASE_ADMIN_REQUIRED_ENV, getFirebaseAdmin } from '../firebase-admin';
@@ -59,7 +58,8 @@ describe('getFirebaseAdmin', () => {
     apps.length = 0;
     cert.mockClear();
     initializeApp.mockClear();
-    app.mockClear();
+    getApp.mockClear();
+    getApps.mockClear();
   });
 
   afterEach(() => vi.restoreAllMocks());
@@ -94,12 +94,12 @@ describe('getFirebaseAdmin', () => {
     expect(sa['private_key']).not.toContain('\\n');
   });
 
-  it('initializes the default app only once (guards on admin.apps)', () => {
+  it('initializes the default app only once (guards on getApps)', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const cfg = makeCfg() as any;
     getFirebaseAdmin(cfg);
     getFirebaseAdmin(cfg);
     expect(initializeApp).toHaveBeenCalledTimes(1);
-    expect(app).toHaveBeenCalledTimes(1); // second call returns the existing app
+    expect(getApp).toHaveBeenCalledTimes(1); // second call returns the existing app
   });
 });

package/templates/libs/firebase-admin/src/lib/firebase-admin.ts

@@ -1,4 +1,4 @@
-import * as admin from 'firebase-admin';
+import { initializeApp, getApps, getApp, cert, App, ServiceAccount } from 'firebase-admin/app';
 
 /**
  * Minimal structural view of NestJS's `ConfigService` — just the two readers
@@ -46,11 +46,11 @@ export const FIREBASE_ADMIN_REQUIRED_ENV = [
  * tokens from project_id/client_email/private_key, but feeding the complete
  * downloaded JSON keeps the code aligned with the documented FB_ADMIN_* env.
  */
-export function getFirebaseAdmin(cfg: FirebaseConfigReader): admin.app.App {
-  if (admin.apps.length > 0) return admin.app();
+export function getFirebaseAdmin(cfg: FirebaseConfigReader): App {
+  if (getApps().length > 0) return getApp();
 
-  return admin.initializeApp({
-    credential: admin.credential.cert({
+  return initializeApp({
+    credential: cert({
       type: cfg.getOrThrow<string>('FB_ADMIN_TYPE'),
       project_id: cfg.getOrThrow<string>('FB_ADMIN_PROJECT_ID'),
       private_key_id: cfg.getOrThrow<string>('FB_ADMIN_PRIVATE_KEY_ID'),
@@ -62,7 +62,7 @@ export function getFirebaseAdmin(cfg: FirebaseConfigReader): admin.app.App {
       auth_provider_x509_cert_url: cfg.getOrThrow<string>('FB_ADMIN_AUTH_PROVIDER_X509_CERT_URL'),
       client_x509_cert_url: cfg.getOrThrow<string>('FB_ADMIN_CLIENT_X509_CERT_URL'),
       universe_domain: cfg.getOrThrow<string>('FB_ADMIN_UNIVERSE_DOMAIN'),
-    } as unknown as admin.ServiceAccount),
+    } as ServiceAccount),
     // Optional: the storage MS also passes the bucket name explicitly to
     // .bucket(); set here too so admin.storage().bucket() (no arg) works.
     storageBucket: cfg.get<string>('FIREBASE_STORAGE_BUCKET'),

package/templates/libs/storage-strategies/firebase/package.json

@@ -10,6 +10,7 @@
     "@icore/shared": "*",
     "@nestjs/common": "^11.1.27",
     "@nestjs/config": "^4.0.4",
+    "firebase-admin": "^14.1.0",
     "tslib": "^2.8.1"
   },
   "devDependencies": {

package/templates/libs/storage-strategies/firebase/src/lib/firebase-storage.module.ts

@@ -1,6 +1,7 @@
 import { Module, DynamicModule } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { getFirebaseAdmin, FIREBASE_ADMIN_REQUIRED_ENV } from '@icore/firebase-admin';
+import { getStorage } from 'firebase-admin/storage';
 import { buildStrategyWithFallback, FakeStorageStrategy } from '@icore/shared';
 import type { StorageStrategy } from '@icore/shared';
 import {
@@ -32,7 +33,9 @@ export class FirebaseStorageModule {
                 const bucketName = cfg.getOrThrow<string>('FIREBASE_STORAGE_BUCKET');
                 const app = getFirebaseAdmin(cfg);
                 return new FirebaseStorageStrategy({
-                  bucket: app.storage().bucket(bucketName) as unknown as FirebaseStorageBucketLike,
+                  bucket: getStorage(app).bucket(
+                    bucketName,
+                  ) as unknown as FirebaseStorageBucketLike,
                 });
               },
               fake: () => new FakeStorageStrategy(),

package/templates/libs/storage-strategies/mongodb/package.json

@@ -11,7 +11,7 @@
     "@nestjs/config": "^4.0.4",
     "@nestjs/mongoose": "^11.0.4",
     "mongodb-memory-server": "^11.2.0",
-    "mongoose": "^9.7.1",
+    "mongoose": "^9.7.2",
     "tslib": "^2.8.1"
   }
 }

package/templates/libs/template-shared/package.json

@@ -10,7 +10,7 @@
     "@icore/shared": "*",
     "@idevconn/api-client": "^0.3.0",
     "@idevconn/use-draft": "^0.2.0",
-    "i18next": "^26.3.1",
+    "i18next": "^26.3.2",
     "react-i18next": "^17.0.8",
     "tslib": "^2.8.1",
     "zustand": "^5.0.14"