fix(@schematics/angular): v6 migration should keep packageManager

hansl · hansl · commit 4de4db93d36b · 2018-06-05T17:55:18.000-07:00
Fix #10225
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -99,8 +99,13 @@ function migrateConfiguration(oldConfig: CliConfig): Rule {
   };
 }
 
-function extractCliConfig(_config: CliConfig): JsonObject | null {
-  return null;
+function extractCliConfig(config: CliConfig): JsonObject | null {
+  const newConfig: JsonObject = {};
+  if (config.packageManager && config.packageManager !== 'default') {
+    newConfig['packageManager'] = config.packageManager;
+  }
+
+  return newConfig;
 }
 
 function extractSchematicsConfig(config: CliConfig): JsonObject | null {

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,13 @@ function migrateConfiguration(oldConfig: CliConfig): Rule {`
`99`	`99`	`};`
`100`	`100`	`}`
`101`	`101`
`102`		`-function extractCliConfig(_config: CliConfig): JsonObject \| null {`
`103`		`- return null;`
	`102`	`+function extractCliConfig(config: CliConfig): JsonObject \| null {`
	`103`	`+ const newConfig: JsonObject = {};`
	`104`	`+ if (config.packageManager && config.packageManager !== 'default') {`
	`105`	`+ newConfig['packageManager'] = config.packageManager;`
	`106`	`+ }`
	`107`	`+`
	`108`	`+ return newConfig;`
`104`	`109`	`}`
`105`	`110`
`106`	`111`	`function extractSchematicsConfig(config: CliConfig): JsonObject \| null {`