Merge branch 'canary' into add-example

Author: leerob

.cargo/config.toml

@@ -1,37 +1,52 @@
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
+TURBO_PNPM_WORKSPACE_DIR = { value = "", relative = true }
 
 [build]
-
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y", # make the current crate share its generic instantiations
+  "-Zthreads=8", # parallel frontend https://blog.rust-lang.org/2023/11/09/parallel-rustc.html
+  "-Csymbol-mangling-version=v0",
+]
 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"
+[target.aarch64-pc-windows-msvc]
+linker = "rust-lld"
 
-[target.aarch64-unknown-linux-musl]
-linker = "aarch64-linux-musl-gcc"
+[target.'cfg(target_os = "macos")']
+linker = "rust-lld"
+
+[target.'cfg(all(target_os = "linux", target_env = "gnu"))']
 rustflags = [
   "--cfg",
   "tokio_unstable",
   "-Zshare-generics=y",
+  "-Zthreads=8",
+  "-Zunstable-options",
   "-Csymbol-mangling-version=v0",
-  "-Ctarget-feature=-crt-static",
-  "-Clink-arg=-lgcc",
+  "-Clinker-flavor=gnu-lld-cc",
+  "-Clink-self-contained=+linker",
 ]
 
-[target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
-
-[target.'cfg(all())']
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-musl-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
   "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
+  "-Ctarget-feature=-crt-static",
+  "-Clink-arg=-lgcc",
 ]
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"

.config/ast-grep/rule-tests/__snapshots__/no-context-snapshot.yml

@@ -0,0 +1,11 @@
+id: no-context
+valid:
+  - 'let chunking_context = ChunkingContext::new();'
+  - 'struct Foo { chunking_context: Context };'
+  - 'foo(|chunking_context| context)'
+  - 'fn foo(chunking_context: ChunkingContext) -> u32 { 5 };'
+invalid:
+  - 'let context = ChunkingContext::new();'
+  - 'struct Foo { context: Context };'
+  - 'foo(|context| context)'
+  - 'fn foo(context: ChunkingContext) -> u32 { 5 };'

.config/ast-grep/rule-tests/no-context-test.yml

@@ -0,0 +1,22 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/ast-grep/ast-grep/main/schemas/rule.json
+
+id: no-context
+message: Don't name variables `context`.
+note: Use a more specific name, such as chunking_context, asset_context, etc.
+severity: error
+language: Rust
+rule:
+  regex: \bcontext\b
+  any:
+    - all:
+        - inside:
+            any:
+              - kind: closure_parameters
+              - kind: parameter
+              - kind: function_item
+              - kind: let_declaration
+        - kind: identifier
+    - all:
+        - kind: field_identifier
+        - inside:
+            kind: field_declaration

packages/next-swc/crates/next-custom-transforms/tests/errors/next-font-loaders/import-all/output.js renamed to .config/ast-grep/rule-utils/.gitkeep

@@ -0,0 +1,17 @@
+[profile.tp-test-linux.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Linux)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-mac.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Mac)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-win.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Windows)"
+store-success-output = true
+store-failure-output = true

.config/ast-grep/rules/no-context.yml

@@ -1,5 +1,5 @@
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=20-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.

.config/nextest.toml

@@ -1,5 +1,5 @@
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=20-bullseye
 FROM node:${VARIANT}
 
 # [Option] Install zsh

.devcontainer/Dockerfile

@@ -8,7 +8,7 @@
     // Append -bullseye or -buster to pin to an OS version.
     // Use -bullseye variants on local arm64/Apple Silicon.
     "args": {
-      "VARIANT": "16-bullseye"
+      "VARIANT": "20-bullseye"
     }
   },
   // Configure tool-specific properties.

.devcontainer/base.Dockerfile

@@ -4,6 +4,7 @@ node_modules
 **/.vscode/**
 **/dist/**
 e2e-tests/**
+examples/cms-sanity/sanity.types.ts
 examples/with-eslint/**
 examples/with-typescript-eslint-jest/**
 examples/with-kea/**
@@ -26,16 +27,25 @@ packages/next-codemod/**/*.js
 packages/next-codemod/**/*.d.ts
 packages/next-env/**/*.d.ts
 packages/create-next-app/templates/**
-test/integration/eslint/**
-test/integration/script-loader/**/*
-test/development/basic/legacy-decorators/**/*
+test/integration/eslint/**/*.js
+test/integration/script-loader/**/*.js
+test/development/basic/legacy-decorators/**/*.js
 test/production/emit-decorator-metadata/**/*.js
+!test/**/*.test.*
 test/e2e/app-dir/rsc-errors/app/swc/use-client/page.js
 test-timings.json
-packages/next-swc/crates/**
+crates/**
 bench/nested-deps/**
 bench/nested-deps-app-router/**
+bench/heavy-npm-deps/**
 packages/next-bundle-analyzer/index.d.ts
 examples/with-typescript-graphql/lib/gql/
 test/development/basic/hmr/components/parse-error.js
 packages/next-swc/docs/assets/**/*
+test/lib/amp-validator-wasm.js
+test/production/pages-dir/production/fixture/amp-validator-wasm.js
+test/e2e/async-modules/amp-validator-wasm.js
+
+# turbopack crates
+turbopack/crates/*/tests/**
+turbopack/crates/*/js/src/compiled