mirror react_compiler_swc from swc-project

Author: wbinnssmith

.github/workflows/sync.yml

@@ -43,12 +43,18 @@ jobs:
       - name: Set branch name
         run: echo "BRANCH=sync/react-compiler-$(date +%Y%m%d-%H%M%S)" >> "$GITHUB_ENV"
 
-      - name: Sync upstream
-        run: just upstream_ref="${{ inputs.upstream_ref }}" sync
+      - name: Sync React compiler crates from react/react
+        run: just upstream_ref="${{ inputs.upstream_ref }}" sync-react
+
+      - name: Sync SWC integration crate from swc-project/swc
+        run: just sync-swc
 
       - name: Run codemod
         run: just codemod
 
+      - name: Apply patches
+        run: just patch
+
       - name: Create signed commit and open PR
         run: node --experimental-strip-types .github/scripts/sync-pr.ts
         env:

justfile

@@ -4,13 +4,19 @@
 # name, source, and directories as upstream's `react_compiler_*`, and adds the
 # metadata + `publish` flags to release `nextjs_react_compiler` and its deps to crates.io.
 #
+# The core compiler crates live in react/react:compiler/crates/. The SWC integration
+# crate (react_compiler_swc) was moved to swc-project/swc:crates/swc_ecma_react_compiler;
+# `sync` pulls from both repos and overlays the swc crate on top of the react/react snapshot.
+#
 # The oxc-project org ruleset forbids merge commits, so the vendor is a linear
 # snapshot (not `git subtree`): each `sync` re-extracts upstream's `compiler/`,
 # re-runs the transform tool (./codemod), re-applies ./patches, and commits once.
 # Both are re-applied every sync because the snapshot is taken fresh.
 #
 #   just import       # one-time: create ./react-compiler (transformed)
-#   just sync         # update ./react-compiler to the latest main state (re-transformed)
+#   just sync         # update ./react-compiler from both upstreams, re-transform, commit
+#   just sync-react   # extract react/react compiler crates only (no commit)
+#   just sync-swc     # extract swc-project/swc integration crate only (no commit)
 #   just codemod      # (re)run codemod on ./react-compiler in place
 #   just patch        # apply ./patches/*.patch (Rust source changes the codemod can't express)
 #   just check        # cargo check the vendored workspace
@@ -23,38 +29,94 @@ upstream_ref  := "main"
 src_dir       := "compiler"          # path of the compiler inside the react monorepo
 prefix        := "react-compiler"    # where it lives in THIS repo
 
+swc_repo  := "https://github.com/swc-project/swc.git"
+swc_ref   := "main"
+swc_src   := "crates/swc_ecma_react_compiler"  # path within swc-project/swc
+swc_dest  := "react_compiler_swc"              # crate directory name in this repo
+
 # Show available recipes
 default:
     @just --list
 
 # One-time import (same operation as sync; kept for discoverability)
 import: sync
 
-# Snapshot react's `compiler/` into ./{{prefix}}, set published names to nextjs_react_compiler_*, commit once
+# Full sync: extract from both upstreams, transform, patch, and commit.
 sync:
     #!/usr/bin/env bash
     set -euo pipefail
-    git fetch --depth=1 --no-tags {{react_repo}} {{upstream_ref}}
-    upstream="$(git rev-parse FETCH_HEAD)"
-    tree="$(git rev-parse "FETCH_HEAD:{{src_dir}}")"
     # Preserve the currently-published version across the wipe so cargo-release-oxc
     # stays the single source of truth — the codemod re-stamps whatever is committed
     # rather than inventing a number.
     version="$(sed -n 's/^version = "\(.*\)"/\1/p' {{prefix}}/Cargo.toml | head -1)"
     version="${version:-0.1.0}"
-    git rm -r --cached --quiet --ignore-unmatch {{prefix}}
-    rm -rf {{prefix}}
-    git read-tree --prefix={{prefix}}/ -u "$tree"
+    just sync-react
+    just sync-swc
     just codemod "$version"
     just patch
     git add -A {{prefix}}
     if git diff --cached --quiet -- {{prefix}}; then
-        echo "{{prefix}} already at react {{upstream_ref}} @ ${upstream} — nothing to commit."
+        echo "{{prefix}} already up to date — nothing to commit."
     else
-        git commit -q -m "vendor: react-compiler from {{upstream_ref}} @ ${upstream} (nextjs_react_compiler)"
-        echo "Committed {{prefix}} @ ${upstream}."
+        git commit -q -m "vendor: sync react-compiler from react/react and swc-project/swc"
+        echo "Committed {{prefix}}."
     fi
 
