Skip to content

Commit

Permalink
Revert "Replace Mix with Vite"
Browse files Browse the repository at this point in the history
  • Loading branch information
KodeStar authored Feb 17, 2024
1 parent 3a509fc commit 36d1d55
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 121 deletions.
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 10 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions public/build/assets/Sortable.min.b80eb16a.js

This file was deleted.

3 changes: 0 additions & 3 deletions public/build/assets/app.568d25ab.css

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/app.7f9aa9fe.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/huebee.9481eb16.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/itemExport.6e7e40c3.js

This file was deleted.

Loading

0 comments on commit 36d1d55

Please sign in to comment.