Skip to content

fix(@schematics/angular): blank root leads to wrong tsconfig.lib.prod… #16446

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
vikerman merged 1 commit into from
Dec 17, 2019
Merged

fix(@schematics/angular): blank root leads to wrong tsconfig.lib.prod… #16446

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
4 changes: 3 additions & 1 deletion packages/schematics/angular/migrations/update-9/ivy-libraries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { join, normalize } from '@angular-devkit/core';
import { Rule, Tree } from '@angular-devkit/schematics';
import { getWorkspacePath } from '../../utility/config';
import {
Expand Down Expand Up @@ -36,7 +38,7 @@ export function updateLibraries(): Rule {
}

const configurations = findPropertyInAstObject(target, 'configurations');
const tsConfig = `${projectRoot.value}/tsconfig.lib.prod.json`;
const tsConfig = join(normalize(projectRoot.value), 'tsconfig.lib.prod.json');

if (!configurations || configurations.kind !== 'object') {
// Configurations doesn't exist.
Expand Down
14 changes: 14 additions & 0 deletions packages/schematics/angular/migrations/update-9/ivy-libraries_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@ describe('Migration to version 9', () => {
tree.delete(libProdTsConfig);
});

it(`should add 'tsConfig' option with correct path when 'root' is an empty string`, async () => {
let config = JSON.parse(tree.readContent(workspacePath));
const projectConfig = config.projects['migration-lib'];
projectConfig.architect.build.configurations = undefined;
projectConfig.root = '';
tree.overwrite(workspacePath, JSON.stringify(config, undefined, 2));

const libProdTsConfigPath = 'tsconfig.lib.prod.json';
const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
config = getWorkspaceTargets(tree2).build;
expect(config.configurations.production.tsConfig).toEqual(libProdTsConfigPath);
expect(tree2.exists(libProdTsConfigPath)).toBeTruthy();
});

it(`should add 'tsConfig' option in production when configurations doesn't exists`, async () => {
let config = getWorkspaceTargets(tree);
config.build.configurations = undefined;
Expand Down