merge canary

.github/actions/setup-rust/action.yml

@@ -0,0 +1,65 @@
+name: 'Rust Setup'
+description: 'Sets up the Rust toolchain for CI'
+inputs:
+  targets:
+    description: 'Comma-separated list of target triples to install for this toolchain'
+    required: false
+  components:
+    description: 'Comma-separated list of components to be additionally installed'
+    required: false
+  skip-install:
+    description: 'Sets environment variables without installing the rust toolchain'
+    required: false
+
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Get toolchain version from file'
+      id: file
+      shell: bash
+      run: echo "toolchain=$(cat ./rust-toolchain)" >> $GITHUB_OUTPUT
+
+    - shell: bash
+      run: |
+        : force toolchain version
+        echo "RUST_TOOLCHAIN=${{ steps.file.outputs.toolchain }}" >> $GITHUB_ENV
+
+    - shell: bash
+      run: |
+        : disable incremental compilation
+        if [ -z "${CARGO_INCREMENTAL+set}" ]; then
+          echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
+        fi
+
+    - shell: bash
+      run: |
+        : enable colors in Cargo output
+        if [ -z "${CARGO_TERM_COLOR+set}" ]; then
+          echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
+        fi
+
+    - shell: bash
+      run: |
+        : enable rust backtrace
+        if [ -z "${RUST_BACKTRACE+set}" ]; then
+          echo RUST_BACKTRACE=short >> $GITHUB_ENV
+        fi
+
+    - shell: bash
+      run: |
+        : enable faster cargo sparse registry
+        if [ -z "${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set}" ]; then
+          echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV
+        fi
+
+    - name: 'Setup Rust toolchain'
+      uses: dtolnay/rust-toolchain@master
+      if: ${{ !inputs.skip-install }}
+      with:
+        toolchain: ${{ steps.file.outputs.toolchain }}
+        targets: ${{ inputs.targets }}
+        components: ${{ inputs.components }}
+
+    - name: 'Add cargo problem matchers'
+      shell: bash
+      run: echo "::add-matcher::${{ github.action_path }}/matchers.json"

.github/actions/setup-rust/matchers.json

@@ -0,0 +1,44 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "cargo-common",
+      "pattern": [
+        {
+          "regexp": "^(warning|warn|error)(?:\\[(\\S*)\\])?: (.*)$",
+          "severity": 1,
+          "code": 2,
+          "message": 3
+        },
+        {
+          "regexp": "^(?:[\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3
+        }
+      ]
+    },
+    {
+      "owner": "cargo-test",
+      "pattern": [
+        {
+          "regexp": "^.*panicked\\s+at\\s+'(.*)',\\s+(.*):(\\d+):(\\d+)$",
+          "message": 1,
+          "file": 2,
+          "line": 3,
+          "column": 4
+        }
+      ]
+    },
+    {
+      "owner": "rustfmt",
+      "pattern": [
+        {
+          "regexp": "^(Diff in (\\S+)) at line (\\d+):",
+          "message": 1,
+          "file": 2,
+          "line": 3
+        }
+      ]
+    }
+  ]
+}

.github/workflows/build_and_deploy.yml

@@ -8,7 +8,6 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.9.6
-  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18
@@ -199,14 +198,11 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - name: Install
-        uses: actions-rs/toolchain@v1
-        if: ${{ !matrix.settings.docker }}
+      - name: Install Rust
+        uses: ./.github/actions/setup-rust
         with:
-          profile: minimal
-          override: true
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-          target: ${{ matrix.settings.target }}
+          targets: ${{ matrix.settings.target }}
+          skip-install: ${{ !!matrix.settings.docker }}
 
       - name: Cache cargo registry
         uses: actions/cache@v3
@@ -235,7 +231,21 @@ jobs:
         if: ${{ matrix.settings.docker }}
         with:
           image: ${{ matrix.settings.docker }}
-          options: -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} -e NAPI_CLI_VERSION=${{ env.NAPI_CLI_VERSION }} -e TURBO_VERSION=${{ env.TURBO_VERSION }} -e TURBO_TEAM=vercel -e TURBO_TOKEN=${{ secrets.TURBO_TOKEN }} -e TURBO_REMOTE_ONLY=true -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
+          options: >-
+            -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
+            -e CARGO_INCREMENTAL=${{ env.CARGO_INCREMENTAL }}
+            -e CARGO_TERM_COLOR=${{ env.CARGO_TERM_COLOR }}
+            -e RUST_BACKTRACE=${{ env.RUST_BACKTRACE }}
+            -e CARGO_REGISTRIES_CRATES_IO_PROTOCOL=${{ env.CARGO_REGISTRIES_CRATES_IO_PROTOCOL }}
+            -e NAPI_CLI_VERSION=${{ env.NAPI_CLI_VERSION }}
+            -e TURBO_VERSION=${{ env.TURBO_VERSION }}
+            -e TURBO_TEAM=vercel
+            -e TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
+            -e TURBO_REMOTE_ONLY=true
+            -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git
+            -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry
+            -v ${{ github.workspace }}:/build
+            -w /build
           run: ${{ matrix.settings.build }}
 
       - name: 'Build'
