diff --git a/src/Presets/React.php b/src/Presets/React.php index 126c487..4335662 100644 --- a/src/Presets/React.php +++ b/src/Presets/React.php @@ -32,11 +32,13 @@ public static function install() 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']); + ] + Arr::except($packages, [ + '@vitejs/plugin-vue', + 'vue' + ]); } /** diff --git a/src/Presets/Vue.php b/src/Presets/Vue.php index 46a47a1..515b280 100644 --- a/src/Presets/Vue.php +++ b/src/Presets/Vue.php @@ -31,12 +31,9 @@ public static function install() protected static function updatePackageArray(array $packages) { return [ - '@vitejs/plugin-vue' => '^2.3.3', - 'resolve-url-loader' => '^3.1.2', - 'sass' => '^1.32.11', + '@vitejs/plugin-vue' => '^3.0.1', 'vue' => '^3.2.37', ] + Arr::except($packages, [ - '@babel/preset-react', '@vitejs/plugin-react', 'react', 'react-dom', 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', 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: {