Merge branch 'trunk'

This commit is contained in:
Jérémy Munsch 2021-11-12 17:03:44 +01:00
commit 1650de20a7
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
4 changed files with 20 additions and 17 deletions

View file

@ -15,12 +15,20 @@ use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\View;
use Illuminate\Support\Str;
use League\Csv\Writer;
use Symfony\Component\HttpFoundation\StreamedResponse;
class CustomerController extends Controller
{
public function __construct()
{
$this->middleware(function ($request, $next) {
View::share('modelClass', Customer::class);
return $next($request);
});
}
public function index(Request $request)
{
$modelTable = (new Customer())->getTable();

View file

@ -69,8 +69,6 @@ class AppServiceProvider extends ServiceProvider
Paginator::useBootstrap();
}
Paginator::useBootstrap();
$appInfos = Cache::remember('composer', 360, function () {
return json_decode(File::get(\app_path('../composer.json')));
});

View file

@ -11,8 +11,9 @@
},
"devDependencies": {
"axios": "^0.21",
"clean-webpack-plugin": "^4.0.0-alpha.0",
"clean-webpack-plugin": "^4.0.0",
"laravel-mix": "^6.0.6",
"laravel-mix-clean": "^0.1.0",
"laravel-mix-polyfill": "^3.0.0",
"moment": "^2.29.1",
"postcss": "^8.1.14",

24
webpack.mix.js vendored
View file

@ -1,6 +1,6 @@
const path = require('path');
const mix = require('laravel-mix');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
require('laravel-mix-clean');
require('laravel-mix-polyfill');
mix.webpackConfig({
@ -8,18 +8,7 @@ mix.webpackConfig({
alias: {
'@': path.resolve('resources/assets')
}
},
plugins: [
new CleanWebpackPlugin({
cleanOnceBeforeBuildPatterns: [
'css/*',
'js/*',
'images/*',
'fonts/*',
'assets/*'
]
})
],
}
});
let assetDir = 'assets';
@ -38,7 +27,14 @@ mix.options({
// mix Backend
mix.js("resources/js/back.js", "public/js/preload-back.js")
.sass("resources/sass/back.scss", "public/css/preload-back.css")
// .vue()
.clean({
cleanOnceBeforeBuildPatterns: [
'css/*',
'js/*',
'images/*',
'assets/*'
]
})
.polyfill({
enabled: true,
useBuiltIns: "usage",