diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-custom/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-custom/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-custom/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-default/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-default/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/404-default/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/__flakey__/metadata/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/__flakey__/metadata/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/__flakey__/metadata/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/basic/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/basic/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/basic/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/force-dynamic/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/force-dynamic/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/force-dynamic/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/implicit-metadata/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/implicit-metadata/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/implicit-metadata/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-627/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-627/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-627/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-869/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-869/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route-WEB-869/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/route/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/rsc-NEXT-657/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/rsc-NEXT-657/input/next.config.js deleted file mode 100755 index dafb0c88e961e..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/rsc-NEXT-657/input/next.config.js +++ /dev/null @@ -1,8 +0,0 @@ -/** @type {import('next').NextConfig} */ -const nextConfig = { - experimental: { - appDir: true, - }, -} - -module.exports = nextConfig diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/use-server/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/use-server/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/app/use-server/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/error/ssr/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/error/ssr/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/error/ssr/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/externals/server-component-externals/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/externals/server-component-externals/input/next.config.js index 802aa4168f600..3b460b2f7278f 100644 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/externals/server-component-externals/input/next.config.js +++ b/packages/next-swc/crates/next-dev-tests/tests/integration/next/externals/server-component-externals/input/next.config.js @@ -1,6 +1,5 @@ module.exports = { experimental: { - appDir: true, serverComponentsExternalPackages: ['package'], }, } diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/image/app/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/image/app/input/next.config.js deleted file mode 100644 index d45ffa44885de..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/image/app/input/next.config.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @type {import('next').NextConfig} - */ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/polyfill/basic/input/next.config.js b/packages/next-swc/crates/next-dev-tests/tests/integration/next/polyfill/basic/input/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/polyfill/basic/input/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/packages/next-swc/crates/next-dev/benches/next.config.js b/packages/next-swc/crates/next-dev/benches/next.config.js deleted file mode 100644 index cfa3ac3d7aa94..0000000000000 --- a/packages/next-swc/crates/next-dev/benches/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: true, - }, -} diff --git a/test/.stats-app/stats-config.js b/test/.stats-app/stats-config.js index 3ae253132424f..6c17d6965c03a 100644 --- a/test/.stats-app/stats-config.js +++ b/test/.stats-app/stats-config.js @@ -79,9 +79,6 @@ module.exports = { path: 'next.config.js', content: ` module.exports = { - experimental: { - appDir: true, - }, generateBuildId: () => 'BUILD_ID', webpack(config) { config.optimization.minimize = false @@ -99,9 +96,6 @@ module.exports = { path: 'next.config.js', content: ` module.exports = { - experimental: { - appDir: true, - }, generateBuildId: () => 'BUILD_ID' } `, diff --git a/test/development/acceptance-app/ReactRefreshRegression.test.ts b/test/development/acceptance-app/ReactRefreshRegression.test.ts index 947ef8cd8bd3c..00ee9d6a798b2 100644 --- a/test/development/acceptance-app/ReactRefreshRegression.test.ts +++ b/test/development/acceptance-app/ReactRefreshRegression.test.ts @@ -345,7 +345,6 @@ describe('ReactRefreshRegression app', () => { }); module.exports = withMDX({ pageExtensions: ["js", "mdx"], - experimental: { appDir: true }, }); ` ) diff --git a/test/development/acceptance/server-component-compiler-errors-in-pages.test.ts b/test/development/acceptance/server-component-compiler-errors-in-pages.test.ts index 2f3f3b34d5f39..06546db7bbbcb 100644 --- a/test/development/acceptance/server-component-compiler-errors-in-pages.test.ts +++ b/test/development/acceptance/server-component-compiler-errors-in-pages.test.ts @@ -5,7 +5,6 @@ import { sandbox } from 'development-sandbox' import { outdent } from 'outdent' const initialFiles = new Map([ - ['next.config.js', 'module.exports = { experimental: { appDir: true } }'], ['app/_.js', ''], // app dir need to exists, otherwise the SWC RSC checks will not run [ 'pages/index.js', diff --git a/test/integration/build-spinners/index.test.ts b/test/integration/build-spinners/index.test.ts index 6a02fc8b333be..b179260793f39 100644 --- a/test/integration/build-spinners/index.test.ts +++ b/test/integration/build-spinners/index.test.ts @@ -30,16 +30,6 @@ const appDirFiles: File[] = [ } `, }, - { - filename: 'next.config.js', - content: ` - module.exports = { - experimental: { - appDir: true - } - } - `, - }, ] const pagesFiles: File[] = [ { @@ -65,7 +55,6 @@ it.each([ content: ` module.exports = { experimental: { - appDir: true, webpackBuildWorker: true, } } diff --git a/test/integration/eslint/base-directories/next.config.js b/test/integration/eslint/base-directories/next.config.js deleted file mode 100644 index f3bbebcc4dad4..0000000000000 --- a/test/integration/eslint/base-directories/next.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - experimental: { - appDir: false, - }, -} diff --git a/test/integration/eslint/test/next-build.test.js b/test/integration/eslint/test/next-build.test.js index 6ffdd94caf458..1ce25e8a97a69 100644 --- a/test/integration/eslint/test/next-build.test.js +++ b/test/integration/eslint/test/next-build.test.js @@ -81,51 +81,7 @@ describe('Next Build', () => { ) }) - // Consolidate two tests below when the `appDir` is released. test('base directories are linted by default during builds', async () => { - dirBaseDirectoriesConfigFile.write(` - module.exports = { - experimental: { - appDir: false, - } - } - `) - const { stdout, stderr } = await nextBuild(dirBaseDirectories, [], { - stdout: true, - stderr: true, - }) - - const output = stdout + stderr - - expect(output).toContain('Failed to compile') - expect(output).toContain( - 'Error: `next/head` should not be imported in `pages/_document.js`. Use `` from `next/document` instead' - ) - expect(output).toContain( - 'Warning: Using `` could result in slower LCP and higher bandwidth. Consider using `` from `next/image` to automatically optimize images.' - ) - expect(output).toContain('Warning: Do not include stylesheets manually') - expect(output).toContain('Warning: Synchronous scripts should not be used') - expect(output).not.toContain( - 'Warning: `rel="preconnect"` is missing from Google Font' - ) - - // Files in pages, components, lib, and src directories are linted - expect(output).toContain('pages/_document.js') - expect(output).toContain('components/bar.js') - expect(output).toContain('lib/foo.js') - expect(output).toContain('src/index.js') - expect(output).not.toContain('app/layout.js') - }) - - test('base directories with appDir flag are linted by default during builds', async () => { - dirBaseDirectoriesConfigFile.write(` - module.exports = { - experimental: { - appDir: true, - } - } - `) const { stdout, stderr } = await nextBuild(dirBaseDirectories, [], { stdout: true, stderr: true, @@ -146,7 +102,7 @@ describe('Next Build', () => { 'Warning: `rel="preconnect"` is missing from Google Font' ) - // Files in pages, app, components, lib, and src directories are linted + // Files in app, pages, components, lib, and src directories are linted expect(output).toContain('pages/_document.js') expect(output).toContain('components/bar.js') expect(output).toContain('lib/foo.js') diff --git a/test/integration/eslint/test/next-lint.test.js b/test/integration/eslint/test/next-lint.test.js index ab5965b32c8c8..1fd6ca6399ab0 100644 --- a/test/integration/eslint/test/next-lint.test.js +++ b/test/integration/eslint/test/next-lint.test.js @@ -19,9 +19,6 @@ const dirPluginCoreWebVitalsConfig = join( ) const dirIgnoreDuringBuilds = join(__dirname, '../ignore-during-builds') const dirBaseDirectories = join(__dirname, '../base-directories') -const dirBaseDirectoriesConfigFile = new File( - join(dirBaseDirectories, '/next.config.js') -) const dirCustomDirectories = join(__dirname, '../custom-directories') const dirConfigInPackageJson = join(__dirname, '../config-in-package-json') const dirInvalidOlderEslintVersion = join( @@ -182,49 +179,7 @@ describe('Next Lint', () => { ) }) - // Consolidate two tests below when the `appDir` is released. test('base directories are linted by default', async () => { - dirBaseDirectoriesConfigFile.write(` - module.exports = { - experimental: { - appDir: false, - } - } - `) - const { stdout, stderr } = await nextLint(dirBaseDirectories, [], { - stdout: true, - stderr: true, - }) - - const output = stdout + stderr - expect(output).toContain( - 'Error: `next/head` should not be imported in `pages/_document.js`. Use `` from `next/document` instead' - ) - expect(output).toContain( - 'Warning: Using `` could result in slower LCP and higher bandwidth. Consider using `` from `next/image` to automatically optimize images.' - ) - expect(output).toContain('Warning: Do not include stylesheets manually') - expect(output).toContain('Warning: Synchronous scripts should not be used') - expect(output).not.toContain( - 'Warning: `rel="preconnect"` is missing from Google Font' - ) - - // Files in pages, components, lib, and src directories are linted - expect(output).toContain('pages/_document.js') - expect(output).toContain('components/bar.js') - expect(output).toContain('lib/foo.js') - expect(output).toContain('src/index.js') - expect(output).not.toContain('app/layout.js') - }) - - test('base directories with appDir flag are linted by default', async () => { - dirBaseDirectoriesConfigFile.write(` - module.exports = { - experimental: { - appDir: true, - } - } - `) const { stdout, stderr } = await nextLint(dirBaseDirectories, [], { stdout: true, stderr: true, @@ -243,7 +198,7 @@ describe('Next Lint', () => { 'Warning: `rel="preconnect"` is missing from Google Font' ) - // Files in pages, app, components, lib, and src directories are linted + // Files in app, pages, components, lib, and src directories are linted expect(output).toContain('pages/_document.js') expect(output).toContain('components/bar.js') expect(output).toContain('lib/foo.js') diff --git a/test/integration/telemetry/test/page-features.test.js b/test/integration/telemetry/test/page-features.test.js index 7a6bacdb7593c..dd1a1e5260314 100644 --- a/test/integration/telemetry/test/page-features.test.js +++ b/test/integration/telemetry/test/page-features.test.js @@ -5,10 +5,6 @@ import { check, findPort, killApp, launchApp, nextBuild } from 'next-test-utils' const appDir = path.join(__dirname, '..') const setupAppDir = async () => { - await fs.writeFile( - path.join(__dirname, '../next.config.js'), - 'module.exports = { experimental: { appDir: true } }' - ) await fs.mkdir(path.join(__dirname, '../app')) await fs.writeFile( path.join(__dirname, '../app/layout.js'), @@ -29,7 +25,6 @@ const setupAppDir = async () => { return async function teardownAppDir() { await fs.remove(path.join(__dirname, '../app')) - await fs.remove(path.join(__dirname, '../next.config.js')) } } diff --git a/test/production/app-dir-edge-runtime-with-wasm/index.test.ts b/test/production/app-dir-edge-runtime-with-wasm/index.test.ts index c1f950aaf6e49..54b4e3a3f152e 100644 --- a/test/production/app-dir-edge-runtime-with-wasm/index.test.ts +++ b/test/production/app-dir-edge-runtime-with-wasm/index.test.ts @@ -47,11 +47,6 @@ describe('app-dir edge runtime with wasm', () => { react: 'experimental', 'react-dom': 'experimental', }, - nextConfig: { - experimental: { - appDir: true, - }, - }, }) }) afterAll(() => next.destroy()) diff --git a/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts b/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts index 99147a4ac8880..5da467ce703c6 100644 --- a/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts +++ b/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts @@ -39,9 +39,6 @@ describe('should set-up next', () => { eslint: { ignoreDuringBuilds: true, }, - experimental: { - appDir: true, - }, output: 'standalone', }, })