Skip to content

fix(@schematics/angular): remove leading comments when removing `core… #13528

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
hansl merged 1 commit into from
Jan 30, 2019
Merged

fix(@schematics/angular): remove leading comments when removing `core… #13528

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: 4 additions & 7 deletions packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,15 @@ function _removeReflectFromPolyfills(tree: Tree, path: string) {
const recorder = tree.beginUpdate(path);

const sourceFile = ts.createSourceFile(path, source.toString(), ts.ScriptTarget.Latest);
const imports = (
sourceFile.statements
.filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[]
);
const imports = sourceFile.statements
.filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];

for (const i of imports) {
const module = i.moduleSpecifier.kind == ts.SyntaxKind.StringLiteral
&& (i.moduleSpecifier as ts.StringLiteral).text;
const module = ts.isStringLiteral(i.moduleSpecifier) && i.moduleSpecifier.text;

switch (module) {
case 'core-js/es7/reflect':
recorder.remove(i.getStart(sourceFile), i.getWidth(sourceFile));
recorder.remove(i.getFullStart(), i.getFullWidth());
break;
}
}
Expand Down
32 changes: 30 additions & 2 deletions packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,34 @@ import 'web-animations-js'; // Run \`npm install --save web-animations-js\`.
import 'zone.js/dist/zone'; // Included with Angular CLI.
`;

const newPolyfills = `
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol';
// import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
// import 'core-js/es6/parse-float';
import 'core-js/es6/number';
// import 'core-js/es6/math';
// import 'core-js/es6/string';
import 'core-js/es6/date';
// import 'core-js/es6/array';
// import 'core-js/es6/regexp';

/** IE10 and IE11 requires the following for the Reflect API. */
import 'core-js/es6/reflect';

import 'web-animations-js'; // Run \`npm install --save web-animations-js\`.

(window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
(window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick

/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
`;


describe('polyfillMetadataRule', () => {
const schematicRunner = new SchematicTestRunner(
Expand Down Expand Up @@ -84,7 +112,7 @@ describe('polyfillMetadataRule', () => {
const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
.toPromise();

expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
expect(tree2.readContent(polyfillPath)).toBe(newPolyfills);
});

it('should work as expected for a project with a root', async () => {
Expand All @@ -96,6 +124,6 @@ describe('polyfillMetadataRule', () => {
const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
.toPromise();

expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
expect(tree2.readContent(polyfillPath)).toBe(newPolyfills);
});
});