summaryrefslogtreecommitdiff
path: root/editors/vscode/files/patch-build_npm_postinstall.js
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vscode/files/patch-build_npm_postinstall.js')
-rw-r--r--editors/vscode/files/patch-build_npm_postinstall.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 49c77f3ee71a..c5b7422ea9cc 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,18 +1,20 @@
---- build/npm/postinstall.js.orig 2020-07-21 14:27:11 UTC
+--- build/npm/postinstall.js.orig 2021-02-03 15:33:23 UTC
+++ build/npm/postinstall.js
-@@ -20,7 +20,8 @@ function yarnInstall(location, opts) {
+@@ -21,8 +21,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');
+- if (opts.ignoreEngines) {
+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--offline', '--no-progress', '--verbose'];
+ const args = original.filter(arg => passargs.includes(arg));
-
- console.log(`Installing dependencies in ${location}...`);
- console.log(`$ yarn ${args.join(' ')}`);
-@@ -74,4 +75,4 @@ yarnInstall('test/smoke'); // node modules required fo
- yarnInstall('test/integration/browser'); // node modules required for integration
- yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
++ if (opts.ignoreEngines) {
+ args.push('--ignore-engines');
+ delete opts.ignoreEngines;
+ }
+@@ -88,4 +89,4 @@ runtime "${runtime}"`;
+ yarnInstall(watchPath);
+ }
-cp.execSync('git config pull.rebase true');
+// cp.execSync('git config pull.rebase true');