Skip to content

fix(schematics): module imports not generated for schematics #16787

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 1 commit into from
Aug 15, 2019
Merged

fix(schematics): module imports not generated for schematics #16787

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
16 changes: 12 additions & 4 deletions src/cdk/schematics/utils/version-agnostic-typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ import {SchematicsException} from '@angular-devkit/schematics';
let ts: typeof typescript;

try {
ts = require('@schematics/angular/node_modules/typescript');
ts = require('@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript');
} catch {
// Fallback for CLI versions before v8.0.0. The TypeScript dependency has been dropped in
// CLI version v8.0.0 but older CLI versions can still run the latest generation schematics.
// See: https://github.com/angular/angular-cli/commit/bf1c069f73c8e3d4f0e8d584cbfb47c408c1730b
try {
ts = require('typescript');
ts = require('@schematics/angular/node_modules/typescript');
} catch {
throw new SchematicsException('Error: Could not find a TypeScript version for the ' +
'schematics. Please report an issue on the Angular Material repository.');
try {
ts = require('typescript');
} catch {
throw new SchematicsException(
'Error: Could not find a TypeScript version for the ' +
'schematics. Please report an issue on the Angular Material repository.');
}
}
}

Expand Down