From 8f3ef6969ed1d478ff4c78c62670e70989376f1c Mon Sep 17 00:00:00 2001 From: Kevin Soltysiak Date: Fri, 5 Jan 2024 15:25:09 +0100 Subject: [PATCH] Allow NPM use for install/build --- lib/tasks/cssbundling/build.rake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/tasks/cssbundling/build.rake b/lib/tasks/cssbundling/build.rake index dcdd429..c291258 100644 --- a/lib/tasks/cssbundling/build.rake +++ b/lib/tasks/cssbundling/build.rake @@ -23,13 +23,15 @@ module Cssbundling def install_command return "bun install" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock')) - return "yarn install" if File.exist?('yarn.lock') || tool_exists?('yarn') + return "yarn install" if File.exist?('yarn.lock') || (tool_exists?('yarn') && !File.exist?('package-lock.json')) + return "npm install" if File.exist?('package-lock.json') || tool_exists?('npm') raise "cssbundling-rails: No suitable tool found for installing JavaScript dependencies" end def build_command return "bun run build:css" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock')) - return "yarn build:css" if File.exist?('yarn.lock') || tool_exists?('yarn') + return "yarn build:css" if File.exist?('yarn.lock') || (tool_exists?('yarn') && !File.exist?('package-lock.json')) + return "npm run build:css" if File.exist?('package-lock.json') || tool_exists?('npm') raise "cssbundling-rails: No suitable tool found for building CSS" end