diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0ad9756f..39e33597 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -54,6 +54,77 @@ jobs:
       - name: Benchmark
         run: bun run benchmark
 
+  # The landing app is the only real-scale acceptance target in this repo, and
+  # `publish` runs it against the deployed vinext/@devup-ui/vite-plugin build.
+  # This job runs the SAME 128 assertions and the SAME screenshot baselines
+  # against a Next 16 + Turbopack build, so @devup-ui/next-plugin's production
+  # CSS path stays gated at 64 routes — the scale where extraction-wave races
+  # actually reproduce. It runs in parallel so it stays off the publish critical
+  # path, and its artifact is never deployed.
+  landing-next-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Cache cargo registry + target
+        uses: actions/cache@v6
+        with:
+          path: |
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: cargo-landing-next-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: "1.4.0"
+        name: Install bun
+
+      - name: Cache bun dependencies
+        uses: actions/cache@v6
+        with:
+          path: ~/.bun/install/cache
+          key: bun-landing-next-${{ runner.os }}-${{ hashFiles('**/bun.lock') }}
+      - uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: "latest"
+      - name: Install Node.js
+        uses: actions/setup-node@v7
+        with:
+          node-version: 24
+      - run: bun install
+      - run: bun run build
+      - name: Build Landing (Next)
+        run: |
+          bun run --filter @devup-ui/components build-storybook
+          mv ./packages/components/storybook-static ./apps/landing/public/storybook
+          bun run --filter landing build:next
+      - name: Cache Playwright Browsers
+        uses: actions/cache@v6
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-landing-next-${{ runner.os }}-${{ hashFiles('**/bun.lock') }}
+      - name: Install Playwright Browsers
+        run: bunx playwright install chromium --with-deps
+      - name: Run E2E Tests (Next)
+        run: bun run test:e2e:next
+      - name: Build Landing (Next, singleCss)
+        run: |
+          rm -rf apps/landing/out apps/landing/.next apps/landing/df
+          DEVUP_SINGLE_CSS=1 bun run --filter landing build:next
+      - name: Run E2E Tests (Next, singleCss)
+        run: bun run test:e2e:next
+      - name: Upload Next Playwright Report
+        uses: actions/upload-artifact@v7
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report-next
+          path: playwright-report/
+          retention-days: 1
+
   publish:
     runs-on: ubuntu-latest
     steps:
diff --git a/apps/landing/.gitignore b/apps/landing/.gitignore
index 7ab304aa..eeb6ca47 100644
--- a/apps/landing/.gitignore
+++ b/apps/landing/.gitignore
@@ -16,10 +16,11 @@ public/storybook
 # testing
 /coverage
 
-# vinext
+# vinext (deployed) and the CI-only Next build
 /.next/
 /.vinext/
 /dist/
+/out/
 
 # production
 /build
diff --git a/apps/landing/next.config.ts b/apps/landing/next.config.ts
index 637ef254..84115a0d 100644
--- a/apps/landing/next.config.ts
+++ b/apps/landing/next.config.ts
@@ -1,8 +1,29 @@
+import { DevupUI } from '@devup-ui/next-plugin'
+import createMDX from '@next/mdx'
+import type { NextConfig } from 'next'
+
 import { STATIC_EXPORT_DEPLOYMENT_ID } from './src/utils/static-export-rsc-transport'
 
