From 1446d0da4575c61e368f2e4cfac5c830e17e668a Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Sun, 21 Oct 2018 20:31:08 -0400 Subject: [PATCH] fix(@schematics/angular): migrate build-angular for 7.0 RC users Fixes #12647 --- .../schematics/angular/migrations/migration-collection.json | 5 +++++ packages/schematics/angular/migrations/update-7/index.ts | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json index b6836ed7aacd..5d789a24cb50 100644 --- a/packages/schematics/angular/migrations/migration-collection.json +++ b/packages/schematics/angular/migrations/migration-collection.json @@ -19,6 +19,11 @@ "version": "7.1.0-beta.0", "factory": "./update-7/index#typeScriptHelpersRule", "description": "Update an Angular CLI project to version 7." + }, + "migration-05": { + "version": "7.0.4", + "factory": "./update-7", + "description": "Update an Angular CLI project to version 7." } } } diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts index 283fa59ad7cd..b54923bd3341 100644 --- a/packages/schematics/angular/migrations/update-7/index.ts +++ b/packages/schematics/angular/migrations/update-7/index.ts @@ -20,8 +20,11 @@ export { typeScriptHelpersRule } from './typescript-helpers'; export default function(): Rule { return (tree, context) => { const existing = getPackageJsonDependency(tree, '@angular-devkit/build-angular'); - const type = existing ? existing.type : NodeDependencyType.Dev; + if (existing && latestVersions.DevkitBuildAngular === existing.version) { + return; + } + const type = existing ? existing.type : NodeDependencyType.Dev; addPackageJsonDependency( tree, {