Skip to content

fix(@schematics/angular): move and update existing src/browserslist #14241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexeagle merged 1 commit into from
Apr 23, 2019
Merged

fix(@schematics/angular): move and update existing src/browserslist #14241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/schematics/angular/migrations/update-8/differential-loading.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,18 @@ function updateBrowserlist(): Rule {
continue;
}

const browserslistPath = join(normalize(project.root), '/browserslist');
const browserslistPath = join(normalize(project.root), 'browserslist');
if (typeof project.sourceRoot === 'string') {
const srcBrowsersList = join(normalize(project.sourceRoot), 'browserslist');
if (tree.exists(srcBrowsersList)) {
tree.rename(srcBrowsersList, browserslistPath);
}
}

const source = tree.read(browserslistPath);
if (!source) {
tree.create(browserslistPath, browserslistContent);
} else {
} else if (!source.toString().toLowerCase().includes('chrome 41')) {
const recorder = tree.beginUpdate(browserslistPath);
recorder.insertRight(source.length, '\nChrome 41 # Googlebot');
tree.commitUpdate(recorder);
Expand Down
10 changes: 10 additions & 0 deletions packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,15 @@ describe('Migration to version 8', () => {
expect(tree2.readContent('/browserslist'))
.toContain('Googlebot support');
});

it('should move browserslist file if it exists in the sourceRoot', () => {
tree.create('/src/browserslist', 'last 2 Chrome versions');
tree.delete('/browserslist');
const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
Copy link
Copy Markdown
Contributor

@alexeagle alexeagle Apr 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am confused why these all say migration-07

Copy link
Copy Markdown
Collaborator Author

@alan-agius4 alan-agius4 Apr 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the migration name. For example for Angular CLI version 8, we have multiple migrations.

Copy link
Copy Markdown
Collaborator Author

@alan-agius4 alan-agius4 Apr 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/alan-agius4/angular-cli/blob/42cfb32469dc51e651e6e07763878bf935a92cf3/packages/schematics/angular/migrations/migration-collection.json#L33-L41

expect(tree2.exists('/browserslist')).toBe(true);
const content = tree2.readContent('/browserslist');
expect(content).toContain('Chrome 41');
expect(content).toContain('last 2 Chrome versions');
});
});
});