From 3b7bcc640b37b485d81c193e5445862e2bc207dc Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 09:51:00 +1000 Subject: [PATCH 1/6] Update Vue and React plugins for Vite 3 --- src/Presets/React.php | 2 +- src/Presets/Vue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presets/React.php b/src/Presets/React.php index 126c487..9397938 100644 --- a/src/Presets/React.php +++ b/src/Presets/React.php @@ -33,7 +33,7 @@ protected static function updatePackageArray(array $packages) { return [ '@babel/preset-react' => '^7.13.13', - '@vitejs/plugin-react' => '^1.3.2', + '@vitejs/plugin-react' => '^2.0.0', 'react' => '^17.0.2', 'react-dom' => '^17.0.2', ] + Arr::except($packages, ['@vitejs/plugin-vue', 'vue']); diff --git a/src/Presets/Vue.php b/src/Presets/Vue.php index 46a47a1..e2e128b 100644 --- a/src/Presets/Vue.php +++ b/src/Presets/Vue.php @@ -31,7 +31,7 @@ public static function install() protected static function updatePackageArray(array $packages) { return [ - '@vitejs/plugin-vue' => '^2.3.3', + '@vitejs/plugin-vue' => '^3.0.1', 'resolve-url-loader' => '^3.1.2', 'sass' => '^1.32.11', 'vue' => '^3.2.37', From dc541c2b4ee11a701430bbf19e10ec07387b2dbb Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 09:51:31 +1000 Subject: [PATCH 2/6] Update env var to match laravel/laravel --- src/Presets/bootstrap-stubs/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presets/bootstrap-stubs/bootstrap.js b/src/Presets/bootstrap-stubs/bootstrap.js index 3c4dd4d..58c3fed 100644 --- a/src/Presets/bootstrap-stubs/bootstrap.js +++ b/src/Presets/bootstrap-stubs/bootstrap.js @@ -28,7 +28,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; // window.Echo = new Echo({ // broadcaster: 'pusher', // key: import.meta.env.VITE_PUSHER_APP_KEY, -// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_CLUSTER}.pusher.com`, +// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`, // wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80, // wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443, // forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https', From 3b361d495417e4b5ec9aa29d85a81390988fd247 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 09:51:52 +1000 Subject: [PATCH 3/6] Enable Blade refreshing --- src/Presets/bootstrap-stubs/vite.config.js | 11 +++++++---- src/Presets/react-stubs/vite.config.js | 11 +++++++---- src/Presets/vue-stubs/vite.config.js | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/Presets/bootstrap-stubs/vite.config.js b/src/Presets/bootstrap-stubs/vite.config.js index 9264c75..dbbf333 100644 --- a/src/Presets/bootstrap-stubs/vite.config.js +++ b/src/Presets/bootstrap-stubs/vite.config.js @@ -3,9 +3,12 @@ import laravel from 'laravel-vite-plugin'; export default defineConfig({ plugins: [ - laravel([ - 'resources/sass/app.scss', - 'resources/js/app.js', - ]), + laravel({ + input: [ + 'resources/sass/app.scss', + 'resources/js/app.js', + ], + refresh: true, + }), ], }); diff --git a/src/Presets/react-stubs/vite.config.js b/src/Presets/react-stubs/vite.config.js index fabba91..0322a5e 100644 --- a/src/Presets/react-stubs/vite.config.js +++ b/src/Presets/react-stubs/vite.config.js @@ -4,10 +4,13 @@ import react from '@vitejs/plugin-react'; export default defineConfig({ plugins: [ - laravel([ - 'resources/sass/app.scss', - 'resources/js/app.js', - ]), + laravel({ + input: [ + 'resources/sass/app.scss', + 'resources/js/app.js', + ], + refresh: true, + }), react(), ], }); diff --git a/src/Presets/vue-stubs/vite.config.js b/src/Presets/vue-stubs/vite.config.js index 9709d3d..a36b23a 100644 --- a/src/Presets/vue-stubs/vite.config.js +++ b/src/Presets/vue-stubs/vite.config.js @@ -4,10 +4,13 @@ import vue from '@vitejs/plugin-vue'; export default defineConfig({ plugins: [ - laravel([ - 'resources/sass/app.scss', - 'resources/js/app.js', - ]), + laravel({ + input: [ + 'resources/sass/app.scss', + 'resources/js/app.js', + ], + refresh: true, + }), vue({ template: { transformAssetUrls: { From 63a344995e4eac0a602222e01ac614526563e029 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 10:08:54 +1000 Subject: [PATCH 4/6] Remove unnecessary packages --- src/Presets/React.php | 1 - src/Presets/Vue.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/Presets/React.php b/src/Presets/React.php index 9397938..c1249f0 100644 --- a/src/Presets/React.php +++ b/src/Presets/React.php @@ -32,7 +32,6 @@ public static function install() protected static function updatePackageArray(array $packages) { return [ - '@babel/preset-react' => '^7.13.13', '@vitejs/plugin-react' => '^2.0.0', 'react' => '^17.0.2', 'react-dom' => '^17.0.2', diff --git a/src/Presets/Vue.php b/src/Presets/Vue.php index e2e128b..8dc169d 100644 --- a/src/Presets/Vue.php +++ b/src/Presets/Vue.php @@ -32,11 +32,9 @@ protected static function updatePackageArray(array $packages) { return [ '@vitejs/plugin-vue' => '^3.0.1', - 'resolve-url-loader' => '^3.1.2', 'sass' => '^1.32.11', 'vue' => '^3.2.37', ] + Arr::except($packages, [ - '@babel/preset-react', '@vitejs/plugin-react', 'react', 'react-dom', From 09b701649c7d94cecb94ec8113c3527b0be24a2d Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 10:16:12 +1000 Subject: [PATCH 5/6] Formatting --- src/Presets/React.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Presets/React.php b/src/Presets/React.php index c1249f0..4335662 100644 --- a/src/Presets/React.php +++ b/src/Presets/React.php @@ -35,7 +35,10 @@ protected static function updatePackageArray(array $packages) '@vitejs/plugin-react' => '^2.0.0', 'react' => '^17.0.2', 'react-dom' => '^17.0.2', - ] + Arr::except($packages, ['@vitejs/plugin-vue', 'vue']); + ] + Arr::except($packages, [ + '@vitejs/plugin-vue', + 'vue' + ]); } /** From f5601996e22ceb4cb0bf5c4ccb7f60f9a6a213bb Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 22 Jul 2022 10:16:36 +1000 Subject: [PATCH 6/6] Remove duplicate package --- src/Presets/Vue.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Presets/Vue.php b/src/Presets/Vue.php index 8dc169d..515b280 100644 --- a/src/Presets/Vue.php +++ b/src/Presets/Vue.php @@ -32,7 +32,6 @@ protected static function updatePackageArray(array $packages) { return [ '@vitejs/plugin-vue' => '^3.0.1', - 'sass' => '^1.32.11', 'vue' => '^3.2.37', ] + Arr::except($packages, [ '@vitejs/plugin-react',