From 101c57a08ec4a82a4a053a535da799b01a359a46 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Thu, 14 Jul 2022 16:39:52 +1000 Subject: [PATCH 1/4] vite 3 support --- src/Console/InstallCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 494c02aa2..3c55bacb4 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -303,7 +303,7 @@ protected function installInertiaStack() '@inertiajs/progress' => '^0.2.7', '@tailwindcss/forms' => '^0.5.2', '@tailwindcss/typography' => '^0.5.2', - '@vitejs/plugin-vue' => '^2.3.3', + '@vitejs/plugin-vue' => '^3.0.0', 'autoprefixer' => '^10.4.7', 'postcss' => '^8.4.14', 'tailwindcss' => '^3.1.0', From bdc5d96966bff378a93f3e8e46c25dbbe98f091e Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Sun, 17 Jul 2022 15:35:15 +1000 Subject: [PATCH 2/4] do not externalise inertiajs/server --- src/Console/InstallCommand.php | 2 +- stubs/inertia/vite.config.ssr.js | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 stubs/inertia/vite.config.ssr.js diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 3c55bacb4..3e32d41ea 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -513,7 +513,7 @@ protected function installInertiaSsrStack() }); copy(__DIR__.'/../../stubs/inertia/resources/js/ssr.js', resource_path('js/ssr.js')); - $this->replaceInFile("input: 'resources/js/app.js',", "input: 'resources/js/app.js',".PHP_EOL." ssr: 'resources/js/ssr.js',", base_path('vite.config.js')); + copy(__DIR__.'/../../stubs/inertia/vite.config.ssr.js', base_path('vite.config.js')); (new Process([$this->phpBinary(), 'artisan', 'vendor:publish', '--provider=Inertia\ServiceProvider', '--force'], base_path())) ->setTimeout(null) diff --git a/stubs/inertia/vite.config.ssr.js b/stubs/inertia/vite.config.ssr.js new file mode 100644 index 000000000..1e34606f0 --- /dev/null +++ b/stubs/inertia/vite.config.ssr.js @@ -0,0 +1,24 @@ +import { defineConfig } from 'vite'; +import laravel from 'laravel-vite-plugin'; +import vue from '@vitejs/plugin-vue'; + +export default defineConfig({ + plugins: [ + laravel({ + input: 'resources/js/app.js', + ssr: 'resources/js/ssr.js', + refresh: true, + }), + vue({ + template: { + transformAssetUrls: { + base: null, + includeAbsolute: false, + }, + }, + }), + ], + ssr: { + noExternal: ['@inertiajs/server'], + } +}); From 7bcc0ec90dc4efabce78b3fbaa46a338ef9f7d51 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Sun, 17 Jul 2022 15:36:20 +1000 Subject: [PATCH 3/4] CS --- stubs/inertia/vite.config.ssr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/inertia/vite.config.ssr.js b/stubs/inertia/vite.config.ssr.js index 1e34606f0..d227dfcae 100644 --- a/stubs/inertia/vite.config.ssr.js +++ b/stubs/inertia/vite.config.ssr.js @@ -20,5 +20,5 @@ export default defineConfig({ ], ssr: { noExternal: ['@inertiajs/server'], - } + }, }); From 85b62b1b30da641f5a20dbcae1d87b6d3fff7590 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Tue, 19 Jul 2022 11:09:33 +1000 Subject: [PATCH 4/4] Use a single Vite config file --- src/Console/InstallCommand.php | 3 ++- stubs/inertia/vite.config.ssr.js | 24 ------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 stubs/inertia/vite.config.ssr.js diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 3e32d41ea..74ea69514 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -513,7 +513,8 @@ protected function installInertiaSsrStack() }); copy(__DIR__.'/../../stubs/inertia/resources/js/ssr.js', resource_path('js/ssr.js')); - copy(__DIR__.'/../../stubs/inertia/vite.config.ssr.js', base_path('vite.config.js')); + $this->replaceInFile("input: 'resources/js/app.js',", "input: 'resources/js/app.js',".PHP_EOL." ssr: 'resources/js/ssr.js',", base_path('vite.config.js')); + $this->replaceInFile('});', ' ssr: {'.PHP_EOL." noExternal: ['@inertiajs/server'],".PHP_EOL.' },'.PHP_EOL.'});', base_path('vite.config.js')); (new Process([$this->phpBinary(), 'artisan', 'vendor:publish', '--provider=Inertia\ServiceProvider', '--force'], base_path())) ->setTimeout(null) diff --git a/stubs/inertia/vite.config.ssr.js b/stubs/inertia/vite.config.ssr.js deleted file mode 100644 index d227dfcae..000000000 --- a/stubs/inertia/vite.config.ssr.js +++ /dev/null @@ -1,24 +0,0 @@ -import { defineConfig } from 'vite'; -import laravel from 'laravel-vite-plugin'; -import vue from '@vitejs/plugin-vue'; - -export default defineConfig({ - plugins: [ - laravel({ - input: 'resources/js/app.js', - ssr: 'resources/js/ssr.js', - refresh: true, - }), - vue({ - template: { - transformAssetUrls: { - base: null, - includeAbsolute: false, - }, - }, - }), - ], - ssr: { - noExternal: ['@inertiajs/server'], - }, -});