@leo-h/create-nodejs-app 1.0.51 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo-h/create-nodejs-app",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "packageManager": "pnpm@9.15.9",
   "author": "Leonardo Henrique <leonardo0507.business@gmail.com>",
   "description": "Create a modern Node.js app with TypeScript using one command.",

package/templates/fastify/.lintstagedrc.json

@@ -1,4 +1,4 @@
 {
   "*.{js,ts,json,yaml,yml,md}": "prettier --write --cache",
-  "*.{js,ts}": ["eslint --max-warnings 0 --fix --cache --no-ignore"]
+  "*.{js,ts}": ["eslint --max-warnings 0 --fix --cache --no-warn-ignored"]
 }

package/templates/fastify/src/core/fastify/middleware.ts

@@ -0,0 +1,20 @@
+import { BaseError } from "@/http/errors";
+import { Constructor } from "type-fest";
+
+export type MiddlewareHandlerOutput<
+  Errors extends ReadonlyArray<Constructor<BaseError>>,
+> = Promise<MiddlewareLeft<InstanceType<Errors[number]>> | void>;
+
+export const middleware = Object.freeze({
+  left,
+} as const);
+
+class MiddlewareLeft<Error extends BaseError> {
+  public constructor(public readonly error: Error) {
+    throw error;
+  }
+}
+
+function left<Error extends BaseError>(error: Error) {
+  return new MiddlewareLeft<Error>(error);
+}

package/templates/fastify/src/core/schema.ts

@@ -17,3 +17,8 @@ export type ZodUnrestrictShape<Target> = {
 export type ZodUnrestrictFieldsShape<Target> = {
   [K in keyof Target | (string & {})]?: ZodTypeAny;
 };
+
+export type ZodUnrestrictEnumFromLiterals<Target extends string> = [
+  Target,
+  ...Target[],
+];

package/templates/fastify/src/http/controllers/hello-multipart.controller.ts

@@ -1,5 +1,5 @@
 import { FastifyZodInstance } from "@/@types/fastify";
-import { createControllerResponseSchema } from "@/core/create-controller-response-schema";
+import { createControllerResponseSchema } from "@/core/fastify/create-controller-response-schema";
 import { z } from "zod";
 import { InternalServerError, ValidationError } from "../errors";
 import {

package/templates/fastify/src/http/controllers/hello.controller.ts

@@ -1,5 +1,5 @@
 import { FastifyZodInstance } from "@/@types/fastify";
-import { createControllerResponseSchema } from "@/core/create-controller-response-schema";
+import { createControllerResponseSchema } from "@/core/fastify/create-controller-response-schema";
 import { z } from "zod";
 import { InternalServerError, ValidationError } from "../errors";
 

package/templates/nest/package.json

@@ -52,7 +52,7 @@
     "husky": "9.1.7",
     "lint-staged": "15.5.2",
     "prettier": "3.5.3",
-    "supertest": "7.1.3",
+    "supertest": "7.1.4",
     "type-fest": "4.38.0",
     "typescript": "5.8.3",
     "typescript-eslint": "8.28.0",

package/templates/nest/pnpm-lock.yaml

@@ -103,8 +103,8 @@ importers:
         specifier: 3.5.3
         version: 3.5.3
       supertest:
-        specifier: 7.1.3
-        version: 7.1.3
+        specifier: 7.1.4
+        version: 7.1.4
       type-fest:
         specifier: 4.38.0
         version: 4.38.0
@@ -1211,6 +1211,10 @@ packages:
     resolution: {integrity: sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==}
     engines: {node: '>=14.16'}
 
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
   call-bind@1.0.7:
     resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
     engines: {node: '>= 0.4'}
@@ -1459,6 +1463,10 @@ packages:
     resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
     engines: {node: '>=12'}
 
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -1496,6 +1504,10 @@ packages:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
     engines: {node: '>= 0.4'}
 
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
   es-errors@1.3.0:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
@@ -1503,6 +1515,14 @@ packages:
   es-module-lexer@1.5.4:
     resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
   esbuild@0.21.5:
     resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
     engines: {node: '>=12'}
@@ -1752,6 +1772,10 @@ packages:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
 
+  form-data@4.0.4:
+    resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
+    engines: {node: '>= 6'}
+
   formidable@3.5.4:
     resolution: {integrity: sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==}
     engines: {node: '>=14.0.0'}
@@ -1793,6 +1817,14 @@ packages:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
 
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
   get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
@@ -1840,6 +1872,10 @@ packages:
   gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
 
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
   got@13.0.0:
     resolution: {integrity: sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==}
     engines: {node: '>=16'}
@@ -1873,6 +1909,14 @@ packages:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
   hasown@2.0.2:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
@@ -2170,6 +2214,10 @@ packages:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
     engines: {node: '>=10'}
 
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
   media-typer@0.3.0:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
@@ -2881,12 +2929,12 @@ packages:
     resolution: {integrity: sha512-FhwotcEqjr241ZbjFzjlIYg6c5/L/s4yBGWSMvJ9UoExiSqL+FnFA/CaeZx17WGaZMS/4SOZp8wH18jSS4R4lw==}
     engines: {node: '>=16'}
 
-  superagent@10.2.2:
-    resolution: {integrity: sha512-vWMq11OwWCC84pQaFPzF/VO3BrjkCeewuvJgt1jfV0499Z1QSAWN4EqfMM5WlFDDX9/oP8JjlDKpblrmEoyu4Q==}
+  superagent@10.2.3:
+    resolution: {integrity: sha512-y/hkYGeXAj7wUMjxRbB21g/l6aAEituGXM9Rwl4o20+SX3e8YOSV6BxFXl+dL3Uk0mjSL3kCbNkwURm8/gEDig==}
     engines: {node: '>=14.18.0'}
 
-  supertest@7.1.3:
-    resolution: {integrity: sha512-ORY0gPa6ojmg/C74P/bDoS21WL6FMXq5I8mawkEz30/zkwdu0gOeqstFy316vHG6OKxqQ+IbGneRemHI8WraEw==}
+  supertest@7.1.4:
+    resolution: {integrity: sha512-tjLPs7dVyqgItVFirHYqe2T+MfWc2VOBQ8QFKKbWTA3PU7liZR8zoSpAi/C1k1ilm9RsXIKYf197oap9wXGVYg==}
     engines: {node: '>=14.18.0'}
 
   supports-color@5.5.0:
@@ -4393,6 +4441,11 @@ snapshots:
       normalize-url: 8.0.1
       responselike: 3.0.0
 
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
   call-bind@1.0.7:
     dependencies:
       es-define-property: 1.0.0
@@ -4624,6 +4677,12 @@ snapshots:
 
   dotenv@16.4.7: {}
 
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
   eastasianwidth@0.2.0: {}
 
   ee-first@1.1.1: {}
@@ -4654,10 +4713,23 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  es-define-property@1.0.1: {}
+
   es-errors@1.3.0: {}
 
   es-module-lexer@1.5.4: {}
 
+  es-object-atoms@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
   esbuild@0.21.5:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.21.5
@@ -5035,6 +5107,14 @@ snapshots:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
+  form-data@4.0.4:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
+      mime-types: 2.1.35
+
   formidable@3.5.4:
     dependencies:
       '@paralleldrive/cuid2': 2.2.2
@@ -5073,6 +5153,24 @@ snapshots:
       has-symbols: 1.0.3
       hasown: 2.0.2
 
+  get-intrinsic@1.3.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      math-intrinsics: 1.1.0
+
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.1
+
   get-stream@6.0.1: {}
 
   get-stream@8.0.1: {}
@@ -5127,6 +5225,8 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  gopd@1.2.0: {}
+
   got@13.0.0:
     dependencies:
       '@sindresorhus/is': 5.6.0
@@ -5159,6 +5259,12 @@ snapshots:
 
   has-symbols@1.0.3: {}
 
+  has-symbols@1.1.0: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.0.3
+
   hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
@@ -5471,6 +5577,8 @@ snapshots:
     dependencies:
       semver: 7.6.3
 
+  math-intrinsics@1.1.0: {}
+
   media-typer@0.3.0: {}
 
   memfs@3.5.3:
@@ -6157,13 +6265,13 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.3.1
 
-  superagent@10.2.2:
+  superagent@10.2.3:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
       debug: 4.4.0
       fast-safe-stringify: 2.1.1
-      form-data: 4.0.0
+      form-data: 4.0.4
       formidable: 3.5.4
       methods: 1.1.2
       mime: 2.6.0
@@ -6171,10 +6279,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  supertest@7.1.3:
+  supertest@7.1.4:
     dependencies:
       methods: 1.1.2
-      superagent: 10.2.2
+      superagent: 10.2.3
     transitivePeerDependencies:
       - supports-color
 

package/templates/react-vite/.lintstagedrc.json

@@ -1,4 +1,6 @@
 {
   "*.{js,jsx,ts,tsx,css,scss,html,json,yaml,yml,md}": "prettier --write --cache",
-  "*.{js,jsx,ts,tsx}": ["eslint --max-warnings 0 --fix --cache"]
+  "*.{js,jsx,ts,tsx}": [
+    "eslint --max-warnings 0 --fix --cache --no-ignore --no-warn-ignored"
+  ]
 }

package/templates/react-vite/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit",
+    "source.fixAll.eslint": "explicit"
+  },
+  "css.lint.unknownAtRules": "ignore"
+}

