Skip to content

Commit 11297fd

Browse files
authored
Merge pull request #255 from skryukov/fix-svelte-generator
Fix svelte generator
2 parents 3d60732 + 2ea8653 commit 11297fd

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

.github/workflows/generators.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@ jobs:
2525
tailwind: [true, false]
2626
ruby: ['3.3']
2727
node: ['22']
28-
inertia_version: ['1.2.0', '1.3', '2.0']
29-
exclude:
30-
# 1.2.0 does not support typescript
31-
- typescript: true
32-
inertia_version: '1.2.0'
33-
# 1.2.0 doesn't support Svelte 5
34-
- framework: svelte
35-
inertia_version: '1.2.0'
28+
inertia_version: ['latest']
3629

3730
name: ${{ matrix.framework }} (TS:${{ matrix.typescript }}, TW:${{ matrix.tailwind }}, Inertia:${{ matrix.inertia_version }})
3831

lib/generators/inertia/install/frameworks.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ react:
44
- "@vitejs/plugin-react"
55
- "react"
66
- "react-dom"
7+
- "vite@latest"
78
packages_ts:
89
- "@types/react"
910
- "@types/react-dom"
@@ -29,6 +30,7 @@ vue:
2930
packages:
3031
- "vue"
3132
- "@vitejs/plugin-vue"
33+
- "vite@latest"
3234
packages_ts:
3335
- "typescript@~5.6.2"
3436
- "vue-tsc"
@@ -52,6 +54,7 @@ svelte4:
5254
packages:
5355
- "svelte@4"
5456
- "@sveltejs/vite-plugin-svelte@3"
57+
- "vite@5"
5558
packages_ts:
5659
- "@tsconfig/svelte@4"
5760
- "svelte-check"
@@ -76,7 +79,8 @@ svelte:
7679
inertia_package: "@inertiajs/svelte"
7780
packages:
7881
- "svelte@5"
79-
- "@sveltejs/vite-plugin-svelte@4"
82+
- "@sveltejs/vite-plugin-svelte"
83+
- "vite@latest"
8084
packages_ts:
8185
- "@tsconfig/svelte@5"
8286
- "svelte-check"

lib/generators/inertia/install/templates/svelte/inertia.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ import { createInertiaApp } from '@inertiajs/svelte'
22
import { mount } from 'svelte';
33

44
createInertiaApp({
5-
// Set default page title
6-
// see https://inertia-rails.dev/guide/title-and-meta
7-
//
8-
// title: title => title ? `${title} - App` : 'App',
9-
105
// Disable progress bar
116
//
127
// see https://inertia-rails.dev/guide/progress-indicators

lib/generators/inertia/install/templates/svelte/inertia.ts.tt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
22
import { mount } from 'svelte'
33

44
createInertiaApp({
5-
// Set default page title
6-
// see https://inertia-rails.dev/guide/title-and-meta
7-
//
8-
// title: title => title ? `${title} - App` : 'App',
9-
105
// Disable progress bar
116
//
127
// see https://inertia-rails.dev/guide/progress-indicators
@@ -25,7 +20,7 @@ createInertiaApp({
2520
// and use the following line.
2621
// see https://inertia-rails.dev/guide/pages#default-layouts
2722
//
28-
// return { default: page.default, layout: page.layout || Layout }
23+
// return { default: page.default, layout: page.layout || Layout } as ResolvedComponent
2924

3025
return page
3126
},

0 commit comments

Comments
 (0)