mirror of
https://github.com/brunofontes/shareit.git
synced 2024-11-27 13:21:26 +00:00
chore: Update to Laravel 9.0
This commit is contained in:
parent
11162a9ffa
commit
2cd7ab11fa
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
use Fideloper\Proxy\TrustProxies as Middleware;
|
use Illuminate\Http\Middleware\TrustProxies as Middleware;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class TrustProxies extends Middleware
|
class TrustProxies extends Middleware
|
||||||
@ -19,5 +19,10 @@ class TrustProxies extends Middleware
|
|||||||
*
|
*
|
||||||
* @var int
|
* @var int
|
||||||
*/
|
*/
|
||||||
protected $headers = Request::HEADER_X_FORWARDED_ALL;
|
protected $headers =
|
||||||
|
Request::HEADER_X_FORWARDED_FOR |
|
||||||
|
Request::HEADER_X_FORWARDED_HOST |
|
||||||
|
Request::HEADER_X_FORWARDED_PORT |
|
||||||
|
Request::HEADER_X_FORWARDED_PROTO |
|
||||||
|
Request::HEADER_X_FORWARDED_AWS_ELB;
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,10 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.3.0",
|
"php": "^8.0.2",
|
||||||
"fideloper/proxy": "^4.4",
|
"fideloper/proxy": "^4.4",
|
||||||
"laravel/framework": "^8.0",
|
"inertiajs/inertia-laravel": "^0.6.3",
|
||||||
|
"laravel/framework": "^9.19.0",
|
||||||
"laravel/helpers": "^1.4",
|
"laravel/helpers": "^1.4",
|
||||||
"laravel/tinker": "^2.4.1",
|
"laravel/tinker": "^2.4.1",
|
||||||
"laravel/ui": "^3.0"
|
"laravel/ui": "^3.0"
|
||||||
@ -17,9 +18,9 @@
|
|||||||
"filp/whoops": "^2.0",
|
"filp/whoops": "^2.0",
|
||||||
"fzaninotto/faker": "^1.4",
|
"fzaninotto/faker": "^1.4",
|
||||||
"mockery/mockery": "^1.0",
|
"mockery/mockery": "^1.0",
|
||||||
"nunomaduro/collision": "^5.0",
|
"nunomaduro/collision": "^6.1",
|
||||||
"nunomaduro/larastan": "^0.7.4",
|
"nunomaduro/larastan": "^0.7.4",
|
||||||
"nunomaduro/phpinsights": "^1.14",
|
"nunomaduro/phpinsights": "*",
|
||||||
"phpstan/phpstan": "^0.12.85",
|
"phpstan/phpstan": "^0.12.85",
|
||||||
"phpunit/phpunit": "^9.0"
|
"phpunit/phpunit": "^9.0"
|
||||||
},
|
},
|
||||||
|
3562
composer.lock
generated
3562
composer.lock
generated
File diff suppressed because it is too large
Load Diff
14474
package-lock.json
generated
14474
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@ -1,26 +1,24 @@
|
|||||||
{
|
{
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run development",
|
"dev": "vite",
|
||||||
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
|
"build": "vite build"
|
||||||
"watch": "npm run development -- --watch",
|
|
||||||
"watch-poll": "npm run watch -- --watch-poll",
|
|
||||||
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
|
|
||||||
"prod": "npm run production",
|
|
||||||
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"axios": "^0.21",
|
"axios": "^1.1.3",
|
||||||
"bootstrap": "^4.6.0",
|
"bootstrap": "^4.6.0",
|
||||||
"cross-env": "^5.2.1",
|
"cross-env": "^5.2.1",
|
||||||
"jquery": "^3.5.1",
|
"jquery": "^3.5.1",
|
||||||
"laravel-mix": "^6.0.18",
|
"laravel-vite-plugin": "^0.7.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"popper.js": "^1.16.1",
|
"popper.js": "^1.16.1",
|
||||||
|
"postcss": "^8.4.19",
|
||||||
"resolve-url-loader": "^3.1.3",
|
"resolve-url-loader": "^3.1.3",
|
||||||
"sass": "^1.32.12",
|
"sass": "^1.56.1",
|
||||||
"sass-loader": "^8.0.2",
|
"sass-loader": "^8.0.2",
|
||||||
"vue": "^2.6.12",
|
"vite": "^3.2.3"
|
||||||
"vue-template-compiler": "^2.6.12"
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"webpack": "^5.75.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1
public/build/assets/app.95ac02f4.js
vendored
Normal file
1
public/build/assets/app.95ac02f4.js
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
require("./bootstrap");
|
7
public/build/manifest.json
Normal file
7
public/build/manifest.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"resources/js/app.js": {
|
||||||
|
"file": "assets/app.95ac02f4.js",
|
||||||
|
"src": "resources/js/app.js",
|
||||||
|
"isEntry": true
|
||||||
|
}
|
||||||
|
}
|
9252
public/css/app.css
vendored
9252
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
46234
public/js/app.js
vendored
46234
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
@ -1,4 +1 @@
|
|||||||
{
|
{}
|
||||||
"/js/app.js": "/js/app.js",
|
|
||||||
"/css/app.css": "/css/app.css"
|
|
||||||
}
|
|
||||||
|
10
resources/js/app.js
vendored
10
resources/js/app.js
vendored
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
require('./bootstrap');
|
require('./bootstrap');
|
||||||
|
|
||||||
window.Vue = require('vue');
|
// window.Vue = require('vue');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Next, we will create a fresh Vue application instance and attach it to
|
* Next, we will create a fresh Vue application instance and attach it to
|
||||||
@ -15,8 +15,8 @@ window.Vue = require('vue');
|
|||||||
* or customize the JavaScript scaffolding to fit your unique needs.
|
* or customize the JavaScript scaffolding to fit your unique needs.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Vue.component('example-component', require('./components/ExampleComponent.vue'));
|
// Vue.component('example-component', require('./components/ExampleComponent.vue'));
|
||||||
|
|
||||||
const app = new Vue({
|
// const app = new Vue({
|
||||||
el: '#app'
|
// el: '#app'
|
||||||
});
|
// });
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="container">
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-md-8">
|
|
||||||
<div class="card card-default">
|
|
||||||
<div class="card-header">Example Component</div>
|
|
||||||
|
|
||||||
<div class="card-body">
|
|
||||||
I'm an example component.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
mounted() {
|
|
||||||
console.log('Component mounted.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
27
vite.config.js
vendored
Normal file
27
vite.config.js
vendored
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
import { defineConfig } from 'vite';
|
||||||
|
import laravel from 'laravel-vite-plugin';
|
||||||
|
// import react from '@vitejs/plugin-react';
|
||||||
|
// import vue from '@vitejs/plugin-vue';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [
|
||||||
|
laravel([
|
||||||
|
// 'resources/css/app.css',
|
||||||
|
'resources/js/app.js',
|
||||||
|
]),
|
||||||
|
// react(),
|
||||||
|
// vue({
|
||||||
|
// template: {
|
||||||
|
// transformAssetUrls: {
|
||||||
|
// base: null,
|
||||||
|
// includeAbsolute: false,
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// }),
|
||||||
|
],
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': '/resources/js'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
15
webpack.mix.js
vendored
15
webpack.mix.js
vendored
@ -1,15 +0,0 @@
|
|||||||
const mix = require('laravel-mix');
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Mix Asset Management
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Mix provides a clean, fluent API for defining some Webpack build steps
|
|
||||||
| for your Laravel application. By default, we are compiling the Sass
|
|
||||||
| file for the application as well as bundling up all the JS files.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
mix.js('resources/js/app.js', 'public/js')
|
|
||||||
.sass('resources/sass/app.scss', 'public/css');
|
|
Loading…
Reference in New Issue
Block a user