From 1e916d970108ed77805255a20c73d6726caab453 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Tue, 18 Apr 2023 14:45:07 +0000
Subject: [PATCH] Move compiled files from public to public/build

---
 resources/views/errors/layout.blade.php       |  2 +-
 resources/views/layout/app.blade.php          |  4 +--
 resources/views/layout/footer.blade.php       |  2 +-
 .../views/vendor/mail/html/header.blade.php   |  2 +-
 webpack.mix.js                                | 29 +++++++++++--------
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
index c43a0f4..01e28d4 100644
--- a/resources/views/errors/layout.blade.php
+++ b/resources/views/errors/layout.blade.php
@@ -150,7 +150,7 @@
     </head>
     <body>
         <div class="flex-center position-ref full-height">
-            <img src="{{ asset('assets/images/supportweb_128.png') }}" alt="{{ config('app.name') }}">
+            <img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" alt="{{ config('app.name') }}">
             <div class="content">
                 <div class="title">
                     @yield('message')
diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
index 33f2d6f..8d22908 100644
--- a/resources/views/layout/app.blade.php
+++ b/resources/views/layout/app.blade.php
@@ -18,7 +18,7 @@
     <meta name="theme-color" content="#ffffff">
 
     <!-- Styles -->
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css', 'build') }}" rel="stylesheet">
     @crudPoliciesCSS
     @stack('styles')
 </head>
@@ -49,7 +49,7 @@
     @include('layout.footer')
     @stack('scriptsConstants')
     @include('modules.scriptConstants')
-    <script src="{{ mix('js/app.js') }}"></script>
+    <script src="{{ mix('js/app.js', 'build') }}"></script>
     @stack('scripts')
     @crudPoliciesJS()
     @auth
diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php
index 655fdc7..0e34c1e 100644
--- a/resources/views/layout/footer.blade.php
+++ b/resources/views/layout/footer.blade.php
@@ -1,6 +1,6 @@
 <footer id="footer" class="text-center text-lg-start">
     <div class="text-center p-2 bg-light">
-        <img src="{{ asset('assets/images/supportweb_128.png') }}" alt="{{ config('app.name', 'Laravel') }}" width="56">
+        <img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" alt="{{ config('app.name', 'Laravel') }}" width="56">
         <span class="text-reset">{{ $license }}</span>
         -
         <span class="text-reset">{{ $name }}&nbsp;-&nbsp;{{ $version }}</span>
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
index ba53e91..1a11669 100644
--- a/resources/views/vendor/mail/html/header.blade.php
+++ b/resources/views/vendor/mail/html/header.blade.php
@@ -1,7 +1,7 @@
 <tr>
 <td class="header">
 <a href="{{ $url }}" class="d-inline-block">
-<img src="{{ asset('assets/images/supportweb_128.png') }}" class="logo" alt="{{ config('app.name') }} Logo">
+<img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" class="logo" alt="{{ config('app.name') }} Logo">
 </a>
 </td>
 </tr>
diff --git a/webpack.mix.js b/webpack.mix.js
index 7a57f24..d2db4bf 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,5 +1,5 @@
-const path = require("path");
-const mix = require("laravel-mix");
+const path = require('path');
+const mix = require('laravel-mix');
 
 require("laravel-mix-polyfill");
 require("laravel-mix-clean");
@@ -14,6 +14,9 @@ const polyfill = {
     targets: "last 3 version, not dead, >0.3%",
 };
 
+mix.setPublicPath('public/build');
+mix.setResourceRoot('/build');
+
 mix.webpackConfig({
     resolve: {
         extensions: ["*", ".js", ".vue", ".ts"],
@@ -43,16 +46,14 @@ mix.webpackConfig({
     // Pour debug compilation errors
     // stats: {
     //     children: true,
-    //     warningsFilter: [
-    //         /\-\-underline\-color/,
-    //     ]
+    //     warningsFilter: [/\-\-underline\-color/],
     // },
 });
 
 mix.options({
     fileLoaderDirs: {
         fonts: `${assetDir}/fonts`,
-        images: `${assetDir}/images`,
+        images: `${assetDir}/images`
     },
     postCss: [
         require("postcss-discard-comments")({
@@ -62,11 +63,15 @@ mix.options({
 });
 
 mix.clean({
-    cleanOnceBeforeBuildPatterns: ["css/*", "js/*", "assets/*"],
+    cleanOnceBeforeBuildPatterns: [
+        "vendor/*",
+        "build/*"
+    ],
 });
 
-// mix Backend
-mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
+
+// * COMMON
+mix.ts("resources/ts/app.ts", "js", { transpileOnly: true })
     .vue({
         runtimeOnly: true,
         extractStyles: true,
@@ -76,7 +81,7 @@ mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
         fix: true,
         extensions: ["js", "ts"],
     })
-    .sass("resources/sass/app.scss", "public/css")
+    .sass("resources/sass/app.scss", "css")
     .stylelint({
         configFile: ".stylelintrc.json",
         files: ["**/*.scss"],
@@ -85,5 +90,5 @@ mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
     .version()
     .sourceMaps(true, "inline-source-map");
 
-// Copy Blade Images Assets
-mix.copyDirectory("resources/assets", "public/assets");
+// * Copy Blade Images Assets
+mix.copyDirectory("resources/assets", "public/build/assets");