Merge branch 'canary' of https://github.com/hanneslund/next.js into n…

…ext-font-builtin
vercel · Feb 13, 2023 · 9e4539a · 9e4539a
2 parents 75cb189 + a5fe64c
commit 9e4539a
Show file tree

Hide file tree

Showing 141 changed files with 3,059 additions and 1,165 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -7,7 +7,7 @@ on:
 name: Build, test, and deploy
 
 env:
-  NAPI_CLI_VERSION: 2.13.3
+  NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.6.3
   RUST_TOOLCHAIN: nightly-2022-11-04
   PNPM_VERSION: 7.24.3
@@ -932,8 +932,10 @@ jobs:
         with:
           image: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-x64
           options: -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} -e NAPI_CLI_VERSION=${{ env.NAPI_CLI_VERSION }} -e TURBO_VERSION=${{ env.TURBO_VERSION }} -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
+          # turn on some optimization while building Rust codes to prevent tests timeout
           run: |
             set -e &&
+            export CARGO_PROFILE_DEV_OPT_LEVEL=1 &&
             rustup toolchain install "${RUST_TOOLCHAIN}" &&
             rustup default "${RUST_TOOLCHAIN}" &&
             rustup target add x86_64-unknown-linux-gnu &&

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -5,7 +5,7 @@ on:
 name: Generate Pull Request Stats
 
 env:
-  NAPI_CLI_VERSION: 2.13.3
+  NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.6.3
   RUST_TOOLCHAIN: nightly-2022-11-04
   PNPM_VERSION: 7.24.3

diff --git a/docs/advanced-features/output-file-tracing.md b/docs/advanced-features/output-file-tracing.md
@@ -101,15 +101,8 @@ module.exports = {
       // if there is `process.cwd()` expression in your code, you can set this option to tell `turbotrace` the value of `process.cwd()` while tracing.
       // for example the require(process.cwd() + '/package.json') will be traced as require('/path/to/cwd/package.json')
       processCwd?: string
-      // control the maximum number of files that are passed to the `turbotrace`
-      // default is 128
-      maxFiles?: number
-      // control the maximum memory usage of the `turbotrace`, in `MB`
+      // control the maximum memory usage of the `turbotrace`, in `MB`, default is `6000`.
       memoryLimit?: number
-      // control if the webpack entries should be skipped when tracing
-      // tracing the entries is not necessary for applications that all assets could be traced in the dist files
-      // default is `false`
-      skipEntries?: boolean
     },
   },
 }

diff --git a/examples/cms-kontent-ai/README.md b/examples/cms-kontent-ai/README.md
@@ -38,15 +38,15 @@ Once you have access to [the environment variables you'll need](#step-3-set-up-e
 Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), or [pnpm](https://pnpm.io) to bootstrap the example:
 
 ```bash
-npx create-next-app --example cms-kontent cms-kontent-app
+npx create-next-app --example cms-kontent-ai cms-kontent-app
 ```
 
 ```bash
-yarn create next-app --example cms-kontent cms-kontent-app
+yarn create next-app --example cms-kontent-ai cms-kontent-app
 ```
 
 ```bash
-pnpm create next-app --example cms-kontent cms-kontent-app
+pnpm create next-app --example cms-kontent-ai cms-kontent-app
 ```
 
 ## Configuration

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.1.7-canary.8"
+  "version": "13.1.7-canary.10"
 }
diff --git a/package.json b/package.json
@@ -60,8 +60,8 @@
     "@babel/preset-react": "7.14.5",
     "@edge-runtime/jest-environment": "2.0.0",
     "@fullhuman/postcss-purgecss": "1.3.0",
-    "@mdx-js/loader": "^1.5.1",
-    "@mdx-js/react": "^1.6.18",
+    "@mdx-js/loader": "2.2.1",
+    "@mdx-js/react": "2.2.1",
     "@next/bundle-analyzer": "workspace:*",
     "@next/env": "workspace:*",
     "@next/eslint-plugin-next": "workspace:*",

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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/index.js b/packages/eslint-config-next/index.js
@@ -75,6 +75,7 @@ module.exports = {
     'jsx-a11y/aria-unsupported-elements': 'warn',
     'jsx-a11y/role-has-required-aria-props': 'warn',
     'jsx-a11y/role-supports-aria-props': 'warn',
+    'react/jsx-no-target-blank': 'off',
   },
   parser: './parser.js',
   parserOptions: {

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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "test-pack": "cd ../../ && pnpm test-pack eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.1.7-canary.8",
+    "@next/eslint-plugin-next": "13.1.7-canary.10",
     "@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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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": "13.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "main": "index.js",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,15 @@
   },
   "peerDependencies": {
     "@mdx-js/loader": ">=0.15.0",
-    "@mdx-js/react": "*"
+    "@mdx-js/react": ">=0.15.0"
+  },
+  "peerDependenciesMeta": {
+    "@mdx-js/loader": {
+      "optional": true
+    },
+    "@mdx-js/react": {
+      "optional": true
+    }
   },
   "peerDependenciesMeta": {
     "@mdx-js/loader": {

diff --git a/packages/next-mdx/readme.md b/packages/next-mdx/readme.md
@@ -136,7 +136,6 @@ const nextConfig = {
   pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
   experimental: {
     appDir: true,
-    mdxRs: true
   }
   // Optionally, add any other Next.js config below
   reactStrictMode: true,

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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "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.1.7-canary.8",
+  "version": "13.1.7-canary.10",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",