From 645b4371ce94add9d996e25bc1a68b483a772ebd Mon Sep 17 00:00:00 2001
From: Calum Towers <towers@hey.com>
Date: Thu, 29 Feb 2024 22:03:36 +0000
Subject: [PATCH] fix: Import AlpineJS from Repo

---
 package-lock.json          | 24 +++++++++++++++++++++++-
 package.json               |  3 ++-
 resources/assets/js/app.js |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4fcc8b4c0a..46c7112270 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,8 @@
       "name": "vatsimukcore",
       "license": "MIT",
       "dependencies": {
-        "@alpinejs/collapse": "^3.13.5"
+        "@alpinejs/collapse": "^3.13.5",
+        "alpinejs": "^3.13.5"
       },
       "devDependencies": {
         "@fortawesome/fontawesome-free": "^6.5.1",
@@ -706,6 +707,19 @@
         "prettier": "^1.18.2 || ^2.0.0"
       }
     },
+    "node_modules/@vue/reactivity": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.5.tgz",
+      "integrity": "sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==",
+      "dependencies": {
+        "@vue/shared": "3.1.5"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz",
+      "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -1060,6 +1074,14 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/alpinejs": {
+      "version": "3.13.5",
+      "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.5.tgz",
+      "integrity": "sha512-1d2XeNGN+Zn7j4mUAKXtAgdc4/rLeadyTMWeJGXF5DzwawPBxwTiBhFFm6w/Ei8eJxUZeyNWWSD9zknfdz1kEw==",
+      "dependencies": {
+        "@vue/reactivity": "~3.1.1"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
diff --git a/package.json b/package.json
index c3ae681b29..87c7c84cf7 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "vue-template-compiler": "^2.7.16"
   },
   "dependencies": {
-    "@alpinejs/collapse": "^3.13.5"
+    "@alpinejs/collapse": "^3.13.5",
+    "alpinejs": "^3.13.5"
   }
 }
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index db57c3e6a0..037bf555a3 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -8,7 +8,7 @@ $("body").scrollspy({
 
 $(".tooltip_displays").tooltip();
 
-import { Alpine } from "../../../vendor/livewire/livewire/dist/livewire.esm";
+import Alpine from 'alpinejs';
 import collapse from "@alpinejs/collapse";
 
 Alpine.plugin(collapse);