Skip to content

Commit 1ee1bda

Browse files
authored
[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
1 parent ed323a2 commit 1ee1bda

File tree

6 files changed

+28
-20
lines changed

6 files changed

+28
-20
lines changed

Diff for: src/Presets/React.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ public static function install()
3232
protected static function updatePackageArray(array $packages)
3333
{
3434
return [
35-
'@babel/preset-react' => '^7.13.13',
36-
'@vitejs/plugin-react' => '^1.3.2',
35+
'@vitejs/plugin-react' => '^2.0.0',
3736
'react' => '^17.0.2',
3837
'react-dom' => '^17.0.2',
39-
] + Arr::except($packages, ['@vitejs/plugin-vue', 'vue']);
38+
] + Arr::except($packages, [
39+
'@vitejs/plugin-vue',
40+
'vue'
41+
]);
4042
}
4143

4244
/**

Diff for: src/Presets/Vue.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ public static function install()
3131
protected static function updatePackageArray(array $packages)
3232
{
3333
return [
34-
'@vitejs/plugin-vue' => '^2.3.3',
35-
'resolve-url-loader' => '^3.1.2',
36-
'sass' => '^1.32.11',
34+
'@vitejs/plugin-vue' => '^3.0.1',
3735
'vue' => '^3.2.37',
3836
] + Arr::except($packages, [
39-
'@babel/preset-react',
4037
'@vitejs/plugin-react',
4138
'react',
4239
'react-dom',

Diff for: src/Presets/bootstrap-stubs/bootstrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
2828
// window.Echo = new Echo({
2929
// broadcaster: 'pusher',
3030
// key: import.meta.env.VITE_PUSHER_APP_KEY,
31-
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_CLUSTER}.pusher.com`,
31+
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
3232
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
3333
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
3434
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',

Diff for: src/Presets/bootstrap-stubs/vite.config.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ import laravel from 'laravel-vite-plugin';
33

44
export default defineConfig({
55
plugins: [
6-
laravel([
7-
'resources/sass/app.scss',
8-
'resources/js/app.js',
9-
]),
6+
laravel({
7+
input: [
8+
'resources/sass/app.scss',
9+
'resources/js/app.js',
10+
],
11+
refresh: true,
12+
}),
1013
],
1114
});

Diff for: src/Presets/react-stubs/vite.config.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import react from '@vitejs/plugin-react';
44

55
export default defineConfig({
66
plugins: [
7-
laravel([
8-
'resources/sass/app.scss',
9-
'resources/js/app.js',
10-
]),
7+
laravel({
8+
input: [
9+
'resources/sass/app.scss',
10+
'resources/js/app.js',
11+
],
12+
refresh: true,
13+
}),
1114
react(),
1215
],
1316
});

Diff for: src/Presets/vue-stubs/vite.config.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import vue from '@vitejs/plugin-vue';
44

55
export default defineConfig({
66
plugins: [
7-
laravel([
8-
'resources/sass/app.scss',
9-
'resources/js/app.js',
10-
]),
7+
laravel({
8+
input: [
9+
'resources/sass/app.scss',
10+
'resources/js/app.js',
11+
],
12+
refresh: true,
13+
}),
1114
vue({
1215
template: {
1316
transformAssetUrls: {

0 commit comments

Comments
 (0)