refactor(bindings): Make @swc/core a subpackage

.github/workflows/CI.yml

@@ -146,6 +146,8 @@ jobs:
           # toolchain: stable
           # override: true
 
+      - run: corepack enable
+
       - uses: actions/setup-node@v4
         with:
           node-version: "18"
@@ -154,6 +156,7 @@ jobs:
       - name: Install node dependencies
         shell: bash
         run: |
+          corepack enable
           yarn
 
       # Ensure that all components are compilable.
@@ -168,6 +171,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - shell: bash
+        run: corepack enable
+
       # We explicitly do this to cache properly.
       - uses: actions-rs/toolchain@v1
         with:
@@ -191,6 +197,7 @@ jobs:
       - name: Install node dependencies
         shell: bash
         run: |
+          corepack enable
           yarn
 
       - name: Build
@@ -589,6 +596,8 @@ jobs:
         with:
           submodules: true
 
+      - run: corepack enable
+
       # Source map format
       - uses: actions/setup-node@v4
         with:
@@ -613,6 +622,7 @@ jobs:
       - name: Install node dependencies
         shell: bash
         run: |
+          corepack enable
           yarn
           # I don't want to think deeply about this
           yarn global add jest@27 mocha || \
@@ -633,7 +643,7 @@ jobs:
       - name: Verify dependencies
         shell: bash
         run: |
-          jest --version && mocha --version
+          yarn jest --version && yarn mocha --version
 
       - name: Configure execution cache
         shell: bash
@@ -725,8 +735,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Corepack
-        shell: bash
+      - shell: bash
         run: corepack enable
 
       # We explicitly do this to cache properly.
@@ -735,7 +744,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 18
           cache: "yarn"
 
       - name: Patch
@@ -761,7 +770,14 @@ jobs:
           corepack enable
           yarn
 
+      - name: Build
+        working-directory: packages/core
+        run: |
           yarn build:dev
+
+      - name: Test
+        working-directory: packages/core
+        run: |
           yarn test
 
   integration-test:
@@ -772,8 +788,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Corepack
-        shell: bash
+      - shell: bash
         run: corepack enable
 
       - uses: actions/setup-node@v4
@@ -878,14 +893,19 @@ jobs:
         with:
           submodules: true
 
+      - shell: bash
+        run: corepack enable
+
       - uses: actions/setup-node@v4
         with:
           node-version: "18"
           cache: "yarn"
 
       - name: Install node dependencies
         shell: bash
-        run: yarn
+        run: |
+          corepack enable
+          yarn
 
       - name: Print rustup toolchain version
         shell: bash

.github/workflows/publish-core.yml

@@ -1,5 +1,8 @@
 name: Publish (core)
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 env:
   DEBUG: napi:*
   APP_NAME: swc
@@ -34,25 +37,25 @@ jobs:
           - host: macos-latest
             target: x86_64-apple-darwin
             build: |
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-apple-darwin
-              cp ./bindings/target/x86_64-apple-darwin/release/swc .
+              cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-apple-darwin
+              cp ../../bindings/target/x86_64-apple-darwin/release/swc .
               chmod +x ./swc
               yarn build --target x86_64-apple-darwin
               strip -x *.node
           - host: windows-latest
             build: |
               export CARGO_PROFILE_RELEASE_LTO=false
               yarn build --target x86_64-pc-windows-msvc
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-pc-windows-msvc
-              cp ./bindings/target/x86_64-pc-windows-msvc/release/swc .
+              cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-pc-windows-msvc
+              cp ../../bindings/target/x86_64-pc-windows-msvc/release/swc .
             target: x86_64-pc-windows-msvc
           - host: windows-latest
             # use npm to run test, because of corepack link the yarn with x64 Node.js
             build: |
               export DISABLE_PLUGIN_E2E_TESTS=true
               export CARGO_PROFILE_RELEASE_LTO=false
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --target i686-pc-windows-msvc
-              cp bindings/target/i686-pc-windows-msvc/release/swc .
+              cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --target i686-pc-windows-msvc
+              cp ../../bindings/target/i686-pc-windows-msvc/release/swc .
               yarn build --target i686-pc-windows-msvc --no-default-features --features swc_v1
               npm run test
             target: i686-pc-windows-msvc
@@ -61,9 +64,9 @@ jobs:
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
             build: >-
               set -e &&
