diff --git a/cli/template/extras/src/app/layout/with-trpc-tw.tsx b/cli/template/extras/src/app/layout/with-trpc-tw.tsx index e9c9cbf529..eadc62359a 100644 --- a/cli/template/extras/src/app/layout/with-trpc-tw.tsx +++ b/cli/template/extras/src/app/layout/with-trpc-tw.tsx @@ -20,7 +20,7 @@ export default function RootLayout({ children, }: Readonly<{ children: React.ReactNode }>) { return ( - + {children} diff --git a/cli/template/extras/src/app/layout/with-tw.tsx b/cli/template/extras/src/app/layout/with-tw.tsx index c5226fd16b..fc88424fdf 100644 --- a/cli/template/extras/src/app/layout/with-tw.tsx +++ b/cli/template/extras/src/app/layout/with-tw.tsx @@ -18,7 +18,7 @@ export default function RootLayout({ children, }: Readonly<{ children: React.ReactNode }>) { return ( - + {children} ); diff --git a/cli/template/extras/src/server/api/trpc-app/base.ts b/cli/template/extras/src/server/api/trpc-app/base.ts index b38d2fab93..bc5c069804 100644 --- a/cli/template/extras/src/server/api/trpc-app/base.ts +++ b/cli/template/extras/src/server/api/trpc-app/base.ts @@ -88,7 +88,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts index 923751a8e3..92a0166dc8 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts @@ -96,7 +96,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth.ts b/cli/template/extras/src/server/api/trpc-app/with-auth.ts index 5f798e9dd6..73ec19eebe 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-auth.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-auth.ts @@ -93,7 +93,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-app/with-better-auth-db.ts b/cli/template/extras/src/server/api/trpc-app/with-better-auth-db.ts index 2dd55313d5..9b2989d49c 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-better-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-better-auth-db.ts @@ -97,7 +97,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-app/with-better-auth.ts b/cli/template/extras/src/server/api/trpc-app/with-better-auth.ts index 18e95d9ff0..39649789b5 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-better-auth.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-better-auth.ts @@ -94,7 +94,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-app/with-db.ts b/cli/template/extras/src/server/api/trpc-app/with-db.ts index 4e24ba4373..f57331eca8 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-db.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-db.ts @@ -91,7 +91,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/base.ts b/cli/template/extras/src/server/api/trpc-pages/base.ts index 09445dacab..fdafb26136 100644 --- a/cli/template/extras/src/server/api/trpc-pages/base.ts +++ b/cli/template/extras/src/server/api/trpc-pages/base.ts @@ -107,7 +107,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts index 588ddf2c49..61f6433301 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts @@ -123,7 +123,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth.ts index d64d31b25b..4a23153681 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-auth.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-auth.ts @@ -121,7 +121,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/with-better-auth-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-better-auth-db.ts index f291a93e00..0c47ef0d14 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-better-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-better-auth-db.ts @@ -131,7 +131,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/with-better-auth.ts b/cli/template/extras/src/server/api/trpc-pages/with-better-auth.ts index 55a130e26d..13b2272579 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-better-auth.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-better-auth.ts @@ -129,7 +129,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/server/api/trpc-pages/with-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-db.ts index fd11499e57..aff03a64b8 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-db.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-db.ts @@ -110,7 +110,7 @@ const timingMiddleware = t.middleware(async ({ next, path }) => { const result = await next(); const end = Date.now(); - console.log(`[TRPC] ${path} took ${end - start}ms to execute`); + console.log(`[TRPC] ${path} took ${String(end - start)}ms to execute`); return result; }); diff --git a/cli/template/extras/src/styles/globals.css b/cli/template/extras/src/styles/globals.css index 8fe04fa0d4..1336e2f2a1 100644 --- a/cli/template/extras/src/styles/globals.css +++ b/cli/template/extras/src/styles/globals.css @@ -1,6 +1,7 @@ @import "tailwindcss"; @theme { - --font-sans: var(--font-geist-sans), ui-sans-serif, system-ui, sans-serif, + --font-sans: + var(--font-geist-sans), ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } diff --git a/cli/template/extras/src/trpc/react.tsx b/cli/template/extras/src/trpc/react.tsx index 378290c59a..92c35660a4 100644 --- a/cli/template/extras/src/trpc/react.tsx +++ b/cli/template/extras/src/trpc/react.tsx @@ -74,5 +74,5 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { function getBaseUrl() { if (typeof window !== "undefined") return window.location.origin; if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; - return `http://localhost:${process.env.PORT ?? 3000}`; + return `http://localhost:${process.env.PORT?.toString() ?? 3000}`; } diff --git a/cli/template/extras/src/utils/api.ts b/cli/template/extras/src/utils/api.ts index 0f03d307e1..3410c12cae 100644 --- a/cli/template/extras/src/utils/api.ts +++ b/cli/template/extras/src/utils/api.ts @@ -14,7 +14,7 @@ import { type AppRouter } from "~/server/api/root"; const getBaseUrl = () => { if (typeof window !== "undefined") return ""; // browser should use relative url if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; // SSR should use vercel url - return `http://localhost:${process.env.PORT ?? 3000}`; // dev SSR should use localhost + return `http://localhost:${process.env.PORT?.toString() ?? 3000}`; // dev SSR should use localhost }; /** A set of type-safe react-query hooks for your tRPC API. */