From b2e8054ade323bfa2b3e02e149de2f6c48f516cd Mon Sep 17 00:00:00 2001 From: Tembong Fonji Date: Sat, 12 Aug 2017 21:56:20 -0700 Subject: [PATCH 1/5] feat: Add typescript version to ng version --- package-lock.json | 6 +++--- packages/@angular/cli/commands/version.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1b8852fa3d4..0262ed4522fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4316,9 +4316,9 @@ } }, "license-webpack-plugin": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.4.3.tgz", - "integrity": "sha1-+diNTrwEQHoAYejMrCZXH4jlGhY=", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.5.1.tgz", + "integrity": "sha1-aNivEDSGqcTrzt237V071h84O+Q=", "requires": { "object-assign": "4.1.1" } diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts index 4463187c50a9..d2291b2b582f 100644 --- a/packages/@angular/cli/commands/version.ts +++ b/packages/@angular/cli/commands/version.ts @@ -31,7 +31,7 @@ const VersionCommand = Command.extend({ versions.os = process.platform + ' ' + process.arch; const alwaysPrint = ['node', 'os']; - const roots = ['@angular/', '@ngtools/']; + const roots = ['@angular/', '@ngtools/', 'typescript']; let ngCliVersion = pkg.version; if (!__dirname.match(/node_modules/)) { From bb307ecfbc71e90317e2b109900cd80f89568e19 Mon Sep 17 00:00:00 2001 From: Tembong Fonji Date: Fri, 18 Aug 2017 15:25:18 -0700 Subject: [PATCH 2/5] Revert "feat: Add typescript version to ng version" This reverts commit b2e8054ade323bfa2b3e02e149de2f6c48f516cd. --- package-lock.json | 6 +++--- packages/@angular/cli/commands/version.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0262ed4522fc..c1b8852fa3d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4316,9 +4316,9 @@ } }, "license-webpack-plugin": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.5.1.tgz", - "integrity": "sha1-aNivEDSGqcTrzt237V071h84O+Q=", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.4.3.tgz", + "integrity": "sha1-+diNTrwEQHoAYejMrCZXH4jlGhY=", "requires": { "object-assign": "4.1.1" } diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts index d2291b2b582f..4463187c50a9 100644 --- a/packages/@angular/cli/commands/version.ts +++ b/packages/@angular/cli/commands/version.ts @@ -31,7 +31,7 @@ const VersionCommand = Command.extend({ versions.os = process.platform + ' ' + process.arch; const alwaysPrint = ['node', 'os']; - const roots = ['@angular/', '@ngtools/', 'typescript']; + const roots = ['@angular/', '@ngtools/']; let ngCliVersion = pkg.version; if (!__dirname.match(/node_modules/)) { From dc4ca5b3b8c644ba1983f4278379e6d2a832e6ae Mon Sep 17 00:00:00 2001 From: Tembong Fonji Date: Fri, 18 Aug 2017 15:47:13 -0700 Subject: [PATCH 3/5] feat: show typescript version on ng version --- packages/@angular/cli/commands/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts index 4463187c50a9..d2291b2b582f 100644 --- a/packages/@angular/cli/commands/version.ts +++ b/packages/@angular/cli/commands/version.ts @@ -31,7 +31,7 @@ const VersionCommand = Command.extend({ versions.os = process.platform + ' ' + process.arch; const alwaysPrint = ['node', 'os']; - const roots = ['@angular/', '@ngtools/']; + const roots = ['@angular/', '@ngtools/', 'typescript']; let ngCliVersion = pkg.version; if (!__dirname.match(/node_modules/)) { From f74d637b10e709f56d647bb339648f0c0053e0ea Mon Sep 17 00:00:00 2001 From: Tembong Fonji Date: Fri, 18 Aug 2017 20:06:52 -0700 Subject: [PATCH 4/5] Revert "feat: show typescript version on ng version" This reverts commit dc4ca5b3b8c644ba1983f4278379e6d2a832e6ae. --- packages/@angular/cli/commands/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts index d2291b2b582f..4463187c50a9 100644 --- a/packages/@angular/cli/commands/version.ts +++ b/packages/@angular/cli/commands/version.ts @@ -31,7 +31,7 @@ const VersionCommand = Command.extend({ versions.os = process.platform + ' ' + process.arch; const alwaysPrint = ['node', 'os']; - const roots = ['@angular/', '@ngtools/', 'typescript']; + const roots = ['@angular/', '@ngtools/']; let ngCliVersion = pkg.version; if (!__dirname.match(/node_modules/)) { From e5c782c839b1d43d4a1c592dd154a65fc84b6cbe Mon Sep 17 00:00:00 2001 From: Tembong Fonji Date: Sat, 19 Aug 2017 14:20:47 -0700 Subject: [PATCH 5/5] feat: Add typescript version to ng version --- packages/@angular/cli/commands/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts index 4463187c50a9..d2291b2b582f 100644 --- a/packages/@angular/cli/commands/version.ts +++ b/packages/@angular/cli/commands/version.ts @@ -31,7 +31,7 @@ const VersionCommand = Command.extend({ versions.os = process.platform + ' ' + process.arch; const alwaysPrint = ['node', 'os']; - const roots = ['@angular/', '@ngtools/']; + const roots = ['@angular/', '@ngtools/', 'typescript']; let ngCliVersion = pkg.version; if (!__dirname.match(/node_modules/)) {