-export default {
-  deploymentId: STATIC_EXPORT_DEPLOYMENT_ID,
+const baseConfig: NextConfig = {
   output: 'export',
   pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
   reactCompiler: true,
 }
+
+// vinext produces the deployed artifact and gets the plugin-free config: its
+// MDX and Devup wiring live in `vite.config.ts`. `deploymentId` is what the
+// static RSC transport stamps onto the payloads it rewrites.
+//
+// LANDING_BUILD_MODE=next selects the CI-only Next build, which adds the MDX
+// loader and `@devup-ui/next-plugin` so this app also gates the Turbopack
+// production CSS path. It deliberately drops `deploymentId`: Next reads it as
+// skew protection and falls back to a full page load whenever the host cannot
+// echo the id, which a plain static host never can. `DevupUI` starts a
+// coordinator when called, so it is only invoked on this branch.
+export default process.env.LANDING_BUILD_MODE === 'next'
+  ? createMDX({ extension: /\.mdx?$/ })(
+      DevupUI(baseConfig, {
+        singleCss: process.env.DEVUP_SINGLE_CSS === '1',
+      }),
+    )
+  : { ...baseConfig, deploymentId: STATIC_EXPORT_DEPLOYMENT_ID }
diff --git a/apps/landing/package.json b/apps/landing/package.json
index a28577e4..d7ae275b 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -7,6 +7,7 @@
     "dev": "node ./script.js && vinext dev",
     "search": "node ./script.js",
     "build": "node ./script.js && vinext build",
+    "build:next": "node ./script.js && LANDING_BUILD_MODE=next next build",
     "start": "npx serve ./dist/client",
     "lint": "eslint"
   },
@@ -14,10 +15,13 @@
     "@devup-ui/components": "workspace:^",
     "@devup-ui/react": "workspace:^",
     "@devup-ui/reset-css": "workspace:^",
+    "@mdx-js/loader": "^3.1",
     "@mdx-js/react": "^3.1",
+    "@next/mdx": "^16.3",
     "body-scroll-lock": "3.1",
     "clsx": "^2.1",
     "lenis": "1.3",
+    "next": "^16.3",
     "react": "^19.2",
     "react-dom": "^19.2",
     "react-markdown": "^10.1",
