consultoria-as/gonoware-laravel-maps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Laravel 7 compatibility

Browse Source
This commit is contained in:
Emanuel Mutschlechner
2020-04-07 01:41:36 +02:00
parent fbffa51ed9
commit 68cfe44c05
3 changed files with 508 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@@ -35,12 +35,12 @@
], ],
"type": "library", "type": "library",
"require": { "require": {
"php": ">=7.0.0|>=7.1.3", "php": "^7.0.0|^7.2|^7.2.5",
"illuminate/support": "^5.5|^6.0" "illuminate/support": "^5.5|^6.0|^7.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "^1.0", "mockery/mockery": "0.9.*|^1.0|^1.3.1",
"phpunit/phpunit": "~6.0|~7.0" "phpunit/phpunit": "~6.0|^8.0|^8.5"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

762
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

3
webpack.mix.js vendored
View File

@@ -1,8 +1,7 @@
const mix = require('laravel-mix'); const mix = require('laravel-mix');
mix.setPublicPath('public') mix.setPublicPath('public')
.setResourceRoot('../')
.js('resources/js/index.js', 'js') .js('resources/js/index.js', 'js')
.sass('resources/sass/index.scss', 'css') .sass('resources/sass/index.scss', 'css')
.copy('resources/img/*.png', 'public/img') .copy('resources/img/*.png', 'img')
.version('img'); .version('img');