inertia_rails 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1703f19fcb6d8f3d2c580e6e7bd80ff999cda8f55f72f7ea915001279577386c
-  data.tar.gz: d5ff27be81328583e03aa7eb4473f1a4a966139993a3d856c54c0b6ae447b122
+  metadata.gz: 9d06f57228ce3ff3b4dba1d2b7bdf99deaa110c8b85c474c106baa989dd1bf8c
+  data.tar.gz: ec01c88da7419b8dbf1cc1243eced6fd38c10a7fba1c21d75def08ae1516cf01
 SHA512:
-  metadata.gz: 9cdd9eebf261e555bc09d237272852c4c59cf08618462f5deb5aaa314e09538e121a8c116e989c9c66632f38d2bcf14617d0d0f6ca9f5fe152e7b646a5a652f3
-  data.tar.gz: 4fea8b1605262d6d80ccec45fe68368b9f62ae4cd96cca7768b58b0b65e5a690877216f6f10f7d4e93915cbba8003b4635b99ea4b3af3f2100bceda8c572cd73
+  metadata.gz: 6506c7ae154865ed78172e6f6bc2f28ff09cc8ee00faf25cb9d687f53143c9cbe7e105dbc297c028ceb29189070e63ba5484ecdf4c7217115b2d46b090389321
+  data.tar.gz: 7891ba539d642509920d1ab0d17c7c79e6bfbb1399c93c1c298a1ed20367b5a758352c644fc2794ea2309053a452643d807a26a1167b67a93e68febeabe9170e

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.1] - 2025-02-04
+
+* Install generator tweaks @skryukov
+* Performance improvement for oj serialization users @alexspeller
+* Doc updates @youyoumu
+* Doc updates @pedroaugustoramalhoduarte
+* Tailwind v4 support in install generators @arandilopez
+* Various CI fixes @bknoles / @skryukov
+
 ## [3.6.0] - 2024-12-13
 
 Support for the v2.0 Inertia.js release! It's a minor bump because there are no breaking changes!

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 TODO: Bellawatt
+Copyright (c) 2025 Bellawatt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/generators/inertia/install/install_generator.rb

@@ -78,8 +78,7 @@ module 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}"
@@ -152,11 +151,9 @@ module Inertia
 
       def install_tailwind
         say 'Installing Tailwind CSS'
-        add_dependencies(%w[tailwindcss postcss autoprefixer @tailwindcss/forms @tailwindcss/typography
-                            @tailwindcss/container-queries])
-
-        template 'tailwind/tailwind.config.js', file_path('tailwind.config.js')
-        copy_file 'tailwind/postcss.config.js', file_path('postcss.config.js')
+        add_dependencies(%w[tailwindcss @tailwindcss/vite @tailwindcss/forms @tailwindcss/typography])
+        prepend_file vite_config_path, "import tailwindcss from '@tailwindcss/vite'\n"
+        insert_into_file vite_config_path, "\n    tailwindcss(),", after: 'plugins: ['
         copy_file 'tailwind/application.css', js_file_path('entrypoints/application.css')
 
         if application_layout.exist?
@@ -266,7 +263,7 @@ module Inertia
 
       def inertia_resolved_version
         @inertia_resolved_version ||= Gem::Version.new(
-          `npm show @inertiajs/core@#{options[:inertia_version]} version`.strip
+          `npm show @inertiajs/core@#{options[:inertia_version]} version --json | tail -n2 | head -n1 | tr -d '", '`.strip
         )
       end
 

data/lib/generators/inertia/install/templates/react/InertiaExample.tsx