-              unset CC_x86_64_unknown_linux_gnu && unset CC && RUSTFLAGS='-C target-feature=+sse2' cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-unknown-linux-gnu &&
-              rm -rf bindings/target/target/x86_64-unknown-linux-gnu/release/.cargo-lock &&
-              cp bindings/target/x86_64-unknown-linux-gnu/release/swc . && chmod +x ./swc &&
+              unset CC_x86_64_unknown_linux_gnu && unset CC && RUSTFLAGS='-C target-feature=+sse2' cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-unknown-linux-gnu &&
+              rm -rf ../../bindings/target/target/x86_64-unknown-linux-gnu/release/.cargo-lock &&
+              cp ../../bindings/target/x86_64-unknown-linux-gnu/release/swc . && chmod +x ./swc &&
               yarn build --target x86_64-unknown-linux-gnu
           - host: ubuntu-latest
             target: x86_64-unknown-linux-musl
@@ -72,9 +75,9 @@ jobs:
             build: >-
               set -e &&
               export CARGO_PROFILE_RELEASE_LTO=false &&
-              RUSTFLAGS='-C target-feature=+sse2' cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-unknown-linux-musl &&
+              RUSTFLAGS='-C target-feature=+sse2' cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target x86_64-unknown-linux-musl &&
               rm -rf target/release/.cargo-lock &&
-              cp bindings/target/x86_64-unknown-linux-musl/release/swc . && chmod +x ./swc &&
+              cp ../../bindings/target/x86_64-unknown-linux-musl/release/swc . && chmod +x ./swc &&
               RUSTFLAGS='-C target-feature=+sse2 -C target-feature=-crt-static' yarn build --target x86_64-unknown-linux-musl
           - host: macos-latest
             target: aarch64-apple-darwin
@@ -84,8 +87,8 @@ jobs:
               export CXX=$(xcrun -f clang++);
               SYSROOT=$(xcrun --sdk macosx --show-sdk-path);
               export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-apple-darwin
-              cp ./bindings/target/aarch64-apple-darwin/release/swc .
+              cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-apple-darwin
+              cp ../../bindings/target/aarch64-apple-darwin/release/swc .
               chmod +x ./swc
               yarn build --target aarch64-apple-darwin
           - host: ubuntu-latest
@@ -95,15 +98,15 @@ jobs:
               set -e &&
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
               rustup target add aarch64-unknown-linux-gnu &&
-              RUSTFLAGS='' cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-unknown-linux-gnu &&
-              cp ./bindings/target/aarch64-unknown-linux-gnu/release/swc . && chmod +x ./swc &&
+              RUSTFLAGS='' cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-unknown-linux-gnu &&
+              cp ../../bindings/target/aarch64-unknown-linux-gnu/release/swc . && chmod +x ./swc &&
               export CC_aarch64_unknown_linux_gnu=/usr/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-gcc &&
               yarn build --target aarch64-unknown-linux-gnu
           - host: ubuntu-latest
             target: armv7-unknown-linux-gnueabihf
             build: |
               export DISABLE_PLUGIN_E2E_TESTS=true
-              yarn napi build --bin swc --release --target armv7-unknown-linux-gnueabihf --manifest-path ./bindings/swc_cli/Cargo.toml -x --target-dir ../release -o .
+              yarn napi build --bin swc --release --target armv7-unknown-linux-gnueabihf --manifest-path ../../bindings/swc_cli/Cargo.toml -x --target-dir ../release -o .
               chmod +x ./swc
               yarn build --target armv7-unknown-linux-gnueabihf --no-default-features --features swc_v1 --use-napi-cross
           - host: ubuntu-latest
@@ -112,11 +115,11 @@ jobs:
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: >-
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
-              rustup toolchain install $(cat ./rust-toolchain) &&
+              rustup toolchain install $(cat ../../rust-toolchain) &&
               rustup target add aarch64-unknown-linux-musl &&
-              RUSTFLAGS='-C target-feature=+crt-static -C link-arg=-lgcc' cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-unknown-linux-musl &&
+              RUSTFLAGS='-C target-feature=+crt-static -C link-arg=-lgcc' cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --features plugin --target aarch64-unknown-linux-musl &&
               rm -rf target/release/.cargo-lock &&
-              cp bindings/target/aarch64-unknown-linux-musl/release/swc . && chmod +x ./swc &&
+              cp ../../bindings/target/aarch64-unknown-linux-musl/release/swc . && chmod +x ./swc &&
               env RUSTFLAGS='-C target-feature=-crt-static' yarn build --target=aarch64-unknown-linux-musl
           - host: windows-latest
             target: aarch64-pc-windows-msvc
