Date: Sat, 9 Jul 2022 01:53:57 GMT
From: Hiroki Tagato <tagattie@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 5b2cbb7be292 - main - editors/vscode: fix build with ${LOCALBASE}/share/.yarnrc existing
Message-ID: <202207090153.2691rvcV041016@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b2cbb7be2922fb35dd827a4a17ab1c04c23db58 commit 5b2cbb7be2922fb35dd827a4a17ab1c04c23db58 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2022-07-09 01:51:16 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2022-07-09 01:51:16 +0000 editors/vscode: fix build with ${LOCALBASE}/share/.yarnrc existing PR: 242936 Reported by: bourne.identity@hotmail.com, jacques+freebsdbugzilla@foucry.net, meta --- editors/vscode/files/patch-build_npm_postinstall.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js index 9013734a9ffb..44581f460354 100644 --- a/editors/vscode/files/patch-build_npm_postinstall.js +++ b/editors/vscode/files/patch-build_npm_postinstall.js @@ -1,12 +1,13 @@ --- build/npm/postinstall.js.orig 2022-06-08 11:20:55 UTC +++ build/npm/postinstall.js -@@ -20,7 +20,8 @@ function yarnInstall(location, opts) { +@@ -20,7 +20,9 @@ function yarnInstall(location, opts) { const raw = process.env['npm_config_argv'] || '{}'; const argv = JSON.parse(raw); const original = argv.original || []; - const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files'); + const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose']; + const args = original.filter(arg => passargs.includes(arg)); ++ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc'); if (opts.ignoreEngines) { args.push('--ignore-engines'); delete opts.ignoreEngines;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207090153.2691rvcV041016>