Skip to content

fix(preinstall): run preinstall before reify #2713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(preinstall): run preinstall before reify #2713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/ci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,24 @@ const ci = async () => {
}),
removeNodeModules(where),
])

if (!ignoreScripts) {
await runScript({
path: where,
args: [],
scriptShell,
stdio: 'inherit',
stdioString: true,
event: 'preinstall',
})
}

// npm ci should never modify the lockfile or package.json
await arb.reify({ ...npm.flatOptions, save: false })

// run the same set of scripts that `npm install` runs.
if (!ignoreScripts) {
const scripts = [
'preinstall',
'install',
'postinstall',
'prepublish', // XXX should we remove this finally??
Expand Down
25 changes: 21 additions & 4 deletions lib/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const cmd = async (args, cb) => install(args).then(() => cb()).catch(cb)
const install = async args => {
// the /path/to/node_modules/..
const globalTop = resolve(npm.globalDir, '..')
const { ignoreScripts, global: isGlobalInstall } = npm.flatOptions
const { global: isGlobalInstall } = npm.flatOptions
const where = isGlobalInstall ? globalTop : npm.prefix

// don't try to install the prefix into itself
Expand All @@ -30,19 +30,36 @@ const install = async args => {
if (npm.config.get('dev'))
log.warn('install', 'Usage of the `--dev` option is deprecated. Use `--include=dev` instead.')

const { scriptShell } = npm.flatOptions
const arb = new Arborist({
...npm.flatOptions,
path: where,
})

const ignoreScripts = (args.length > 0) || isGlobalInstall ||
npm.flatOptions.ignoreScripts

// This is placed after Arborist is initialized but before reify to
// match the behavior in lib/ci.js, which has to initialize Arborist,
// remove node_modules, then reify again.
if (!ignoreScripts) {
await runScript({
path: where,
args: [],
scriptShell,
stdio: 'inherit',
stdioString: true,
event: 'preinstall',
})
}

await arb.reify({
...npm.flatOptions,
add: args,
})
if (!args.length && !isGlobalInstall && !ignoreScripts) {
const { scriptShell } = npm.flatOptions

if (!ignoreScripts) {
const scripts = [
'preinstall',
'install',
'postinstall',
'prepublish', // XXX should we remove this finally??
Expand Down