react_on_rails 16.4.0.rc.10 → 16.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd0253666ff913084d12f9f5b3f24b41f0f33ed418165f54a5d038cb567012d
-  data.tar.gz: 510bcdc628f66dd6c9ddfae7be24582fef28ea35c263440e86a640b419bff379
+  metadata.gz: 2e8711eddc91f2c2afd343c203a466e320e3c98231a6cea82f950f91de9c234c
+  data.tar.gz: 3e833073ef81b6051e2484075288e7aca18026eafb9d7e1727a84a7ae53e22fc
 SHA512:
-  metadata.gz: fa0ec02748d25524f70fa7fe73803fc25c8c73249a17b953517ab3b226fa2101efc0443b3bab201737711f91d4a4f4d9d280e29005c28b505ae3d2d6d4bda153
-  data.tar.gz: 365c80cbf379d64e9c74958e96334fe494d2f9770f8fa0f1b01eae03f89e11fd08590459bbe3a021f6a4e3ff697a7ad78bcfa9fd93ac0646ada6007f6d471b8a
+  metadata.gz: fb4f879f38e2a7fce93204c22efaf2c360dc5031ad52384d7abe3cfcf0f712365dbfed53ae3385f93106d4d9549bb36a714caacb820d633d7c21a4864dce3c00
+  data.tar.gz: df85baa5aecb849d6b28636975540a2102ab0f70c1efdc3b00e26923dd4524f4bda758a6153eb541c8db86dfc8e6860830c6336785e50c1d5416d12486b2d5e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.4.0.rc.10)
+    react_on_rails (16.4.0)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/base_generator.rb

@@ -267,6 +267,7 @@ module ReactOnRails
 
       def copy_webpack_main_config(base_path, config)
         webpack_config_path = bundler_main_config_path
+        template_path = bundler_main_config_template_path(base_path, webpack_config_path)
 
         if File.exist?(webpack_config_path)
           existing_content = File.read(webpack_config_path)
@@ -279,7 +280,7 @@ module ReactOnRails
             say_status :replace,
                        "#{webpack_config_path} (auto-upgrading from standard Shakapacker to React on Rails config)",
                        :green
-            template("#{base_path}/config/webpack/webpack.config.js.tt", webpack_config_path, config)
+            template(template_path, webpack_config_path, config)
           elsif react_on_rails_config?(existing_content)
             say_status :identical, "#{webpack_config_path} (already React on Rails compatible)", :blue
             # Skip - don't need to do anything
@@ -288,7 +289,7 @@ module ReactOnRails
           end
         else
           # File doesn't exist, create it
-          template("#{base_path}/config/webpack/webpack.config.js.tt", webpack_config_path, config)
+          template(template_path, webpack_config_path, config)
         end
       end
 
@@ -309,7 +310,7 @@ module ReactOnRails
             say_status :create, "#{backup_path} (backup of your custom config)", :green
           end
 
-          template("#{base_path}/config/webpack/webpack.config.js.tt", webpack_config_path, config)
+          template(bundler_main_config_template_path(base_path, webpack_config_path), webpack_config_path, config)
         else
           say_status :skip, webpack_config_path, :yellow
           say_status :warning,
@@ -320,7 +321,13 @@ module ReactOnRails
 
       def bundler_main_config_path
         if using_rspack?
-          "config/rspack/rspack.config.js"
+          if File.exist?("config/rspack/rspack.config.ts")
+            "config/rspack/rspack.config.ts"
+          else
+            "config/rspack/rspack.config.js"
+          end
+        elsif File.exist?("config/webpack/webpack.config.ts")
+          "config/webpack/webpack.config.ts"
         else
           "config/webpack/webpack.config.js"
         end
@@ -584,10 +591,26 @@ module ReactOnRails
 
         # Normalize whitespace while preserving comments by default so added comments
         # count as potential customizations and keep cleanup conservative.
-        normalized_content.gsub(/\s+/, " ").strip
+        normalized_content.gsub(/\s+/, " ")
+                          .tr('"', "'") # Normalize quote style for import/require statements
+                          .strip
+      end
+
+      def bundler_main_config_template_path(base_path, config_path)
+        template_ext = config_path.end_with?(".ts") ? "ts.tt" : "js.tt"
+        template_base = if config_path.include?("/rspack/") || File.basename(config_path).start_with?("rspack.config")
+                          "rspack.config"
+                        else
+                          "webpack.config"
+                        end
+        "#{base_path}/config/webpack/#{template_base}.#{template_ext}"
       end
 
       def shakapacker_default_configs
+        shakapacker_cjs_default_configs + shakapacker_esm_default_configs
+      end
+
+      def shakapacker_cjs_default_configs
         configs = []
 
         # Shakapacker v7+ (generateWebpackConfig function)