@@ -293,12 +303,9 @@ jobs:
           check-latest: true
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: ./.github/actions/setup-rust
         with:
-          profile: minimal
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-          override: true
-          target: wasm32-unknown-unknown
+          targets: wasm32-unknown-unknown
 
       - run: npm i -g turbo@${{ env.TURBO_VERSION }} pnpm@${PNPM_VERSION}
 

.github/workflows/build_and_test.yml

@@ -9,11 +9,12 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.9.6
-  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18
   TEST_CONCURRENCY: 6
+  # disable backtrace for test snapshots
+  RUST_BACKTRACE: 0
 
   TURBO_TEAM: 'vercel'
   TURBO_REMOTE_ONLY: 'true'

.github/workflows/build_reusable.yml

@@ -31,11 +31,12 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.9.6
-  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18
   TEST_CONCURRENCY: 6
+  # disable backtrace for test snapshots
+  RUST_BACKTRACE: 0
 
   TURBO_TEAM: 'vercel'
   TURBO_REMOTE_ONLY: 'true'
@@ -56,11 +57,14 @@ jobs:
       - run: node -v
       - run: pwd
 
-      - name: Install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 25
+
+      # local action -> needs to run after checkout
+      - name: Install Rust
+        uses: ./.github/actions/setup-rust
         with:
-          profile: minimal
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: rustfmt, clippy
 
       - name: Install nextest
@@ -71,10 +75,6 @@ jobs:
 
       - run: npm i -g yarn "pnpm@${PNPM_VERSION}" "turbo@${TURBO_VERSION}" "@napi-rs/cli@${NAPI_CLI_VERSION}"
 
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 25
-
       # clean up any previous artifacts to avoid hitting disk space limits
       - run: git clean -xdf && rm -rf /tmp/next-repo-*; rm -rf /tmp/next-install-* /tmp/yarn-* /tmp/ncc-cache target && cargo clean
 

.github/workflows/pull_request_stats.yml

@@ -7,7 +7,6 @@ name: Generate Pull Request Stats
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.9.6
-  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18

.github/workflows/trigger_release.yml

@@ -26,7 +26,6 @@ name: Trigger Release
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.9.6
-  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.5-canary.6"
+  "version": "13.4.5-canary.7"
 }

package.json

@@ -200,14 +200,14 @@
     "random-seed": "0.3.0",
     "react": "18.2.0",
     "react-17": "npm:react@17.0.2",
-    "react-builtin": "npm:react@18.3.0-canary-16d053d59-20230506",
+    "react-builtin": "npm:react@18.3.0-canary-1cea38448-20230530",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@17.0.2",
-    "react-dom-builtin": "npm:react-dom@18.3.0-canary-16d053d59-20230506",
-    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-16d053d59-20230506",
-    "react-experimental-builtin": "npm:react@0.0.0-experimental-16d053d59-20230506",
-    "react-server-dom-webpack": "18.3.0-canary-16d053d59-20230506",
-    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-16d053d59-20230506",
+    "react-dom-builtin": "npm:react-dom@18.3.0-canary-1cea38448-20230530",
+    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-1cea38448-20230530",
+    "react-experimental-builtin": "npm:react@0.0.0-experimental-1cea38448-20230530",
+    "react-server-dom-webpack": "18.3.0-canary-1cea38448-20230530",
+    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-1cea38448-20230530",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
@@ -217,8 +217,8 @@
     "resolve-from": "5.0.0",
     "sass": "1.54.0",
     "satori": "0.9.1",
-    "scheduler-builtin": "npm:scheduler@0.24.0-canary-16d053d59-20230506",
-    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-16d053d59-20230506",
+    "scheduler-builtin": "npm:scheduler@0.24.0-canary-1cea38448-20230530",
+    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-1cea38448-20230530",
     "seedrandom": "3.0.5",
     "selenium-webdriver": "4.0.0-beta.4",
     "semver": "7.3.7",
@@ -249,8 +249,8 @@
     "@babel/parser": "7.18.0",
     "@babel/types": "7.18.0",
     "@babel/traverse": "7.18.0",
-    "@types/react": "18.2.5",
-    "@types/react-dom": "18.2.3"
+    "@types/react": "18.2.7",
+    "@types/react-dom": "18.2.4"
   },
   "engines": {
     "node": ">=16.8.0"

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-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": "13.4.5-canary.6",
+    "@next/eslint-plugin-next": "13.4.5-canary.7",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-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",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.4.5-canary.6",
+  "version": "13.4.5-canary.7",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",