[4.x] Vite 3 (#231)

* Update Vue and React plugins for Vite 3 * Update env var to match laravel/laravel * Enable Blade refreshing * Remove unnecessary packages * Formatting * Remove duplicate package
laravel · Jul 22, 2022 · 1ee1bda · 1ee1bda
1 parent ed323a2
commit 1ee1bda
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: {