Skip to content

Commit

Permalink
Fix(types collision) update webpack (#151)
Browse files Browse the repository at this point in the history
* Updated webpack and @types/webpack version

* Updated packages again using yarn

* Logged changes
  • Loading branch information
hareaca authored and johnnyreilly committed Aug 11, 2018
1 parent db649e3 commit 102fba2
Show file tree
Hide file tree
Showing 4 changed files with 446 additions and 750 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.4.8

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

## v0.4.7

* [Fix(types collision): update chalk and chokidar](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/147) (#142)
Expand Down
6 changes: 3 additions & 3 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.7",
"version": "0.4.8",
"description": "Runs typescript type checker and linter on separate process.",
"main": "lib/index.js",
"types": "lib/types/index.d.ts",
Expand Down Expand Up @@ -58,7 +58,7 @@
"@types/minimatch": "^3.0.1",
"@types/node": "^8.0.26",
"@types/resolve": "0.0.4",
"@types/webpack": "^3.0.10",
"@types/webpack": "^4.4.9",
"chai": "^3.5.0",
"css-loader": "^0.28.7",
"eslint": "^3.19.0",
Expand All @@ -75,7 +75,7 @@
"vue-class-component": "^6.1.1",
"vue-loader": "^15.2.4",
"vue-template-compiler": "^2.5.16",
"webpack": "^4.0.0"
"webpack": "^4.16.5"
},
"peerDependencies": {
"tslint": "^4.0.0 || ^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import childProcess = require('child_process');
import chalk, { Chalk } from 'chalk';
import fs = require('fs');
import os = require('os');
import webpack = require('webpack');
import * as webpack from 'webpack';
import isString = require('lodash.isstring');
import isFunction = require('lodash.isfunction');
import CancellationToken = require('./CancellationToken');
Expand Down
Loading

0 comments on commit 102fba2

Please sign in to comment.