Merge branch 'canary' into feat/extend-nextcookies

vercel · Oct 18, 2022 · d638c7a · d638c7a
2 parents 918a55a + cf1c0b6
commit d638c7a
Show file tree

Hide file tree

Showing 242 changed files with 337 additions and 5,906 deletions.
diff --git a/docs/upgrading.md b/docs/upgrading.md
@@ -15,6 +15,8 @@ A [codemod is available](/docs/advanced-features/codemods.md#next-image-to-legac
 
 The `next/link` child can no longer be `<a>`. Add the `legacyBehavior` prop to use the legacy behavior or remove the `<a>` to upgrade. A [codemod is available](/docs/advanced-features/codemods.md#new-link) to automatically upgrade your code.
 
+The `target` configuration option has been removed and superseded by [Output File Tracing](https://nextjs.org/docs/advanced-features/output-file-tracing).
+
 ## Upgrading to 12.2
 
 If you were using Middleware prior to `12.2`, please see the [upgrade guide](https://nextjs.org/docs/messages/middleware-upgrade-guide) for more information.

diff --git a/errors/deprecated-target-config.md b/errors/deprecated-target-config.md
@@ -2,11 +2,11 @@
 
 #### Why This Error Occurred
 
-The `target` property in `next.config.js` has been deprecated. Please migrate to leverage the default target instead.
+Starting in Next.js 13, the `target` property in `next.config.js` has been removed.
 
 #### Possible Ways to Fix It
 
-For serverless cases, leverage the new output file traces or deploy your application somewhere where they are leveraged automatically like [Vercel](https://vercel.com).
+For serverless targets, please use the Output File Tracing or deploy your application somewhere where it can be leveraged automatically, like [Vercel](https://vercel.com).
 
 ### Useful Links
 

diff --git a/errors/gssp-export.md b/errors/gssp-export.md
@@ -4,7 +4,7 @@
 
 You attempted to statically export your application via `next export`, however, one or more of your pages uses `getServerSideProps`.
 
-The `getServerSideProps` lifecycle is not compatible with `next export`, so you'll need to use `next start` or a [serverless deployment](https://vercel.com).
+The `getServerSideProps` lifecycle is not compatible with `next export`, so you'll need to use `next start` when self hosting or deploy to a provider like [Vercel](https://vercel.com).
 
 #### Possible Ways to Fix It
 

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.3.2-canary.29"
+  "version": "12.3.2-canary.30"
 }
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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "keywords": [
     "react",
     "next",

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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+    "@next/eslint-plugin-next": "12.3.2-canary.30",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "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": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.3.2-canary.29",
+  "version": "12.3.2-canary.30",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --features plugin --js false native",

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
@@ -2,7 +2,6 @@ import type { ClientPagesLoaderOptions } from './webpack/loaders/next-client-pag
 import type { MiddlewareLoaderOptions } from './webpack/loaders/next-middleware-loader'
 import type { EdgeSSRLoaderQuery } from './webpack/loaders/next-edge-ssr-loader'
 import type { NextConfigComplete } from '../server/config-shared'
-import type { ServerlessLoaderQuery } from './webpack/loaders/next-serverless-loader'
 import type { webpack } from 'next/dist/compiled/webpack/webpack'
 import type {
   MiddlewareConfig,
@@ -14,7 +13,6 @@ import { posix, join } from 'path'
 import { stringify } from 'querystring'
 import {
   API_ROUTE,
-  DOT_NEXT_ALIAS,
   PAGES_DIR_ALIAS,
   ROOT_DIR_ALIAS,
   APP_DIR_ALIAS,
@@ -33,13 +31,11 @@ import {
   EDGE_RUNTIME_WEBPACK,
 } from '../shared/lib/constants'
 import { __ApiPreviewProps } from '../server/api-utils'
-import { isTargetLikeServerless } from '../server/utils'
 import { warn } from './output/log'
 import {
   isMiddlewareFile,
   isMiddlewareFilename,
   NestedMiddlewareError,
-  MiddlewareInServerlessTargetError,
 } from './utils'
 import { getPageStaticInfo } from './analysis/get-page-static-info'
 import { normalizePathSep } from '../shared/lib/page-path/normalize-path-sep'
@@ -147,7 +143,6 @@ interface CreateEntrypointsParams {
   previewMode: __ApiPreviewProps
   rootDir: string
   rootPaths?: Record<string, string>
-  target: 'server' | 'serverless' | 'experimental-serverless-trace'
   appDir?: string
   appPaths?: Record<string, string>
   pageExtensions: string[]
@@ -229,48 +224,6 @@ export function getAppEntry(opts: {
   }
 }
 
-export function getServerlessEntry(opts: {
-  absolutePagePath: string
-  buildId: string
-  config: NextConfigComplete
-  envFiles: LoadedEnvFiles
-  page: string
-  previewMode: __ApiPreviewProps
-  pages: { [page: string]: string }
-}): ObjectValue<webpack.EntryObject> {
-  const loaderParams: ServerlessLoaderQuery = {
-    absolute404Path: opts.pages['/404'] || '',
-    absoluteAppPath: opts.pages['/_app'],
-    absoluteDocumentPath: opts.pages['/_document'],
-    absoluteErrorPath: opts.pages['/_error'],
-    absolutePagePath: opts.absolutePagePath,
-    assetPrefix: opts.config.assetPrefix,
-    basePath: opts.config.basePath,
-    buildId: opts.buildId,
-    canonicalBase: opts.config.amp.canonicalBase || '',
-    distDir: DOT_NEXT_ALIAS,
-    generateEtags: opts.config.generateEtags ? 'true' : '',
-    i18n: opts.config.i18n ? JSON.stringify(opts.config.i18n) : '',
-    // base64 encode to make sure contents don't break webpack URL loading
-    loadedEnvFiles: Buffer.from(JSON.stringify(opts.envFiles)).toString(
-      'base64'
-    ),
-    page: opts.page,
-    poweredByHeader: opts.config.poweredByHeader ? 'true' : '',
-    previewProps: JSON.stringify(opts.previewMode),
-    runtimeConfig:
-      Object.keys(opts.config.publicRuntimeConfig).length > 0 ||
-      Object.keys(opts.config.serverRuntimeConfig).length > 0
-        ? JSON.stringify({
-            publicRuntimeConfig: opts.config.publicRuntimeConfig,
-            serverRuntimeConfig: opts.config.serverRuntimeConfig,
-          })
-        : '',
-  }
-
-  return `next-serverless-loader?${stringify(loaderParams)}!`
-}
-
 export function getClientEntry(opts: {
   absolutePagePath: string
   page: string
@@ -340,7 +293,6 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
     isDev,
     rootDir,
     rootPaths,
-    target,
     appDir,
     appPaths,
     pageExtensions,
@@ -428,10 +380,6 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
         middlewareMatchers = staticInfo.middleware?.matchers ?? [
           { regexp: '.*' },
         ]
-
-        if (target === 'serverless') {
-          throw new MiddlewareInServerlessTargetError()
-        }
       }
 
       await runDependingOnPageType({
@@ -459,14 +407,6 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
               appPaths: matchedAppPaths,
               pageExtensions,
             })
-          } else if (isTargetLikeServerless(target)) {
-            if (page !== '/_app' && page !== '/_document') {
-              server[serverBundlePath] = getServerlessEntry({
-                ...params,
-                absolutePagePath: mappings[page],
-                page,
-              })
-            }
           } else {
             server[serverBundlePath] = [mappings[page]]
           }