@@ -640,6 +663,40 @@ module ReactOnRails
         configs
       end
 
+      def shakapacker_esm_default_configs
+        configs = []
+
+        # Shakapacker v9.4+ TypeScript webpack configs (ESM syntax)
+        configs << <<~CONFIG
+          import { generateWebpackConfig } from 'shakapacker'
+          import type { Configuration } from 'webpack'
+          const webpackConfig: Configuration = generateWebpackConfig()
+          export default webpackConfig
+        CONFIG
+
+        configs << <<~CONFIG
+          import { generateWebpackConfig } from 'shakapacker'
+          const webpackConfig = generateWebpackConfig()
+          export default webpackConfig
+        CONFIG
+
+        # Shakapacker v9.4+ TypeScript rspack configs (ESM syntax)
+        configs << <<~CONFIG
+          import { generateRspackConfig } from 'shakapacker/rspack'
+          import type { RspackOptions } from '@rspack/core'
+          const rspackConfig: RspackOptions = generateRspackConfig()
+          export default rspackConfig
+        CONFIG
+
+        configs << <<~CONFIG
+          import { generateRspackConfig } from 'shakapacker/rspack'
+          const rspackConfig = generateRspackConfig()
+          export default rspackConfig
+        CONFIG
+
+        configs
+      end
+
       def react_on_rails_config?(content)
         # Check if it already has React on Rails environment-specific loading
         content.include?("envSpecificConfig") || content.include?("env.nodeEnv")

data/lib/generators/react_on_rails/templates/base/base/config/webpack/rspack.config.js.tt

@@ -0,0 +1,15 @@
+const { env } = require('shakapacker')
+const { existsSync } = require('fs')
+const { resolve } = require('path')
+
+const envSpecificConfig = () => {
+  const path = resolve(__dirname, `${env.nodeEnv}.js`)
+  if (existsSync(path)) {
+    console.log(`Loading ENV specific rspack configuration file ${path}`)
+    return require(path)
+  } else {
+    throw new Error(`Could not find file to load ${path}, based on NODE_ENV`)
+  }
+}
+
+module.exports = envSpecificConfig()

data/lib/generators/react_on_rails/templates/base/base/config/webpack/rspack.config.ts.tt

@@ -0,0 +1,15 @@
+import { env } from 'shakapacker'
+import { existsSync } from 'fs'
+import { resolve } from 'path'
+
+const envSpecificConfig = () => {
+  const path = resolve(__dirname, `${env.nodeEnv}.js`)
+  if (existsSync(path)) {
+    console.log(`Loading ENV specific rspack configuration file ${path}`)
+    return require(path)
+  }
+
+  throw new Error(`Could not find file to load ${path}, based on NODE_ENV`)
+}
+
+export default envSpecificConfig()

data/lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.ts.tt

@@ -0,0 +1,15 @@
+import { env } from 'shakapacker'
+import { existsSync } from 'fs'
+import { resolve } from 'path'
+
+const envSpecificConfig = () => {
+  const path = resolve(__dirname, `${env.nodeEnv}.js`)
+  if (existsSync(path)) {
+    console.log(`Loading ENV specific webpack configuration file ${path}`)
+    return require(path)
+  }
+
+  throw new Error(`Could not find file to load ${path}, based on NODE_ENV`)
+}
+
+export default envSpecificConfig()

data/lib/react_on_rails/system_checker.rb

@@ -134,7 +134,7 @@ module ReactOnRails
           • bin/shakapacker
           • bin/shakapacker-dev-server
           • config/shakapacker.yml
-          • config/webpack/webpack.config.js
+          • config/{webpack,rspack}/{webpack,rspack}.config.{js,ts}
 
           Run: bundle exec rails shakapacker:install
         MSG
@@ -291,48 +291,80 @@ module ReactOnRails
 
     # Webpack configuration validation
     def check_webpack_configuration
-      webpack_config_path = "config/webpack/webpack.config.js"
-      if File.exist?(webpack_config_path)
-        add_success("✅ Webpack configuration exists")
-        check_webpack_config_content
-        suggest_webpack_inspection
+      config_path = detect_bundler_config_path
+      if config_path
+        add_success("✅ Bundler configuration exists (#{config_path})")
+        check_webpack_config_content(config_path)
+        suggest_webpack_inspection(config_path)
       else
         add_error(<<~MSG.strip)
-          🚫 Webpack configuration not found.
+          🚫 Bundler configuration not found.
 
-          Expected: config/webpack/webpack.config.js
+          Expected one of: config/webpack/webpack.config.{js,ts} or config/rspack/rspack.config.{js,ts}
           Run: rails generate react_on_rails:install
         MSG
       end
     end
 