@@ -18,7 +18,7 @@ export default function InertiaExample({ name }: { name: string }) {
         <h1 className={cs.h1}>Hello {name}!</h1>
 
         <div>
-          <a href="https://inertia-rails.netlify.app" target="_blank">
+          <a href="https://inertia-rails.dev" target="_blank">
             <img className={cs.logo} src={inertiaSvg} alt="Inertia logo" />
           </a>
           <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/react/inertia.ts

@@ -10,13 +10,13 @@ type ResolvedComponent = {
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -30,7 +30,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following line.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // page.default.layout ||= (page) => createElement(Layout, null, page)
 

data/lib/generators/inertia/install/templates/svelte/InertiaExample.svelte

@@ -16,7 +16,7 @@
   <h1>Hello {name}!</h1>
 
   <div>
-    <a href="https://inertia-rails.netlify.app" target="_blank">
+    <a href="https://inertia-rails.dev" target="_blank">
       <img class="logo" src={inertiaSvg} alt="Inertia logo" />
     </a>
     <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/svelte/InertiaExample.ts.svelte

@@ -16,7 +16,7 @@
   <h1>Hello {name}!</h1>
 
   <div>
-    <a href="https://inertia-rails.netlify.app" target="_blank">
+    <a href="https://inertia-rails.dev" target="_blank">
       <img class="logo" src={inertiaSvg} alt="Inertia logo" />
     </a>
     <a href="https://vite-ruby.netlify.app" target="_blank">

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

@@ -3,13 +3,13 @@ import  { mount } from 'svelte';
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -23,7 +23,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following line.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // return { default: page.default, layout: page.layout || Layout }
 

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

@@ -3,13 +3,13 @@ import { mount } from 'svelte'
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -23,7 +23,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following line.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // return { default: page.default, layout: page.layout || Layout }
 
@@ -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(

data/lib/generators/inertia/install/templates/svelte4/InertiaExample.svelte

@@ -20,7 +20,7 @@
   <h1>Hello {name}!</h1>
 
   <div>
-    <a href="https://inertia-rails.netlify.app" target="_blank">
+    <a href="https://inertia-rails.dev/" target="_blank">
       <img class="logo" src={inertiaSvg} alt="Inertia logo" />
     </a>
     <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/svelte4/InertiaExample.ts.svelte

@@ -20,7 +20,7 @@
   <h1>Hello {name}!</h1>
 
   <div>
-    <a href="https://inertia-rails.netlify.app" target="_blank">
+    <a href="https://inertia-rails.dev" target="_blank">
       <img class="logo" src={inertiaSvg} alt="Inertia logo" />
     </a>
     <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/svelte4/inertia.js

@@ -2,13 +2,13 @@ import { createInertiaApp } from '@inertiajs/svelte'
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -22,7 +22,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following lines.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // return { default: page.default, layout: page.layout || Layout }
 

data/lib/generators/inertia/install/templates/svelte4/inertia.ts.tt

@@ -2,13 +2,13 @@ import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -22,7 +22,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following line.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // return { default: page.default, layout: page.layout || Layout }
 
@@ -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(

data/lib/generators/inertia/install/templates/tailwind/application.css

@@ -1,13 +1,4 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
 
-/*
-
-@layer components {
-  .btn-primary {
-    @apply py-2 px-4 bg-blue-200;
-  }
-}
-
-*/
+@plugin "@tailwindcss/typography";
+@plugin "@tailwindcss/forms";

data/lib/generators/inertia/install/templates/vue/InertiaExample.ts.vue

@@ -5,7 +5,7 @@
     <h1 class="h1">Hello {{ name }}!</h1>
 
     <div>
-      <a href="https://inertia-rails.netlify.app" target="_blank">
+      <a href="https://inertia-rails.dev" target="_blank">
         <img class="logo" :src="inertiaSvg" alt="Inertia logo" />
       </a>
       <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/vue/InertiaExample.vue

@@ -5,7 +5,7 @@
     <h1 class="h1">Hello {{ name }}!</h1>
 
     <div>
-      <a href="https://inertia-rails.netlify.app" target="_blank">
+      <a href="https://inertia-rails.dev" target="_blank">
         <img class="logo" :src="inertiaSvg" alt="Inertia logo" />
       </a>
       <a href="https://vite-ruby.netlify.app" target="_blank">

data/lib/generators/inertia/install/templates/vue/inertia.ts

@@ -3,13 +3,13 @@ import { createApp, DefineComponent, h } from 'vue'
 
 createInertiaApp({
   // Set default page title
-  // see https://inertia-rails.netlify.app/guide/title-and-meta
+  // see https://inertia-rails.dev/guide/title-and-meta
   //
   // title: title => title ? `${title} - App` : 'App',
 
   // Disable progress bar
   //
-  // see https://inertia-rails.netlify.app/guide/progress-indicators
+  // see https://inertia-rails.dev/guide/progress-indicators
   // progress: false,
 
   resolve: (name) => {
@@ -20,7 +20,7 @@ createInertiaApp({
 
     // To use a default layout, import the Layout component
     // and use the following lines.
-    // see https://inertia-rails.netlify.app/guide/pages#default-layouts
+    // see https://inertia-rails.dev/guide/pages#default-layouts
     //
     // const page = pages[`../pages/${name}.vue`]
     // page.default.layout = page.default.layout || Layout

data/lib/inertia_rails/generators/helper.rb

@@ -4,14 +4,16 @@ module InertiaRails
   module Generators
     module Helper
       class << self
-        def guess_the_default_framework
-          package = Rails.root.join('package.json').read
-          case package
-          when %r{@inertiajs/react}
+        def guess_the_default_framework(package_json_path = Rails.root.join('package.json'))
+          package_json = JSON.parse(package_json_path.read)
+          dependencies = package_json['dependencies'] || {}
+
+          if dependencies['@inertiajs/react']
             'react'
-          when %r{@inertiajs/svelte}
-            package.match?(/"svelte": "\^5/) ? 'svelte' : 'svelte4'
-          when %r{@inertiajs/vue3}
+          elsif dependencies['@inertiajs/svelte']
+            version = dependencies['svelte'].gsub(/[\^~]/, '') # Remove ^ or ~ from version
+            version.start_with?('5') ? 'svelte' : 'svelte4'
+          elsif dependencies['@inertiajs/vue3']
             'vue'
           else
             Thor::Shell::Basic.new.say_error 'Could not determine the Inertia.js framework you are using.'

data/lib/inertia_rails/renderer.rb

@@ -41,7 +41,7 @@ module InertiaRails
       end
       if @request.headers['X-Inertia']
         @response.set_header('X-Inertia', 'true')
-        @render_method.call json: page, status: @response.status, content_type: Mime[:json]
+        @render_method.call json: page.to_json, status: @response.status, content_type: Mime[:json]
       else
         return render_ssr if configuration.ssr_enabled rescue nil
         @render_method.call template: 'inertia', layout: layout, locals: view_data.merge(page: page)

data/lib/inertia_rails/rspec.rb

@@ -32,8 +32,9 @@ module InertiaRails
         else
           # Sequential Inertia request
           @view_data = {}
-          @props = params[:json][:props]
-          @component = params[:json][:component]
+          json = JSON.parse(params[:json])
+          @props = json["props"]
+          @component = json["component"]
         end
       end
     end
@@ -81,8 +82,7 @@ end
 
 RSpec::Matchers.define :have_exact_props do |expected_props|
   match do |inertia|
-  # Computed props have symbolized keys. 
-    expect(inertia.props).to eq expected_props.deep_symbolize_keys
+    expect(inertia.props).to eq expected_props
   end
 
   failure_message do |inertia|
@@ -92,8 +92,7 @@ end
 
 RSpec::Matchers.define :include_props do |expected_props|
   match do |inertia|
-  # Computed props have symbolized keys. 
-    expect(inertia.props).to include expected_props.deep_symbolize_keys
+    expect(inertia.props).to include expected_props
   end
 
   failure_message do |inertia|

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "3.6.0"
+  VERSION = "3.6.1"
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Brian Knoles
 - Brandon Shar
 - Eugene Granovsky
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -81,8 +80,6 @@ files:
 - lib/generators/inertia/install/templates/svelte4/tsconfig.node.json
 - lib/generators/inertia/install/templates/svelte4/vite-env.d.ts
 - lib/generators/inertia/install/templates/tailwind/application.css
-- lib/generators/inertia/install/templates/tailwind/postcss.config.js
-- lib/generators/inertia/install/templates/tailwind/tailwind.config.js.tt
 - lib/generators/inertia/install/templates/vue/InertiaExample.ts.vue
 - lib/generators/inertia/install/templates/vue/InertiaExample.vue
 - lib/generators/inertia/install/templates/vue/inertia.js
@@ -250,7 +247,6 @@ metadata:
   homepage_uri: https://github.com/inertiajs/inertia-rails
   source_code_uri: https://github.com/inertiajs/inertia-rails
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,8 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Inertia.js adapter for Rails
 test_files: []

data/lib/generators/inertia/install/templates/tailwind/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}

data/lib/generators/inertia/install/templates/tailwind/tailwind.config.js.tt

@@ -1,18 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-
-module.exports = {
-  content: [
-    './public/*.html',
-    './app/helpers/**/*.rb',
-    './<%= js_destination_path %>/**/*.{js,ts,jsx,tsx,vue,svelte}',
-    './app/views/**/*.{erb,haml,html,slim}'
-  ],
-  theme: {
-    extend: {},
-  },
-  plugins: [
-    require('@tailwindcss/forms'),
-    require('@tailwindcss/typography'),
-    require('@tailwindcss/container-queries'),
-  ]
-}