Skip to content

Commit 102fba2

Browse files
hareacajohnnyreilly
authored andcommitted
Fix(types collision) update webpack (TypeStrong#151)
* Updated webpack and @types/webpack version * Updated packages again using yarn * Logged changes
1 parent db649e3 commit 102fba2

File tree

4 files changed

+446
-750
lines changed

4 files changed

+446
-750
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v0.4.8
2+
3+
* [Fix(types collision): update webpack](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/151) (#142)
4+
15
## v0.4.7
26

37
* [Fix(types collision): update chalk and chokidar](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/147) (#142)

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fork-ts-checker-webpack-plugin",
3-
"version": "0.4.7",
3+
"version": "0.4.8",
44
"description": "Runs typescript type checker and linter on separate process.",
55
"main": "lib/index.js",
66
"types": "lib/types/index.d.ts",
@@ -58,7 +58,7 @@
5858
"@types/minimatch": "^3.0.1",
5959
"@types/node": "^8.0.26",
6060
"@types/resolve": "0.0.4",
61-
"@types/webpack": "^3.0.10",
61+
"@types/webpack": "^4.4.9",
6262
"chai": "^3.5.0",
6363
"css-loader": "^0.28.7",
6464
"eslint": "^3.19.0",
@@ -75,7 +75,7 @@
7575
"vue-class-component": "^6.1.1",
7676
"vue-loader": "^15.2.4",
7777
"vue-template-compiler": "^2.5.16",
78-
"webpack": "^4.0.0"
78+
"webpack": "^4.16.5"
7979
},
8080
"peerDependencies": {
8181
"tslint": "^4.0.0 || ^5.0.0",

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import childProcess = require('child_process');
44
import chalk, { Chalk } from 'chalk';
55
import fs = require('fs');
66
import os = require('os');
7-
import webpack = require('webpack');
7+
import * as webpack from 'webpack';
88
import isString = require('lodash.isstring');
99
import isFunction = require('lodash.isfunction');
1010
import CancellationToken = require('./CancellationToken');

0 commit comments

Comments
 (0)