Merge branch 'canary' into router-events-typescript

vercel · Jun 22, 2021 · 04146f8 · 04146f8
2 parents 801115d + 9fefd3c
commit 04146f8
Show file tree

Hide file tree

Showing 39 changed files with 1,478 additions and 166 deletions.
diff --git a/.alexignore b/.alexignore
@@ -0,0 +1,4 @@
+CODE_OF_CONDUCT.md
+docs/
+errors/
+examples/
diff --git a/contributing.md b/contributing.md
@@ -46,7 +46,7 @@ Running a specific test suite inside of the `test/integration` directory:
 yarn testonly --testPathPattern "production"
 ```
 
-Running just one test in the `production` test suite:
+Running one test in the `production` test suite:
 
 ```sh
 yarn testonly --testPathPattern "production" -t "should allow etag header support"

diff --git a/docs/advanced-features/i18n-routing.md b/docs/advanced-features/i18n-routing.md
@@ -52,6 +52,9 @@ module.exports = {
       {
         domain: 'example.fr',
         defaultLocale: 'fr',
+        // an optional http field can also be used to test
+        // locale domains locally with http instead of https
+        http: true,
       },
     ],
   },

diff --git a/docs/advanced-features/security-headers.md b/docs/advanced-features/security-headers.md
@@ -11,16 +11,18 @@ To improve the security of your application, you can use [`headers`](/docs/api-r
 
 // You can choose which headers to add to the list
 // after learning more below.
-const securityHeaders = [];
-
-async headers() {
-  return [
-    {
-      // Apply these headers to all routes in your application.
-      source: '/(.*)',
-      headers: securityHeaders
-    }
-  ]
+const securityHeaders = []
+
+module.exports = {
+  async headers() {
+    return [
+      {
+        // Apply these headers to all routes in your application.
+        source: '/(.*)',
+        headers: securityHeaders,
+      },
+    ]
+  },
 }
 ```
 

diff --git a/docs/api-reference/next/router.md b/docs/api-reference/next/router.md
@@ -49,6 +49,7 @@ The following is the definition of the `router` object returned by both [`useRou
 - `locale`: `String` - The active locale (if enabled).
 - `locales`: `String[]` - All supported locales (if enabled).
 - `defaultLocale`: `String` - The current default locale (if enabled).
+- `domainLocales`: `Array<{domain, defaultLocale, locales}>` - Any configured domain locales.
 - `isReady`: `boolean` - Whether the router fields are updated client-side and ready for use. Should only be used inside of `useEffect` methods and not for conditionally rendering on the server.
 - `isPreview`: `boolean` - Whether the application is currently in [preview mode](/docs/advanced-features/preview-mode.md).
 

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.0.1-canary.6"
+  "version": "11.0.1-canary.7"
 }
diff --git a/package.json b/package.json
@@ -23,8 +23,9 @@
     "lint-typescript": "lerna run typescript",
     "lint-eslint": "eslint . --ext js,jsx,ts,tsx --max-warnings=0",
     "lint-no-typescript": "run-p prettier-check lint-eslint",
-    "lint": "run-p lint-typescript prettier-check lint-eslint",
+    "lint": "run-p lint-typescript prettier-check lint-eslint lint-language",
     "lint-fix": "yarn prettier-fix && eslint . --ext js,jsx,ts,tsx --fix --max-warnings=0",
+    "lint-language": "alex .",
     "prettier-check": "prettier --check .",
     "prettier-fix": "prettier --write .",
     "types": "lerna run types --stream",
@@ -56,6 +57,7 @@
     "@zeit/next-sass": "1.0.2-canary.2",
     "@zeit/next-typescript": "1.1.2-canary.0",
     "abort-controller": "3.0.0",
+    "alex": "9.1.0",
     "amphtml-validator": "1.0.33",
     "async-sema": "3.0.1",
     "babel-core": "7.0.0-bridge.0",

diff --git a/packages/create-next-app/README.md b/packages/create-next-app/README.md
@@ -1,6 +1,6 @@
 # Create Next App
 
-The easiest way to get started with Next.js is by using `create-next-app`. This simple CLI tool enables you to quickly start building a new Next.js application, with everything set up for you. You can create a new app using the default Next.js template, or by using one of the [official Next.js examples](https://github.com/vercel/next.js/tree/canary/examples). To get started, use the following command:
+The easiest way to get started with Next.js is by using `create-next-app`. This CLI tool enables you to quickly start building a new Next.js application, with everything set up for you. You can create a new app using the default Next.js template, or by using one of the [official Next.js examples](https://github.com/vercel/next.js/tree/canary/examples). To get started, use the following command:
 
 ```bash
 npx create-next-app

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": "11.0.1-canary.6",
+  "version": "11.0.1-canary.7",
   "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": "11.0.1-canary.6",
+  "version": "11.0.1-canary.7",
   "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": "11.0.1-canary.6",
+    "@next/eslint-plugin-next": "11.0.1-canary.7",
     "@rushstack/eslint-patch": "^1.0.6",
     "@typescript-eslint/parser": "^4.20.0",
     "eslint-import-resolver-node": "^0.3.4",

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": "11.0.1-canary.6",
+  "version": "11.0.1-canary.7",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

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": "11.0.1-canary.6",
+  "version": "11.0.1-canary.7",
   "main": "index.js",
   "license": "MIT",
   "repository": {

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

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -192,7 +192,13 @@ export default async function build(
     const verifyResult = await nextBuildSpan
       .traceChild('verify-typescript-setup')
       .traceAsyncFn(() =>
-        verifyTypeScriptSetup(dir, pagesDir, !ignoreTypeScriptErrors, cacheDir)
+        verifyTypeScriptSetup(
+          dir,
+          pagesDir,
+          !ignoreTypeScriptErrors,
+          !config.images.disableStaticImages,
+          cacheDir
+        )
       )
 
     const typeCheckEnd = process.hrtime(typeCheckStart)

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts b/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts
@@ -351,10 +351,15 @@ export function getUtils({
 
     let defaultLocale = i18n.defaultLocale
     let detectedLocale = detectLocaleCookie(req, i18n.locales)
-    let acceptPreferredLocale =
-      i18n.localeDetection !== false
-        ? accept.language(req.headers['accept-language'], i18n.locales)
-        : detectedLocale
+    let acceptPreferredLocale
+    try {
+      acceptPreferredLocale =
+        i18n.localeDetection !== false
+          ? accept.language(req.headers['accept-language'], i18n.locales)
+          : detectedLocale
+    } catch (_) {
+      acceptPreferredLocale = detectedLocale
+    }
 
     const { host } = req.headers || {}
     // remove port from host and remove port if present

diff --git a/packages/next/client/router.ts b/packages/next/client/router.ts
@@ -43,6 +43,7 @@ const urlPropertyFields = [
   'isReady',
   'isPreview',
   'isLocaleDomain',
+  'domainLocales',
 ]
 const routerEvents = [
   'routeChangeStart',