Merge branch 'leerob-perf-improvements'

apps/web/.gitignore

@@ -1,14 +1,3 @@
 
 # Sentry Config File
 .env.sentry-build-plugin
-
-# next-pwa
-/public/sw.js
-/public/workbox-*.js
-/public/worker-*.js
-/public/fallback-*.js
-/public/precache.*.*.js.map
-/public/sw.js.map
-/public/workbox-*.js.map
-/public/worker-*.js.map
-/public/fallback-*.js

apps/web/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

apps/web/next.config.mjs

@@ -1,6 +1,6 @@
 import MillionLint from "@million/lint";
 import { setupDevPlatform } from "@cloudflare/next-on-pages/next-dev";
-import pwa from "next-pwa";
+
 /** @type {import('next').NextConfig} */
 const baseNextConfig = {
 	transpilePackages: ["@repo/ui"],
@@ -9,17 +9,10 @@ const baseNextConfig = {
 		TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN,
 	},
 	eslint: {
-		ignoreDuringBuilds: true
+		ignoreDuringBuilds: true,
 	},
 };
 
-const withPWA = pwa({
-	dest: "public",
-	disable: process.env.NODE_ENV === "development",
-	register: true,
-	skipWaiting: true,
-});
-
 let selectedConfig = baseNextConfig;
 
 if (process.env.NODE_ENV === "development") {
@@ -28,7 +21,7 @@ if (process.env.NODE_ENV === "development") {
 	})(baseNextConfig);
 }
 
-export default withPWA(selectedConfig);
+export default selectedConfig;
 
 // we only need to use the utility during development so we can check NODE_ENV
 // (note: this check is recommended but completely optional)

apps/web/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.0",
 	"private": true,
 	"scripts": {
-		"dev": "next dev",
+		"dev": "next dev --turbo",
 		"build": "next build",
 		"start": "next start",
 		"lint": "eslint . --max-warnings 0",
@@ -27,13 +27,12 @@
 		"drizzle-orm": "0.30.0",
 		"lowlight": "^3.1.0",
 		"million": "^3.1.6",
-		"next": "^14.1.1",
-		"next-pwa": "^5.6.0",
+		"next": "15.0.0-canary.112",
 		"novel": "^0.4.2",
 		"nuqs": "^1.17.4",
 		"posthog-js": "^1.154.5",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
+		"react": "19.0.0-rc-68dbd84b-20240812",
+		"react-dom": "19.0.0-rc-68dbd84b-20240812",
 		"react-resizable-panels": "^2.0.19",
 		"use-debounce": "^10.0.1"
 	},

packages/tailwind-config/tailwind.config.ts

@@ -7,7 +7,8 @@ const config = {
 		"./components/**/*.{ts,tsx}",
 		"./app/**/*.{ts,tsx}",
 		"./src/**/*.{ts,tsx}",
-		"../../packages/ui/**/*.{js,ts,jsx,tsx}", // Add the ui package
+		"../../packages/ui/shadcn/**/*.{js,ts,jsx,tsx}",
+		"../../packages/ui/components/**/*.{js,ts,jsx,tsx}",
 		"./content/**/*.{js,ts,jsx,tsx}",
 		"./ui/**/*.{js,ts,jsx,tsx}",
 	],