@@ -125,8 +128,8 @@ jobs:
               export DISABLE_PLUGIN_E2E_TESTS=true
               export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=256
               export CARGO_PROFILE_RELEASE_LTO=false
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --target aarch64-pc-windows-msvc
-              cp bindings/target/aarch64-pc-windows-msvc/release/swc.exe .
+              cargo build --manifest-path ../../bindings/swc_cli/Cargo.toml --release --target aarch64-pc-windows-msvc
+              cp ../../bindings/target/aarch64-pc-windows-msvc/release/swc.exe .
               yarn build --target aarch64-pc-windows-msvc --no-default-features --features swc_v1
     name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
@@ -197,10 +200,12 @@ jobs:
           image: ${{ matrix.settings.docker }}
           options: -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
           run: >-
+            cd ./packages/core &&
             corepack enable &&
             npm i -g wasm-pack &&
             ${{ matrix.settings.build }}
       - name: Build
+        working-directory: ./packages/core
         if: ${{ !matrix.settings.docker }}
         run: ${{ matrix.settings.build }}
         shell: bash
@@ -209,7 +214,7 @@ jobs:
         with:
           name: bindings-${{ matrix.settings.target }}
           path: |
-            swc*
+            packages/core/swc*
           if-no-files-found: error
   test-macOS-windows-binding:
     if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/ci') }}

.github/workflows/publish-extra-bindings.yml

@@ -1,5 +1,9 @@
 name: Publish (extra-bindings)
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: "${{ github.event_name == 'pull_request' }}"
+
 env:
   DEBUG: napi:*
   APP_NAME: swc

crates/swc/tests/exec.rs

@@ -63,7 +63,6 @@ fn init_helpers() -> Arc<PathBuf> {
         }
 
         let yarn = find_executable("yarn").expect("failed to find yarn");
-        let npm = find_executable("npm").expect("failed to find npm");
         {
             let mut cmd = if cfg!(target_os = "windows") {
                 let mut c = Command::new("cmd");
@@ -90,25 +89,6 @@ fn init_helpers() -> Arc<PathBuf> {
             assert!(status.success());
         }
 
-        {
-            let mut cmd = if cfg!(target_os = "windows") {
-                let mut c = Command::new("cmd");
-                c.arg("/C").arg(&npm);
-                c
-            } else {
-                Command::new(&npm)
-            };
-            cmd.current_dir(&project_root)
-                .arg("install")
-                .arg("--no-save")
-                .arg("--no-package-lock")
-                .arg("./packages/helpers");
-            let status = cmd
-                .status()
-                .expect("failed to install helper package from root");
-            assert!(status.success());
-        }
-
         Arc::new(helper_dir)
     });
 

crates/swc/tests/projects.rs

@@ -1141,7 +1141,7 @@ fn issue_8674_1() {
 
     let base_url = current_dir()
         .unwrap()
-        .join("../../node-swc/tests/issue-8674")
+        .join("../../packages/core/tests/issue-8674")
         .canonicalize()
         .unwrap();
 

crates/testing/src/lib.rs

@@ -1,9 +1,10 @@
 use std::{
-    env, fmt,
-    fmt::{Debug, Display, Formatter},
+    env,
+    fmt::{self, Debug, Display, Formatter},
     fs::{create_dir_all, rename, File},
     io::Write,
     path::{Component, Path, PathBuf},
+    process::Command,
     str::FromStr,
     sync::RwLock,
     thread,
@@ -60,7 +61,7 @@ pub fn find_executable(name: &str) -> Option<PathBuf> {
         }
     }
 
-    let path = env::var_os("PATH").and_then(|paths| {
+    let mut path = env::var_os("PATH").and_then(|paths| {
         env::split_paths(&paths)
             .filter_map(|dir| {
                 let full_path = dir.join(name);
@@ -73,6 +74,28 @@ pub fn find_executable(name: &str) -> Option<PathBuf> {
             .next()
     });
 
+    if path.is_none() {
+        // Run yarn bin $name
+
+        path = Command::new("yarn")
+            .arg("bin")
+            .arg(name)
+            .output()
+            .ok()
+            .and_then(|output| {
+                if output.status.success() {
+                    let path = String::from_utf8(output.stdout).ok()?;
+                    let path = path.trim();
+                    let path = PathBuf::from(path);
+                    if path.is_file() {
+                        return Some(path);
+                    }
+                }
+
+                None
+            });
+    }
+
     if let Some(path) = path.clone() {
         let mut locked = CACHE.write().unwrap();
         locked.insert(name.to_string(), path);