diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-02-21 11:48:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-02-21 11:48:55 +0100 |
| commit | 7661357cf669ef57bfdd3e39c0c5574094984de4 (patch) | |
| tree | af75b678c266f6d6d3964233cecff0ceee27b704 | |
| parent | b98cfbfade5bf5469341620eb26e6f4611f73ca8 (diff) | |
| parent | abc9f06d93b9f380301da14fb9073771cadd71f5 (diff) | |
Merge branch 'develop' into feature/hash-routed
| -rw-r--r-- | build/webpack.base.conf.js | 2 | ||||
| -rw-r--r-- | src/main.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index ccff6772..68e75972 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -23,7 +23,7 @@ module.exports = { extensions: ['', '.js', '.vue'], fallback: [path.join(__dirname, '../node_modules')], alias: { - 'vue$': 'vue/dist/vue.common', + 'vue$': 'vue/dist/vue.runtime.common', 'src': path.resolve(__dirname, '../src'), 'assets': path.resolve(__dirname, '../src/assets'), 'components': path.resolve(__dirname, '../src/components') diff --git a/src/main.js b/src/main.js index 3d365095..6fa95e12 100644 --- a/src/main.js +++ b/src/main.js @@ -66,8 +66,7 @@ new Vue({ router, store, el: '#app', - template: '<App/>', - components: { App } + render: h => h(App) }) window.fetch('/static/config.json') |