Merge branch 'canary' into fix/remove-global-error-in-example

.cargo/config.toml

@@ -17,10 +17,22 @@ rustdocflags = []
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
-rustflags = ["-C", "target-feature=+crt-static"]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-C",
+  "target-feature=+crt-static"
+]
 
 [target.i686-pc-windows-msvc]
-rustflags = ["-C", "target-feature=+crt-static"]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-C",
+  "target-feature=+crt-static"
+]
 
 [target.aarch64-pc-windows-msvc]
 linker = "rust-lld"
@@ -42,6 +54,7 @@ rustflags = [
 
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
+# Config need to be mirrowed to .github/workflows/build_and_deploy.yml
 rustflags = [
   "--cfg",
   "tokio_unstable",
@@ -51,5 +64,16 @@ rustflags = [
   "-Clink-arg=-lgcc",
 ]
 
+[target.x86_64-unknown-linux-musl]
+# Config need to be mirrowed to .github/workflows/build_and_deploy.yml
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-Zthreads=8",
+  "-Csymbol-mangling-version=v0",
+  "-Ctarget-feature=-crt-static",
+]
+
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"

.devcontainer/Dockerfile

@@ -28,4 +28,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN su node -c "npm install -g <your-package-list-here>"
 
 # Enable pnpm
+RUN npm i -g corepack@latest
 RUN corepack enable pnpm

.eslintrc.json

@@ -162,7 +162,7 @@
       "files": ["packages/**"],
       "excludedFiles": [
         "packages/next/taskfile*.js",
-        "packages/next/next_runtime.config.js"
+        "packages/next/next-runtime.webpack-config.js"
       ],
       "rules": {
         "no-shadow": ["error", { "builtinGlobals": false }],

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -82,34 +82,39 @@ body:
         - 'create-next-app'
         - 'CSS'
         - 'dynamicIO'
+        - 'Dynamic Routes'
         - 'Error Handling'
-        - 'Experimental'
         - 'Lazy Loading'
         - 'Font (next/font)'
         - 'Form (next/form)'
         - 'Image (next/image)'
         - 'Instrumentation'
         - 'Internationalization (i18n)'
-        - 'Link (next/link)'
+        - 'Linking and Navigating'
         - 'Linting'
+        - 'Loading UI and Streaming'
         - 'Markdown (MDX)'
         - 'Metadata'
         - 'Middleware'
         - 'Module Resolution'
-        - 'Output (export/standalone)'
+        - 'Output'
+        - 'Package Managers'
         - 'Pages Router'
         - 'Parallel & Intercepting Routes'
         - 'Partial Prerendering (PPR)'
         - 'Performance'
         - 'React'
+        - 'Redirects'
         - 'Route Groups'
+        - 'Route Handlers'
         - 'Runtime'
         - 'Script (next/script)'
         - 'Server Actions'
         - 'Testing'
         - 'Turbopack'
         - 'TypeScript'
         - 'SWC'
+        - 'Use Cache'
         - 'Webpack'
 
     validations:

.github/actions/next-stats-action/Dockerfile

@@ -12,6 +12,7 @@ RUN apt install unzip wget curl nano htop screen build-essential pkg-config libs
 RUN ln $(which python3) /usr/bin/python
 
 RUN curl -sfLS https://install-node.vercel.app/v18.18.2 | bash -s -- -f
+RUN npm i -g corepack@0.31
 RUN corepack enable
 
 WORKDIR /next-stats

.github/workflows/build_and_deploy.yml

@@ -29,7 +29,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: Determine deploy target
         # 'force-preview' performs a full preview build but only if acknowledged i.e. workflow_dispatch
         # 'automated-preview' for pushes on branches other than 'canary' for integration testing.
@@ -70,7 +73,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - uses: actions/checkout@v4
         with:
@@ -225,6 +231,7 @@ jobs:
               rustup show &&
               rustup target add x86_64-unknown-linux-musl &&
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" &&
+              export RUSTFLAGS="--cfg tokio_unstable -Zshare-generics=y -Zthreads=8 -Csymbol-mangling-version=v0 -Ctarget-feature=-crt-static" &&
               cd packages/next-swc && npm run build-native-release -- --target x86_64-unknown-linux-musl &&
               strip native/next-swc.*.node
 
@@ -266,6 +273,7 @@ jobs:
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" &&
               rustup show &&
               rustup target add aarch64-unknown-linux-musl &&
+              export RUSTFLAGS="--cfg tokio_unstable -Zshare-generics=y -Zthreads=8 -Zunstable-options -Csymbol-mangling-version=v0 -Clinker-flavor=gnu-lld-cc -Clink-self-contained=+linker" &&
               cd packages/next-swc && npm run build-native-release -- --target aarch64-unknown-linux-musl &&
               llvm-strip -x native/next-swc.*.node
 
@@ -458,7 +466,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -518,7 +529,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -576,7 +590,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - uses: ./.github/actions/setup-rust
         with:

.github/workflows/build_and_test.yml

@@ -108,7 +108,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Run link checker'
         run: node ./.github/actions/validate-docs-links/dist/index.js
         env:

.github/workflows/code_freeze.yml

@@ -31,7 +31,10 @@ jobs:
         with:
           node-version: 18
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - run: git clone https://github.com/vercel/next.js.git --depth=1 .
 

.github/workflows/issue_wrong_template.yml

@@ -11,7 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Close issues using the wrong issue template'
         run: node ./.github/actions/next-repo-actions/dist/wrong-issue-template/index.js
         env:

.github/workflows/popular.yml

@@ -12,7 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Issues: Send notification to Slack'
         run: node ./.github/actions/next-repo-actions/dist/issues/index.mjs
         continue-on-error: true