Skip to content

Commit

Permalink
Fix(types collision) update chalk and chokidar #142 (#147)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyreilly authored Aug 10, 2018
1 parent cd7d8c6 commit dbe2574
Show file tree
Hide file tree
Showing 5 changed files with 190 additions and 21 deletions.
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fork-ts-checker-webpack-plugin",
"version": "0.4.6",
"version": "0.4.7",
"description": "Runs typescript type checker and linter on separate process.",
"main": "lib/index.js",
"types": "lib/types/index.d.ts",
Expand Down Expand Up @@ -50,8 +50,7 @@
},
"devDependencies": {
"@types/babel-code-frame": "^6.20.1",
"@types/chalk": "^0.4.31",
"@types/chokidar": "^1.7.2",
"@types/chokidar": "^1.7.5",
"@types/lodash.endswith": "^4.2.3",
"@types/lodash.isfunction": "^3.0.3",
"@types/lodash.isstring": "^4.0.3",
Expand Down Expand Up @@ -85,8 +84,8 @@
},
"dependencies": {
"babel-code-frame": "^6.22.0",
"chalk": "^1.1.3",
"chokidar": "^1.7.0",
"chalk": "^2.4.1",
"chokidar": "^2.0.4",
"lodash.endswith": "^4.2.1",
"lodash.isfunction": "^3.0.8",
"lodash.isstring": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/formatter/codeframeFormatter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os = require('os');
import codeFrame = require('babel-code-frame');
import chalk = require('chalk');
import chalk from 'chalk';
import fs = require('fs');
import NormalizedMessage = require('../NormalizedMessage');

Expand Down
2 changes: 1 addition & 1 deletion src/formatter/defaultFormatter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import chalk = require('chalk');
import chalk from 'chalk';
import os = require('os');
import NormalizedMessage = require('../NormalizedMessage');

Expand Down
8 changes: 4 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path = require('path');
import process = require('process');
import childProcess = require('child_process');
import chalk = require('chalk');
import chalk, { Chalk } from 'chalk';
import fs = require('fs');
import os = require('os');
import webpack = require('webpack');
Expand Down Expand Up @@ -77,7 +77,7 @@ class ForkTsCheckerWebpackPlugin {
workersNumber: number;
memoryLimit: number;
useColors: boolean;
colors: chalk.Chalk;
colors: Chalk;
formatter: Formatter;

tsconfigPath: string;
Expand Down Expand Up @@ -599,7 +599,7 @@ class ForkTsCheckerWebpackPlugin {
}

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

if ('hooks' in this.compiler) {
Expand Down Expand Up @@ -651,7 +651,7 @@ class ForkTsCheckerWebpackPlugin {
}

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

if (this.compiler) {
Expand Down
Loading

0 comments on commit dbe2574

Please sign in to comment.