AkkomaGang/akkoma-fe
4
13
Fork 58
Code Issues 75 Pull requests 17 Projects Releases 1 Wiki Activity

Merge branch 'develop' into feature/hash-routed

Browse source
This commit is contained in:
Roger Braun 2017-02-21 11:48:55 +01:00
parent b98cfbfade abc9f06d93
commit 7661357cf6
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/webpack.base.conf.js
View file

@ -23,7 +23,7 @@ module.exports = {
extensions: ['', '.js', '.vue'], extensions: ['', '.js', '.vue'],
fallback: [path.join(__dirname, '../node_modules')], fallback: [path.join(__dirname, '../node_modules')],
alias: { alias: {
'vue$': 'vue/dist/vue.common', 'vue$': 'vue/dist/vue.runtime.common',
'src': path.resolve(__dirname, '../src'), 'src': path.resolve(__dirname, '../src'),
'assets': path.resolve(__dirname, '../src/assets'), 'assets': path.resolve(__dirname, '../src/assets'),
'components': path.resolve(__dirname, '../src/components') 'components': path.resolve(__dirname, '../src/components')

3
src/main.js
View file

@ -66,8 +66,7 @@ new Vue({
router, router,
store, store,
el: '#app', el: '#app',
template: '<App/>', render: h => h(App)
components: { App }
}) })
window.fetch('/static/config.json') window.fetch('/static/config.json')