Merge branch 'canary' into fix/guard-stream-cancel-calls-if-closed

Author: huozhi

.cargo/config.toml

@@ -7,6 +7,9 @@ rustdocflags = []
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
+rustflags = ["-C", "target-feature=+crt-static"]
+[target.i686-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
 
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"

.github/workflows/build_and_deploy.yml

@@ -152,7 +152,7 @@ jobs:
             #   to ensure it did not change unexpectedly if docker image, or other dependency changed
             # - zig linker with portable glibc is avoided as it has known issues with static tls + node.js + multi threaded
             #   environment.
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-x64
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-x64
             build: >-
               set -e &&
               apt update &&
@@ -173,7 +173,7 @@ jobs:
               - 'metal'
 
             target: 'x86_64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-alpine
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
             build: >-
               set -e &&
               apk update &&
@@ -192,7 +192,7 @@ jobs:
               - 'metal'
 
             target: 'aarch64-unknown-linux-gnu'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-aarch64
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-aarch64
             build: >-
               set -e &&
               apt update &&
@@ -214,7 +214,7 @@ jobs:
               - 'metal'
 
             target: 'aarch64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-alpine
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
             build: >-
               set -e &&
               apk update &&

.github/workflows/build_and_test.yml

@@ -33,6 +33,9 @@ jobs:
     uses: ./.github/workflows/build_reusable.yml
     with:
       skipInstallBuild: 'yes'
+      # Ensure all of the tests listed in turbopack test manifest actually exists;
+      # i.e after removing an actual test and if it still stays in the manifest
+      afterBuild: node -e 'require(\"./test/turbopack-tests-manifest.js\").verifyEnabledTestPath()'
     secrets: inherit
 
   build-next:
@@ -151,6 +154,21 @@ jobs:
       afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit
 
+  # --type production also runs tests/e2e
+  test-turbopack-prod:
+    name: test turbopack prod
+    needs: ['build-native', 'build-next']
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3, 4, 5]
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      nodeVersion: 16
+      skipForDocsOnly: 'yes'
+      afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" TURBOPACK=1 NEXT_TEST_MODE=start node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type production
+    secrets: inherit
+
   test-next-swc-wasm:
     name: test next-swc wasm
     needs: ['build-native', 'build-next']
@@ -227,7 +245,16 @@ jobs:
     secrets: inherit
 
   report-test-results:
-    needs: ['test-unit', 'test-dev', 'test-prod', 'test-integration']
+    needs:
+      [
+        'test-unit',
+        'test-dev',
+        'test-prod',
+        'test-integration',
+        'test-turbopack-dev',
+        'test-turbopack-integration',
+        'test-turbopack-prod',
+      ]
     uses: ./.github/workflows/build_reusable.yml
     with:
       skipForDocsOnly: 'yes'

.github/workflows/issue_validator.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Nissuer
-        uses: balazsorban44/nissuer@1.4.0
+        uses: balazsorban44/nissuer@1.5.0
         with:
           label-area-prefix: 'area:'
           label-area-section: 'Which area\(s\) are affected\? \(Select all that apply\)(.*)### Additional context'

docs/02-app/01-building-your-application/02-data-fetching/03-forms-and-mutations.mdx

@@ -43,7 +43,6 @@ module.exports = {
 > - Forms calling Server Actions from Server Components can function without JavaScript.
 > - Forms calling Server Actions from Client Components will queue submissions if JavaScript isn't loaded yet, prioritizing client hydration.
 > - Server Actions inherit the [runtime](/docs/app/building-your-application/rendering/edge-and-nodejs-runtimes) from the page or layout they are used on.
-> - Currently, if a route uses a Server Action, it is required to [render dynamically](/docs/app/building-your-application/rendering/server-components#server-rendering-strategies).
 
 ## Revalidating Cached Data
 

docs/02-app/02-api-reference/08-next-cli.mdx

@@ -158,19 +158,19 @@ will give you information like this example:
 
 ```bash filename="Terminal"
 
-    Operating System:
-      Platform: linux
-      Arch: x64
-      Version: #22-Ubuntu SMP Fri Nov 5 13:21:36 UTC 2021
-    Binaries:
-      Node: 16.13.0
-      npm: 8.1.0
-      Yarn: 1.22.17
-      pnpm: 6.24.2
-    Relevant packages:
-      next: 12.0.8
-      react: 17.0.2
-      react-dom: 17.0.2
+Operating System:
+  Platform: linux
+  Arch: x64
+  Version: #22-Ubuntu SMP Fri Nov 5 13:21:36 UTC 2021
+Binaries:
+  Node: 16.13.0
+  npm: 8.1.0
+  Yarn: 1.22.17
+  pnpm: 6.24.2
+Relevant packages:
+  next: 12.0.8
+  react: 17.0.2
+  react-dom: 17.0.2
 
 ```
 

docs/03-pages/01-building-your-application/06-configuring/13-debugging.mdx

@@ -33,7 +33,7 @@ Create a file named `.vscode/launch.json` at the root of your project with the f
       "request": "launch",
       "command": "npm run dev",
       "serverReadyAction": {
-        "pattern": "started server on .+, url: (https?://.+)",
+        "pattern": "- Local:.+(https?://.+)",
         "uriFormat": "%s",
         "action": "debugWithChrome"
       }

docs/04-architecture/fast-refresh.mdx

@@ -91,6 +91,9 @@ state to be preserved in more cases.
   edit.
 - You can put `console.log` or `debugger;` into the components you edit during
   development.
+- Remember that imports are case sensitive. Both fast and full refresh can fail,
+  when your import doesn't match the actual filename.
+  For example, `'./header'` vs `'./Header'`.
 
 ## Fast Refresh and Hooks
 

examples/data-fetch/package.json

@@ -6,7 +6,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "12.2.5",
+    "next": "12.3.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.5.2"
+  "version": "13.5.3-canary.0"
 }