Skip to content

Library imports #16340

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
merged 2 commits into from
Dec 3, 2019
Merged

Library imports #16340

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
d8bd8e3
fix(@schematics/angular): improve paths and exclude options
alan-agius4 Dec 3, 2019
63c93d0
build: only run ngcc hook for large tests
alan-agius4 Dec 3, 2019
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
7 changes: 0 additions & 7 deletions packages/schematics/angular/library/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ function updateTsConfig(packageName: string, distRoot: string) {
tsconfig.compilerOptions.paths[packageName] = [];
}
tsconfig.compilerOptions.paths[packageName].push(distRoot);

// deep import & secondary entrypoint support
const deepPackagePath = packageName + '/*';
if (!tsconfig.compilerOptions.paths[deepPackagePath]) {
tsconfig.compilerOptions.paths[deepPackagePath] = [];
}
tsconfig.compilerOptions.paths[deepPackagePath].push(distRoot + '/*');
});
};
}
Expand Down
3 changes: 0 additions & 3 deletions packages/schematics/angular/library/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,6 @@ describe('Library Schematic', () => {
expect(tsConfigJson.compilerOptions.paths.foo).toBeTruthy();
expect(tsConfigJson.compilerOptions.paths.foo.length).toEqual(1);
expect(tsConfigJson.compilerOptions.paths.foo[0]).toEqual('dist/foo');
expect(tsConfigJson.compilerOptions.paths['foo/*']).toBeTruthy();
expect(tsConfigJson.compilerOptions.paths['foo/*'].length).toEqual(1);
expect(tsConfigJson.compilerOptions.paths['foo/*'][0]).toEqual('dist/foo/*');
});

it(`should append to existing paths mappings`, async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/workspace/files/tsconfig.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",<% if (strict) { %>
"outDir": "./dist",<% if (strict) { %>
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
Expand Down
21 changes: 11 additions & 10 deletions scripts/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,18 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
const specGlob = args.large ? '*_spec_large.ts' : '*_spec.ts';
const regex = args.glob ? args.glob : `packages/**/${specGlob}`;

if (args['ve']) {
// tslint:disable-next-line:no-console
console.warn('********* VE Enabled ***********');
} else {
// CI is really flaky with NGCC
// This is a working around test order and isolation issues.
console.warn('********* Running ngcc ***********');
execSync('yarn ngcc', { stdio: 'inherit' });
}

if (args.large) {
if (args['ve']) {
// tslint:disable-next-line:no-console
console.warn('********* VE Enabled ***********');
} else {
console.warn('********* Ivy Enabled ***********');
// CI is really flaky with NGCC
// This is a working around test order and isolation issues.
console.warn('********* Running ngcc ***********');
execSync('yarn ngcc', { stdio: 'inherit' });
}

// Default timeout for large specs is 2.5 minutes.
jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
}
Expand Down