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

Commit 635c9d3

Browse files
committed
feat(*): update deps
BREAKING_CHAGE: some deps were updated to the latest versions
1 parent 08578d2 commit 635c9d3

File tree

7 files changed

+24
-30
lines changed

7 files changed

+24
-30
lines changed

.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
6

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ language: node_js
33
before_script:
44
- npm run build
55
node_js:
6-
- "4.1"
6+
- "4"
7+
- "6"

package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,41 @@
3636
"babel-polyfill": "^6.1.19",
3737
"colors": "^1.1.2",
3838
"enhanced-resolve": "^0.9.1",
39-
"es6-promisify": "^3.0.0",
39+
"es6-promisify": "^4.1.0",
4040
"loader-utils": "^0.2.6",
41-
"lodash": "^3.10.1",
42-
"object-assign": "^2.1.1",
41+
"lodash": "^4.13.1",
42+
"object-assign": "^4.1.0",
4343
"parse-json": "^2.2.0",
4444
"source-map-support": "^0.4.0",
45-
"strip-bom": "^2.0.0",
45+
"strip-bom": "^3.0.0",
4646
"strip-json-comments": "^2.0.0",
47-
"tsconfig": "^2.1.1"
47+
"tsconfig": "^3.0.0"
4848
},
4949
"devDependencies": {
5050
"babel-cli": "^6.3.17",
5151
"babel-core": "^6.7.4",
5252
"babel-preset-es2015": "^6.1.2",
53-
"babel-preset-es2015-node4": "^1.0.0",
53+
"babel-preset-es2015-node4": "^2.1.0",
5454
"babel-preset-stage-2": "^6.1.2",
5555
"bluebird": "^3.3.3",
5656
"chai": "^3.5.0",
57-
"git-hooks": "0.0.10",
58-
"grunt": "^0.4.5",
57+
"git-hooks": "^1.0.2",
58+
"grunt": "^1.0.1",
5959
"grunt-bump": "^0.3.1",
60-
"grunt-cli": "^0.1.13",
61-
"grunt-contrib-clean": "^0.6.0",
62-
"grunt-contrib-copy": "^0.7.0",
63-
"grunt-conventional-changelog": "^1.2.1",
60+
"grunt-cli": "^1.2.0",
61+
"grunt-contrib-clean": "^1.0.0",
62+
"grunt-contrib-copy": "^1.0.0",
63+
"grunt-conventional-changelog": "^6.1.0",
6464
"grunt-shell": "^1.1.2",
65-
"load-grunt-tasks": "^0.6.0",
65+
"load-grunt-tasks": "^3.5.0",
6666
"mkdirp": "^0.5.1",
6767
"mocha": "^2.3.4",
68-
"ps-node": "0.0.5",
68+
"ps-node": "^0.1.1",
6969
"rimraf": "^2.5.0",
7070
"sinon": "^1.17.4",
7171
"temp": "^0.8.3",
72-
"tslint": "3.5.0-dev.1",
73-
"typescript": "^1.9.0-dev.20160509",
72+
"tslint": "3.11.0-dev.0",
73+
"typescript": "1.9.0-dev.20160610-1.0",
7474
"webpack": "2.1.0-beta.4"
7575
}
7676
}

src/checker-runtime.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export class Host implements ts.LanguageServiceHost {
184184
}
185185

186186
function processInit(payload: IInitPayload) {
187-
env.compiler = require(payload.compilerInfo.compilerName);
187+
env.compiler = require(payload.compilerInfo.compilerPath);
188188
env.compilerInfo = payload.compilerInfo;
189189
env.options = payload.compilerOptions;
190190
env.webpackOptions = payload.webpackOptions;

src/host.ts

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export interface IFile {
1717
}
1818

1919
export interface ICompilerInfo {
20-
compilerName: string;
2120
compilerPath: string;
2221
tsImpl: typeof ts;
2322
lib5: { fileName: string, text: string };

src/instance.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
116116
}
117117

118118
let tsFlow = Promise.resolve();
119-
120-
let compilerName = options.compiler || 'typescript';
121-
let compilerPath = path.dirname(compilerName);
122-
if (compilerPath == '.') {
123-
compilerPath = compilerName;
124-
}
119+
let compilerPath = options.compiler || 'typescript';
125120

126121
let tsImpl: typeof ts;
127122
try {
@@ -143,7 +138,6 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
143138
}
144139

145140
let compilerInfo: ICompilerInfo = {
146-
compilerName,
147141
compilerPath,
148142
tsImpl,
149143
lib5: loadLib(libPath),
@@ -366,7 +360,7 @@ function setupAfterCompile(compiler, instanceName, forkChecker = false) {
366360
compilation.errors.push(new Error(msg));
367361
};
368362

369-
let {options: {ignoreDiagnostics}} = instance;
363+
let { options: { ignoreDiagnostics } } = instance;
370364
diagnostics
371365
.filter(err => !ignoreDiagnostics || ignoreDiagnostics.indexOf(err.code) == -1)
372366
.map(err => `[${ instanceName }] ` + formatError(err))
@@ -402,6 +396,7 @@ function setupAfterCompile(compiler, instanceName, forkChecker = false) {
402396
instance.compiledFiles = {};
403397
compilation.fileDependencies.push.apply(compilation.fileDependencies, phantomImports);
404398
compilation.fileDependencies = _.uniq(compilation.fileDependencies);
399+
405400
callback();
406401
});
407402
}

src/test/checker.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ let ps = require('ps-node');
88
function getCheckerRuntimeProcess(): Promise<any> {
99
let opts = {
1010
command: /node/,
11-
arguments: /checker-runtime/,
12-
psargs: 'aux'
11+
arguments: /checker-runtime.js/,
1312
};
1413
return new Promise((resolve, reject) => {
1514
ps.lookup(opts, (err, resultList ) => {

0 commit comments

Comments
 (0)