fix(@schematics/angular): skip E2E projects when migrating browserslist

clydin · clydin · commit 95bf71bbd288 · 2019-04-22T14:56:30.000-04:00
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -88,14 +88,17 @@ function updateBrowserlist(): Rule {
     }
 
     // For all projects
-    for (const projectName of Object.keys(angularJson.projects)) {
-      const project = angularJson.projects[projectName];
+    for (const [name, project] of Object.entries(angularJson.projects)) {
       if (!isJsonObject(project)) {
         continue;
       }
       if (typeof project.root != 'string' || project.projectType !== 'application') {
         continue;
       }
+      if (name.endsWith('-e2e')) {
+        // Skip existing separate E2E projects
+        continue;
+      }
 
       const browserslistPath = join(normalize(project.root), '/browserslist');
       const source = tree.read(browserslistPath);

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,17 @@ function updateBrowserlist(): Rule {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// For all projects`
`91`		`- for (const projectName of Object.keys(angularJson.projects)) {`
`92`		`- const project = angularJson.projects[projectName];`
	`91`	`+ for (const [name, project] of Object.entries(angularJson.projects)) {`
`93`	`92`	`if (!isJsonObject(project)) {`
`94`	`93`	`continue;`
`95`	`94`	`}`
`96`	`95`	`if (typeof project.root != 'string' \|\| project.projectType !== 'application') {`
`97`	`96`	`continue;`
`98`	`97`	`}`
	`98`	`+ if (name.endsWith('-e2e')) {`
	`99`	`+ // Skip existing separate E2E projects`
	`100`	`+ continue;`
	`101`	`+ }`
`99`	`102`
`100`	`103`	`const browserslistPath = join(normalize(project.root), '/browserslist');`
`101`	`104`	`const source = tree.read(browserslistPath);`