From a43adc80d30edb93ded93b5b42cbf782598d6539 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.be>
Date: Wed, 17 Apr 2024 10:17:54 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"[5.x]=20feature:=20this=20adds=20the?=
 =?UTF-8?q?=20vite=20integrity=20plugin=20to=20support=20assetsA=E2=80=A6"?=
 =?UTF-8?q?=20(#1417)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit df27ad9c125c1eb8c8c8b2cb50f38a2a28288da9.
---
 package-lock.json                | 13 -------------
 package.json                     |  1 -
 public/build/manifest.json       | 12 ++++--------
 resources/views/layout.blade.php | 19 +++++--------------
 vite.config.mjs                  |  2 --
 5 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 108c0a1b..4d9433ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
                 "sass": "^1.74.1",
                 "sql-formatter": "^4.0.2",
                 "vite": "^5.2.8",
-                "vite-plugin-manifest-sri": "^0.2.0",
                 "vue": "^2.7.16",
                 "vue-json-pretty": "^1.9.5",
                 "vue-router": "^3.6.5"
@@ -1572,12 +1571,6 @@
                 "picomatch": "^2.3.1"
             }
         },
-        "node_modules/vite-plugin-manifest-sri": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/vite-plugin-manifest-sri/-/vite-plugin-manifest-sri-0.2.0.tgz",
-            "integrity": "sha512-Zt5jt19xTIJ91LOuQTCtNG7rTFc5OziAjBz2H5NdCGqaOD1nxrWExLhcKW+W4/q8/jOPCg/n5ncYEQmqCxiGQQ==",
-            "dev": true
-        },
         "node_modules/vue": {
             "version": "2.7.16",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
@@ -2571,12 +2564,6 @@
                 "picomatch": "^2.3.1"
             }
         },
-        "vite-plugin-manifest-sri": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/vite-plugin-manifest-sri/-/vite-plugin-manifest-sri-0.2.0.tgz",
-            "integrity": "sha512-Zt5jt19xTIJ91LOuQTCtNG7rTFc5OziAjBz2H5NdCGqaOD1nxrWExLhcKW+W4/q8/jOPCg/n5ncYEQmqCxiGQQ==",
-            "dev": true
-        },
         "vue": {
             "version": "2.7.16",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
diff --git a/package.json b/package.json
index a1ece21b..8830d78e 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
         "sass": "^1.74.1",
         "sql-formatter": "^4.0.2",
         "vite": "^5.2.8",
-        "vite-plugin-manifest-sri": "^0.2.0",
         "vue": "^2.7.16",
         "vue-json-pretty": "^1.9.5",
         "vue-router": "^3.6.5"
diff --git a/public/build/manifest.json b/public/build/manifest.json
index 30ab3175..ce083231 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -1,8 +1,7 @@
 {
   "resources/img/favicon.png": {
     "file": "favicon.png",
-    "src": "resources/img/favicon.png",
-    "integrity": "sha384-tqnRilkeRgqFt3SUYaxuaQs14WOwuU8Gvk3sqRZmnyWZVhr1Kk19Ecr7dFMb4HZo"
+    "src": "resources/img/favicon.png"
   },
   "resources/js/app.js": {
     "file": "app.js",
@@ -11,19 +10,16 @@
     "isEntry": true,
     "css": [
       "app.css"
-    ],
-    "integrity": "sha384-EV5vlraT2g7leIzueltC7I+UzR7uBT4ndQF5b1G9I+kUrQ4XL0DREuRw/XiU/U3P"
+    ]
   },
   "resources/sass/styles-dark.scss": {
     "file": "styles-dark.css",
     "src": "resources/sass/styles-dark.scss",
-    "isEntry": true,
-    "integrity": "sha384-/sLOxh+NTFEdcZ8svIuVTv/lSL65X3QGIXhExXAhntQYWjiez1CQbv4ICbtwRfd8"
+    "isEntry": true
   },
   "resources/sass/styles.scss": {
     "file": "styles.css",
     "src": "resources/sass/styles.scss",
-    "isEntry": true,
-    "integrity": "sha384-4HOmv1E51xgqbUYzCYXaRXPRja5nEho6eq/L/CKs0LlidzTGNTk81VtCAHqLiYSC"
+    "isEntry": true
   }
 }
\ No newline at end of file
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 552608a6..c08d4ad1 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -1,16 +1,5 @@
 @php
 use Illuminate\Support\Facades\Vite;
-use Illuminate\Foundation\Vite as ViteFoundation;
-
-$viteDataSchemeLight = new ViteFoundation();
-$viteDataSchemeLight->useStyleTagAttributes([
-'data-scheme' => 'light',
-]);
-
-$viteDataSchemeDark = new ViteFoundation();
-$viteDataSchemeDark->useStyleTagAttributes([
-'data-scheme' => 'dark',
-]);
 @endphp
 <!DOCTYPE html>
 <html lang="en">
@@ -27,8 +16,10 @@
     <link rel="preconnect" href="https://fonts.bunny.net">
     <link href="https://fonts.bunny.net/css?family=figtree:300,400,500,600" rel="stylesheet" />
 
-    {{ $viteDataSchemeLight('resources/sass/styles.scss', 'vendor/horizon') }}
-    {{ $viteDataSchemeDark('resources/sass/styles-dark.scss', 'vendor/horizon') }}
+    <link rel="preload" as="style" href="{{ Vite::asset('resources/sass/styles.scss', 'vendor/horizon') }}" data-scheme="light" />
+    <link rel="stylesheet" href="{{ Vite::asset('resources/sass/styles.scss', 'vendor/horizon') }}" data-scheme="light" />
+    <link rel="preload" as="style" href="{{ Vite::asset('resources/sass/styles-dark.scss', 'vendor/horizon') }}" data-scheme="dark" />
+    <link rel="stylesheet" href="{{ Vite::asset('resources/sass/styles-dark.scss', 'vendor/horizon') }}" data-scheme="dark" />
 </head>
 <body>
 <div id="horizon" v-cloak>
@@ -156,6 +147,6 @@
     window.Horizon = @json($horizonScriptVariables);
 </script>
 
-@vite('resources/js/app.js', 'vendor/horizon')
+    @vite('resources/js/app.js', 'vendor/horizon')
 </body>
 </html>
diff --git a/vite.config.mjs b/vite.config.mjs
index aa696725..2358f9d4 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -1,7 +1,6 @@
 import vue2 from "@vitejs/plugin-vue2";
 import { defineConfig } from "vite";
 import laravel from "laravel-vite-plugin";
-import manifestSRI from "vite-plugin-manifest-sri";
 
 const config = defineConfig({
     plugins: [
@@ -11,7 +10,6 @@ const config = defineConfig({
             "resources/js/app.js",
         ]),
         vue2(),
-        manifestSRI(),
     ],
     resolve: {
         alias: {