From 6e1f161e33c45342e8eb150e7f92b64a7253a2df Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 14 Jun 2024 19:02:46 +0000 Subject: [PATCH 1/5] Add npm dependencies --- package.json | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 3c5a06f6..32c7ee49 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,20 @@ { - "private": true, - "scripts": { - "dev": "npm run development", - "development": "node node_modules/cross-env/src/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "npm run development -- --watch" - }, - "devDependencies": { - "bootstrap": "4.0.0-alpha.2", - "cross-env": "^7.0.3", - "devbridge-autocomplete": "1.4.11", - "js-cookie": "~2.2.1", - "laravel-mix": "^6.0.49", - "postcss": "^8.4.31", - "resolve-url-loader": "^3.1.5", - "sass": "^1.69.3", - "sass-loader": "^10.4.1" - } + "private": true, + "scripts": { + "dev": "npm run development", + "development": "node node_modules/cross-env/src/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch" + }, + "devDependencies": { + "bootstrap": "4.0.0-alpha.2", + "cross-env": "^7.0.3", + "devbridge-autocomplete": "1.4.11", + "js-cookie": "~2.2.1", + "postcss": "^8.4.31", + "resolve-url-loader": "^3.1.5", + "sass": "^1.69.3", + "sass-loader": "^10.4.1", + "vite": "^3.0.2", + "laravel-vite-plugin": "^0.6.0" + } } From 3f068c5ab0663bac671f16e9dba8cf7a435a2564 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 14 Jun 2024 19:02:46 +0000 Subject: [PATCH 2/5] Update build scripts --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 32c7ee49..d6ed2c02 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { "private": true, "scripts": { - "dev": "npm run development", "development": "node node_modules/cross-env/src/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "npm run development -- --watch" + "watch": "npm run dev -- --watch", + "dev": "vite", + "build": "vite build" }, "devDependencies": { "bootstrap": "4.0.0-alpha.2", From 1b09af0b16ed2ef60662f63c96bea61c4ae893f9 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 14 Jun 2024 19:02:46 +0000 Subject: [PATCH 3/5] Configure Vite --- vite.config.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 vite.config.js diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 00000000..570afeca --- /dev/null +++ b/vite.config.js @@ -0,0 +1,13 @@ +import { defineConfig } from 'vite'; +import laravel from 'laravel-vite-plugin'; + +export default defineConfig({ + plugins: [ + laravel({ + input: [ + 'resources/assets/sass/app.scss', + ], + refresh: true, + }), + ], +}); From cd8e096abe553b35a21205464607ac230a555a3a Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 14 Jun 2024 19:02:46 +0000 Subject: [PATCH 4/5] Remove `webpack.mix.js` --- webpack.mix.js | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 webpack.mix.js diff --git a/webpack.mix.js b/webpack.mix.js deleted file mode 100644 index 092598bd..00000000 --- a/webpack.mix.js +++ /dev/null @@ -1,23 +0,0 @@ -const mix = require('laravel-mix'); - -/* - |-------------------------------------------------------------------------- - | Mix Asset Management - |-------------------------------------------------------------------------- - | - | Mix provides a clean, fluent API for defining some Webpack build steps - | for your Laravel application. By default, we are compiling the Sass - | file for the application as well as bundling up all the JS files. - | - */ - -mix.sass('resources/assets/sass/app.scss', 'public/css'); - -mix.scripts([ - 'node_modules/js-cookie/src/js.cookie.js', - 'node_modules/bootstrap/dist/js/bootstrap.min.js', - // We're using a very slightly modified version of colResizable, - // so have made a copy of the source to the public directory. - 'public/js/colResizable-1.6.js', - 'node_modules/devbridge-autocomplete/dist/jquery.autocomplete.js' -], 'public/js/vendor.js'); From fdc4e33ed723f407f32e4e02f4fb18e4b1d7b8e1 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 14 Jun 2024 19:02:46 +0000 Subject: [PATCH 5/5] Ignore build assets --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 93f96f5c..1d88d4d9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ README.html .vagrant/ Homestead.yaml .phpunit.result.cache + +/public/build \ No newline at end of file