Merge branch 'develop' into feature/hash-routed

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')

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')