Skip to content

fix(@schematics/angular): change extends from tsconfig.base.json to tsconfig.json #18540

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
alan-agius4 merged 2 commits into from
Aug 17, 2020
Merged

fix(@schematics/angular): change extends from tsconfig.base.json to tsconfig.json #18540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
290f3c8
test: update remove solutions style tsconfig test to extend `tsconfig…
alan-agius4 Aug 15, 2020
37c2253
fix(@schematics/angular): change `extends` from `tsconfig.base.json`…
alan-agius4 Aug 15, 2020
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
10 changes: 4 additions & 6 deletions packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ export default function (): Rule {
return (host, context) => {
const logger = context.logger;

const tsConfig = new JSONFile(host, 'tsconfig.json');
const files = tsConfig.get(['files']);
const files = new JSONFile(host, 'tsconfig.json').get(['files']);
if (!(Array.isArray(files) && files.length === 0)) {
logger.info('Migration has already been executed.');

Expand All @@ -51,16 +50,15 @@ export default function (): Rule {
// Iterate over all tsconfig files and change the extends from 'tsconfig.base.json' to 'tsconfig.json'.
const extendsJsonPath = ['extends'];
for (const path of visitExtendedJsonFiles(host.root)) {
const tsConfigDir = dirname(normalize(path));
let tsConfigJson;

try {
tsConfigJson = new JSONFile(host, path);
const tsConfigDir = dirname(normalize(path));
const tsConfigJson = new JSONFile(host, path);
const extendsValue = tsConfigJson.get(extendsJsonPath);

if (typeof extendsValue === 'string' && '/tsconfig.base.json' === resolve(tsConfigDir, normalize(extendsValue))) {
// tsconfig extends the workspace tsconfig path.
tsConfig.modify(extendsJsonPath, extendsValue.replace('tsconfig.base.json', 'tsconfig.json'));
tsConfigJson.modify(extendsJsonPath, extendsValue.replace('tsconfig.base.json', 'tsconfig.json'));
}
} catch (error) {
logger.warn(
Expand Down
8 changes: 4 additions & 4 deletions packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
createJsonFile(tree, 'tsconfig.json', { files: [] });
createJsonFile(tree, 'tsconfig.base.json', { compilerOptions });
createJsonFile(tree, 'tsconfig.common.json', { compilerOptions });
createJsonFile(tree, 'src/tsconfig.json', { extends: './../tsconfig.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.base.json', { extends: './../tsconfig.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.json', { extends: './../tsconfig.base.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.base.json', { extends: './../tsconfig.base.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.tsc.json', { extends: './tsconfig.base.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.app.json', { extends: './../tsconfig.common.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.spec.json', { extends: './../tsconfig.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.worker.json', { extends: './../tsconfig.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.spec.json', { extends: './../tsconfig.base.json', compilerOptions });
createJsonFile(tree, 'src/tsconfig.worker.json', { extends: './../tsconfig.base.json', compilerOptions });
});

it(`should rename 'tsconfig.base.json' to 'tsconfig.json'`, async () => {
Expand Down