Skip to content

Commit

Permalink
Merge pull request #510 from tighten/shift-123286
Browse files Browse the repository at this point in the history
Migrate from Laravel Mix to Vite
  • Loading branch information
andrewmile authored Jul 3, 2024
2 parents 061bc70 + 89342df commit 442f781
Show file tree
Hide file tree
Showing 9 changed files with 937 additions and 6,733 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CAPTCHA_PRIVATE=
BUGSNAG_API_KEY=
BUGSNAG_NOTIFY_RELEASE_STAGES=staging,production

MIX_DISABLE_LOCATION_LOOKUP=false
VITE_DISABLE_LOCATION_LOOKUP=false
GOOGLE_MAPS_API_KEY=
GOOGLE_MAPS_API_FRONTEND_KEY=

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
php artisan key:generate
- name: Build Assets
run: npm ci && npm run prod
run: npm ci && npm run build

- name: PHPUnit
run: vendor/bin/phpunit
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
/.phpunit.cache
.idea/*
phpunit.xml
/public/build
/public/hot
7,589 changes: 896 additions & 6,693 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js"
"production": "vite build",
"dev": "vite",
"build": "vite build"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.0",
Expand All @@ -16,8 +12,6 @@
"browser-sync": "^2.26.7",
"browser-sync-webpack-plugin": "^2.2.2",
"husky": "^8.0.1",
"laravel-mix": "^6.0.25",
"laravel-mix-purgecss": "^6.0.0",
"lint-staged": "^13.0.3",
"livewire-vue": "^0.3.1",
"lodash": "^4.17.15",
Expand All @@ -27,9 +21,12 @@
"stylelint": "^14.10.0",
"stylelint-config-standard": "^27.0.0",
"tailwindcss": "^3.3.1",
"vue": "^2.6.7",
"vue": "^2.7.0",
"vue-loader": "^15.9.7",
"vue-template-compiler": "^2.6.10"
"vue-template-compiler": "^2.6.10",
"vite": "^3.0.2",
"laravel-vite-plugin": "^0.6.0",
"@vitejs/plugin-vue2": "^1.1.2"
},
"dependencies": {
"cross-env": "^7.0.3",
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
1 change: 1 addition & 0 deletions resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Vue from 'vue';
import VCalendar from 'v-calendar';
import Dismiss from './directives/Dismiss';
import 'livewire-vue'
import '../css/app.css'

window.Vue = Vue;

Expand Down
22 changes: 22 additions & 0 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { defineConfig } from 'vite';
import laravel from 'laravel-vite-plugin';
import vue from '@vitejs/plugin-vue2';

export default defineConfig({
plugins: [
laravel({
input: [
'resources/js/app.js',
],
refresh: true,
}),
vue({
template: {
transformAssetUrls: {
base: null,
includeAbsolute: false,
},
},
}),
],
});
27 changes: 0 additions & 27 deletions webpack.mix.js

This file was deleted.

0 comments on commit 442f781

Please sign in to comment.