Merge branch 'canary' into mattlewis/update-contentful

.eslintignore

@@ -34,7 +34,7 @@ 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/**

.github/.react-version

@@ -0,0 +1 @@
+19.0.0-rc-6230622a1a-20240610

.github/labeler.json

@@ -5,7 +5,7 @@
     "examples": ["examples/**"],
     "Font (next/font)": ["**/*font*"],
     "tests": ["test/**", "bench/**"],
-    "Turbopack": ["packages/next-swc/crates/next-*/**"],
+    "Turbopack": ["crates/next-*/**"],
     "created-by: Chrome Aurora": [
       { "type": "user", "pattern": "atcastle" },
       { "type": "user", "pattern": "devknoll" },
@@ -71,6 +71,7 @@
       "packages/next-swc/**",
       "packages/next/**",
       "packages/react-refresh-utils/**"
-    ]
+    ],
+    "type: react-sync": [".github/.react-version"]
   }
 }

.github/workflows/build_and_deploy.yml

@@ -429,7 +429,7 @@ jobs:
         run: turbo run build-wasm -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }}
 
       - name: Add target to folder name
-        run: '[[ -d "packages/next-swc/crates/wasm/pkg" ]] && mv packages/next-swc/crates/wasm/pkg packages/next-swc/crates/wasm/pkg-${{ matrix.target }} || ls packages/next-swc/crates/wasm'
+        run: '[[ -d "crates/wasm/pkg" ]] && mv crates/wasm/pkg crates/wasm/pkg-${{ matrix.target }} || ls crates/wasm'
 
       - name: Upload turbo summary artifact
         uses: actions/upload-artifact@v4
@@ -441,7 +441,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: wasm-binaries-${{matrix.target}}
-          path: packages/next-swc/crates/wasm/pkg-*
+          path: crates/wasm/pkg-*
 
   deploy-tarball:
     if: ${{ needs.deploy-target.outputs.value != 'production' }}
@@ -486,7 +486,7 @@ jobs:
         with:
           pattern: wasm-binaries-*
           merge-multiple: true
-          path: packages/next-swc/crates/wasm
+          path: crates/wasm
 
       - name: Create tarballs
         run: node scripts/create-preview-tarballs.js "${{ github.sha }}" "${{ runner.temp }}/preview-tarballs"
@@ -546,7 +546,7 @@ jobs:
         with:
           pattern: wasm-binaries-*
           merge-multiple: true
-          path: packages/next-swc/crates/wasm
+          path: crates/wasm
 
       - run: npm i -g npm@10.4.0 # need latest version for provenance (pinning to avoid bugs)
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc

.github/workflows/build_and_test.yml

@@ -241,7 +241,7 @@ jobs:
 
     uses: ./.github/workflows/build_reusable.yml
     with:
-      afterBuild: rustup target add wasm32-unknown-unknown && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && node ./scripts/normalize-version-bump.js && turbo run build-wasm -- --target nodejs && git checkout . && mv packages/next-swc/crates/wasm/pkg packages/next-swc/crates/wasm/pkg-nodejs && node ./scripts/setup-wasm.mjs && NEXT_TEST_MODE=start TEST_WASM=true node run-tests.js test/production/pages-dir/production/test/index.test.ts test/e2e/streaming-ssr/index.test.ts
+      afterBuild: rustup target add wasm32-unknown-unknown && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && node ./scripts/normalize-version-bump.js && turbo run build-wasm -- --target nodejs && git checkout . && mv crates/wasm/pkg crates/wasm/pkg-nodejs && node ./scripts/setup-wasm.mjs && NEXT_TEST_MODE=start TEST_WASM=true node run-tests.js test/production/pages-dir/production/test/index.test.ts test/e2e/streaming-ssr/index.test.ts
       stepName: 'test-next-swc-wasm'
     secrets: inherit
 

.husky/pre-push

@@ -1,11 +1,49 @@
 #!/usr/bin/env bash
 
-main_branch="canary"
+protected_branch='canary'
 
-branch="$(git rev-parse --abbrev-ref HEAD)"
+protected_remote_urls=(
+  'git@github.com:vercel/next.js.git'
+  'https://github.com/vercel/next.js.git' # github blocks password-based auth, but still usable via API token
+)
 
-if [ "$branch" = "$main_branch" ]; then
-  echo "You probably didn't intend to push directly to '$main_branch'." >&2
+
+# The pre-push hook [...] receives the name and location of the remote as parameters
+# https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
+remote_name="$1"
+remote_url="$2"
+
+
+
+# if we're pushing to a fork, we don't need to protect canary.
+# check if the remote is one of the protected ones.
+is_remote_protected=0
+for protected_remote_url in "${protected_remote_urls[@]}"; do
+  if [ "$remote_url" = "$protected_remote_url" ]; then
+    is_remote_protected=1
+    break
+  fi
+done
+
+if [ "$is_remote_protected" = 0 ]; then
+  exit 0
+fi
+
+
+
+# check if the push is targeting canary on the remote
+# https://stackoverflow.com/a/44156933
+push_targets_protected_branch=0
+protected_ref="refs/heads/$protected_branch"
+while read -r _local_ref _local_sha remote_ref _remote_sha; do
+  if [ "$remote_ref" = "$protected_ref" ]; then
+    push_targets_protected_branch=1
+    break
+  fi
+done
+
+if [ "$push_targets_protected_branch" = "1" ]; then
+  echo "You probably didn't intend to push directly to '$protected_branch' on '$remote_name' ($remote_url)." >&2
   echo "If you're sure that that's what you want to do, bypass this check via" >&2
   echo "" >&2
   echo "  git push --no-verify" >&2

.prettierignore

@@ -16,16 +16,16 @@ packages/next/src/bundles/webpack/packages/lazy-compilation-*.js
 
 .github/actions/next-stats-action/.work
 
-packages/next-swc/crates/**/tests/**/output*
-packages/next-swc/crates/core/tests/loader/issue-32553/input.js
+crates/**/tests/**/output*
+crates/core/tests/loader/issue-32553/input.js
 # prettier destroys the directives here
-packages/next-swc/crates/next-custom-transforms/tests/errors/react-server-components/client-graph/use-client/input.js
-packages/next-swc/crates/next-custom-transforms/tests/errors/react-server-components/server-graph/fake-client-entry/input.js
-packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/input.js
-packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/9/input.js
-packages/next-swc/crates/next-custom-transforms/tests/fixture/optimize-barrel/normal/4/input.js
-packages/next-swc/crates/next-custom-transforms/tests/fixture/react-server-components/client-graph/client-entry/input.js
-packages/next-swc/crates/next-custom-transforms/tests/fixture/react-server-components/server-graph/client-entry/input.js
+crates/next-custom-transforms/tests/errors/react-server-components/client-graph/use-client/input.js
+crates/next-custom-transforms/tests/errors/react-server-components/server-graph/fake-client-entry/input.js
+crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/input.js
+crates/next-custom-transforms/tests/errors/server-actions/server-graph/9/input.js
+crates/next-custom-transforms/tests/fixture/optimize-barrel/normal/4/input.js
+crates/next-custom-transforms/tests/fixture/react-server-components/client-graph/client-entry/input.js
+crates/next-custom-transforms/tests/fixture/react-server-components/server-graph/client-entry/input.js
 packages/next-swc/native/**/*
 packages/next-swc/docs/assets/**/*