From 39f39aa0918db50965464fac40de7b9318328eb3 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:21 -0700 Subject: [PATCH 1/9] web-ext: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/web-ext.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/web-ext.rb b/Formula/w/web-ext.rb index 45ccb7215f1769..b29b3d6aeb704f 100644 --- 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` From 3e4165bc836c308e5a5fd4039dbb3f0bf181ad7f Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:27 -0700 Subject: [PATCH 2/9] webpack: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/webpack.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Formula/w/webpack.rb b/Formula/w/webpack.rb index 7e8563d85ddc0b..291fdb5a24db22 100644 --- 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" From 09184adcccc33ea7a2122239807ee2ab40b8f530 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:35 -0700 Subject: [PATCH 3/9] webpod: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/webpod.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/webpod.rb b/Formula/w/webpod.rb index d042297785e5e4..9cba8c0c18fd89 100644 --- 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 From 69e7f3ca48f9e40911ae3ff6698cfeee2ad5b16b Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:44 -0700 Subject: [PATCH 4/9] webtorrent-cli: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/webtorrent-cli.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/webtorrent-cli.rb b/Formula/w/webtorrent-cli.rb index c233b7cb5350c6..0c8e3afb11cd04 100644 --- 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 From 24a8a80b2c7cef2deb6951e854abe1e965bf2b89 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:50 -0700 Subject: [PATCH 5/9] whistle: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/whistle.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/whistle.rb b/Formula/w/whistle.rb index f6f640b9c37a4e..0749f5e6e8815b 100644 --- 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 From cce899362802ffd48969e88a0182630f2bbeb565 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:35:56 -0700 Subject: [PATCH 6/9] wikibase-cli: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/wikibase-cli.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/wikibase-cli.rb b/Formula/w/wikibase-cli.rb index a34e478cd352a5..3bd82bd633fb7b 100644 --- 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 From 6023509a7407e57b8454afb113a631bee0e3ad58 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:36:02 -0700 Subject: [PATCH 7/9] write-good: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/w/write-good.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/w/write-good.rb b/Formula/w/write-good.rb index 368e1d7832ac9e..82427b99b529c3 100644 --- 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 From c79b9886ddb86d79d1ab08b9ff6c363aa06252e0 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:36:15 -0700 Subject: [PATCH 8/9] yaml-language-server: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/y/yaml-language-server.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/y/yaml-language-server.rb b/Formula/y/yaml-language-server.rb index 4229928cfa3f88..264945f128ad1d 100644 --- 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 From c6c5befdae48cb0a28ff365485364edaf1d02950 Mon Sep 17 00:00:00 2001 From: Patrick Linnane Date: Fri, 26 Jul 2024 12:36:25 -0700 Subject: [PATCH 9/9] yo: use `*std_npm_args` Signed-off-by: Patrick Linnane --- Formula/y/yo.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/y/yo.rb b/Formula/y/yo.rb index d2b2470a837c0f..80e90c8ff2e929 100644 --- 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