Skip to content
Snippets Groups Projects
Unverified Commit 8c0f7c12 authored by Michael Kriese's avatar Michael Kriese Committed by GitHub
Browse files

fix(npm): repect allowScripts & ignoreScripts (#9684)


Co-authored-by: default avatarRhys Arkins <rhys@arkins.net>
parent cf460434
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ exports[`generateLockFile finds npm globally 1`] = `Array []`; ...@@ -7,7 +7,7 @@ exports[`generateLockFile finds npm globally 1`] = `Array []`;
exports[`generateLockFile generates lock files 1`] = ` exports[`generateLockFile generates lock files 1`] = `
Array [ Array [
Object { Object {
"cmd": "npm install --ignore-scripts --no-audit", "cmd": "npm install --no-audit --ignore-scripts",
"options": Object { "options": Object {
"cwd": "some-dir", "cwd": "some-dir",
"encoding": "utf-8", "encoding": "utf-8",
...@@ -50,7 +50,7 @@ exports[`generateLockFile performs full install 1`] = `Array []`; ...@@ -50,7 +50,7 @@ exports[`generateLockFile performs full install 1`] = `Array []`;
exports[`generateLockFile performs lock file maintenance 1`] = ` exports[`generateLockFile performs lock file maintenance 1`] = `
Array [ Array [
Object { Object {
"cmd": "npm install --package-lock-only --ignore-scripts --no-audit", "cmd": "npm install --package-lock-only --no-audit --ignore-scripts",
"options": Object { "options": Object {
"cwd": "some-dir", "cwd": "some-dir",
"encoding": "utf-8", "encoding": "utf-8",
...@@ -73,7 +73,7 @@ Array [ ...@@ -73,7 +73,7 @@ Array [
exports[`generateLockFile performs lock file updates 1`] = ` exports[`generateLockFile performs lock file updates 1`] = `
Array [ Array [
Object { Object {
"cmd": "npm install --package-lock-only --ignore-scripts --no-audit some-dep@1.0.1", "cmd": "npm install --package-lock-only --no-audit --ignore-scripts some-dep@1.0.1",
"options": Object { "options": Object {
"cwd": "some-dir", "cwd": "some-dir",
"encoding": "utf-8", "encoding": "utf-8",
......
...@@ -51,11 +51,16 @@ export async function generateLockFile( ...@@ -51,11 +51,16 @@ export async function generateLockFile(
let cmdOptions = ''; let cmdOptions = '';
if (postUpdateOptions?.includes('npmDedupe') || skipInstalls === false) { if (postUpdateOptions?.includes('npmDedupe') || skipInstalls === false) {
logger.debug('Performing node_modules install'); logger.debug('Performing node_modules install');
cmdOptions += '--ignore-scripts --no-audit'; cmdOptions += '--no-audit';
} else { } else {
logger.debug('Updating lock file only'); logger.debug('Updating lock file only');
cmdOptions += '--package-lock-only --ignore-scripts --no-audit'; cmdOptions += '--package-lock-only --no-audit';
} }
if (!getAdminConfig().allowScripts || config.ignoreScripts) {
cmdOptions += ' --ignore-scripts';
}
const tagConstraint = await getNodeConstraint(config); const tagConstraint = await getNodeConstraint(config);
const execOptions: ExecOptions = { const execOptions: ExecOptions = {
cwd, cwd,
......
...@@ -277,6 +277,7 @@ export interface PostUpdateConfig extends ManagerConfig, Record<string, any> { ...@@ -277,6 +277,7 @@ export interface PostUpdateConfig extends ManagerConfig, Record<string, any> {
updatedPackageFiles?: File[]; updatedPackageFiles?: File[];
postUpdateOptions?: string[]; postUpdateOptions?: string[];
skipInstalls?: boolean; skipInstalls?: boolean;
ignoreScripts?: boolean;
platform?: string; platform?: string;
upgrades?: Upgrade[]; upgrades?: Upgrade[];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment