Merge pull request #10 from 6drf21e/fix/google-analytics-and-prod-deps

Update next.config.mjs and package.json
fatwang2 · Mar 30, 2024 · 010e8e6 · 010e8e6
2 parents f503915 + 19b599e
commit 010e8e6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,12 +4,12 @@ WORKDIR /app
 
 # Install dependencies
 COPY ./web/package*.json ./
+ENV NODE_ENV production
 RUN npm install
 COPY ./web .
 
 # Compile Next.js and configure distDir
 RUN sed -i 's/distDir:.*/distDir: process.env.NEXT_DIST_DIR || ".\/ui"/' next.config.mjs
-ENV NODE_ENV production
 ENV NEXT_DIST_DIR ./NEXT_BUILD
 RUN npm run build
 

diff --git a/web/next.config.mjs b/web/next.config.mjs
@@ -8,6 +8,9 @@ export default (phase, { defaultConfig }) => {
       output: "export",
       assetPrefix: "/ui/",
       basePath: "/ui",
+      experimental: {
+        missingSuspenseWithCSRBailout: false
+      },
       distDir: "../ui"
     };
   } else {

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -14,8 +14,10 @@
     "@next/third-parties": "^14.0.4",
     "@radix-ui/react-popover": "^1.0.7",
     "@tailwindcss/forms": "^0.5.7",
+    "@tailwindcss/typography": "^0.5.10",
     "@upstash/ratelimit": "^1.0.0",
     "@vercel/kv": "^1.0.1",
+    "autoprefixer": "^10.0.1",
     "clsx": "^2.1.0",
     "headlessui": "^0.0.0",
     "lucide-react": "^0.309.0",
@@ -26,22 +28,20 @@
     "react-dom": "^18",
     "react-markdown": "^9.0.1",
     "tailwind-merge": "^2.2.0",
+    "tailwindcss": "^3.3.0",
+    "typescript": "^5",
     "unist-builder": "^4.0.0"
   },
   "devDependencies": {
-    "@tailwindcss/typography": "^0.5.10",
-    "@types/node": "^20",
+    "@types/node": "20.11.30",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "autoprefixer": "^10.0.1",
     "eslint": "^8",
     "eslint-config-next": "14.0.4",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-unused-imports": "^3.0.0",
     "postcss": "^8",
-    "prettier": "^3.1.0",
-    "tailwindcss": "^3.3.0",
-    "typescript": "^5"
+    "prettier": "^3.1.0"
   }
 }
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
@@ -16,7 +16,9 @@ export default function RootLayout({ children }: { children: ReactNode }) {
   return (
     <html lang="en">
       <body className={inter.className}>{children}</body>
-      <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS || ""} />
+      {process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS && (
+        <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS} />
+      )}
     </html>
   );
 }