File tree Expand file tree Collapse file tree 4 files changed +8
-4
lines changed Expand file tree Collapse file tree 4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
39
39
}
40
40
41
41
async run ( options : AddCommandSchema & Arguments ) {
42
- ensureCompatibleNpm ( ) ;
42
+ await ensureCompatibleNpm ( this . context . root ) ;
43
43
44
44
if ( ! options . collection ) {
45
45
this . logger . fatal (
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
22
22
}
23
23
24
24
public async run ( options : NewCommandSchema & Arguments ) {
25
- ensureCompatibleNpm ( ) ;
25
+ await ensureCompatibleNpm ( this . context . root ) ;
26
26
27
27
// Register the version of the CLI in the registry.
28
28
const packageJson = require ( '../package.json' ) ;
Original file line number Diff line number Diff line change @@ -267,7 +267,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
267
267
268
268
// tslint:disable-next-line:no-big-function
269
269
async run ( options : UpdateCommandSchema & Arguments ) {
270
- ensureCompatibleNpm ( ) ;
270
+ await ensureCompatibleNpm ( this . context . root ) ;
271
271
272
272
// Check if the current installed CLI version is older than the latest version.
273
273
if ( ! disableVersionCheck && await this . checkCLILatestVersion ( options . verbose , options . next ) ) {
Original file line number Diff line number Diff line change @@ -58,7 +58,11 @@ export async function getPackageManager(root: string): Promise<PackageManager> {
58
58
/**
59
59
* Checks if the npm version is version 6.x. If not, display a message and exit.
60
60
*/
61
- export function ensureCompatibleNpm ( ) {
61
+ export async function ensureCompatibleNpm ( root : string ) : Promise < void > {
62
+ if ( ( await getPackageManager ( root ) ) !== PackageManager . Npm ) {
63
+ return ;
64
+ }
65
+
62
66
try {
63
67
const version = execSync ( 'npm --version' , { encoding : 'utf8' , stdio : 'pipe' } ) . trim ( ) ;
64
68
const major = Number ( version . match ( / ^ ( \d + ) \. / ) ?. [ 1 ] ) ;
You can’t perform that action at this time.
0 commit comments