-    def suggest_webpack_inspection
-      add_info("💡 To debug webpack builds:")
+    def detect_bundler_config_path
+      paths_by_bundler = {
+        "rspack" => existing_bundler_config_paths("rspack"),
+        "webpack" => existing_bundler_config_paths("webpack")
+      }
+
+      present_paths = paths_by_bundler.select { |_bundler, paths| paths.any? }
+      return nil if present_paths.empty?
+      return present_paths.values.first.first if present_paths.one?
+
+      configured_bundler = configured_assets_bundler
+      if configured_bundler && paths_by_bundler[configured_bundler].any?
+        add_warning(
+          "⚠️  Found both webpack and rspack configs. Using #{configured_bundler} from config/shakapacker.yml."
+        )
+        return paths_by_bundler[configured_bundler].first
+      end
+
+      add_warning(
+        "⚠️  Found both webpack and rspack configs. Could not determine active bundler; defaulting to rspack."
+      )
+      paths_by_bundler["rspack"].first || paths_by_bundler["webpack"].first
+    end
+
+    def suggest_webpack_inspection(config_path)
+      bundler_name = config_path.include?("rspack") ? "rspack" : "webpack"
+      export_style = config_path.end_with?(".ts") ? "export default" : "module.exports"
+
+      add_info("💡 To debug #{bundler_name} builds:")
       add_info("    bin/shakapacker --mode=development --progress")
       add_info("    bin/shakapacker --mode=production --progress")
       add_info("    bin/shakapacker --debug-shakapacker  # Debug Shakapacker configuration")
 
-      add_info("💡 Advanced webpack debugging:")
-      add_info("    1. Add 'debugger;' before 'module.exports' in config/webpack/webpack.config.js")
+      add_info("💡 Advanced #{bundler_name} debugging:")
+      add_info("    1. Add 'debugger;' before '#{export_style}' in #{config_path}")
       add_info("    2. Run: ./bin/shakapacker --debug-shakapacker")
       add_info("    3. Open Chrome DevTools to inspect config object")
-      add_info("    📖 See: https://github.com/shakacode/shakapacker/blob/main/docs/troubleshooting.md#debugging-your-webpack-config")
+      add_info(
+        "    📖 See: https://github.com/shakacode/shakapacker/blob/main/docs/troubleshooting.md#debugging-your-webpack-config"
+      )
 
       add_info("💡 To analyze bundle size:")
       if bundle_analyzer_available?
         add_info("    ANALYZE=true bin/shakapacker")
-        add_info("    This opens webpack-bundle-analyzer in your browser")
-      else
+        add_info("    This opens the configured bundle analyzer in your browser")
+      elsif bundler_name == "webpack"
         add_info("    1. yarn add --dev webpack-bundle-analyzer")
-        add_info("    2. Add to config/webpack/webpack.config.js:")
+        add_info("    2. Add to #{config_path}:")
         add_info("       const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');")
         add_info("       // Add to plugins array when process.env.ANALYZE")
         add_info("    3. ANALYZE=true bin/shakapacker")
-        add_info("    Or use Shakapacker's built-in support if available")
+      else
+        add_info("    1. Install a compatible analyzer for your rspack setup")
+        add_info("    2. Run: ANALYZE=true bin/shakapacker")
       end
 
-      add_info("💡 Generate webpack stats for analysis:")
-      add_info("    bin/shakapacker --json > webpack-stats.json")
+      stats_file = bundler_name == "rspack" ? "rspack-stats.json" : "webpack-stats.json"
+      add_info("💡 Generate #{bundler_name} stats for analysis:")
+      add_info("    bin/shakapacker --json > #{stats_file}")
       add_info("    Upload to webpack.github.io/analyse or webpack-bundle-analyzer.com")
     end
 
@@ -348,23 +380,23 @@ module ReactOnRails
       end
     end
 
-    def check_webpack_config_content
-      webpack_config_path = "config/webpack/webpack.config.js"
-      content = File.read(webpack_config_path)
+    def check_webpack_config_content(config_path)
+      content = File.read(config_path)
+      bundler_name = config_path.include?("rspack") ? "rspack" : "webpack"
 
       if react_on_rails_config?(content)
-        add_success("✅ Webpack config includes React on Rails environment configuration")
+        add_success("✅ #{bundler_name.capitalize} config includes React on Rails environment configuration")
         add_info("    ℹ️  Environment-specific configs detected for optimal React on Rails integration")
       elsif standard_shakapacker_config?(content)
         add_warning(<<~MSG.strip)
-          ⚠️  Standard Shakapacker webpack config detected.
+          ⚠️  Standard Shakapacker #{bundler_name} config detected.
 
           React on Rails works better with environment-specific configuration.
           Consider running: rails generate react_on_rails:install --force
           This adds client and server environment configs for better performance.
         MSG
       else
