fixup!

Author: avivkeller

.github/workflows/build.yml

@@ -75,15 +75,3 @@ jobs:
         with:
           name: webpack-stats
           path: apps/site/.next/server/webpack-stats.json
-
-      - name: Build Next.js (Static Export)
-        # We want to generate a static build, as it is a requirement of our website.
-        run: node_modules/.bin/turbo deploy ${{ env.TURBO_ARGS }}
-        env:
-          # We want to ensure we have enough RAM allocated to the Node.js process
-          # this should be a last resort in case by any chances the build memory gets too high
-          # but in general this should never happen
-          NODE_OPTIONS: '--max_old_space_size=4096'
-          # We want to ensure that static exports for all locales do not occur on `pull_request` events
-          # TODO: The output of this is too large, and it crashes the GitHub Runner
-          NEXT_PUBLIC_STATIC_EXPORT_LOCALE: false # ${{ github.event_name == 'push' }}

apps/site/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import './.next/dev/types/routes.d.ts';
+import './.next/types/routes.d.ts';
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/site/next.config.mjs

@@ -5,7 +5,7 @@ import createNextIntlPlugin from 'next-intl/plugin';
 
 import { rehypePlugins, remarkPlugins } from './mdx/plugins.mjs';
 import { OPEN_NEXT_CLOUDFLARE } from './next.constants.cloudflare.mjs';
-import { BASE_PATH, ENABLE_STATIC_EXPORT } from './next.constants.mjs';
+import { BASE_PATH } from './next.constants.mjs';
 import { getImagesConfig } from './next.image.config.mjs';
 import { redirects, rewrites } from './next.rewrites.mjs';
 
@@ -43,15 +43,11 @@ const nextConfig = {
       './node_modules/@types/node/**/*',
     ],
   },
-  // On static export builds we want the output directory to be "build"
-  distDir: ENABLE_STATIC_EXPORT ? 'build' : undefined,
-  // On static export builds we want to enable the export feature
-  output: ENABLE_STATIC_EXPORT ? 'export' : undefined,
   // This configures all the Next.js rewrites, which are used for rewriting internal URLs into other internal Endpoints
   // This feature is not supported within static export builds, hence we pass an empty array if static exports are enabled
-  rewrites: ENABLE_STATIC_EXPORT ? undefined : rewrites,
+  rewrites,
   // This configures all Next.js redirects
-  redirects: ENABLE_STATIC_EXPORT ? undefined : redirects,
+  redirects,
   // We don't want to run Type Checking on Production Builds
   // as we already check it on the CI within each Pull Request
   typescript: { ignoreBuildErrors: true },
@@ -60,6 +56,7 @@ const nextConfig = {
   typedRoutes: true,
   // Experimental Flags
   experimental: {
+    webpackMemoryOptimizations: true,
     // Ensure that server-side code is also minified
     serverMinification: true,
     // Use Workers and Threads for webpack compilation

apps/site/next.constants.mjs

@@ -14,29 +14,6 @@ export const IS_DEV_ENV = process.env.NODE_ENV === 'development';
  */
 export const VERCEL_ENV = process.env.VERCEL_ENV || undefined;
 
-/**
- * This is used for telling Next.js to do a Static Export Build of the Website
- *
- * This is used for static/without a Node.js server hosting, such as on our
- * legacy Website Build Environment on Node.js's DigitalOcean Droplet.
- *
- * Note that this is a manual Environment Variable defined by us during `npm run deploy`
- */
-export const ENABLE_STATIC_EXPORT =
-  process.env.NEXT_PUBLIC_STATIC_EXPORT === 'true' ||
-  process.env.NEXT_PUBLIC_STATIC_EXPORT === true;
-
-/**
- * This is used to ensure that pages are Static Export for all locales or only
- * in the default (`en`) locale.
- *
- * Note that this is a manual Environment Variable defined by us during the
- * build process in CI.
- */
-export const ENABLE_STATIC_EXPORT_LOCALE =
-  process.env.NEXT_PUBLIC_STATIC_EXPORT_LOCALE === 'true' ||
-  process.env.NEXT_PUBLIC_STATIC_EXPORT_LOCALE === true;
-
 /**
  * This is used for any place that requires the full canonical URL path for the Node.js Website (and its deployment), such as for example, the Node.js RSS Feed.
  *

apps/site/next.image.config.mjs

@@ -1,5 +1,4 @@
 import { OPEN_NEXT_CLOUDFLARE } from './next.constants.cloudflare.mjs';
-import { ENABLE_STATIC_EXPORT } from './next.constants.mjs';
 
 const remotePatterns = [
   'https://avatars.githubusercontent.com/**',
@@ -24,8 +23,6 @@ export const getImagesConfig = () => {
   }
 
   return {
-    // We disable image optimisation during static export builds
-    unoptimized: ENABLE_STATIC_EXPORT,
     // We add it to the remote pattern for the static images we use from multiple sources
     // to be marked as safe sources (these come from Markdown files)
     remotePatterns: remotePatterns.map(url => new URL(url)),

apps/site/package.json

@@ -10,7 +10,6 @@
     "cloudflare:deploy": "opennextjs-cloudflare deploy",
     "cloudflare:preview": "wrangler dev",
     "predeploy": "node --run build:blog-data",
-    "deploy": "cross-env NEXT_PUBLIC_STATIC_EXPORT=true node --run build",
     "predev": "node --run build:blog-data",
     "dev": "cross-env NODE_NO_WARNINGS=1 next dev",
     "lint": "node --run lint:js && node --run lint:css && node --run lint:md",

apps/site/turbo.json

@@ -9,8 +9,6 @@
       "env": [
         "VERCEL_ENV",
         "VERCEL_URL",
-        "NEXT_PUBLIC_STATIC_EXPORT",
-        "NEXT_PUBLIC_STATIC_EXPORT_LOCALE",
         "NEXT_PUBLIC_BASE_URL",
         "NEXT_PUBLIC_DIST_URL",
         "NEXT_PUBLIC_DOCS_URL",
@@ -36,8 +34,6 @@
       "env": [
         "VERCEL_ENV",
         "VERCEL_URL",
-        "NEXT_PUBLIC_STATIC_EXPORT",
-        "NEXT_PUBLIC_STATIC_EXPORT_LOCALE",
         "NEXT_PUBLIC_BASE_URL",
         "NEXT_PUBLIC_DIST_URL",
         "NEXT_PUBLIC_DOCS_URL",
@@ -57,8 +53,6 @@
       "env": [
         "VERCEL_ENV",
         "VERCEL_URL",
-        "NEXT_PUBLIC_STATIC_EXPORT",
-        "NEXT_PUBLIC_STATIC_EXPORT_LOCALE",
         "NEXT_PUBLIC_BASE_URL",
         "NEXT_PUBLIC_DIST_URL",
         "NEXT_PUBLIC_DOCS_URL",
@@ -83,8 +77,6 @@
       "env": [
         "VERCEL_ENV",
         "VERCEL_URL",
-        "NEXT_PUBLIC_STATIC_EXPORT",
-        "NEXT_PUBLIC_STATIC_EXPORT_LOCALE",
         "NEXT_PUBLIC_BASE_URL",
         "NEXT_PUBLIC_DIST_URL",
         "NEXT_PUBLIC_DOCS_URL",

apps/site/types/server.ts

@@ -1,4 +1,4 @@
-import type { useDetectOS } from '#site/hooks';
+import type { useDetectOS } from '#site/hooks/client';
 import type { MarkdownContext } from '#site/types/markdown';
 
 export type ClientSharedServerContext = MarkdownContext &