Merge pull request #78 from keepsimpleio/dev

Optimization

Author: MaryWylde

.gitignore

@@ -116,3 +116,6 @@ dist
 package-lock.json
 
 .claude/settings.local.json
+
+# Playwright
+playwright-report/

next.config.js

@@ -1,77 +1,64 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 const dotenv = require('dotenv');
 const path = require('path');
 const { existsSync } = require('fs');
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+});
 
-module.exports = async () => {
+module.exports = withBundleAnalyzer({
+  // Move env loading to the top level, outside the config
+  ...loadEnv(),
+
+  i18n: {
+    locales: ['en', 'ru', 'hy'],
+    defaultLocale: 'en',
+  },
+  assetPrefix: process.env.NODE_ENV === 'development' ? '' : '/keepsimple_next',
+  async rewrites() {
+    return [
+      { source: '/assets/:path*', destination: '/keepsimple_/assets/:path*' },
+      { source: '/fonts/:path*', destination: '/keepsimple_/fonts/:path*' },
+      { source: '/audio/:path*', destination: '/keepsimple_/audio/:path*' },
+      { source: '/static/:path*', destination: '/keepsimple_/static/:path*' },
+      { source: '/robots.txt', destination: '/keepsimple_/robots.txt' },
+    ];
+  },
+  env: {
+    NEXTAUTH_URL: process.env.NEXTAUTH_URL,
+  },
+  compiler: {
+    removeConsole: process.env.NODE_ENV === 'prod',
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  images: {
+    domains: [
+      'lh3.googleusercontent.com',
+      'cdn.discordapp.com',
+      'strapi.keepsimple.io',
+      'staging-strapi.keepsimple.io',
+    ],
+    deviceSizes: [480, 640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+  },
+  webpack(config) {
+    config.module.rules.push({
+      test: /\.svg$/i,
+      issuer: /\.[jt]sx?$/,
+      use: ['@svgr/webpack'],
+    });
+    return config;
+  },
+  productionBrowserSourceMaps: true,
+});
+
+function loadEnv() {
   const envFile = `.env.${process.env.APP_ENV || 'local'}`;
   const envPath = path.join(__dirname, envFile);
-  const isLocal = process.env.NODE_ENV === 'development';
-
   if (existsSync(envPath)) {
     dotenv.config({ path: envPath });
   } else {
     console.error(`Env file not found: ${envPath}`);
   }
-
-  return {
-    i18n: {
-      locales: ['en', 'ru', 'hy'],
-      defaultLocale: 'en',
-    },
-    assetPrefix: isLocal ? '' : '/keepsimple_next',
-    async rewrites() {
-      return [
-        {
-          source: '/assets/:path*',
-          destination: '/keepsimple_/assets/:path*',
-        },
-        {
-          source: '/fonts/:path*',
-          destination: '/keepsimple_/fonts/:path*',
-        },
-        {
-          source: '/audio/:path*',
-          destination: '/keepsimple_/audio/:path*',
-        },
-        {
-          source: '/static/:path*',
-          destination: '/keepsimple_/static/:path*',
-        },
-        {
-          source: '/robots.txt',
-          destination: '/keepsimple_/robots.txt',
-        },
-      ];
-    },
-    env: {
-      NEXTAUTH_URL: process.env.NEXTAUTH_URL,
-    },
-    compiler: {
-      removeConsole:
-        process.env.NODE_ENV === 'prod' ? { exclude: ['error'] } : false,
-    },
-    eslint: {
-      ignoreDuringBuilds: true, // useful in CI/CD
-    },
-    images: {
-      domains: [
-        'lh3.googleusercontent.com',
-        'cdn.discordapp.com',
-        'strapi.keepsimple.io',
-        'staging-strapi.keepsimple.io',
-      ],
-    },
-    webpack(config) {
-      config.module.rules.push({
-        test: /\.svg$/i,
-        issuer: /\.[jt]sx?$/,
-        use: ['@svgr/webpack'],
-      });
-
-      return config;
-    },
-
-    productionBrowserSourceMaps: true,
-  };
-};
+  return {};
+}

package.json

@@ -21,6 +21,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@next/bundle-analyzer": "^16.2.3",
     "@svgr/webpack": "^8.1.0",
     "classnames": "2.3.1",
     "cookie": "0.6.0",