inertia_rails 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef66baa0e1a57eca72a52421858b7d0f1cc27e6bd0bbf09f53d2c6440b677b94
-  data.tar.gz: 832a854fc9e749a365d3745521d256834eb778693e256cdda2321253eda47332
+  metadata.gz: 9d06f57228ce3ff3b4dba1d2b7bdf99deaa110c8b85c474c106baa989dd1bf8c
+  data.tar.gz: ec01c88da7419b8dbf1cc1243eced6fd38c10a7fba1c21d75def08ae1516cf01
 SHA512:
-  metadata.gz: 1dc4a22fe2d2fd31fc1284030f2cc64f292cdc1224b15e37e2370d4f5b081c6240f6ed3340f827ccb9c0ad0b0022acdd51001ca3585c404ca1033b93b2503666
-  data.tar.gz: 9becf43df35016ef9659f0055439b599c88d0a422eec1d6728bbf22b2393cb16bd5b177b697044651a9c79c51be332d5a9564969b6773f0815fada77d6408fae
+  metadata.gz: 6506c7ae154865ed78172e6f6bc2f28ff09cc8ee00faf25cb9d687f53143c9cbe7e105dbc297c028ceb29189070e63ba5484ecdf4c7217115b2d46b090389321
+  data.tar.gz: 7891ba539d642509920d1ab0d17c7c79e6bfbb1399c93c1c298a1ed20367b5a758352c644fc2794ea2309053a452643d807a26a1167b67a93e68febeabe9170e

data/CHANGELOG.md

@@ -4,6 +4,26 @@ 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!
+
+Kudos to @skryukov and @PedroAugustoRamalhoDuarte for driving the features in this release!
+
+* InertiaRails.defer for deferred props
+* History encryption
+* InertiaRails.merge for merge props
+* InertiaRails.optional props (replaces lazy props in v2.0, InertiaRails.lazy now has a deprecation warning)
+
 ## [3.5.0] - 2024-11-29
 
 * Add Algolia search for docs (#151, @skryukov)

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/README.md

@@ -188,15 +188,12 @@ end
 }
 ```
 
-### Lazy Props
+### Optional Props
 
-On the front end, Inertia supports the concept of "partial reloads" where only the props requested are returned by the server. Sometimes, you may want to use this flow to avoid processing a particularly slow prop on the intial load. In this case, you can use Lazy props. Lazy props aren't evaluated unless they're specifically requested by name in a partial reload.
+On the frontend, Inertia supports the concept of "partial reloads" where only the props requested are returned by the server. Sometimes, you may want to use this flow to avoid processing a particularly slow prop on the initial load. In this case, you can use Optional props. Optional props aren't evaluated unless they're specifically requested by name in a partial reload.
 
 ```ruby
