Merge pull request #178610 from Homebrew/npm-args-w-z

[w*-z*]: use `*std_npm_args`
Homebrew · Jul 30, 2024 · 20525a2 · 20525a2
2 parents 6d5d9c5 + c6c5bef
commit 20525a2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 27 deletions.
diff --git a/Formula/w/web-ext.rb b/Formula/w/web-ext.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class WebExt < Formula
  desc "Command-line tool to help build, run, and test web extensions"
  homepage "https://github.com/mozilla/web-ext"
@@ -24,7 +22,7 @@ class WebExt < Formula
  end
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
 
  # Remove vendored pre-built binary `terminal-notifier`

diff --git a/Formula/w/webpack.rb b/Formula/w/webpack.rb
@@ -1,4 +1,3 @@
-require "language/node"
 require "json"
 
 class Webpack < Formula
@@ -31,7 +30,7 @@ def install
  buildpath.install resource("webpack-cli")
 
  cd buildpath/"node_modules/webpack" do
- system "npm", "install", *Language::Node.local_npm_install_args, "--legacy-peer-deps"
+ system "npm", "install", *std_npm_args(prefix: false), "--legacy-peer-deps"
  end
 
  # declare webpack as a bundledDependency of webpack-cli
@@ -40,7 +39,7 @@ def install
  pkg_json["bundleDependencies"] = ["webpack"]
  File.write("package.json", JSON.pretty_generate(pkg_json))
 
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
 
  bin.install_symlink libexec/"bin/webpack-cli"
  bin.install_symlink libexec/"bin/webpack-cli" => "webpack"

diff --git a/Formula/w/webpod.rb b/Formula/w/webpod.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class Webpod < Formula
  desc "Deploy websites and apps anywhere"
  homepage "https://webpod.dev"
@@ -14,7 +12,7 @@ class Webpod < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end
 

diff --git a/Formula/w/webtorrent-cli.rb b/Formula/w/webtorrent-cli.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class WebtorrentCli < Formula
  desc "Command-line streaming torrent client"
  homepage "https://webtorrent.io/"
@@ -23,7 +21,7 @@ class WebtorrentCli < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
 
  # Remove incompatible pre-built binaries

diff --git a/Formula/w/whistle.rb b/Formula/w/whistle.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class Whistle < Formula
  desc "HTTP, HTTP2, HTTPS, Websocket debugging proxy"
  homepage "https://github.com/avwo/whistle"
@@ -20,7 +18,7 @@ class Whistle < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end
 

diff --git a/Formula/w/wikibase-cli.rb b/Formula/w/wikibase-cli.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class WikibaseCli < Formula
  desc "Command-line interface to Wikibase"
  homepage "https://github.com/maxlath/wikibase-cli"
@@ -20,7 +18,7 @@ class WikibaseCli < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end
 

diff --git a/Formula/w/write-good.rb b/Formula/w/write-good.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class WriteGood < Formula
  desc "Naive linter for English prose"
  homepage "https://github.com/btford/write-good"
@@ -24,7 +22,7 @@ class WriteGood < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end
 

diff --git a/Formula/y/yaml-language-server.rb b/Formula/y/yaml-language-server.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class YamlLanguageServer < Formula
  desc "Language Server for Yaml Files"
  homepage "https://github.com/redhat-developer/yaml-language-server"
@@ -20,7 +18,7 @@ class YamlLanguageServer < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end
 

diff --git a/Formula/y/yo.rb b/Formula/y/yo.rb
@@ -1,5 +1,3 @@
-require "language/node"
-
 class Yo < Formula
  desc "CLI tool for running Yeoman generators"
  homepage "https://yeoman.io"
@@ -20,7 +18,7 @@ class Yo < Formula
  depends_on "node"
 
  def install
- system "npm", "install", *Language::Node.std_npm_install_args(libexec)
+ system "npm", "install", *std_npm_args
  bin.install_symlink Dir["#{libexec}/bin/*"]
  end