Skip to content

Commit 6d59404

Browse files
authored
Merge pull request TypeStrong#93 from johnnyreilly/master
Migrate to webpack 4
2 parents af2074c + 16b67d2 commit 6d59404

File tree

9 files changed

+1382
-472
lines changed

9 files changed

+1382
-472
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.9.4
1+
6.9.11

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
language: node_js
2+
node_js:
3+
- "8"
4+
install:
5+
- yarn install
6+
- yarn build
7+
- yarn add $WEBPACK $TSLOADER $VUELOADER -D
8+
# Test against multiple webpack versions
9+
env:
10+
- WEBPACK=webpack@^4.0.0 TSLOADER=ts-loader@^4.0.0 VUELOADER=vue-loader@^14.1.0
11+
- WEBPACK=webpack@^3.10.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
12+
- WEBPACK=webpack@^2.7.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
213
deploy:
314
- provider: npm
415

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## v0.4.0
2+
* Support webpack
3+
14
## v0.3.0
25
* Add `vue` support
36

package.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fork-ts-checker-webpack-plugin",
3-
"version": "0.3.0",
3+
"version": "0.4.0",
44
"description": "Runs typescript type checker and linter on separate process.",
55
"main": "lib/index.js",
66
"files": [
@@ -35,7 +35,14 @@
3535
"increment",
3636
"webpack-plugin"
3737
],
38+
"engines": {
39+
"node": ">=6.11.5"
40+
},
3841
"author": "Piotr Oleś <[email protected]>",
42+
"contributors": [
43+
"Piotr Oleś <[email protected]> (https://github.com/piotr-oles)",
44+
"John Reilly <[email protected]> (https://blog.johnnyreilly.com)"
45+
],
3946
"license": "MIT",
4047
"bugs": {
4148
"url": "https://github.com/Realytics/fork-ts-checker-webpack-plugin/issues"
@@ -61,18 +68,19 @@
6168
"mock-require": "^2.0.2",
6269
"rimraf": "^2.5.4",
6370
"sinon": "^2.3.1",
64-
"ts-loader": "^2.1.0",
71+
"ts-loader": "^4.0.0-beta.0",
6572
"tslint": "^5.0.0",
66-
"typescript": "^2.1.0",
73+
"typescript": "^2.6.2",
6774
"vue": "^2.5.9",
6875
"vue-class-component": "^6.1.1",
69-
"vue-loader": "^13.5.0",
76+
"vue-loader": "^14.1.0",
7077
"vue-template-compiler": "^2.5.9",
71-
"webpack": "^3.0.0"
78+
"webpack": "^4.0.0"
7279
},
7380
"peerDependencies": {
81+
"tslint": "^4.0.0 || ^5.0.0",
7482
"typescript": "^2.1.0",
75-
"webpack": "^2.3.0 || ^3.0.0"
83+
"webpack": "^2.3.0 || ^3.0.0 || ^4.0.0"
7684
},
7785
"dependencies": {
7886
"babel-code-frame": "^6.22.0",
@@ -84,6 +92,7 @@
8492
"lodash.startswith": "^4.2.1",
8593
"minimatch": "^3.0.4",
8694
"resolve": "^1.5.0",
95+
"tapable": "^1.0.0",
8796
"vue-parser": "^1.1.5"
8897
}
8998
}

0 commit comments

Comments
 (0)