From d6b0c5a039ef2fed07287536bf479eb88461a405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 10 Nov 2021 16:57:03 +0100 Subject: [PATCH 1/3] add laravel-mix-clean --- package.json | 3 ++- webpack.mix.js | 24 ++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 5df4967..abe0d2e 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/webpack.mix.js b/webpack.mix.js index ae418f1..ac4f79c 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -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", From 8a289f98ed6afc5e5d2dc4d3dc1e54b57f395007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 12 Nov 2021 17:03:01 +0100 Subject: [PATCH 2/3] remove double paginator set in appservice provider --- app/Providers/AppServiceProvider.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ebdce10..1970e56 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -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'))); }); From 4c5f51bf97ad8e4ef4255730aaddfb62a3920ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 12 Nov 2021 17:03:20 +0100 Subject: [PATCH 3/3] fix customer show missing crud var --- app/Http/Controllers/CustomerController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index e0cbdf9..608b675 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -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();