Merge branch 'main' of https://github.com/CSULB-BeachHacks/acm-website-2024

Author: chuckmilton

.github/workflows/deploy.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install deps
         run: npm ci
 
-      - name: Build Next.js app
+      - name: Build Next.js app (Dynamic)
         env:
           NEXT_PUBLIC_BASE_URL: ${{ secrets.NEXT_PUBLIC_BASE_URL }}
           MONGODB_URI: ${{ secrets.MONGODB_URI }}
@@ -58,10 +58,11 @@ jobs:
             **/README.md
             **/.github/workflows/**
             **/deploy.sh
+            **/build-static.js
 
       - name: Notify deployment completion
         run: |
-          echo "🚀 Deployment completed!"
+          echo "🚀 Dynamic deployment completed!"
           echo "📝 Manual steps required:"
           echo "   1. Go to cPanel → Node.js Apps"
           echo "   2. Click 'Install Dependencies'"

next.config.mjs

@@ -1,13 +1,6 @@
 /** @type {import('next').NextConfig} */
-const isProd = process.env.NODE_ENV === 'production';
-
-// Allow overriding basePath/assetPrefix via env so we can deploy to domain root or a subfolder (e.g., /acm)
-const envBasePath = process.env.NEXT_BASE_PATH; // e.g. "/acm" or undefined for root
-const basePath = envBasePath && envBasePath !== '/' ? envBasePath : undefined;
-const assetPrefix = process.env.NEXT_ASSET_PREFIX || (basePath ? `${basePath}/` : undefined);
-
 const nextConfig = {
-  // Dynamic deployment - no static export
+  // Dynamic deployment - keep all features
   // output: "export", // static export
   // images: { unoptimized: true }, // needed when exporting
 
@@ -16,21 +9,16 @@ const nextConfig = {
     domains: ["localhost", "csulb.acm.org"], // Add your domain here
   },
 
-  // Only set when provided
-  ...(basePath ? { basePath } : {}),
-  ...(assetPrefix ? { assetPrefix } : {}),
-
-  // Memory optimization for cPanel/low-memory environments
-  experimental: {
-    // Reduce memory usage during build
-    memoryBasedWorkers: false,
-  },
+  // Configure for subfolder deployment
+  basePath: "/acm",
+  assetPrefix: "/acm/",
 
-  // Webpack optimization for memory (client-side only)
+  // Webpack optimization for memory
   webpack: (config, { isServer }) => {
     if (!isServer) {
+      // Reduce memory usage for client-side build
       config.optimization.splitChunks = {
-        chunks: 'all',
+        chunks: "all",
         cacheGroups: {
           default: {
             minChunks: 1,
@@ -39,15 +27,18 @@ const nextConfig = {
           },
           vendor: {
             test: /[\\/]node_modules[\\/]/,
-            name: 'vendors',
+            name: "vendors",
             priority: -10,
-            chunks: 'all',
+            chunks: "all",
           },
         },
       };
     }
     return config;
   },
-};
 
-export default nextConfig;
+  // If deploying to root:
+  // basePath: '/',
+  // assetPrefix: '/',
+};
+export default nextConfig;