Skip to content

Commit b9bb004

Browse files
authored
Merge pull request TypeStrong#123 from Realytics/johnnyreilly-patch-1
Update .travis.yml
2 parents d06cc7b + 7764aba commit b9bb004

File tree

4 files changed

+104
-91
lines changed

4 files changed

+104
-91
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ install:
66
- yarn build
77
- yarn add $WEBPACK $TSLOADER $VUELOADER -D
88
env:
9-
- WEBPACK=webpack@^4.0.0 [email protected] VUELOADER=vue-loader@^14.1.0
9+
- WEBPACK=webpack@^4.0.0 TSLOADER=ts-loader@^4.3.0 VUELOADER=vue-loader@^15.2.4
1010
- WEBPACK=webpack@^3.10.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
1111
- WEBPACK=webpack@^2.7.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
1212
deploy:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"typescript": "^2.6.2",
7474
"vue": "^2.5.9",
7575
"vue-class-component": "^6.1.1",
76-
"vue-loader": "^14.1.0",
76+
"vue-loader": "^15.2.4",
7777
"vue-template-compiler": "^2.5.9",
7878
"webpack": "^4.0.0"
7979
},

test/integration/vue.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ var IncrementalChecker = require('../../lib/IncrementalChecker');
1010

1111
var webpackMajorVersion = require('./webpackVersion')();
1212

13+
var VueLoaderPlugin = webpackMajorVersion >= 4 ? require('vue-loader/lib/plugin') : undefined;
14+
1315
describe('[INTEGRATION] vue', function () {
1416
this.timeout(60000);
1517
process.setMaxListeners(0);
@@ -56,6 +58,7 @@ describe('[INTEGRATION] vue', function () {
5658
]
5759
},
5860
plugins: [
61+
...(webpackMajorVersion >= 4 ? [new VueLoaderPlugin()] : []),
5962
plugin
6063
]
6164
});

0 commit comments

Comments
 (0)