diff --git a/.github/actions/ci-setup-rails/action.yml b/.github/actions/ci-setup-rails/action.yml index 7109e10340b..3636c44473c 100644 --- a/.github/actions/ci-setup-rails/action.yml +++ b/.github/actions/ci-setup-rails/action.yml @@ -14,17 +14,11 @@ runs: ruby --yjit -v shell: bash - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version-file: '.node-version' - name: Setup Bun uses: oven-sh/setup-bun@v1 - name: Install Node modules run: | - node --version bun --version bun install shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89eee561ef7..afcd4303a9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,14 +38,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Node - uses: actions/setup-node@v4 - name: Setup Bun uses: oven-sh/setup-bun@v1 - name: Install Node modules run: | - node --version bun --version bun install shell: bash diff --git a/.node-version b/.node-version deleted file mode 100644 index 603606bc911..00000000000 --- a/.node-version +++ /dev/null @@ -1 +0,0 @@ -18.17.0 diff --git a/bin/bun_vite b/bin/bun_vite new file mode 100755 index 00000000000..c82a83279ba --- /dev/null +++ b/bin/bun_vite @@ -0,0 +1,2 @@ +#!/bin/bash +bun run vite "$@" diff --git a/bin/setup b/bin/setup index 3918714dfc6..9b8efb38dbf 100755 --- a/bin/setup +++ b/bin/setup @@ -18,7 +18,6 @@ FileUtils.chdir APP_ROOT do system("bundle check") || system!("bundle install") # Install JavaScript dependencies - system! 'node --version' system! 'bun --version' system! 'bun install' diff --git a/bin/update b/bin/update index 84bc3476f73..a763ffe266d 100755 --- a/bin/update +++ b/bin/update @@ -15,7 +15,6 @@ FileUtils.chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') - system! 'node --version' system! 'bun --version' system! 'bun install' diff --git a/config/vite.json b/config/vite.json index 22f4a6d0cde..2b883c16cd0 100644 --- a/config/vite.json +++ b/config/vite.json @@ -1,5 +1,6 @@ { "all": { + "vite_bin_path": "./bin/bun_vite", "sourceCodeDir": "app/javascript", "watchAdditionalPaths": [] }, diff --git a/package.json b/package.json index a6ea11bcafd..fdfb4ab6637 100644 --- a/package.json +++ b/package.json @@ -121,9 +121,6 @@ "test": "vitest", "coverage": "vitest run --coverage" }, - "engines": { - "node": ">= 18.17.0" - }, "resolutions": { "string-width": "4.2.2", "wrap-ansi": "7.0.0"