Merge branch 'canary' into nabsul/typo/fetchType

vercel · Apr 21, 2023 · 6c531b9 · 6c531b9
2 parents 2ff1c8d + e952160
commit 6c531b9
Show file tree

Hide file tree

Showing 46 changed files with 141 additions and 360 deletions.
diff --git a/examples/with-mux-video/public/mux.svg b/examples/with-mux-video/public/mux.svg
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.3.1-canary.15"
+  "version": "13.3.1-canary.17"
 }
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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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": "13.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+    "@next/eslint-plugin-next": "13.3.1-canary.17",
     "@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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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": "13.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "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.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -81,7 +81,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.3.1-canary.15",
+    "@next/env": "13.3.1-canary.17",
     "@swc/helpers": "0.5.0",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -140,11 +140,11 @@
     "@jest/types": "29.5.0",
     "@napi-rs/cli": "2.14.7",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.3.1-canary.15",
-    "@next/polyfill-nomodule": "13.3.1-canary.15",
-    "@next/react-dev-overlay": "13.3.1-canary.15",
-    "@next/react-refresh-utils": "13.3.1-canary.15",
-    "@next/swc": "13.3.1-canary.15",
+    "@next/polyfill-module": "13.3.1-canary.17",
+    "@next/polyfill-nomodule": "13.3.1-canary.17",
+    "@next/react-dev-overlay": "13.3.1-canary.17",
+    "@next/react-refresh-utils": "13.3.1-canary.17",
+    "@next/swc": "13.3.1-canary.17",
     "@opentelemetry/api": "1.4.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/build/analysis/get-page-static-info.ts b/packages/next/src/build/analysis/get-page-static-info.ts
@@ -312,8 +312,8 @@ function warnAboutUnsupportedValue(
  * Related discussion: https://github.com/vercel/next.js/discussions/34179
  */
 export async function getPageStaticInfo(params: {
-  nextConfig: Partial<NextConfig>
   pageFilePath: string
+  nextConfig: Partial<NextConfig>
   isDev?: boolean
   page?: string
   pageType: 'pages' | 'app' | 'root'
@@ -382,11 +382,10 @@ export async function getPageStaticInfo(params: {
 
     const isAnAPIRoute = isAPIRoute(page?.replace(/^(?:\/src)?\/pages\//, '/'))
 
-    resolvedRuntime = isEdgeRuntime(resolvedRuntime)
-      ? resolvedRuntime
-      : requiresServerRuntime
-      ? resolvedRuntime || nextConfig.experimental?.runtime
-      : undefined
+    resolvedRuntime =
+      isEdgeRuntime(resolvedRuntime) || requiresServerRuntime
+        ? resolvedRuntime
+        : undefined
 
     if (resolvedRuntime === SERVER_RUNTIME.experimentalEdge) {
       warnAboutExperimentalEdge(isAnAPIRoute ? page! : null)
@@ -425,6 +424,6 @@ export async function getPageStaticInfo(params: {
     ssr: false,
     ssg: false,
     rsc: RSC_MODULE_TYPES.server,
-    runtime: nextConfig.experimental?.runtime,
+    runtime: undefined,
   }
 }
diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -705,7 +705,10 @@ export default async function getBaseWebpackConfig(
   const enableTypedRoutes = !!config.experimental.typedRoutes && hasAppDir
 
   if (isClient) {
-    if (isEdgeRuntime(config.experimental.runtime)) {
+    if (
+      // @ts-expect-error: experimental.runtime is deprecated
+      isEdgeRuntime(config.experimental.runtime)
+    ) {
       Log.warn(
         'You are using `experimental.runtime` which was removed. Check https://nextjs.org/docs/api-routes/edge-api-routes on how to use edge runtime.'
       )

diff --git a/packages/next/src/server/config-schema.ts b/packages/next/src/server/config-schema.ts
@@ -1,7 +1,6 @@
 import { NextConfig } from './config'
 import type { JSONSchemaType } from 'ajv'
 import { VALID_LOADERS } from '../shared/lib/image-config'
-import { SERVER_RUNTIME } from '../lib/constants'
 
 const configSchema = {
   type: 'object',
@@ -373,11 +372,6 @@ const configSchema = {
           minimum: 0,
           type: 'number',
         },
-        runtime: {
-          // automatic typing doesn't like enum
-          enum: Object.values(SERVER_RUNTIME) as any,
-          type: 'string',
-        },
         serverComponentsExternalPackages: {
           items: {
             type: 'string',

diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
@@ -6,7 +6,6 @@ import {
   ImageConfigComplete,
   imageConfigDefault,
 } from '../shared/lib/image-config'
-import { ServerRuntime } from 'next/types'
 import { SubresourceIntegrityAlgorithm } from '../build/webpack/plugins/subresource-integrity-plugin'
 import { WEB_VITALS } from '../shared/lib/utils'
 import type { NextParsedUrlQuery } from './request-meta'
@@ -195,7 +194,6 @@ export interface ExperimentalConfig {
   craCompat?: boolean
   esmExternals?: boolean | 'loose'
   isrMemoryCacheSize?: number
-  runtime?: Exclude<ServerRuntime, undefined>
   fullySpecified?: boolean
   urlImports?: NonNullable<webpack.Configuration['experiments']>['buildHttp']
   outputFileTracingRoot?: string
@@ -662,7 +660,6 @@ export const defaultConfig: NextConfig = {
     fetchCacheKeyPrefix: '',
     middlewarePrefetch: 'flexible',
     optimisticClientCache: true,
-    runtime: undefined,
     manualClientBasePath: false,
     legacyBrowsers: false,
     newNextLinkBehavior: true,

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "13.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "13.3.1-canary.15",
+  "version": "13.3.1-canary.17",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",