@@ -26,6 +30,7 @@
     "vinext": "^1.0.0-beta.8"
   },
   "devDependencies": {
+    "@devup-ui/next-plugin": "workspace:^",
     "@devup-ui/vite-plugin": "workspace:^",
     "@mdx-js/rollup": "^3.1",
     "@types/body-scroll-lock": "^3.1",
diff --git a/apps/landing/script.js b/apps/landing/script.js
index bfb9f169..5c766501 100644
--- a/apps/landing/script.js
+++ b/apps/landing/script.js
@@ -28,3 +28,49 @@ for await (const file of files) {
 const res = await Promise.all(q)
 
 await writeFile('public/search.json', JSON.stringify(res))
+
+// Demo barrel.
+//
+// The component docs render every file under `<component>/demo/`. Discovering
+// them at runtime (`readdir` + computed `import()`) or through a bundler
+// specific helper (`import.meta.glob`) hides those edges from static import
+// analysis, and only one of the two bundlers understands each form. Emitting
+// explicit imports keeps the demo graph visible to BOTH Turbopack and Vite, so
+// the Next and vinext builds extract styles from exactly the same file set.
+const demoFiles = []
+for await (const file of glob('src/app/**/demo/*.tsx')) {
+  demoFiles.push(file.split(/[/\\]/).join('/'))
+}
+
+const demos = demoFiles
+  .map((file) => {
+    const segments = file.split('/')
+    const filename = segments.at(-1)
+
+    return {
+      // `src/utils/demos.generated.ts` -> demo module, extension dropped so
+      // both bundlers resolve it through their standard extension list.
+      specifier: `../${segments.slice(1, -1).join('/')}/${filename.replace(/\.tsx$/, '')}`,
+      // Label consumed by `getDemos`: `<component>/demo/<filename>`.
+      label: `${segments.at(-3)}/demo/${filename}`,
+    }
+  })
+  .sort((left, right) => left.specifier.localeCompare(right.specifier))
+
+await writeFile(
+  'src/utils/demos.generated.ts',
+  [
+    '// AUTO-GENERATED by apps/landing/script.js - do not edit by hand.',
+    '// Run `node ./script.js` (part of `dev`, `build` and `build:next`) to refresh.',
+    "import type { ComponentType } from 'react'",
+    '',
+    ...demos.map(
+      ({ specifier }, index) => `import demo${index} from '${specifier}'`,
+    ),
+    '',
+    'export const DEMOS: readonly (readonly [string, ComponentType])[] = [',
+    ...demos.map(({ label }, index) => `  ['${label}', demo${index}],`),
+    ']',
+    '',
+  ].join('\n'),
+)
diff --git a/apps/landing/src/app/layout.tsx b/apps/landing/src/app/layout.tsx
index 23e46b6f..8b75520a 100644
--- a/apps/landing/src/app/layout.tsx
+++ b/apps/landing/src/app/layout.tsx
@@ -14,6 +14,14 @@ import {
 
 const staticExportRscTransport = `(${installStaticExportRscTransport.toString()})(${JSON.stringify(STATIC_EXPORT_DEPLOYMENT_ID)})`
 
+// The transport only exists to feed vinext's navigation runtime from `.rsc`
+// artifacts on a plain static host. The CI-only Next build emits no such
+// artifacts, so installing it there would turn every RSC prefetch into a 404
+// that the acceptance suite (rightly) fails on.
+const needsStaticExportRscTransport =
+  process.env.NODE_ENV === 'production' &&
+  process.env.LANDING_BUILD_MODE !== 'next'
+
 export const metadata: Metadata = {
   title: 'Devup UI',
   description: 'Zero Config, Zero FOUC, Zero Runtime, CSS in JS Preprocessor',
@@ -105,7 +113,7 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <head>
-        {process.env.NODE_ENV === 'production' && (
+        {needsStaticExportRscTransport && (
           <script
             dangerouslySetInnerHTML={{ __html: staticExportRscTransport }}
             data-vinext-static-rsc-transport=""
diff --git a/apps/landing/src/utils/demos.generated.ts b/apps/landing/src/utils/demos.generated.ts
new file mode 100644
index 00000000..f3903ce4
--- /dev/null
+++ b/apps/landing/src/utils/demos.generated.ts
@@ -0,0 +1,71 @@
+// AUTO-GENERATED by apps/landing/script.js - do not edit by hand.
+// Run `node ./script.js` (part of `dev`, `build` and `build:next`) to refresh.
+import type { ComponentType } from 'react'
+
+import demo0 from '../app/(detail)/components/[component]/button/demo/1_Variants'
+import demo1 from '../app/(detail)/components/[component]/button/demo/2_Icon'
+import demo2 from '../app/(detail)/components/[component]/button/demo/3_Danger'
+import demo3 from '../app/(detail)/components/[component]/button/demo/4_Disabled'
+import demo4 from '../app/(detail)/components/[component]/button/demo/5_Colors'
+import demo5 from '../app/(detail)/components/[component]/checkbox/demo/1_Default'
+import demo6 from '../app/(detail)/components/[component]/checkbox/demo/2_Checked'
+import demo7 from '../app/(detail)/components/[component]/checkbox/demo/3_Disabled'
+import demo8 from '../app/(detail)/components/[component]/checkbox/demo/4_Colors'
+import demo9 from '../app/(detail)/components/[component]/radio/demo/1_Default'
+import demo10 from '../app/(detail)/components/[component]/radio/demo/2_Variant'
+import demo11 from '../app/(detail)/components/[component]/radio/demo/3_Direction'
+import demo12 from '../app/(detail)/components/[component]/radio/demo/4_Disabled'
+import demo13 from '../app/(detail)/components/[component]/select/demo/1_Default'
+import demo14 from '../app/(detail)/components/[component]/select/demo/2_Radio'
+import demo15 from '../app/(detail)/components/[component]/select/demo/3_Checkbox'
+import demo16 from '../app/(detail)/components/[component]/select/demo/4_Options'
+import demo17 from '../app/(detail)/components/[component]/stepper/demo/1_Default'
+import demo18 from '../app/(detail)/components/[component]/stepper/demo/2_Type'
+import demo19 from '../app/(detail)/components/[component]/stepper/demo/3_MinMax'
+import demo20 from '../app/(detail)/components/[component]/textarea/demo/1_Default'
+import demo21 from '../app/(detail)/components/[component]/textarea/demo/2_Error'
+import demo22 from '../app/(detail)/components/[component]/textarea/demo/3_Disabled'
+import demo23 from '../app/(detail)/components/[component]/textarea/demo/4_Colors'
+import demo24 from '../app/(detail)/components/[component]/textbox/demo/1_Default'
+import demo25 from '../app/(detail)/components/[component]/textbox/demo/2_Error'
+import demo26 from '../app/(detail)/components/[component]/textbox/demo/3_Disabled'
+import demo27 from '../app/(detail)/components/[component]/textbox/demo/4_Icon'
+import demo28 from '../app/(detail)/components/[component]/toggle/demo/1_Default'
+import demo29 from '../app/(detail)/components/[component]/toggle/demo/2_Variant'
+import demo30 from '../app/(detail)/components/[component]/toggle/demo/3_Disabled'
+import demo31 from '../app/(detail)/components/[component]/toggle/demo/4_Colors'
+
+export const DEMOS: readonly (readonly [string, ComponentType])[] = [
+  ['button/demo/1_Variants.tsx', demo0],
+  ['button/demo/2_Icon.tsx', demo1],
+  ['button/demo/3_Danger.tsx', demo2],
+  ['button/demo/4_Disabled.tsx', demo3],
+  ['button/demo/5_Colors.tsx', demo4],
+  ['checkbox/demo/1_Default.tsx', demo5],
+  ['checkbox/demo/2_Checked.tsx', demo6],
+  ['checkbox/demo/3_Disabled.tsx', demo7],
+  ['checkbox/demo/4_Colors.tsx', demo8],
+  ['radio/demo/1_Default.tsx', demo9],
+  ['radio/demo/2_Variant.tsx', demo10],
+  ['radio/demo/3_Direction.tsx', demo11],
+  ['radio/demo/4_Disabled.tsx', demo12],
+  ['select/demo/1_Default.tsx', demo13],
+  ['select/demo/2_Radio.tsx', demo14],
+  ['select/demo/3_Checkbox.tsx', demo15],
+  ['select/demo/4_Options.tsx', demo16],
+  ['stepper/demo/1_Default.tsx', demo17],
+  ['stepper/demo/2_Type.tsx', demo18],
+  ['stepper/demo/3_MinMax.tsx', demo19],
+  ['textarea/demo/1_Default.tsx', demo20],
+  ['textarea/demo/2_Error.tsx', demo21],
+  ['textarea/demo/3_Disabled.tsx', demo22],
+  ['textarea/demo/4_Colors.tsx', demo23],
+  ['textbox/demo/1_Default.tsx', demo24],
+  ['textbox/demo/2_Error.tsx', demo25],
+  ['textbox/demo/3_Disabled.tsx', demo26],
+  ['textbox/demo/4_Icon.tsx', demo27],
+  ['toggle/demo/1_Default.tsx', demo28],
+  ['toggle/demo/2_Variant.tsx', demo29],
+  ['toggle/demo/3_Disabled.tsx', demo30],
+  ['toggle/demo/4_Colors.tsx', demo31],
+]
diff --git a/apps/landing/src/utils/get-demos.ts b/apps/landing/src/utils/get-demos.ts
index e0ff092c..66a04081 100644
--- a/apps/landing/src/utils/get-demos.ts
+++ b/apps/landing/src/utils/get-demos.ts
@@ -1,22 +1,13 @@
-type DemoModule = {
-  default: React.ComponentType
-}
+import type { ComponentType } from 'react'
 
-const demoModules = import.meta.glob<DemoModule>('../app/**/demo/*.tsx', {
-  eager: true,
-})
+import { DEMOS } from './demos.generated'
 
 export async function getDemos(
   dir: string,
-): Promise<[React.ComponentType, string][]> {
-  const directoryMarker = `/${dir}/demo/`
-
-  return Object.entries(demoModules)
-    .filter(([path]) => path.includes(directoryMarker))
-    .sort(([left], [right]) => left.localeCompare(right))
-    .map(([path, module]) => {
-      const filename = path.slice(path.lastIndexOf('/') + 1)
+): Promise<[ComponentType, string][]> {
+  const prefix = `${dir}/demo/`
 
-      return [module.default, `${dir}/demo/${filename}`]
-    })
+  return DEMOS.filter(([label]) => label.startsWith(prefix)).map<
+    [ComponentType, string]
+  >(([label, component]) => [component, label])
 }
diff --git a/apps/landing/tsconfig.json b/apps/landing/tsconfig.json
index 50f5ca22..d3a4cbb5 100644
--- a/apps/landing/tsconfig.json
+++ b/apps/landing/tsconfig.json
@@ -15,8 +15,18 @@
     "incremental": true,
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
   },
-  "include": ["**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    ".next/dev/types/**/*.ts"
+  ],
   "exclude": ["node_modules"]
 }
diff --git a/bun.lock b/bun.lock
index 8a823a0d..2a17f5b1 100644
--- a/bun.lock
+++ b/bun.lock
@@ -27,10 +27,13 @@
         "@devup-ui/components": "workspace:^",
         "@devup-ui/react": "workspace:^",
         "@devup-ui/reset-css": "workspace:^",
+        "@mdx-js/loader": "^3.1",
         "@mdx-js/react": "^3.1",
+        "@next/mdx": "^16.3",
         "body-scroll-lock": "3.1",
         "clsx": "^2.1",
         "lenis": "1.3",
+        "next": "^16.3",
         "react": "^19.2",
         "react-dom": "^19.2",
         "react-markdown": "^10.1",
@@ -39,6 +42,7 @@
         "vinext": "^1.0.0-beta.8",
       },
       "devDependencies": {
+        "@devup-ui/next-plugin": "workspace:^",
         "@devup-ui/vite-plugin": "workspace:^",
         "@mdx-js/rollup": "^3.1",
         "@types/body-scroll-lock": "^3.1",
@@ -1057,6 +1061,8 @@
 
     "@kuma-ui/webpack-plugin": ["@kuma-ui/webpack-plugin@1.5.0", "", { "dependencies": { "@kuma-ui/compiler": "^1.4.0", "@kuma-ui/sheet": "^1.4.0", "@kuma-ui/system": "^1.8.0", "esbuild": "^0.18.0", "eval": "^0.1.8" }, "peerDependencies": { "webpack": "^5" } }, "sha512-7pJVQ0322CgnuL8tyr1iYfkEhFb5Vq8eTgr/7oZJzhR6rp20WeWwinnUy8g/4jOpebpvCYIESsquzqajnUzI1Q=="],
 
+    "@mdx-js/loader": ["@mdx-js/loader@3.1.1", "", { "dependencies": { "@mdx-js/mdx": "^3.0.0", "source-map": "^0.7.0" }, "peerDependencies": { "webpack": ">=5" }, "optionalPeers": ["webpack"] }, "sha512-0TTacJyZ9mDmY+VefuthVshaNIyCGZHJG2fMnGaDttCt8HmjUF7SizlHJpaCDoGnN635nK1wpzfpx/Xx5S4WnQ=="],
+
     "@mdx-js/mdx": ["@mdx-js/mdx@3.1.1", "", { "dependencies": { "@types/estree": "^1.0.0", "@types/estree-jsx": "^1.0.0", "@types/hast": "^3.0.0", "@types/mdx": "^2.0.0", "acorn": "^8.0.0", "collapse-white-space": "^2.0.0", "devlop": "^1.0.0", "estree-util-is-identifier-name": "^3.0.0", "estree-util-scope": "^1.0.0", "estree-walker": "^3.0.0", "hast-util-to-jsx-runtime": "^2.0.0", "markdown-extensions": "^2.0.0", "recma-build-jsx": "^1.0.0", "recma-jsx": "^1.0.0", "recma-stringify": "^1.0.0", "rehype-recma": "^1.0.0", "remark-mdx": "^3.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.0.0", "source-map": "^0.7.0", "unified": "^11.0.0", "unist-util-position-from-estree": "^2.0.0", "unist-util-stringify-position": "^4.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" } }, "sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ=="],
 
     "@mdx-js/react": ["@mdx-js/react@3.1.1", "", { "dependencies": { "@types/mdx": "^2.0.0" }, "peerDependencies": { "@types/react": ">=16", "react": ">=16" } }, "sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw=="],
@@ -1083,6 +1089,8 @@
 
     "@next/env": ["@next/env@16.3.1", "", {}, "sha512-35G3xwkQUb2oETSDjFXGrVugknoayLFBh7vSE+yAcl9IP2zT9wyGwq7297AYHR11kJld807t5f8AJBs6WBzXsQ=="],
 
+    "@next/mdx": ["@next/mdx@16.3.2", "", { "dependencies": { "source-map": "^0.7.0" }, "peerDependencies": { "@mdx-js/loader": ">=0.15.0", "@mdx-js/react": ">=0.15.0" }, "optionalPeers": ["@mdx-js/loader", "@mdx-js/react"] }, "sha512-3Ch2ayTuBW9rBaOO9KLlRBUdsZpAm2rpuUxWrDjS9+2lcRzyWKlQoss3A66Nql3BnCBnsLE7j7+M3fR7Gssqdw=="],
+
     "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.3.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ABMIu2zQ7cnNIHm5ivKGwZwUrm0pAai3yiJ/gK/rF1c1VP9UOnj7XECbMKFdVKp9I9eMYq9NoDs1WXOoowxzJw=="],
 
     "@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.3.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-gNG21e/UnrroeScbY/QndUEdl0mF1FRibW7BBeYUz/5ABCepjqDdEdgr592vpzMtCn/m7FTjYq3TN4TpyDnutw=="],
diff --git a/e2e/exported-routes.ts b/e2e/exported-routes.ts
index 15ff0599..1b297c2c 100644
--- a/e2e/exported-routes.ts
+++ b/e2e/exported-routes.ts
@@ -1,12 +1,23 @@
 import { readdirSync, readFileSync } from 'node:fs'
 import { join, relative, resolve, sep } from 'node:path'
 
+/**
+ * Which bundler produced the artifact under test. `vinext` (the deployed
+ * build) is the default; `next` is the CI-only build that keeps
+ * `@devup-ui/next-plugin`'s Turbopack production path covered by this same
+ * suite. Both must satisfy every assertion in `e2e/`.
+ */
+export const LANDING_BUILD_MODE =
+  process.env.LANDING_BUILD_MODE === 'next' ? 'next' : 'vinext'
+
 export const LANDING_OUTPUT_ROOT = resolve(
   process.cwd(),
-  'apps',
-  'landing',
-  'dist',
-  'client',
+  process.env.LANDING_OUTPUT_ROOT ??
+    join(
+      'apps',
+      'landing',
+      ...(LANDING_BUILD_MODE === 'next' ? ['out'] : ['dist', 'client']),
+    ),
 )
 
 export const EXPECTED_EXPORTED_ROUTES = [
@@ -75,8 +86,17 @@ export const EXPECTED_EXPORTED_ROUTES = [
   '/team',
 ] as const
 
+/**
+ * Not-found documents are artifacts of the static host contract, not routable
+ * pages, so they are asserted separately from `EXPECTED_EXPORTED_ROUTES`.
+ * Next's export additionally emits `_not-found.html` next to `404.html`;
+ * vinext emits `404.html` alone.
+ */
+export const NOT_FOUND_HTML_FILES =
+  LANDING_BUILD_MODE === 'next' ? ['404.html', '_not-found.html'] : ['404.html']
+
 export const EXPECTED_EXPORTED_HTML_FILES = [
-  '404.html',
+  ...NOT_FOUND_HTML_FILES,
   ...EXPECTED_EXPORTED_ROUTES.map((route) =>
     route === '/' ? 'index.html' : `${route.slice(1)}.html`,
   ),
@@ -103,7 +123,7 @@ export function getExportedHtmlFiles(): string[] {
 
 export function getExportedRoutes(): string[] {
   return getExportedHtmlFiles()
-    .filter((path) => path !== '404.html')
+    .filter((path) => !NOT_FOUND_HTML_FILES.includes(path))
     .map((path) =>
       path === 'index.html' ? '/' : `/${path.replace(/\.html$/, '')}`,
     )
diff --git a/e2e/landing-routes.spec.ts b/e2e/landing-routes.spec.ts
index e2ec3a2b..37b313a3 100644
--- a/e2e/landing-routes.spec.ts
+++ b/e2e/landing-routes.spec.ts
@@ -36,16 +36,35 @@ test.describe('Landing static export routes', () => {
   test('serves every local asset referenced by exported HTML and CSS', async ({
     request,
   }) => {
-    const failures: string[] = []
+    // This sweep shares one single-threaded static server with the route-render
+    // tests, which walk 63 routes each to `networkidle`. Under that contention a
+    // serial request per asset starved past the 60s default (it takes ~4s
+    // alone), so fetch through a bounded pool AND state the real budget.
+    test.setTimeout(180_000)
 
-    for (const assetPath of getLocalAssetPaths()) {
-      const response = await request.get(assetPath)
-      if (response.status() >= 400) {
-        failures.push(`${response.status()} ${assetPath}`)
+    const assetPaths = getLocalAssetPaths()
+    const failures: string[] = []
+    const CONCURRENCY = 8
+    let cursor = 0
+
+    async function drain(): Promise<void> {
+      while (cursor < assetPaths.length) {
+        const assetPath = assetPaths[cursor++]
+        const response = await request.get(assetPath)
+        if (response.status() >= 400) {
+          failures.push(`${response.status()} ${assetPath}`)
+        }
       }
     }
 
-    expect(failures, `Broken local assets:\n${failures.join('\n')}`).toEqual([])
+    await Promise.all(
+      Array.from({ length: Math.min(CONCURRENCY, assetPaths.length) }, drain),
+    )
+
+    expect(
+      failures.sort(),
+      `Broken local assets:\n${failures.join('\n')}`,
+    ).toEqual([])
   })
 
   for (const [viewportName, viewport] of Object.entries(VIEWPORTS)) {
diff --git a/e2e/serve-static.mjs b/e2e/serve-static.mjs
index f3034dd0..782dd0a8 100644
--- a/e2e/serve-static.mjs
+++ b/e2e/serve-static.mjs
@@ -1,6 +1,12 @@
 /**
- * Custom static file server for the vinext client export.
+ * Custom static file server for the landing export.
  * Handles clean URLs by preferring .html files over directories.
+ *
+ * Serves whichever bundler produced the artifact: vinext writes
+ * `apps/landing/dist/client`, the CI-only Next build writes
+ * `apps/landing/out`. Override with LANDING_OUTPUT_ROOT (or LANDING_BUILD_MODE
+ * = next) so the same suite gates both.
+ *
  * Usage: node e2e/serve-static.mjs [port]
  */
 import { readFile, stat } from 'node:fs/promises'
@@ -8,7 +14,14 @@ import { createServer } from 'node:http'
 import { extname, isAbsolute, join, relative, resolve } from 'node:path'
 
 const PORT = parseInt(process.argv[2] || '3099', 10)
-const ROOT = resolve(process.cwd(), 'apps', 'landing', 'dist', 'client')
+const DEFAULT_ROOT =
+  process.env.LANDING_BUILD_MODE === 'next'
+    ? join('apps', 'landing', 'out')
+    : join('apps', 'landing', 'dist', 'client')
+const ROOT = resolve(
+  process.cwd(),
+  process.env.LANDING_OUTPUT_ROOT ?? DEFAULT_ROOT,
+)
 const NOT_FOUND = join(ROOT, '404.html')
 
 const MIME_TYPES = {
@@ -40,6 +53,31 @@ async function exists(path) {
   }
 }
 
+/**
+ * Next's segment-cache prefetch asks for a flat, dot-joined payload name
+ * (`__next.<key>.<segment>.<segment>.__PAGE__.txt`), while `output: 'export'`
+ * writes that payload as a directory tree
+ * (`__next.<key>/<segment>/<segment>/__PAGE__.txt`) and leaves the mapping to
+ * the host. Resolving it here keeps the CI-only Next artifact under the same
+ * "no 404, no console error" assertions as the deployed vinext artifact.
+ *
+ * Returns undefined for the flat payloads Next writes as real files
+ * (`__next._tree.txt`, `__next._index.txt`, `__next._full.txt`,
+ * `__next.__PAGE__.txt`), which resolve through the exact-path check.
+ */
+function toNextSegmentPath(cleanPath) {
+  const separator = cleanPath.lastIndexOf('/')
+  const directory = separator === -1 ? '' : cleanPath.slice(0, separator + 1)
+  const name = cleanPath.slice(separator + 1)
+
+  if (!name.startsWith('__next.') || !name.endsWith('.txt')) return undefined
+
+  const segments = name.slice('__next.'.length, -'.txt'.length).split('.')
+  if (segments.length < 2) return undefined
+
+  return `${directory}__next.${segments[0]}/${segments.slice(1).join('/')}.txt`
+}
+
 async function resolveFile(urlPath) {
   const cleanPath = urlPath.replace(/^\/+/, '')
   const exact = resolve(ROOT, cleanPath)
@@ -52,6 +90,15 @@ async function resolveFile(urlPath) {
   // 1. Try exact file path
   if ((await exists(exact)) === 'file') return { filePath: exact, status: 200 }
 
+  // 1b. Try the nested layout of a Next segment-cache payload
+  const segmentPath = toNextSegmentPath(cleanPath)
+  if (segmentPath) {
+    const nested = resolve(ROOT, segmentPath)
+    if ((await exists(nested)) === 'file') {
+      return { filePath: nested, status: 200 }
+    }
+  }
+
   // 2. Try with .html extension (clean URLs — PRIORITY over directory)
   const withHtml = `${exact}.html`
   if ((await exists(withHtml)) === 'file') {
diff --git a/package.json b/package.json
index b18a28e8..63345e03 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "lint:fix": "eslint --fix && cargo fmt",
     "test": "cargo tarpaulin --out xml --out stdout --all-targets --engine llvm $(node -p \"process.env.CI ? '--fail-under 100' : ''\") && bun test",
     "test:e2e": "bunx playwright test",
+    "test:e2e:next": "LANDING_BUILD_MODE=next bunx playwright test",
     "test:e2e:ui": "bunx playwright test --ui",
     "test:e2e:update": "bunx playwright test --update-snapshots",
     "build": "bun run --filter @devup-ui/wasm --filter @devup-ui/plugin-utils build && bun run --filter @devup-ui/react --filter @devup-ui/webpack-plugin build && bun run --filter @devup-ui/eslint-plugin --filter @devup-ui/vite-plugin --filter @devup-ui/next-plugin --filter @devup-ui/rsbuild-plugin --filter @devup-ui/bun-plugin --filter @devup-ui/components --filter @devup-ui/reset-css build",
diff --git a/playwright.config.ts b/playwright.config.ts
index 39ba88af..8a06a413 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -36,9 +36,12 @@ export default defineConfig({
     },
   ],
   webServer: {
+    // LANDING_BUILD_MODE=next runs the same suite against the CI-only Next
+    // build, which keeps @devup-ui/next-plugin's Turbopack production path
+    // gated by these assertions and pixels.
     command: process.env.CI
       ? 'node e2e/serve-static.mjs 3099'
-      : 'bun run --filter landing build && node e2e/serve-static.mjs 3099',
+      : `bun run --filter landing ${process.env.LANDING_BUILD_MODE === 'next' ? 'build:next' : 'build'} && node e2e/serve-static.mjs 3099`,
     url: 'http://localhost:3099',
     reuseExistingServer: !process.env.CI,
     timeout: 120_000,