-  inertia_share some_data: InertiaRails.lazy(lambda { some_very_slow_method })
-
-  # Using a Ruby block syntax
-  inertia_share some_data: InertiaRails.lazy { some_very_slow_method }
+  inertia_share some_data: InertiaRails.optional { some_very_slow_method }
 ```
 
 ### Routing
@@ -269,6 +266,14 @@ end
 
   __Default__: `false`
 
+#### `encrypt_history`
+
+  When enabled, you instruct Inertia to encrypt your app's history, it uses
+  the browser's built-in [`crypto` api](https://developer.mozilla.org/en-US/docs/Web/API/Crypto)
+  to encrypt the current page's data before pushing it to the history state.
+
+  __Default__: `false`
+
 #### `ssr_enabled` _(experimental)_
 
   Whether to use a JavaScript server to pre-render your JavaScript pages,

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/configuration.rb

@@ -16,6 +16,9 @@ module InertiaRails
       # controller configuration.
       layout: true,
 
+      # Whether to encrypt the history state in the client.
+      encrypt_history: false,
+
       # SSR options.
       ssr_enabled: false,
       ssr_url: 'http://localhost:13714',

data/lib/inertia_rails/controller.rb

@@ -123,7 +123,7 @@ module InertiaRails
     end
 
     def redirect_to(options = {}, response_options = {})
-      capture_inertia_errors(response_options)
+      capture_inertia_session_options(response_options)
       super
     end
 
@@ -155,8 +155,10 @@ module InertiaRails
       head :conflict
     end
 
-    def capture_inertia_errors(options)
-      if (inertia_errors = options.dig(:inertia, :errors))
+    def capture_inertia_session_options(options)
+      return unless (inertia = options[:inertia])
+
+      if (inertia_errors = inertia[:errors])
         if inertia_errors.respond_to?(:to_hash)
           session[:inertia_errors] = inertia_errors.to_hash
         else
@@ -165,7 +167,10 @@ module InertiaRails
           )
           session[:inertia_errors] = inertia_errors
         end
+
       end
+
+      session[:inertia_clear_history] = inertia[:clear_history] if inertia[:clear_history]
     end
   end
 end

data/lib/inertia_rails/defer_prop.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class DeferProp < IgnoreOnFirstLoadProp
+    DEFAULT_GROUP = 'default'
+
+    attr_reader :group
+
+    def initialize(group: nil, merge: nil, &block)
+      super(&block)
+
+      @group = group || DEFAULT_GROUP
+      @merge = merge
+      @block = block
+    end
+
+    def merge?
+      @merge
+    end
+  end
+end

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/ignore_on_first_load_prop.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class IgnoreOnFirstLoadProp < BaseProp
+  end
+end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,6 +1,10 @@
 require 'inertia_rails/base_prop'
+require 'inertia_rails/ignore_on_first_load_prop'
 require 'inertia_rails/always_prop'
 require 'inertia_rails/lazy_prop'
+require 'inertia_rails/optional_prop'
+require 'inertia_rails/defer_prop'
+require 'inertia_rails/merge_prop'
 require 'inertia_rails/configuration'
 
 module InertiaRails
@@ -19,8 +23,20 @@ module InertiaRails
       LazyProp.new(value, &block)
     end
 
+    def optional(&block)
+      OptionalProp.new(&block)
+    end
+
     def always(&block)
       AlwaysProp.new(&block)
     end
+
+    def merge(&block)
+      MergeProp.new(&block)
+    end
+
+    def defer(group: nil, merge: nil, &block)
+      DeferProp.new(group: group, merge: merge, &block)
+    end
   end
 end

data/lib/inertia_rails/lazy_prop.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 module InertiaRails
-  class LazyProp < BaseProp
+  class LazyProp < IgnoreOnFirstLoadProp
     def initialize(value = nil, &block)
       raise ArgumentError, 'You must provide either a value or a block, not both' if value && block
 
+      InertiaRails.deprecator.warn(
+        '`lazy` is deprecated and will be removed in InertiaRails 4.0, use `optional` instead.'
+      )
+
       @value = value
       @block = block
     end

data/lib/inertia_rails/merge_prop.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class MergeProp < BaseProp
+    def initialize(*)
+      super
+      @merge = true
+    end
+
+    def merge?
+      @merge
+    end
+  end
+end

data/lib/inertia_rails/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InertiaRails
   class Middleware
     def initialize(app)
@@ -20,7 +22,10 @@ module InertiaRails
         request = ActionDispatch::Request.new(@env)
 
         # Inertia errors are added to the session via redirect_to
-        request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
+        unless keep_inertia_session_options?(status)
+          request.session.delete(:inertia_errors)
+          request.session.delete(:inertia_clear_history)
+        end
 
         status = 303 if inertia_non_post_redirect?(status)
 
@@ -29,7 +34,7 @@ module InertiaRails
 
       private
 
-      def keep_inertia_errors?(status)
+      def keep_inertia_session_options?(status)
         redirect_status?(status) || stale_inertia_request?
       end
 

data/lib/inertia_rails/optional_prop.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class OptionalProp < IgnoreOnFirstLoadProp
+  end
+end

data/lib/inertia_rails/renderer.rb

@@ -2,7 +2,7 @@
 
 require 'net/http'
 require 'json'
-require_relative "inertia_rails"
+require_relative 'inertia_rails'
 
 module InertiaRails
   class Renderer
@@ -15,9 +15,11 @@ module InertiaRails
       :controller,
       :props,
       :view_data,
+      :encrypt_history,
+      :clear_history
     )
 
-    def initialize(component, controller, request, response, render_method, props: nil, view_data: nil, deep_merge: nil)
+    def initialize(component, controller, request, response, render_method, props: nil, view_data: nil, deep_merge: nil, encrypt_history: nil, clear_history: nil)
       @controller = controller
       @configuration = controller.__send__(:inertia_configuration)
       @component = resolve_component(component)
@@ -27,6 +29,8 @@ module InertiaRails
       @props = props || controller.__send__(:inertia_view_assigns)
       @view_data = view_data || {}
       @deep_merge = !deep_merge.nil? ? deep_merge : configuration.deep_merge_shared_data
+      @encrypt_history = !encrypt_history.nil? ? encrypt_history : configuration.encrypt_history
+      @clear_history = clear_history || controller.session[:inertia_clear_history] || false
     end
 
     def render
@@ -37,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)
@@ -96,12 +100,22 @@ module InertiaRails
     end
 
     def page
-      {
+      default_page = {
         component: component,
         props: computed_props,
         url: @request.original_fullpath,
         version: configuration.version,
+        encryptHistory: encrypt_history,
+        clearHistory: clear_history,
       }
+
+      deferred_props = deferred_props_keys
+      default_page[:deferredProps] = deferred_props if deferred_props.present?
+
+      merge_props = merge_props_keys
+      default_page[:mergeProps] = merge_props if merge_props.present?
+
+      default_page
     end
 
     def deep_transform_props(props, parent_path = [], &block)
@@ -120,8 +134,26 @@ module InertiaRails
       end
     end
 
+    def deferred_props_keys
+      return if rendering_partial_component?
+
+      @props.each_with_object({}) do |(key, prop), result|
+        (result[prop.group] ||= []) << key if prop.is_a?(DeferProp)
+      end
+    end
+
+    def merge_props_keys
+      @props.each_with_object([]) do |(key, prop), result|
+        result << key if prop.try(:merge?) && reset_keys.exclude?(key)
+      end
+    end
+
     def partial_keys
-      (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact
+      @partial_keys ||= (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact
+    end
+
+    def reset_keys
+      (@request.headers['X-Inertia-Reset'] || '').split(',').compact.map(&:to_sym)
     end
 
     def partial_except_keys
@@ -147,8 +179,8 @@ module InertiaRails
         return false if excluded_by_except_partial_keys?(path_with_prefixes)
       end
 
-      # Precedence: Evaluate LazyProp only after partial keys have been checked
-      return false if prop.is_a?(LazyProp) && !rendering_partial_component?
+      # Precedence: Evaluate IgnoreOnFirstLoadProp only after partial keys have been checked
+      return false if prop.is_a?(IgnoreOnFirstLoadProp) && !rendering_partial_component?
 
       true
     end

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.5.0"
+  VERSION = "3.6.1"
 end

data/lib/inertia_rails.rb

@@ -16,6 +16,8 @@ ActionController::Renderers.add :inertia do |component, options|
     props: options[:props],
     view_data: options[:view_data],
     deep_merge: options[:deep_merge],
+    encrypt_history: options[:encrypt_history],
+    clear_history: options[:clear_history],
   ).render
 end
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Brian Knoles
 - Brandon Shar
 - Eugene Granovsky
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 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
@@ -218,14 +215,18 @@ files:
 - lib/inertia_rails/base_prop.rb
 - lib/inertia_rails/configuration.rb
 - lib/inertia_rails/controller.rb
+- lib/inertia_rails/defer_prop.rb
 - lib/inertia_rails/engine.rb
 - lib/inertia_rails/generators/controller_template_base.rb
 - lib/inertia_rails/generators/helper.rb
 - lib/inertia_rails/generators/scaffold_template_base.rb
 - lib/inertia_rails/helper.rb
+- lib/inertia_rails/ignore_on_first_load_prop.rb
 - lib/inertia_rails/inertia_rails.rb
 - lib/inertia_rails/lazy_prop.rb
+- lib/inertia_rails/merge_prop.rb
 - lib/inertia_rails/middleware.rb
+- lib/inertia_rails/optional_prop.rb
 - lib/inertia_rails/renderer.rb
 - lib/inertia_rails/rspec.rb
 - lib/inertia_rails/version.rb
@@ -246,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
@@ -261,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'),
-  ]
-}