Skip to content
Snippets Groups Projects
Commit 04289fb1 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

fix(yarn): always ignore engines and platform

parent 8a7d0c23
No related merge requests found
......@@ -3,7 +3,7 @@
exports[`manager/npm/post-update/yarn catches errors 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -25,7 +25,7 @@ Array [
exports[`manager/npm/post-update/yarn generates lock files using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -59,7 +59,7 @@ Array [
},
},
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -93,7 +93,7 @@ Array [
},
},
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -115,7 +115,7 @@ Array [
exports[`manager/npm/post-update/yarn performs lock file updates and full install using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -132,7 +132,7 @@ Array [
},
},
Object {
"cmd": "yarn upgrade some-dep --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn upgrade some-dep --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -154,7 +154,7 @@ Array [
exports[`manager/npm/post-update/yarn performs lock file updates using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......@@ -171,7 +171,7 @@ Array [
},
},
Object {
"cmd": "yarn upgrade some-dep --network-timeout 100000 --ignore-scripts --ignore-engines --ignore-platform",
"cmd": "yarn upgrade some-dep --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
......
......@@ -53,9 +53,10 @@ export async function generateLockFile(
preCommands.push(optimizeCommand);
}
const commands = [];
let cmdOptions = '--network-timeout 100000';
let cmdOptions =
'--ignore-engines --ignore-platform --network-timeout 100000';
if (global.trustLevel !== 'high' || config.ignoreScripts) {
cmdOptions += ' --ignore-scripts --ignore-engines --ignore-platform';
cmdOptions += ' --ignore-scripts';
}
const tagConstraint = await getNodeConstraint(config);
const execOptions: ExecOptions = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment