Merge pull request #1289 from linuxserver/revert-1288-2.x

Revert "Replace Mix with Vite"

Author: KodeStar

.env.example

@@ -46,5 +46,5 @@ PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
           key: yarn-${{ hashFiles('yarn.lock') }}
 
       - name: Run yarn
-        run: yarn
+        run: yarn && yarn dev
 
       - name: Run ESLint
         run: yarn lint

package.json

@@ -1,9 +1,14 @@
 {
     "private": true,
     "scripts": {
-        "lint": "eslint 'resources/assets/js/*'",
-        "dev": "vite",
-        "build": "vite build"
+        "dev": "npm run development",
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
+        "prod": "npm run production",
+        "production": "mix --production",
+        "lint": "eslint 'resources/assets/js/*'"
     },
     "devDependencies": {
         "bootstrap-sass": "^3.4.3",
@@ -13,11 +18,10 @@
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-prettier": "^4.2.1",
         "jquery": "^3.6.3",
+        "laravel-mix": "^6.0.49",
         "prettier": "^2.8.1",
         "sass": "^1.56.1",
-        "sass-loader": "13.*",
-        "vite": "^3.0.2",
-        "laravel-vite-plugin": "^0.6.0"
+        "sass-loader": "13.*"
     },
     "dependencies": {
         "select2": "^4.0.13",