first commit

2026-03-10 19:37:31 +03:30
commit 61f56f997c
27684 changed files with 2784175 additions and 0 deletions
--- a/test/e2e/app-dir/sub-shell-generation/app/[lang]/[slug]/page.tsx
+++ b/test/e2e/app-dir/sub-shell-generation/app/[lang]/[slug]/page.tsx
@@ -0,0 +1,20 @@
+import { getSentinelValue } from '../../sentinel'
+
+export default async function Page({
+  params,
+}: {
+  params: Promise<{ lang: string; slug: string }>
+}) {
+  const { slug } = await params
+
+  return (
+    <>
+      <p id="page">Page: ({getSentinelValue()})</p>
+      <p>slug: {slug}</p>
+    </>
+  )
+}
+
+export function generateStaticParams({ params }: { params: { lang: string } }) {
+  return params.lang === 'fr' ? [{ slug: '1' }] : [{ slug: 'foo' }]
+}
--- a/test/e2e/app-dir/sub-shell-generation/app/[lang]/layout.tsx
+++ b/test/e2e/app-dir/sub-shell-generation/app/[lang]/layout.tsx
@@ -0,0 +1,28 @@
+import { ReactNode, Suspense } from 'react'
+import { getSentinelValue } from '../sentinel'
+
+export default async function LangLayout({
+  children,
+  params,
+}: {
+  children: ReactNode
+  params: Promise<{ lang: string }>
+}) {
+  const { lang } = await params
+
+  return (
+    <>
+      <div id="lang-layout">Lang Layout: ({getSentinelValue()})</div>
+      <h1>lang: {lang}</h1>
+      <main>
+        <Suspense fallback={<p id="loading">Loading...</p>}>
+          {children}
+        </Suspense>
+      </main>
+    </>
+  )
+}
+
+export function generateStaticParams() {
+  return [{ lang: 'en' }, { lang: 'fr' }]
+}
--- a/test/e2e/app-dir/sub-shell-generation/app/layout.tsx
+++ b/test/e2e/app-dir/sub-shell-generation/app/layout.tsx
@@ -0,0 +1,17 @@
+'use cache'
+
+import { ReactNode, Suspense } from 'react'
+import { getSentinelValue } from './sentinel'
+
+export default async function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>
+        <div id="root-layout">Root Layout: ({getSentinelValue()})</div>
+        <Suspense fallback={<p id="loading">Loading...</p>}>
+          {children}
+        </Suspense>
+      </body>
+    </html>
+  )
+}
--- a/test/e2e/app-dir/sub-shell-generation/app/sentinel.ts
+++ b/test/e2e/app-dir/sub-shell-generation/app/sentinel.ts
@@ -0,0 +1,7 @@
+const { PHASE_PRODUCTION_BUILD } = require('next/constants')
+
+export function getSentinelValue() {
+  return process.env.NEXT_PHASE === PHASE_PRODUCTION_BUILD
+    ? 'buildtime'
+    : 'runtime'
+}
--- a/test/e2e/app-dir/sub-shell-generation/next.config.js
+++ b/test/e2e/app-dir/sub-shell-generation/next.config.js
@@ -0,0 +1,8 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {
+  cacheComponents: true,
+}
+
+module.exports = nextConfig
--- a/test/e2e/app-dir/sub-shell-generation/sub-shell-generation.test.ts
+++ b/test/e2e/app-dir/sub-shell-generation/sub-shell-generation.test.ts
@@ -0,0 +1,82 @@
+import { nextTestSetup } from 'e2e-utils'
+import * as cheerio from 'cheerio'
+
+describe('sub-shell-generation', () => {
+  const { next, isNextDev, isNextDeploy } = nextTestSetup({
+    files: __dirname,
+  })
+
+  if (isNextDev) {
+    it.skip('skipping dev test', () => {})
+    return
+  }
+
+  describe('should serve the correct shell', () => {
+    describe.each([
+      [
+        '/[lang]/[slug]',
+        {
+          page: 'Page: (runtime)',
+          langLayout: 'Lang Layout: (runtime)',
+          rootLayout: 'Root Layout: (buildtime)',
+        },
+        ['/es/1', '/es/2'],
+        true,
+      ],
+      [
+        '/en/[slug]',
+        {
+          page: 'Page: (runtime)',
+          langLayout: 'Lang Layout: (buildtime)',
+          rootLayout: 'Root Layout: (buildtime)',
+        },
+        ['/en/1', '/en/2'],
+        true,
+      ],
+      [
+        '/fr/[slug]',
+        {
+          page: 'Page: (runtime)',
+          langLayout: 'Lang Layout: (buildtime)',
+          rootLayout: 'Root Layout: (buildtime)',
+        },
+        ['/fr/2', '/fr/3'],
+        true,
+      ],
+      [
+        '/fr/1',
+        {
+          page: 'Page: (buildtime)',
+          langLayout: 'Lang Layout: (buildtime)',
+          rootLayout: 'Root Layout: (buildtime)',
+        },
+        ['/fr/1'],
+        false,
+      ],
+    ])('%s', (shell, { page, langLayout, rootLayout }, paths, isPostponed) => {
+      it.each(paths)('should serve the correct shell for %s', async (path) => {
+        const res = await next.fetch(path)
+        expect(res.status).toBe(200)
+
+        if (!isNextDeploy) {
+          expect(res.headers.get('x-nextjs-postponed')).toBe(
+            isPostponed ? '1' : null
+          )
+        }
+
+        const html = await res.text()
+        const $ = cheerio.load(html)
+
+        expect({
+          page: $('#page').text(),
+          langLayout: $('#lang-layout').text(),
+          rootLayout: $('#root-layout').text(),
+        }).toEqual({
+          page,
+          langLayout,
+          rootLayout,
+        })
+      })
+    })
+  })
+})