+# Extract the React compiler crates from react/react into ./{{prefix}}.
+# Wipes and re-extracts the full tree; run sync-swc afterward to overlay the SWC crate.
+sync-react:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    git fetch --depth=1 --no-tags {{react_repo}} {{upstream_ref}}
+    upstream="$(git rev-parse FETCH_HEAD)"
+    tree="$(git rev-parse "FETCH_HEAD:{{src_dir}}")"
+    git rm -r --cached -f --quiet --ignore-unmatch {{prefix}}
+    rm -rf {{prefix}}
+    git read-tree --prefix={{prefix}}/ -u "$tree"
+    echo "sync-react: {{prefix}} from {{react_repo}} @ ${upstream}"
+
+# Extract the SWC integration crate from swc-project/swc into ./{{prefix}}/crates/{{swc_dest}}.
+# The SWC crate was moved out of react/react; this overlays it on top of a sync-react extraction.
+sync-swc:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    git fetch --depth=1 --no-tags {{swc_repo}} {{swc_ref}}
+    swc_upstream="$(git rev-parse FETCH_HEAD)"
+    swc_tree="$(git rev-parse "FETCH_HEAD:{{swc_src}}")"
+    dest="{{prefix}}/crates/{{swc_dest}}"
+    git rm -r --cached -f --quiet --ignore-unmatch "$dest"
+    rm -rf "$dest"
+    git read-tree --prefix="$dest/" -u "$swc_tree"
+    just _fixup-swc-cargo "$dest/Cargo.toml"
+    echo "sync-swc: {{swc_dest}} from {{swc_repo}} @ ${swc_upstream}"
+
+# Post-process the upstream swc crate's Cargo.toml to fit our workspace:
+#   - rename from the swc upstream name to our crate name (codemod adds the nextjs_ prefix)
+#   - strip monorepo path deps, leaving only the crates.io version
+#   - resolve swc-workspace-inherited deps to explicit crates.io versions
+#   - drop [dev-dependencies] (swc-internal test harness not available on crates.io)
+_fixup-swc-cargo cargo:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    cargo="{{cargo}}"
+    # All sed substitutions in one pass → temp file → replace (avoids BSD/GNU -i differences)
+    sed -E \
+        -e 's/^(name[[:space:]]*=[[:space:]]*)"swc_ecma_react_compiler"/\1"react_compiler_swc"/' \
+        -e 's/,[[:space:]]*path[[:space:]]*=[[:space:]]*"[^"]*"//g' \
+        -e 's/^(rustc-hash[[:space:]]*=[[:space:]]*)\{[^}]*workspace[^}]*\}/\1"2"/' \
+        -e 's/^(serde[[:space:]]*=[[:space:]]*)\{[^}]*workspace[^}]*\}/\1{ version = "1", features = ["derive"] }/' \
+        -e 's/^(serde_json[[:space:]]*=[[:space:]]*)\{[^}]*workspace[^}]*\}/\1"1"/' \
+        -e 's/^(indexmap[[:space:]]*=[[:space:]]*)\{[^}]*workspace[^}]*\}/\1{ version = "2", features = ["serde"] }/' \
+        -e 's/^(swc_atoms[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"9"/' \
+        -e 's/^(swc_common[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"21"/' \
+        -e 's/^(swc_ecma_ast[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"23"/' \
+        -e 's/^(swc_ecma_codegen[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"26"/' \
+        -e 's/^(swc_ecma_parser[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"39"/' \
+        -e 's/^(swc_ecma_visit[[:space:]]*=[[:space:]]*)\{[^}]*\}/\1"23"/' \
+        "$cargo" > "${cargo}.tmp" && mv "${cargo}.tmp" "$cargo"
+    # Drop [dev-dependencies] section — the `testing` crate is swc-internal and not on crates.io
+    awk '/^\[dev-dependencies\]/{skip=1; next} skip && /^\[/{skip=0} !skip{print}' "$cargo" > "${cargo}.tmp" && mv "${cargo}.tmp" "$cargo"
+
 # (Re)run codemod on ./{{prefix}}: published names, workspace deps, publish flags, LICENSE, oxc_release.toml.
 # `version` defaults to the version already in the tree (cargo-release-oxc owns the bumps).
 codemod version=`sed -n 's/^version = "\(.*\)"/\1/p' react-compiler/Cargo.toml 2>/dev/null | head -1`: