Skip to content
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

Supports Yarn v2 and Yarn v3 #4892

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Supports Yarn v2 and Yarn v3 #4892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ce456d
Supports Yarn v2 and Yarn v3
Losses Jul 19, 2022
b771971
Merge branch 'develop' into patch-1
Losses Dec 21, 2022
377d327
Merge branch 'develop' into patch-1
IT-MikeS Apr 4, 2023
18e9e0c
chore: don't use const for installerExec
IT-MikeS Apr 4, 2023
f403455
fix: Incorrect NPM client typing
Losses Apr 5, 2023
a6f5498
feat: Add new manager type to builds
Losses Apr 5, 2023
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
2 changes: 1 addition & 1 deletion packages/@ionic/cli/src/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ export interface ITelemetry {
sendCommand(command: string, args: string[]): Promise<void>;
}

export type NpmClient = 'yarn' | 'npm' | 'pnpm';
export type NpmClient = 'yarn' | 'yarn-berry' | 'npm' | 'pnpm';

export type FeatureId = 'ssl-commands';

Expand Down
1 change: 1 addition & 0 deletions packages/@ionic/cli/src/lib/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export abstract class BuildRunner<T extends BuildOptions<any>> implements Runner
npm: NpmBuildCLI,
pnpm: PnpmBuildCLI,
yarn: YarnBuildCLI,
'yarn-berry': YarnBuildCLI,
};

const client = this.e.config.get('npmClient');
Expand Down
13 changes: 12 additions & 1 deletion packages/@ionic/cli/src/lib/utils/npm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,30 @@ export async function pkgManagerArgs(npmClient: NpmClient, options: PkgManagerOp
}
}

let installerExec: string = '';
const installerArgs: string[] = [];

switch (npmClient) {
case 'npm':
installerExec = 'npm';
vocab = { run: 'run', install: 'i', bareInstall: 'i', uninstall: 'uninstall', dedupe: 'dedupe', rebuild: 'rebuild', global: '-g', save: '--save', saveDev: '-D', saveExact: '-E', nonInteractive: '', lockFileOnly: '--package-lock-only' };
break;
case 'yarn':
installerExec = 'yarn';
vocab = { run: 'run', install: 'add', bareInstall: 'install', uninstall: 'remove', dedupe: '', rebuild: 'install', global: '', save: '', saveDev: '--dev', saveExact: '--exact', nonInteractive: '--non-interactive', lockFileOnly: '' };
if (options.global) { // yarn installs packages globally under the 'global' prefix, instead of having a flag
installerArgs.push('global');
}
break;
case 'yarn-berry':
installerExec = 'yarn';
vocab = { run: 'run', install: 'add', bareInstall: 'install', uninstall: 'remove', dedupe: '', rebuild: 'install', global: '', save: '', saveDev: '--dev', saveExact: '--exact', nonInteractive: '', lockFileOnly: '' };
if (options.global) { // yarn installs packages globally under the 'global' prefix, instead of having a flag
installerArgs.push('global');
}
break;
case 'pnpm':
installerExec = 'pnpm';
vocab = { run: 'run', install: 'add', bareInstall: 'install', uninstall: 'remove', dedupe: '', rebuild: 'rebuild', global: '--global', save: '', saveDev: '--save-dev', saveExact: '--save-exact', nonInteractive: '', lockFileOnly: '--lockfile-only' };
break;
default:
Expand Down Expand Up @@ -171,7 +182,7 @@ export async function pkgManagerArgs(npmClient: NpmClient, options: PkgManagerOp
installerArgs.push('--json');
}

return [npmClient, ...installerArgs];
return [installerExec, ...installerArgs];
}

/**
Expand Down