From fff02aebfcddf0a1f835538844baeee3fd6d8c30 Mon Sep 17 00:00:00 2001 From: nanaya Date: Sat, 12 Feb 2022 07:19:10 +0900 Subject: [PATCH] More yarn removal --- .github/workflows/tests.yml | 4 ++-- .gitignore | 3 --- bin/yarn | 17 ----------------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100755 bin/yarn diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ee660b95..2dac9553 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,9 +29,9 @@ jobs: - uses: actions/setup-node@v2 with: - cache: yarn + cache: npm - - run: yarn install + - run: npm install - uses: ruby/setup-ruby@v1 with: diff --git a/.gitignore b/.gitignore index caf61b8f..134da7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,6 @@ /public/packs /public/packs-test /node_modules -/yarn-error.log -yarn-debug.log* -.yarn-integrity /app/assets/builds/* !/app/assets/builds/.keep diff --git a/bin/yarn b/bin/yarn deleted file mode 100755 index 9fab2c35..00000000 --- a/bin/yarn +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env ruby -APP_ROOT = File.expand_path('..', __dir__) -Dir.chdir(APP_ROOT) do - yarn = ENV["PATH"].split(File::PATH_SEPARATOR). - select { |dir| File.expand_path(dir) != __dir__ }. - product(["yarn", "yarn.cmd", "yarn.ps1"]). - map { |dir, file| File.expand_path(file, dir) }. - find { |file| File.executable?(file) } - - if yarn - exec yarn, *ARGV - else - $stderr.puts "Yarn executable was not detected in the system." - $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" - exit 1 - end -end