Skip to content

Commit 3a509fc

Browse files
authored
Merge pull request #1288 from KodeStar/2.x
Replace Mix with Vite
2 parents 23f3a9c + afc07ab commit 3a509fc

22 files changed

Lines changed: 121 additions & 75 deletions

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ PUSHER_APP_KEY=
4646
PUSHER_APP_SECRET=
4747
PUSHER_APP_CLUSTER=mt1
4848

49-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
50-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
49+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
50+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
key: yarn-${{ hashFiles('yarn.lock') }}
3939

4040
- name: Run yarn
41-
run: yarn && yarn dev
41+
run: yarn
4242

4343
- name: Run ESLint
4444
run: yarn lint

package.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
{
22
"private": true,
33
"scripts": {
4-
"dev": "npm run development",
5-
"development": "mix",
6-
"watch": "mix watch",
7-
"watch-poll": "mix watch -- --watch-options-poll=1000",
8-
"hot": "mix watch --hot",
9-
"prod": "npm run production",
10-
"production": "mix --production",
11-
"lint": "eslint 'resources/assets/js/*'"
4+
"lint": "eslint 'resources/assets/js/*'",
5+
"dev": "vite",
6+
"build": "vite build"
127
},
138
"devDependencies": {
149
"bootstrap-sass": "^3.4.3",
@@ -18,10 +13,11 @@
1813
"eslint-plugin-import": "^2.26.0",
1914
"eslint-plugin-prettier": "^4.2.1",
2015
"jquery": "^3.6.3",
21-
"laravel-mix": "^6.0.49",
2216
"prettier": "^2.8.1",
2317
"sass": "^1.56.1",
24-
"sass-loader": "13.*"
18+
"sass-loader": "13.*",
19+
"vite": "^3.0.2",
20+
"laravel-vite-plugin": "^0.6.0"
2521
},
2622
"dependencies": {
2723
"select2": "^4.0.13",

public/build/assets/Sortable.min.b80eb16a.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app.568d25ab.css

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app.7f9aa9fe.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/huebee.9481eb16.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/itemExport.6e7e40c3.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)