kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
This commit is contained in:
James Cole
2022-10-16 19:13:15 +02:00
parent e472c3520d fd37054493
commit 49560ca6a6
41 changed files with 1560 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webpack.mix.js vendored
View File

@@ -21,12 +21,18 @@
let mix = require('laravel-mix');
mix.webpackConfig({
resolve: {
alias: {
'vue$': 'vue/dist/vue.runtime.common.js'
}
}
});
resolve: {
alias: {
'vue$': 'vue/dist/vue.runtime.common.js'
},
fallback: {
"stream": require.resolve("stream-browserify"),
"zlib": false,
"https": false,
"http": false
}
}
});
mix.js('resources/assets/js/app.js', 'public/v1/js');
mix.js('resources/assets/js/app_vue.js', 'public/v1/js').vue({version: 2});