From da7ae9418bfc248a31aef8ffc1a948c591dccb1c Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 8 May 2019 08:25:22 +0200 Subject: [PATCH] fix(@schematics/angular): remove old GoogleBot browserslist setting GoogleBot is now evergreen, we don't need to specialcase it: https://webmasters.googleblog.com/2019/05/the-new-evergreen-googlebot.html?m=1 Fixes #14364 --- .../angular/application/files/browserslist.template | 4 ---- .../migrations/update-8/differential-loading.ts | 11 +---------- .../migrations/update-8/differential-loading_spec.ts | 10 ---------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/packages/schematics/angular/application/files/browserslist.template b/packages/schematics/angular/application/files/browserslist.template index 3525779c0dfb..80848532e47d 100644 --- a/packages/schematics/angular/application/files/browserslist.template +++ b/packages/schematics/angular/application/files/browserslist.template @@ -5,12 +5,8 @@ # You can see what browsers were selected by your queries by running: # npx browserslist -# Googlebot uses an older version of Chrome -# For additional information see: https://developers.google.com/search/docs/guides/rendering - > 0.5% last 2 versions Firefox ESR -Chrome 41 # Support for Googlebot not dead not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts index 652b1acd292a..8daf53941bef 100644 --- a/packages/schematics/angular/migrations/update-8/differential-loading.ts +++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts @@ -29,13 +29,9 @@ const browserslistContent = `# This file is used by the build system to adjust C # You can see what browsers were selected by your queries by running: # npx browserslist -# Googlebot uses an older version of Chrome -# For additional information see: https://developers.google.com/search/docs/guides/rendering - > 0.5% last 2 versions Firefox ESR -Chrome 41 # Support for Googlebot not dead not IE 9-11 # For IE 9-11 support, remove 'not'.`; @@ -148,13 +144,8 @@ function updateProjects(): Rule { } } - const source = tree.read(browserslistPath); - if (!source) { + if (!tree.exists(browserslistPath)) { tree.create(browserslistPath, browserslistContent); - } else if (!source.toString().toLowerCase().includes('chrome 41')) { - const recorder = tree.beginUpdate(browserslistPath); - recorder.insertRight(source.length, '\nChrome 41 # Googlebot'); - tree.commitUpdate(recorder); } } diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts index 01bcb5809364..10d94f6d55dc 100644 --- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts +++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts @@ -80,17 +80,10 @@ describe('Migration to version 8', () => { expect(module).toBe('esnext'); }); - it(`should update browserslist file to add an non evergreen browser`, () => { - const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch()); - expect(tree2.readContent('/browserslist')).toContain('Chrome 41'); - }); - it(`should create browserslist file if it doesn't exist`, () => { tree.delete('/browserslist'); const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch()); expect(tree2.exists('/browserslist')).toBe(true); - expect(tree2.readContent('/browserslist')) - .toContain('Support for Googlebot'); }); it('should move browserslist file if it exists in the sourceRoot', () => { @@ -98,9 +91,6 @@ describe('Migration to version 8', () => { tree.delete('/browserslist'); const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch()); expect(tree2.exists('/browserslist')).toBe(true); - const content = tree2.readContent('/browserslist'); - expect(content).toContain('Chrome 41'); - expect(content).toContain('last 2 Chrome versions'); }); it(`should remove 'target' and 'module' from non workspace tsconfig.json`, () => {