Skip to content

Don't require TypeScript before we've installed it #207

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
May 11, 2018
Merged

Don't require TypeScript before we've installed it #207

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
8 changes: 4 additions & 4 deletions lib/incremental-typescript-compiler/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const path = require('path');
const fs = require('fs-extra');
const resolve = require('resolve');
const compile = require('../utilities/compile');
const ts = require('typescript');
const TypescriptOutput = require('./typescript-output-plugin');
const CompilerState = require('./compiler-state');

Expand All @@ -28,6 +27,7 @@ module.exports = class IncrementalTypescriptCompiler {
this.addons = this._discoverAddons(project, []);
this.state = new CompilerState();

this._ts = project.require('typescript');
this._watchProgram = null;
}

Expand Down Expand Up @@ -125,10 +125,10 @@ module.exports = class IncrementalTypescriptCompiler {
}

_formatDiagnosticMessage(diagnostic) {
return ts.formatDiagnostic(diagnostic, {
return this._ts.formatDiagnostic(diagnostic, {
getCanonicalFileName: path => path,
getCurrentDirectory: ts.sys.getCurrentDirectory,
getNewLine: () => ts.sys.newLine,
getCurrentDirectory: this._ts.sys.getCurrentDirectory,
getNewLine: () => this._ts.sys.newLine,
});
}

Expand Down
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@
"resolutions": {
"@types/ember": "2.8.13"
},
"peerDependencies": {
"typescript": "^2.4.2"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
},
Expand Down