-        add_info("ℹ️  Custom webpack config detected")
+        add_info("ℹ️  Custom #{bundler_name} config detected")
         add_info("    💡 Ensure config supports both client and server rendering")
         add_info("    💡 Verify React JSX transformation is configured")
         add_info("    💡 Check that asset output paths match Rails expectations")
@@ -427,7 +459,14 @@ module ReactOnRails
       File.exist?("bin/shakapacker") &&
         File.exist?("bin/shakapacker-dev-server") &&
         File.exist?("config/shakapacker.yml") &&
-        File.exist?("config/webpack/webpack.config.js")
+        bundler_config_file_exists?
+    end
+
+    def bundler_config_file_exists?
+      File.exist?("config/webpack/webpack.config.js") ||
+        File.exist?("config/webpack/webpack.config.ts") ||
+        File.exist?("config/rspack/rspack.config.js") ||
+        File.exist?("config/rspack/rspack.config.ts")
     end
 
     def shakapacker_in_gemfile?
@@ -441,10 +480,18 @@ module ReactOnRails
     end
 
     def standard_shakapacker_config?(content)
+      # NOTE: Uses loose regex matching, unlike base_generator.rb's exact-string matching.
+      # Intentional: the system checker only needs to detect whether a config is
+      # "Shakapacker-flavored", not whether it's byte-for-byte identical to a default template.
       normalized = normalize_config_content(content)
       shakapacker_patterns = [
+        # CommonJS patterns (JS configs)
         /generateWebpackConfig.*require.*shakapacker/,
-        /webpackConfig.*require.*shakapacker/
+        /webpackConfig.*require.*shakapacker/,
+        /generateRspackConfig.*require.*shakapacker/,
+        # ESM patterns (TS configs)
+        /generateWebpackConfig.*from ['"]shakapacker['"]/,
+        %r{generateRspackConfig.*from ['"]shakapacker/rspack['"]}
       ]
       shakapacker_patterns.any? { |pattern| normalized.match?(pattern) }
     end
@@ -456,6 +503,32 @@ module ReactOnRails
              .strip
     end
 
+    def existing_bundler_config_paths(bundler)
+      candidate_paths = if bundler == "rspack"
+                          %w[
+                            config/rspack/rspack.config.ts
+                            config/rspack/rspack.config.js
+                          ]
+                        else
+                          %w[
+                            config/webpack/webpack.config.ts
+                            config/webpack/webpack.config.js
+                          ]
+                        end
+      candidate_paths.select { |path| File.exist?(path) }
+    end
+
+    def configured_assets_bundler
+      shakapacker_config_path = "config/shakapacker.yml"
+      return nil unless File.exist?(shakapacker_config_path)
+
+      config_content = File.read(shakapacker_config_path)
+      match = config_content.match(/^\s*assets_bundler:\s*["']?(webpack|rspack)["']?\s*$/)
+      match&.captures&.first
+    rescue StandardError
+      nil
+    end
+
     def required_react_dependencies
       deps = {
         "react" => "React library",

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.4.0.rc.10"
+  VERSION = "16.4.0"
 end

data/rakelib/update_changelog.rake

@@ -207,7 +207,7 @@ def cleanup_collapsed_prerelease_links(changelog, base_version)
   # Find the "from" version in prerelease links that points to a non-prerelease (stable) version
   stable_from = nil
   changelog.scan(/^\[#{prerelease_pattern}\]:\s*#{compare_prefix}(\S+)\.\.\./i) do |from_version,|
-    stable_from = from_version unless from_version.match?(prerelease_pattern)
+    stable_from = from_version unless from_version.delete_prefix("v").match?(prerelease_pattern)
   end
 
   if stable_from
@@ -430,8 +430,8 @@ def update_changelog_links(changelog, version, anchor)
   return unless match_data
 
   prev_version = match_data[:prev_version]
-  new_unreleased_link = "#{compare_link_prefix}/#{version}...master"
-  new_version_link = "#{anchor}: #{compare_link_prefix}/#{prev_version}...#{version}"
+  new_unreleased_link = "#{compare_link_prefix}/v#{version}...master"
+  new_version_link = "#{anchor}: #{compare_link_prefix}/#{prev_version}...v#{version}"
   changelog.sub!(match_data[0], "#{new_unreleased_link}\n#{new_version_link}")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.4.0.rc.10
+  version: 16.4.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -168,9 +168,12 @@ files:
 - lib/generators/react_on_rails/templates/base/base/config/webpack/commonWebpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/production.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/rspack.config.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/rspack.config.ts.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/test.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.ts.tt
 - lib/generators/react_on_rails/templates/dev_tests/.eslintrc
 - lib/generators/react_on_rails/templates/dev_tests/.rspec
 - lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb