Remove experimental config from create-next-app (#49241)

## What?

Removes `experimental.appDir` this was leftover from when I flipped the
switch.

Kept the config file as in the future we might add future flags and
such. It also helps that it has the types comment included so you always
get types.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation or adding/fixing Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->

---------

Co-authored-by: JJ Kasper <jj@jjsweb.site>
This commit is contained in:
Tim Neutkens 2023-05-05 09:22:28 +02:00 committed by GitHub
parent c881224eae
commit 25a9547cad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 78 additions and 344 deletions

View file

@ -1,8 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -8,7 +8,11 @@ import isError from '../lib/is-error'
import { getProjectDir } from '../lib/get-project-dir'
import { CONFIG_FILES, PHASE_DEVELOPMENT_SERVER } from '../shared/lib/constants'
import path from 'path'
import type { NextConfig, NextConfigComplete } from '../server/config-shared'
import {
defaultConfig,
NextConfig,
NextConfigComplete,
} from '../server/config-shared'
import { traceGlobals } from '../trace/shared'
import { Telemetry } from '../telemetry/storage'
import loadConfig from '../server/config'
@ -239,7 +243,9 @@ const nextDev: CliCommand = async (argv) => {
const distDir = path.join(dir, rawNextConfig.distDir || '.next')
const { pagesDir, appDir } = findPagesDir(
dir,
!!rawNextConfig.experimental?.appDir
typeof rawNextConfig?.experimental?.appDir === 'undefined'
? !!defaultConfig.experimental?.appDir
: !!rawNextConfig.experimental?.appDir
)
const telemetry = new Telemetry({
distDir,

View file

@ -120,7 +120,7 @@ export async function validateTurboNextConfig({
let keys: string[] = []
for (const key in obj) {
if (typeof obj[key] === 'undefined') {
if (typeof obj?.[key] === 'undefined') {
continue
}
@ -145,9 +145,9 @@ export async function validateTurboNextConfig({
keys = keys.split('.')
}
if (keys.length === 1) {
return obj[keys[0]]
return obj?.[keys?.[0]]
}
return getDeepValue(obj[keys[0]], keys.slice(1))
return getDeepValue(obj?.[keys?.[0]], keys.slice(1))
}
const customKeys = flattenKeys(rawNextConfig)

View file

@ -135,17 +135,6 @@ function assignDefaults(
for (const featureName of Object.keys(
value
) as (keyof ExperimentalConfig)[]) {
const featureValue = value[featureName]
if (featureName === 'appDir' && featureValue === true) {
// auto enable clientRouterFilter if not manually set
// when appDir is enabled
if (
typeof userConfig.experimental.clientRouterFilter ===
'undefined'
) {
userConfig.experimental.clientRouterFilter = true
}
}
if (
value[featureName] !== defaultConfig.experimental[featureName]
) {
@ -456,6 +445,13 @@ function assignDefaults(
silent
)
if (
typeof userConfig.experimental?.clientRouterFilter === 'undefined' &&
result.experimental?.appDir
) {
result.experimental.clientRouterFilter = true
}
if (
result.experimental?.outputFileTracingRoot &&
!isAbsolute(result.experimental.outputFileTracingRoot)

View file

@ -1,8 +1,4 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}
// For development: analyze the bundled chunks for stats app
if (process.env.ANALYZE) {

View file

@ -3,7 +3,6 @@ const withMDX = require('@next/mdx')()
module.exports = withMDX({
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
experimental: {
appDir: true,
mdxRs: true,
},
images: {

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,4 @@
/**
* @type {import('next').NextConfig}
*/
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,7 +1,6 @@
/** @type {import('next').NextConfig} */
module.exports = {
experimental: {
appDir: true,
serverActions: true,
},
}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
export default {
experimental: {
appDir: true,
},
}
export default {}

View file

@ -1,6 +1,3 @@
module.exports = {
basePath: '/base',
experimental: {
appDir: true,
},
}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,5 @@
const nextConfig = {
pageExtensions: ['page.jsx', 'page.js'],
experimental: {
appDir: true,
},
}
module.exports = nextConfig

View file

@ -5,7 +5,6 @@ const withMDX = mdx()
const nextConfig = {
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
experimental: {
appDir: true,
mdxRs: true,
},
}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -2,7 +2,6 @@ module.exports = {
reactStrictMode: true,
transpilePackages: ['untranspiled-module', 'css', 'font'],
experimental: {
appDir: true,
serverComponentsExternalPackages: ['conditional-exports-optout'],
},
}

View file

@ -1,6 +1,5 @@
module.exports = {
experimental: {
appDir: true,
clientRouterFilter: true,
clientRouterFilterRedirects: true,
},

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -3,7 +3,6 @@
*/
const nextConfig = {
trailingSlash: true,
experimental: { appDir: true },
}
module.exports = nextConfig

View file

@ -2,9 +2,6 @@
* @type {import('next').NextConfig}
*/
module.exports = {
experimental: {
appDir: true,
},
typescript: {
ignoreBuildErrors: true,
},

View file

@ -1,7 +1,6 @@
/**@type import('next').NextConfig */
module.exports = {
experimental: {
appDir: true,
incrementalCacheHandlerPath: process.env.CUSTOM_CACHE_HANDLER
? require.resolve('./cache-handler.js')
: undefined,

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,6 +1,5 @@
module.exports = {
experimental: {
appDir: true,
clientRouterFilterRedirects: true,
sri: {
algorithm: 'sha256',

View file

@ -1,7 +1,4 @@
module.exports = {
experimental: {
appDir: true,
},
assetPrefix: '/assets',
rewrites() {
return {

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1,4 @@
/** @type {import("next").NextConfig} */
module.exports = {
reactStrictMode: true,
experimental: { appDir: true },
}

View file

@ -1,9 +1,6 @@
/** @type {import('next').NextConfig} */
module.exports = {
reactStrictMode: true,
experimental: {
appDir: true,
},
images: {
domains: ['res.cloudinary.com', 'avatars.githubusercontent.com'],
},

View file

@ -3,11 +3,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
})
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
}
const nextConfig = {}
// module.exports = nextConfig
module.exports = withBundleAnalyzer(nextConfig)

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,6 +1,3 @@
module.exports = {
reactStrictMode: true,
experimental: {
appDir: true,
},
}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,5 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
rewrites() {
return {
fallback: [

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,7 +1,4 @@
module.exports = {
experimental: {
appDir: true,
},
rewrites: async () => {
return {
afterFiles: [

View file

@ -3,7 +3,4 @@ module.exports = {
defaultLocale: 'en-CA',
locales: ['en-CA', 'en-US', 'fr-CA', 'fr-FR'],
},
experimental: {
appDir: true,
},
}

View file

@ -1,6 +1,3 @@
module.exports = {
strictMode: true,
experimental: {
appDir: true,
},
}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -8,7 +8,6 @@ const withMDX = require('@next/mdx')({
const nextConfig = {
pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'],
experimental: {
appDir: true,
mdxRs: process.env.WITH_MDX_RS === 'true',
},
}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,7 +1,4 @@
module.exports = {
experimental: {
appDir: true,
},
redirects: () => {
return [
{

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -3,7 +3,6 @@
*/
const nextConfig = {
pageExtensions: ['tsx', 'ts'],
experimental: { appDir: true },
}
module.exports = nextConfig

View file

@ -1,8 +1,5 @@
module.exports = {
reactStrictMode: true,
experimental: {
appDir: true,
},
async rewrites() {
return [
{

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,6 +1,3 @@
module.exports = {
strictMode: true,
experimental: {
appDir: true,
},
}

View file

@ -3,7 +3,6 @@
*/
const nextConfig = {
reactStrictMode: true,
experimental: { appDir: true },
}
module.exports = nextConfig

View file

@ -4,7 +4,6 @@ module.exports = {
maxInactiveAge: 1000 * 60 * 60,
},
experimental: {
appDir: true,
serverComponentsExternalPackages: ['conditional-exports-optout'],
},
rewrites: async () => {

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -9,7 +9,6 @@ const headers = nextConfigHeaders.map((header) => ({
* @type {import('next').NextConfig}
*/
const config = {
experimental: { appDir: true },
async headers() {
return [
{

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,6 +1,3 @@
module.exports = {
experimental: {
appDir: true,
},
trailingSlash: true,
}

View file

@ -2,7 +2,6 @@
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
typescript: {
ignoreBuildErrors: true,
},

View file

@ -1,8 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,7 +1,4 @@
/** @type {import('next').NextConfig} */
module.exports = {
output: 'standalone',
experimental: {
appDir: true,
},
}

View file

@ -1,6 +1,5 @@
module.exports = {
experimental: {
instrumentationHook: true,
appDir: true,
},
}

View file

@ -1,9 +1,6 @@
/** @type {import('next').NextConfig} */
module.exports = {
reactStrictMode: true,
experimental: {
appDir: true,
},
async rewrites() {
return {
afterFiles: [

View file

@ -2,9 +2,6 @@
const nextConfig = {
output: 'export',
trailingSlash: true,
experimental: {
appDir: true,
},
generateBuildId() {
return 'test-build-id'
},

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,6 +1,5 @@
export default {
experimental: {
appDir: true,
typedRoutes: true,
},
async rewrites() {

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,6 +1,3 @@
module.exports = {
experimental: {
appDir: true,
},
distDir: '.build',
}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,3 +1 @@
module.exports = {
experimental: {},
}
module.exports = {}

View file

@ -1,6 +1,4 @@
/** @type {import("next").NextConfig} */
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,6 +1,4 @@
/** @type {import("next").NextConfig} */
const nextConfig = {
experimental: { appDir: true },
}
const nextConfig = {}
module.exports = nextConfig

View file

@ -1,3 +1 @@
module.exports = {
experimental: { appDir: true },
}
module.exports = {}

View file

@ -1,5 +1 @@
module.exports = {
experimental: {
appDir: true,
},
}
module.exports = {}

View file

@ -1,6 +1,3 @@
module.exports = {
output: 'standalone',
experimental: {
appDir: true,
},
}