package/templates/react-vite/api/errors.ts

@@ -6,9 +6,9 @@ export class ApiError {
   ) {}
 }
 
-export class ApiUnexpectedResponseError {
+export class ApiUnknownError {
   static readonly message =
-    "Houve uma falha inesperada ao se comunicar com nosso servidor. Aguarde alguns instantes ou contate nosso suporte.";
+    "Houve uma falha inesperada ao se comunicar com nosso servidor. Tente novamente em alguns segundos ou nos contate se o problema persistir.";
 
-  constructor(public message = ApiUnexpectedResponseError.message) {}
+  constructor(public message = ApiUnknownError.message) {}
 }

package/templates/react-vite/api/swr-fetcher.ts

@@ -1,7 +1,7 @@
 import { publicEnv } from "@/public-env";
-import { ApiError, ApiUnexpectedResponseError } from "./errors";
+import { ApiError, ApiUnknownError } from "./errors";
 
-type SwrFetcherOutput = {
+export type SwrFetcherOutput = {
   body: unknown;
   status: number;
   headers: Headers;
@@ -11,16 +11,19 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
   endpointUrl: RequestInfo | URL,
   options: RequestInit,
 ): Promise<Output> {
-  const url = new URL(publicEnv.API_BASE_URL);
+  const url = getFullUrlFromApiByEndpoint(endpointUrl);
+  let response: Response;
 
-  if (url.pathname.endsWith("/")) {
-    url.pathname = endpointUrl.toString();
-  } else {
-    url.pathname += endpointUrl;
+  try {
+    response = await fetch(url, {
+      credentials: "include",
+      ...options,
+    });
+  } catch {
+    throw new ApiUnknownError();
   }
 
-  const response = await fetch(endpointUrl, options);
-  let body: unknown;
+  let body: unknown = null;
 
   if (
     response.headers.get("Content-Type")?.includes("application/json") &&
@@ -38,7 +41,7 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
 
     if (error) throw new ApiError(error.statusCode, error.error, error.message);
 
-    throw new ApiUnexpectedResponseError();
+    throw new ApiUnknownError();
   }
 
   return {
@@ -47,3 +50,27 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
     headers: response.headers,
   } as Awaited<Output>;
 }
+
+function getFullUrlFromApiByEndpoint(endpointUrl: RequestInfo | URL) {
+  const url = new URL(publicEnv.API_BASE_URL);
+  const [pathname, stringifiedSearchParams] = endpointUrl.toString().split("?");
+
+  if (url.pathname.endsWith("/")) {
+    url.pathname = pathname;
+  } else {
+    url.pathname += pathname;
+  }
+
+  if (stringifiedSearchParams) {
+    const searchParams = new URLSearchParams(stringifiedSearchParams);
+
+    for (const searchParamKey of Array.from(searchParams.keys())) {
+      const searchParamValue = searchParams.get(searchParamKey);
+
+      if (searchParamValue)
+        url.searchParams.set(searchParamKey, searchParamValue);
+    }
+  }
+
+  return url;
+}

package/templates/react-vite/gitignore

@@ -13,7 +13,6 @@ dist-ssr
 *.local
 
 # Editor directories and files
-.vscode/*
 !.vscode/extensions.json
 .idea
 .DS_Store

package/templates/react-vite/src/app.tsx

@@ -1,5 +1,5 @@
 import { RouterProvider } from "react-router/dom";
-import { router } from "./routes";
+import { router } from "./lib/react-router-config";
 
 export function App() {
   return <RouterProvider router={router} />;

package/templates/react-vite/src/hooks/use-current-route.ts

@@ -0,0 +1,24 @@
+import { routeGroups } from "@/routes";
+import { useLocation } from "react-router";
+
+type RouteGroup = (typeof routeGroups)[number];
+
+type Route = RouteGroup extends Record<string, infer Route> ? Route : never;
+
+export function useCurrentRoute() {
+  const { pathname } = useLocation();
+  let currentRoute: Route | null = null;
+
+  for (const routeGroup of routeGroups) {
+    const matchedRoute = Object.values(routeGroup).find(route => {
+      return route.path === pathname;
+    });
+
+    if (matchedRoute) {
+      currentRoute = matchedRoute;
+      break;
+    }
+  }
+
+  return currentRoute;
+}

package/templates/react-vite/src/lib/react-router-config.tsx

@@ -0,0 +1,32 @@
+import { AppLayout } from "@/pages/_layouts/app";
+import { AuthLayout } from "@/pages/_layouts/auth";
+import { privateRoutes, publicRoutes } from "@/routes";
+import { createBrowserRouter, RouteObject } from "react-router";
+
+export const router = createBrowserRouter([
+  {
+    element: <AuthLayout />,
+    children: [
+      ...Object.values(publicRoutes).map(
+        publicRoute =>
+          ({
+            path: publicRoute.path,
+            element: <publicRoute.element />,
+            index: true,
+          }) satisfies RouteObject,
+      ),
+    ],
+  },
+  {
+    element: <AppLayout />,
+    children: [
+      ...Object.values(privateRoutes).map(
+        publicRoute =>
+          ({
+            path: publicRoute.path,
+            element: <publicRoute.element />,
+          }) satisfies RouteObject,
+      ),
+    ],
+  },
+]);

package/templates/react-vite/src/pages/_layouts/app.tsx

@@ -1,15 +1,12 @@
-import { privateRoutes } from "@/routes";
-import { Outlet, useLocation } from "react-router";
+import { useCurrentRoute } from "@/hooks/use-current-route";
+import { Outlet } from "react-router";
 
 export function AppLayout() {
-  const { pathname } = useLocation();
-  const currentPublicRoute = Object.values(privateRoutes).find(privateRoute => {
-    return privateRoute.path === pathname;
-  });
+  const currentRoute = useCurrentRoute();
 
   return (
     <>
-      {currentPublicRoute && <title>{currentPublicRoute.title}</title>}
+      {currentRoute && <title>{currentRoute.title}</title>}
 
       <div>
         <Outlet />

package/templates/react-vite/src/pages/_layouts/auth.tsx

@@ -1,15 +1,12 @@
-import { publicRoutes } from "@/routes";
-import { Outlet, useLocation } from "react-router";
+import { useCurrentRoute } from "@/hooks/use-current-route";
+import { Outlet } from "react-router";
 
 export function AuthLayout() {
-  const { pathname } = useLocation();
-  const currentPublicRoute = Object.values(publicRoutes).find(publicRoute => {
-    return publicRoute.path === pathname;
-  });
+  const currentRoute = useCurrentRoute();
 
   return (
     <>
-      {currentPublicRoute && <title>{currentPublicRoute.title}</title>}
+      {currentRoute && <title>{currentRoute.title}</title>}
 
       <div>
         <Outlet />

package/templates/react-vite/src/pages/app/dashboard/{dashboard.tsx → index.tsx}

@@ -2,7 +2,7 @@ import { publicRoutes } from "@/routes";
 import { Link } from "react-router";
 import "./styles.css";
 
-export function Dashboard() {
+export function DashboardPage() {
   return (
     <div className="dashboard-wrapper">
       <h1>Hello world!</h1>

package/templates/react-vite/src/pages/auth/sign-in/index.tsx

@@ -12,7 +12,7 @@ const signInFormSchema = z.object({
 
 type SignInForm = z.infer<typeof signInFormSchema>;
 
-export function SignIn() {
+export function SignInPage() {
   const navigate = useNavigate();
 
   const signInForm = useForm<SignInForm>({

package/templates/react-vite/src/routes.ts

@@ -0,0 +1,27 @@
+import { DashboardPage } from "./pages/app/dashboard";
+import { SignInPage } from "./pages/auth/sign-in";
+import { publicEnv } from "./public-env";
+
+export const publicRoutes = Object.freeze({
+  signIn: {
+    path: "/",
+    element: SignInPage,
+    title: createPageTitleTemplate("Sign In"),
+    label: "Sign In",
+  },
+} as const);
+
+export const privateRoutes = Object.freeze({
+  dashboard: {
+    path: "/dashboard",
+    element: DashboardPage,
+    title: createPageTitleTemplate("Dashboard"),
+    label: "Dashboard",
+  },
+} as const);
+
+export const routeGroups = [publicRoutes, privateRoutes] as const;
+
+function createPageTitleTemplate(title: string) {
+  return `${title} | ${publicEnv.APP_NAME}`;
+}

package/templates/react-vite/src/@types/routes.ts

@@ -1,24 +0,0 @@
-import { RouteObject } from "react-router";
-import { OverrideProperties } from "type-fest";
-
-export type CustomRouteDefinition = {
-  path: string;
-  label: string;
-};
-
-export type ReactRouterRouteDefinition<Routes extends CustomRouteDefinition[]> =
-  OverrideProperties<
-    RouteObject,
-    {
-      path: Routes[number]["path"] | "*";
-      handle: ReactRouterRouteHandleDefinition;
-    }
-  >;
-
-export type ReactRouterRouteHandleDefinition = {
-  metadata: {
-    title: string;
-    description?: string;
-  };
-  [K: string]: unknown;
-};

package/templates/react-vite/src/routes.tsx

@@ -1,49 +0,0 @@
-import { createBrowserRouter, RouteObject } from "react-router";
-import { AppLayout } from "./pages/_layouts/app";
-import { AuthLayout } from "./pages/_layouts/auth";
-import { Dashboard } from "./pages/app/dashboard/dashboard";
-import { SignIn } from "./pages/auth/sign-in";
-import { publicEnv } from "./public-env";
-
-export const publicRoutes = Object.freeze({
-  signIn: {
-    path: "/",
-    element: <SignIn />,
-    title: createTitleTemplate("Sign In"),
-  },
-} as const);
-
-export const privateRoutes = Object.freeze({
-  dashboard: {
-    path: "/dashboard",
-    element: <Dashboard />,
-    title: createTitleTemplate("Dashboard"),
-  },
-} as const);
-
-export const router = createBrowserRouter([
-  {
-    element: <AuthLayout />,
-    children: [
-      ...Object.values(publicRoutes).map<RouteObject>(publicRoute => ({
-        path: publicRoute.path,
-        element: publicRoute.element,
-        index: true,
-      })),
-    ],
-  },
-  {
-    element: <AppLayout />,
-    children: [
-      ...Object.values(privateRoutes).map<RouteObject>(publicRoute => ({
-        path: publicRoute.path,
-        element: publicRoute.element,
-        index: true,
-      })),
-    ],
-  },
-]);
-
-function createTitleTemplate(title: string) {
-  return `${title} | ${publicEnv.APP_NAME}`;
-}