Merge pull request #179 from skryukov/fix-ci

Various installation generator fixes
inertiajs · Jan 11, 2025 · 0f69e56 · 0f69e56
2 parents 8c749e3 + c44d21d
commit 0f69e56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/generators.yml b/.github/workflows/generators.yml
@@ -25,7 +25,7 @@ jobs:
         tailwind: [true, false]
         ruby: ['3.3']
         node: ['22']
-        inertia_version: ['1.2.0', 'next', 'beta']
+        inertia_version: ['1.2.0', '1.3', '2.0']
         exclude:
           # 1.2.0 does not support typescript
           - typescript: true

diff --git a/lib/generators/inertia/install/install_generator.rb b/lib/generators/inertia/install/install_generator.rb
@@ -78,8 +78,7 @@ def install_inertia
         template 'initializer.rb', file_path('config/initializers/inertia_rails.rb')
 
         say 'Installing Inertia npm packages'
-        add_dependencies(*FRAMEWORKS[framework]['packages'])
-        add_dependencies(inertia_package)
+        add_dependencies(inertia_package, *FRAMEWORKS[framework]['packages'])
 
         unless File.read(vite_config_path).include?(FRAMEWORKS[framework]['vite_plugin_import'])
           say "Adding Vite plugin for #{framework}"

diff --git a/lib/generators/inertia/install/templates/svelte/inertia.ts.tt b/lib/generators/inertia/install/templates/svelte/inertia.ts.tt
@@ -32,7 +32,7 @@ createInertiaApp({
 
   setup({ el, App, props }) {
     if (el) {
-<%= "      // @ts-expect-error 1.3.0 beta contains types mismatch\n" if inertia_resolved_version == Gem::Version.new('1.3.0-beta.2') -%>
+<%= "      // @ts-expect-error 1.3.0 contains types mismatch\n" if inertia_resolved_version.release == Gem::Version.new('1.3.0') -%>
       mount(App, { target: el, props })
     } else {
       console.error(

diff --git a/lib/generators/inertia/install/templates/svelte4/inertia.ts.tt b/lib/generators/inertia/install/templates/svelte4/inertia.ts.tt
@@ -31,7 +31,7 @@ createInertiaApp({
 
   setup({ el, App, props }) {
     if (el) {
-      <%= "// @ts-expect-error 1.3.0 beta contains types mismatch\n" if inertia_resolved_version == Gem::Version.new('1.3.0-beta.2') -%>
+      <%= "// @ts-expect-error 1.3.0 beta contains types mismatch\n" if inertia_resolved_version.release == Gem::Version.new('1.3.0') -%>
       new App({ target: el, props })
     } else {
       console.error(