Skip to content
This repository was archived by the owner on Dec 1, 2019. It is now read-only.

Commit b29a73d

Browse files
committed
feat(*): bump dev typescript
1 parent d344196 commit b29a73d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"grunt-shell": "^1.1.2",
4343
"grunt-ts": "^3.0.0",
4444
"load-grunt-tasks": "^0.6.0",
45-
"typescript": "^1.7.0-dev.20151006"
45+
"typescript": "^1.8.0-dev.20151031"
4646
}
4747
}

src/checker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class Host implements ts.LanguageServiceHost {
7979
}
8080

8181
getDefaultLibFileName(options) {
82-
return options.target === ts.ScriptTarget.ES6 ?
82+
return options.target === env.compiler.ScriptTarget.ES6 ?
8383
env.compilerInfo.lib6.fileName :
8484
env.compilerInfo.lib5.fileName;
8585
}

src/host.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class Host implements ts.LanguageServiceHost {
114114
}
115115

116116
getDefaultLibFileName(options) {
117-
return options.target === ts.ScriptTarget.ES6 ?
117+
return options.target === this.state.ts.ScriptTarget.ES6 ?
118118
this.state.compilerInfo.lib6.fileName :
119119
this.state.compilerInfo.lib5.fileName;
120120
}
@@ -205,7 +205,7 @@ export class State {
205205
}
206206

207207
if (!this.options.noLib) {
208-
if (this.options.target === ts.ScriptTarget.ES6 || this.options.library === 'es6') {
208+
if (this.options.target === this.ts.ScriptTarget.ES6 || this.options.library === 'es6') {
209209
this.addFile(this.compilerInfo.lib6.fileName, this.compilerInfo.lib6.text);
210210
} else {
211211
this.addFile(this.compilerInfo.lib5.fileName, this.compilerInfo.lib5.text);

src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
254254

255255
if (typeof options.jsx !== 'undefined') {
256256
switch(options.jsx as any) {
257-
case 'react': options.jsx = ts.JsxEmit.React; break;
258-
case 'preserve': options.jsx = ts.JsxEmit.Preserve; break;
257+
case 'react': options.jsx = tsImpl.JsxEmit.React; break;
258+
case 'preserve': options.jsx = tsImpl.JsxEmit.Preserve; break;
259259
}
260260
}
261261

0 commit comments

Comments
 (0)