Skip to content

Commit 2544aef

Browse files
authored
Merge pull request sagalbot#119 from xemoka/vue2
Updated to Vue 2.1.8.
2 parents b096555 + 3c2bf95 commit 2544aef

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

build/webpack.base.conf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ module.exports = {
3030
loaders: [
3131
{
3232
test: /\.vue$/,
33-
loader: 'vue'
33+
loader: 'vue-loader'
3434
},
3535
{
3636
test: /\.js$/,
37-
loader: 'babel',
37+
loader: 'babel-loader',
3838
include: projectRoot,
3939
exclude: /node_modules/
4040
},
4141
{
4242
test: /\.json$/,
43-
loader: 'json'
43+
loader: 'json-loader'
4444
},
4545
{
4646
test: /\.html$/,
47-
loader: 'vue-html'
47+
loader: 'vue-html-loader'
4848
},
4949
{
5050
test: /\.(png|jpe?g|gif)(\?.*)?$/,

dist/vue-select.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-select.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@
5959
"sass-loader": "^3.2.0",
6060
"shelljs": "^0.7.0",
6161
"url-loader": "^0.5.7",
62-
"vue": "^2.0.3",
63-
"vue-hot-reload-api": "^1.2.0",
62+
"vue": "^2.1.8",
63+
"vue-hot-reload-api": "^2.0.7",
6464
"vue-html-loader": "^1.2.3",
65-
"vue-loader": "^9.9.5",
65+
"vue-loader": "^10.0.2",
6666
"vue-resource": "^1.0.3",
6767
"vue-style-loader": "^1.0.0",
68-
"vuex": "^0.6.3",
68+
"vue-template-compiler": "^2.1.8",
69+
"vuex": "^2.1.1",
6970
"webpack": "^1.12.2",
7071
"webpack-dev-middleware": "^1.4.0",
7172
"webpack-hot-middleware": "^2.6.0",

0 commit comments

Comments
 (0)