Skip to content

Commit dbe2574

Browse files
authored
Fix(types collision) update chalk and chokidar #142 (#147)
1 parent cd7d8c6 commit dbe2574

File tree

5 files changed

+190
-21
lines changed

5 files changed

+190
-21
lines changed

package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fork-ts-checker-webpack-plugin",
3-
"version": "0.4.6",
3+
"version": "0.4.7",
44
"description": "Runs typescript type checker and linter on separate process.",
55
"main": "lib/index.js",
66
"types": "lib/types/index.d.ts",
@@ -50,8 +50,7 @@
5050
},
5151
"devDependencies": {
5252
"@types/babel-code-frame": "^6.20.1",
53-
"@types/chalk": "^0.4.31",
54-
"@types/chokidar": "^1.7.2",
53+
"@types/chokidar": "^1.7.5",
5554
"@types/lodash.endswith": "^4.2.3",
5655
"@types/lodash.isfunction": "^3.0.3",
5756
"@types/lodash.isstring": "^4.0.3",
@@ -85,8 +84,8 @@
8584
},
8685
"dependencies": {
8786
"babel-code-frame": "^6.22.0",
88-
"chalk": "^1.1.3",
89-
"chokidar": "^1.7.0",
87+
"chalk": "^2.4.1",
88+
"chokidar": "^2.0.4",
9089
"lodash.endswith": "^4.2.1",
9190
"lodash.isfunction": "^3.0.8",
9291
"lodash.isstring": "^4.0.1",

src/formatter/codeframeFormatter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os = require('os');
22
import codeFrame = require('babel-code-frame');
3-
import chalk = require('chalk');
3+
import chalk from 'chalk';
44
import fs = require('fs');
55
import NormalizedMessage = require('../NormalizedMessage');
66

src/formatter/defaultFormatter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import chalk = require('chalk');
2+
import chalk from 'chalk';
33
import os = require('os');
44
import NormalizedMessage = require('../NormalizedMessage');
55

src/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path = require('path');
22
import process = require('process');
33
import childProcess = require('child_process');
4-
import chalk = require('chalk');
4+
import chalk, { Chalk } from 'chalk';
55
import fs = require('fs');
66
import os = require('os');
77
import webpack = require('webpack');
@@ -77,7 +77,7 @@ class ForkTsCheckerWebpackPlugin {
7777
workersNumber: number;
7878
memoryLimit: number;
7979
useColors: boolean;
80-
colors: chalk.Chalk;
80+
colors: Chalk;
8181
formatter: Formatter;
8282

8383
tsconfigPath: string;
@@ -599,7 +599,7 @@ class ForkTsCheckerWebpackPlugin {
599599
}
600600

601601
createEmitCallback(compilation: any, callback: () => void) {
602-
return function emitCallback (this: ForkTsCheckerWebpackPlugin) {
602+
return function emitCallback(this: ForkTsCheckerWebpackPlugin) {
603603
const elapsed = Math.round(this.elapsed[0] * 1E9 + this.elapsed[1]);
604604

605605
if ('hooks' in this.compiler) {
@@ -651,7 +651,7 @@ class ForkTsCheckerWebpackPlugin {
651651
}
652652

653653
createDoneCallback() {
654-
return function doneCallback (this: ForkTsCheckerWebpackPlugin) {
654+
return function doneCallback(this: ForkTsCheckerWebpackPlugin) {
655655
const elapsed = Math.round(this.elapsed[0] * 1E9 + this.elapsed[1]);
656656

657657
if (this.compiler) {

0 commit comments

Comments
 (0)