Skip to content

[Refactor] node-package-manager: modernize dependency argument generation #8100

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

Open
gonzaloriestra wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −61
Open

[Refactor] node-package-manager: modernize dependency argument generation #8100

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
83 changes: 22 additions & 61 deletions packages/cli-kit/src/public/node/node-package-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,19 +600,13 @@ export async function addNPMDependenciesWithoutVersionIfNeeded(
* @returns An array with the arguments.
*/
function argumentsToAddDependenciesWithNPM(dependency: string, type: DependencyType): string[] {
let command = ['install']
command = command.concat(dependency)
switch (type) {
case 'dev':
command.push('--save-dev')
break
case 'peer':
command.push('--save-peer')
break
case 'prod':
command.push('--save-prod')
break
const typeFlags: Record<DependencyType, string> = {
dev: '--save-dev',
peer: '--save-peer',
prod: '--save-prod',
}

const command = ['install', dependency, typeFlags[type]]
// NPM adds ^ to the installed version by default. We want to install exact versions unless specified otherwise.
if (dependency.match(/@\d/g)) {
command.push('--save-exact')
Expand All @@ -628,25 +622,13 @@ function argumentsToAddDependenciesWithNPM(dependency: string, type: DependencyT
* @returns An array with the arguments.
*/
function argumentsToAddDependenciesWithYarn(dependencies: string[], type: DependencyType, addAtRoot = false): string[] {
let command = ['add']

if (addAtRoot) {
command.push('-W')
const typeFlags: Record<DependencyType, string> = {
dev: '--dev',
peer: '--peer',
prod: '--prod',
}

command = command.concat(dependencies)
switch (type) {
case 'dev':
command.push('--dev')
break
case 'peer':
command.push('--peer')
break
case 'prod':
command.push('--prod')
break
}
return command
return ['add', ...(addAtRoot ? ['-W'] : []), ...dependencies, typeFlags[type]]
}

/**
Expand All @@ -657,26 +639,13 @@ function argumentsToAddDependenciesWithYarn(dependencies: string[], type: Depend
* @returns An array with the arguments.
*/
function argumentsToAddDependenciesWithPNPM(dependencies: string[], type: DependencyType, addAtRoot = false): string[] {
let command = ['add']

if (addAtRoot) {
command.push('-w')
const typeFlags: Record<DependencyType, string> = {
dev: '--save-dev',
peer: '--save-peer',
prod: '--save-prod',
}

command = command.concat(dependencies)

switch (type) {
case 'dev':
command.push('--save-dev')
break
case 'peer':
command.push('--save-peer')
break
case 'prod':
command.push('--save-prod')
break
}
return command
return ['add', ...(addAtRoot ? ['-w'] : []), ...dependencies, typeFlags[type]]
}

/**
Expand All @@ -686,21 +655,13 @@ function argumentsToAddDependenciesWithPNPM(dependencies: string[], type: Depend
* @returns An array with the arguments.
*/
function argumentsToAddDependenciesWithBun(dependencies: string[], type: DependencyType): string[] {
let command = ['add']

command = command.concat(dependencies)

switch (type) {
case 'dev':
command.push('--development')
break
case 'peer':
command.push('--optional')
break
case 'prod':
break
const typeFlags: Partial<Record<DependencyType, string>> = {
dev: '--development',
peer: '--optional',
}
return command

const flag = typeFlags[type]
return ['add', ...dependencies, ...(flag ? [flag] : [])]
}

/**
Expand Down
Loading