iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): use single quotes for relative link resolution migration to align with style guide (#39070)

Browse Source 
This updates the migration to align with the style guide and work with default lint rules. It avoids a lint error on
newly migrated projects and fixes a test in the CLI repo.

PR Close #39070
This commit is contained in:
Doug Parker 2020-09-30 14:13:55 -07:00 committed by Joey Perrott
parent ac54019315
commit 889470663d
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/schematics/migrations/relative-link-resolution/transform.ts
View File

@ -44,8 +44,8 @@ export class RelativeLinkResolutionTransform {
// literal already defines a value for relativeLinkResolution. Skip it // literal already defines a value for relativeLinkResolution. Skip it
return literal; return literal;
} }
const legacyExpression = const legacyExpression = ts.createPropertyAssignment(
ts.createPropertyAssignment(RELATIVE_LINK_RESOLUTION, ts.createStringLiteral('legacy')); RELATIVE_LINK_RESOLUTION, ts.createStringLiteral('legacy', true /* singleQuotes */));
return ts.updateObjectLiteral(literal, [...literal.properties, legacyExpression]); return ts.updateObjectLiteral(literal, [...literal.properties, legacyExpression]);
} }

14
packages/core/schematics/test/google3/relative_link_resolution_default_spec.ts
View File

@ -85,7 +85,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain(`RouterModule.forRoot([], { relativeLinkResolution: "legacy" })`); .toContain(`RouterModule.forRoot([], { relativeLinkResolution: 'legacy' })`);
}); });
it('should migrate options without relativeLinkResolution', () => { it('should migrate options without relativeLinkResolution', () => {
@ -103,7 +103,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: "legacy" })`); .toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: 'legacy' })`);
}); });
it('should not migrate options containing relativeLinkResolution', () => { it('should not migrate options containing relativeLinkResolution', () => {
@ -133,7 +133,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain( .toContain(
`const options = { useHash: true, relativeLinkResolution: "legacy" } as ExtraOptions;`); `const options = { useHash: true, relativeLinkResolution: 'legacy' } as ExtraOptions;`);
}); });
it('should migrate when options is a variable', () => { it('should migrate when options is a variable', () => {
@ -145,7 +145,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain( .toContain(
`const options: ExtraOptions = { useHash: true, relativeLinkResolution: "legacy" };`); `const options: ExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
}); });
it('should migrate when options is a variable with no type', () => { it('should migrate when options is a variable with no type', () => {
@ -166,7 +166,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain(`const options = { useHash: true, relativeLinkResolution: "legacy" };`); .toContain(`const options = { useHash: true, relativeLinkResolution: 'legacy' };`);
expect(getFile('/index.ts')).toContain(`RouterModule.forRoot([], options)`); expect(getFile('/index.ts')).toContain(`RouterModule.forRoot([], options)`);
}); });
@ -179,7 +179,7 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain( .toContain(
`const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: "legacy" };`); `const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
}); });
it('should migrate aliased RouterModule.forRoot', () => { it('should migrate aliased RouterModule.forRoot', () => {
@ -197,6 +197,6 @@ describe('Google3 relativeLinkResolution TSLint rule', () => {
runTSLint(true); runTSLint(true);
expect(getFile('/index.ts')) expect(getFile('/index.ts'))
.toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: "legacy" }),`); .toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: 'legacy' }),`);
}); });
}); });

14
packages/core/schematics/test/relative_link_resolution_spec.ts
View File

@ -61,7 +61,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain(`RouterModule.forRoot([], { relativeLinkResolution: "legacy" })`); .toContain(`RouterModule.forRoot([], { relativeLinkResolution: 'legacy' })`);
}); });
it('should migrate options without relativeLinkResolution', async () => { it('should migrate options without relativeLinkResolution', async () => {
@ -79,7 +79,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: "legacy" })`); .toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: 'legacy' })`);
}); });
it('should not migrate options containing relativeLinkResolution', async () => { it('should not migrate options containing relativeLinkResolution', async () => {
@ -109,7 +109,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain( .toContain(
`const options = { useHash: true, relativeLinkResolution: "legacy" } as ExtraOptions;`); `const options = { useHash: true, relativeLinkResolution: 'legacy' } as ExtraOptions;`);
}); });
it('should migrate when options is a variable', async () => { it('should migrate when options is a variable', async () => {
@ -121,7 +121,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain( .toContain(
`const options: ExtraOptions = { useHash: true, relativeLinkResolution: "legacy" };`); `const options: ExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
}); });
it('should migrate when options is a variable with no type', async () => { it('should migrate when options is a variable with no type', async () => {
@ -142,7 +142,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain(`const options = { useHash: true, relativeLinkResolution: "legacy" };`); .toContain(`const options = { useHash: true, relativeLinkResolution: 'legacy' };`);
expect(tree.readContent('/index.ts')).toContain(`RouterModule.forRoot([], options)`); expect(tree.readContent('/index.ts')).toContain(`RouterModule.forRoot([], options)`);
}); });
@ -155,7 +155,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain( .toContain(
`const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: "legacy" };`); `const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
}); });
it('should migrate aliased RouterModule.forRoot', async () => { it('should migrate aliased RouterModule.forRoot', async () => {
@ -173,7 +173,7 @@ describe('initial navigation migration', () => {
await runMigration(); await runMigration();
expect(tree.readContent('/index.ts')) expect(tree.readContent('/index.ts'))
.toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: "legacy" }),`); .toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: 'legacy' }),`);
}); });
function writeFile(filePath: string, contents: string) { function writeFile(filePath: string, contents: string) {