🆙 Update dependencies (nextjs14) (#22)

* 🆙 Update dependencies (nextjs14) * Fix nginx config for ws error https://gist.github.com/kocisov/2a9567eb51b83dfef48efce02ef3ab06 * Fix `Warning: Extra attributes from the server: class,style` in console It looks like this is a bug in shadcn w/ next-themes cf. shadcn/next-contentlayer#7 * ♻️ Stop using `src` directory for Next.js * Add Makefile target `update` to update dependencies * Fix frontend Dockerfile to copy package-lock.json (Fix #20)
usatie · Nov 2, 2023 · 9cce0e9 · 9cce0e9
1 parent c217896
commit 9cce0e9
Show file tree

Hide file tree

Showing 30 changed files with 345 additions and 252 deletions.
diff --git a/Makefile b/Makefile
@@ -50,3 +50,8 @@ prod:
 .PHONY: fmt
 fmt:
 	npx prettier --write frontend/src backend/src
+
+.PHONY: update
+update:
+	docker compose run frontend npx npm-check-updates -i
+	docker compose run backend yarn upgrade-interactive
diff --git a/backend/package.json b/backend/package.json
@@ -54,14 +54,14 @@
     "typescript": "^5.1.3"
   },
   "jest": {
-	"moduleNameMapper": {
-		"^src/(.*)$": "<rootDir>/$1"
-	},
+    "moduleNameMapper": {
+      "^src/(.*)$": "<rootDir>/$1"
+    },
     "moduleFileExtensions": [
       "js",
       "json",
       "ts",
-	  "tsx"
+      "tsx"
     ],
     "rootDir": "src",
     "testRegex": ".*\\.spec\\.ts$",

diff --git a/backend/yarn.lock b/backend/yarn.lock
diff --git a/compose.dev.yml b/compose.dev.yml
@@ -2,7 +2,6 @@ services:
   web:
     volumes:
       - ./web/html:/var/www/playground
-      - ./web/nginx.conf:/etc/nginx/nginx.conf
   frontend:
     volumes:
       - ./frontend:/app

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -2,7 +2,7 @@ FROM node:20
 
 WORKDIR /app
 
-COPY package.json ./
+COPY package.json package-lock.json ./
 RUN npm install
 
 COPY . .
diff --git a/frontend/src/app/favicon.ico → frontend/app/favicon.ico b/frontend/src/app/favicon.ico → frontend/app/favicon.ico
diff --git a/frontend/src/app/globals.css → frontend/app/globals.css b/frontend/src/app/globals.css → frontend/app/globals.css
diff --git a/frontend/src/app/layout.tsx → frontend/app/layout.tsx b/frontend/src/app/layout.tsx → frontend/app/layout.tsx
@@ -20,7 +20,7 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en">
+    <html lang="en" suppressHydrationWarning>
       <body className={inter.className}>
         <ThemeProvider
           attribute="class"

diff --git a/frontend/src/app/page.tsx → frontend/app/page.tsx b/frontend/src/app/page.tsx → frontend/app/page.tsx
diff --git a/frontend/src/app/user/[id]/error.tsx → frontend/app/user/[id]/error.tsx b/frontend/src/app/user/[id]/error.tsx → frontend/app/user/[id]/error.tsx
diff --git a/frontend/src/app/user/[id]/page.tsx → frontend/app/user/[id]/page.tsx b/frontend/src/app/user/[id]/page.tsx → frontend/app/user/[id]/page.tsx
diff --git a/frontend/src/app/user/page.tsx → frontend/app/user/page.tsx b/frontend/src/app/user/page.tsx → frontend/app/user/page.tsx
diff --git a/frontend/src/app/user/signup/page.tsx → frontend/app/user/signup/page.tsx b/frontend/src/app/user/signup/page.tsx → frontend/app/user/signup/page.tsx
diff --git a/frontend/src/components/Nav.tsx → frontend/components/Nav.tsx b/frontend/src/components/Nav.tsx → frontend/components/Nav.tsx
@@ -12,8 +12,8 @@ export default function Nav() {
               src="/vercel.svg"
               alt="Vercel Logo"
               className="dark:invert"
-              width={100}
-              height={24}
+              width={300 / 3}
+              height={68 / 3}
               priority
             />
           </li>

diff --git a/frontend/src/components/UserCard.tsx → frontend/components/UserCard.tsx b/frontend/src/components/UserCard.tsx → frontend/components/UserCard.tsx
diff --git a/frontend/src/components/theme-provider.tsx → frontend/components/theme-provider.tsx b/frontend/src/components/theme-provider.tsx → frontend/components/theme-provider.tsx
diff --git a/frontend/src/components/toggle-mode.tsx → frontend/components/toggle-mode.tsx b/frontend/src/components/toggle-mode.tsx → frontend/components/toggle-mode.tsx
diff --git a/frontend/src/components/ui/button.tsx → frontend/components/ui/button.tsx b/frontend/src/components/ui/button.tsx → frontend/components/ui/button.tsx
diff --git a/frontend/src/components/ui/card.tsx → frontend/components/ui/card.tsx b/frontend/src/components/ui/card.tsx → frontend/components/ui/card.tsx
diff --git a/frontend/src/components/ui/dropdown-menu.tsx → frontend/components/ui/dropdown-menu.tsx b/frontend/src/components/ui/dropdown-menu.tsx → frontend/components/ui/dropdown-menu.tsx
diff --git a/frontend/src/components/ui/input.tsx → frontend/components/ui/input.tsx b/frontend/src/components/ui/input.tsx → frontend/components/ui/input.tsx
diff --git a/frontend/src/components/ui/label.tsx → frontend/components/ui/label.tsx b/frontend/src/components/ui/label.tsx → frontend/components/ui/label.tsx
diff --git a/frontend/src/components/ui/toast.tsx → frontend/components/ui/toast.tsx b/frontend/src/components/ui/toast.tsx → frontend/components/ui/toast.tsx
diff --git a/frontend/src/components/ui/toaster.tsx → frontend/components/ui/toaster.tsx b/frontend/src/components/ui/toaster.tsx → frontend/components/ui/toaster.tsx
diff --git a/frontend/src/components/ui/use-toast.ts → frontend/components/ui/use-toast.ts b/frontend/src/components/ui/use-toast.ts → frontend/components/ui/use-toast.ts
diff --git a/frontend/src/lib/utils.ts → frontend/lib/utils.ts b/frontend/src/lib/utils.ts → frontend/lib/utils.ts
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -15,8 +15,8 @@
     "@radix-ui/react-toast": "^1.1.5",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
-    "lucide-react": "^0.288.0",
-    "next": "13.5.6",
+    "lucide-react": "^0.291.0",
+    "next": "14.0.1",
     "next-themes": "^0.2.1",
     "react": "^18",
     "react-dom": "^18",
@@ -29,7 +29,7 @@
     "@types/react-dom": "^18",
     "autoprefixer": "^10",
     "eslint": "^8",
-    "eslint-config-next": "13.5.6",
+    "eslint-config-next": "14.0.1",
     "postcss": "^8",
     "tailwindcss": "^3",
     "typescript": "^5"

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -19,7 +19,7 @@
       }
     ],
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],

diff --git a/web/nginx.conf b/web/nginx.conf
@@ -12,9 +12,25 @@ http {
 		}
 		location / {
 			proxy_pass http://frontend:3000;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "upgrade";
+			proxy_set_header Host $host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Forwarded-Proto $scheme;
+			proxy_set_header X-Forwarded-Host $host;
+			proxy_set_header X-Forwarded-Port $server_port;
 		}
 		location /api {
 			proxy_pass http://backend:3000;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "upgrade";
+			proxy_set_header Host $host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Forwarded-Proto $scheme;
+			proxy_set_header X-Forwarded-Host $host;
+			proxy_set_header X-Forwarded-Port $server_port;
 		}
 	}
 }