vercel · May 4, 2023 · May 4, 2023 · May 4, 2023 · May 4, 2023 · May 4, 2023
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.0"
+  "version": "13.4.1"
 }
diff --git a/package.json b/package.json
@@ -247,8 +247,8 @@
     "@babel/parser": "7.18.0",
     "@babel/types": "7.18.0",
     "@babel/traverse": "7.18.0",
-    "@types/react": "18.0.37",
-    "@types/react-dom": "18.0.11"
+    "@types/react": "18.2.5",
+    "@types/react-dom": "18.2.3"
   },
   "engines": {
     "node": ">=16.8.0"

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "keywords": [
     "react",
     "next",

diff --git a/packages/create-next-app/templates/app-tw/js/next.config.js b/packages/create-next-app/templates/app-tw/js/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app-tw/ts/next.config.js b/packages/create-next-app/templates/app-tw/ts/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app/js/next.config.js b/packages/create-next-app/templates/app/js/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app/ts/next.config.js b/packages/create-next-app/templates/app/ts/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.4.0",
+    "@next/eslint-plugin-next": "13.4.1",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/crates/next-dev/src/lib.rs b/packages/next-swc/crates/next-dev/src/lib.rs
@@ -389,10 +389,7 @@ async fn source(
     let main_source = main_source.into();
     let source_maps = SourceMapContentSourceVc::new(main_source).into();
     let source_map_trace = NextSourceMapTraceContentSourceVc::new(main_source).into();
-    let img_source = NextImageContentSourceVc::new(
-        CombinedContentSourceVc::new(vec![static_source, page_source]).into(),
-    )
-    .into();
+    let img_source = NextImageContentSourceVc::new(main_source).into();
     let router_source = NextRouterContentSourceVc::new(
         main_source,
         execution_context,

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "private": true,
   "scripts": {
     "clean": "rm -rf ./native/*",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.4.0",
+    "@next/env": "13.4.1",
     "@swc/helpers": "0.5.1",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -143,11 +143,11 @@
     "@jest/types": "29.5.0",
     "@napi-rs/cli": "2.14.7",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.4.0",
-    "@next/polyfill-nomodule": "13.4.0",
-    "@next/react-dev-overlay": "13.4.0",
-    "@next/react-refresh-utils": "13.4.0",
-    "@next/swc": "13.4.0",
+    "@next/polyfill-module": "13.4.1",
+    "@next/polyfill-nomodule": "13.4.1",
+    "@next/react-dev-overlay": "13.4.1",
+    "@next/react-refresh-utils": "13.4.1",
+    "@next/swc": "13.4.1",
     "@opentelemetry/api": "1.4.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/build/entries.ts b/packages/next/src/build/entries.ts
@@ -553,6 +553,7 @@ export async function createEntrypoints(
               appDir,
               appPaths: matchedAppPaths,
               pageExtensions,
+              basePath: config.basePath,
               assetPrefix: config.assetPrefix,
               nextConfigOutput: config.output,
               preferredRegion: staticInfo.preferredRegion,
@@ -580,6 +581,7 @@ export async function createEntrypoints(
               appDir: appDir!,
               appPaths: matchedAppPaths,
               pageExtensions,
+              basePath: config.basePath,
               assetPrefix: config.assetPrefix,
               nextConfigOutput: config.output,
               // This isn't used with edge as it needs to be set on the entry module, which will be the `edgeServerEntry` instead.

diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -283,8 +283,12 @@ export default async function build(
 
       const publicDir = path.join(dir, 'public')
       const isAppDirEnabled = !!config.experimental.appDir
+      const { pagesDir, appDir } = findPagesDir(dir, isAppDirEnabled)
+      NextBuildContext.pagesDir = pagesDir
+      NextBuildContext.appDir = appDir
+      hasAppDir = Boolean(appDir)
 
-      if (isAppDirEnabled) {
+      if (isAppDirEnabled && hasAppDir) {
         if (!process.env.__NEXT_TEST_MODE && ciEnvironment.hasNextSupport) {
           const requireHook = require.resolve('../server/require-hook')
           const contents = await promises.readFile(requireHook, 'utf8')
@@ -297,11 +301,6 @@ export default async function build(
         }
       }
 
-      const { pagesDir, appDir } = findPagesDir(dir, isAppDirEnabled)
-      NextBuildContext.pagesDir = pagesDir
-      NextBuildContext.appDir = appDir
-      hasAppDir = Boolean(appDir)
-
       const isSrcDir = path
         .relative(dir, pagesDir || appDir || '')
         .startsWith('src')
@@ -826,6 +825,8 @@ export default async function build(
 
       const manifestPath = path.join(distDir, SERVER_DIRECTORY, PAGES_MANIFEST)
 
+      const { incrementalCacheHandlerPath } = config.experimental
+
       const requiredServerFiles = nextBuildSpan
         .traceChild('generate-required-server-files')
         .traceFn(() => ({
@@ -841,12 +842,8 @@ export default async function build(
             experimental: {
               ...config.experimental,
               trustHostHeader: ciEnvironment.hasNextSupport,
-              incrementalCacheHandlerPath: config.experimental
-                .incrementalCacheHandlerPath
-                ? path.relative(
-                    distDir,
-                    config.experimental.incrementalCacheHandlerPath
-                  )
+              incrementalCacheHandlerPath: incrementalCacheHandlerPath
+                ? path.relative(distDir, incrementalCacheHandlerPath)
                 : undefined,
             },
           },
@@ -1918,9 +1915,13 @@ export default async function build(
 
             // ensure we trace any dependencies needed for custom
             // incremental cache handler
-            if (config.experimental.incrementalCacheHandlerPath) {
+            if (incrementalCacheHandlerPath) {
               toTrace.push(
-                require.resolve(config.experimental.incrementalCacheHandlerPath)
+                require.resolve(
+                  path.isAbsolute(incrementalCacheHandlerPath)
+                    ? incrementalCacheHandlerPath
+                    : path.join(dir, incrementalCacheHandlerPath)
+                )
               )
             }
 

diff --git a/packages/next/src/build/output/log.ts b/packages/next/src/build/output/log.ts
@@ -1,13 +1,13 @@
 import chalk from '../../lib/chalk'
 
 export const prefixes = {
-  wait: chalk.cyan('wait') + '  -',
-  error: chalk.red('error') + ' -',
-  warn: chalk.yellow('warn') + '  -',
-  ready: chalk.green('ready') + ' -',
-  info: chalk.cyan('info') + '  -',
-  event: chalk.magenta('event') + ' -',
-  trace: chalk.magenta('trace') + ' -',
+  wait: '- ' + chalk.cyan('wait'),
+  error: '- ' + chalk.red('error'),
+  warn: '- ' + chalk.yellow('warn'),
+  ready: '- ' + chalk.green('ready'),
+  info: '- ' + chalk.cyan('info'),
+  event: '- ' + chalk.magenta('event'),
+  trace: '- ' + chalk.magenta('trace'),
 }
 
 export function wait(...message: any[]) {

diff --git a/packages/next/src/build/webpack/loaders/metadata/discover.ts b/packages/next/src/build/webpack/loaders/metadata/discover.ts
@@ -64,12 +64,14 @@ export async function createStaticMetadataFromRoute(
     isRootLayoutOrRootPage,
     loaderContext,
     pageExtensions,
+    basePath,
   }: {
     segment: string
     resolvePath: (pathname: string) => Promise<string>
     isRootLayoutOrRootPage: boolean
     loaderContext: webpack.LoaderContext<any>
     pageExtensions: string[]
+    basePath: string
   }
 ) {
   let hasStaticMetadataFiles = false
@@ -124,6 +126,7 @@ export async function createStaticMetadataFromRoute(
           {
             type,
             segment,
+            basePath,
             pageExtensions,
           }
         )}!${filepath}${METADATA_RESOURCE_QUERY}`

diff --git a/packages/next/src/build/webpack/loaders/next-app-loader.ts b/packages/next/src/build/webpack/loaders/next-app-loader.ts
@@ -33,6 +33,7 @@ export type AppLoaderOptions = {
   rootDir?: string
   tsconfigPath?: string
   isDev?: boolean
+  basePath: string
   nextConfigOutput?: NextConfig['output']
 }
 type AppLoader = webpack.LoaderDefinitionFunction<AppLoaderOptions>
@@ -176,6 +177,7 @@ async function createTreeCodeFromPath(
     resolveParallelSegments,
     loaderContext,
     pageExtensions,
+    basePath,
   }: {
     resolver: PathResolver
     resolvePath: (pathname: string) => Promise<string>
@@ -184,6 +186,7 @@ async function createTreeCodeFromPath(
     ) => [key: string, segment: string | string[]][]
     loaderContext: webpack.LoaderContext<AppLoaderOptions>
     pageExtensions: string[]
+    basePath: string
   }
 ) {
   const splittedPath = pagePath.split(/[\\/]/)
@@ -258,6 +261,7 @@ async function createTreeCodeFromPath(
 
       if (resolvedRouteDir) {
         metadata = await createStaticMetadataFromRoute(resolvedRouteDir, {
+          basePath,
           segment: segmentPath,
           resolvePath,
           isRootLayoutOrRootPage,
@@ -427,6 +431,7 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
     isDev,
     nextConfigOutput,
     preferredRegion,
+    basePath,
   } = loaderOptions
 
   const buildInfo = getModuleBuildInfo((this as any)._module)
@@ -535,6 +540,7 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
     resolveParallelSegments,
     loaderContext: this,
     pageExtensions,
+    basePath,
   })
 
   if (!rootLayout) {
@@ -599,7 +605,7 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
     export { renderToReadableStream, decodeReply, decodeAction } from 'react-server-dom-webpack/server.edge'
     export const __next_app_webpack_require__ = __webpack_require__
     export { preloadStyle, preloadFont, preconnect } from 'next/dist/server/app-render/rsc/preloads'
-    
+
     export const originalPathname = "${page}"
   `