Skip to content

Commit 771fa3f

Browse files
committed
Merge branch 'dev'
2 parents 6ab4631 + 02ce315 commit 771fa3f

5 files changed

Lines changed: 60 additions & 51 deletions

File tree

apps/web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@hookform/resolvers": "^5.2.1",
13-
"@next/third-parties": "^15.5.3",
13+
"@next/third-parties": "^15.5.4",
1414
"@radix-ui/react-accordion": "^1.2.11",
1515
"@radix-ui/react-label": "^2.1.7",
1616
"@radix-ui/react-separator": "^1.1.7",
@@ -32,7 +32,7 @@
3232
"ky": "^1.8.2",
3333
"lucide-react": "^0.536.0",
3434
"marked": "^16.2.0",
35-
"next": "15.4.6",
35+
"next": "15.5.4",
3636
"next-themes": "^0.4.6",
3737
"react": "19.1.0",
3838
"react-dom": "19.1.0",

apps/web/src/app/layout.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import "./globals.css";
33
import type { Metadata } from "next";
44
import { JetBrains_Mono, Merriweather, Poppins } from "next/font/google";
55

6-
import RootProvider from "@/components/root-provider";
6+
import RootProvider from "@/components/provider/root-provider";
7+
import ThirdPartyProvider from "@/components/provider/third-party-provider";
78
import { cn } from "@repo/ui/utils/cn";
89

910
const poppins = Poppins({
@@ -82,6 +83,7 @@ export default function RootLayout({
8283
/>
8384
</head>
8485
<body className={cn(poppins.className, "antialiased")}>
86+
<ThirdPartyProvider />
8587
<RootProvider>{children}</RootProvider>
8688
</body>
8789
</html>

apps/web/src/components/root-provider.tsx renamed to apps/web/src/components/provider/root-provider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { queryClient } from "@/lib/tanstack";
44
import { QueryClientProvider } from "@tanstack/react-query";
55

6-
import { Toaster } from "./ui/sonner";
6+
import { Toaster } from "../ui/sonner";
77

88
interface RootProviderProps {
99
children: React.ReactNode;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { GoogleTagManager } from "@next/third-parties/google";
2+
3+
const isProduction = process.env.NODE_ENV === "production";
4+
5+
export default function ThirdPartyProvider() {
6+
return isProduction ? <GoogleTagManager gtmId="GTM-N32B47GH" /> : null;
7+
}

pnpm-lock.yaml

Lines changed: 47 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)