react-rails 2.4.7 → 2.7.1

data/lib/generators/react/component_generator.rb

@@ -55,6 +55,11 @@ module React
                    default: false,
                    desc: 'Output es6 class based component'
 
+      class_option :ts,
+                   type: :boolean,
+                   default: false,
+                   desc: 'Output tsx class based component'
+
       class_option :coffee,
                    type: :boolean,
                    default: false,
@@ -89,9 +94,38 @@ module React
         }
       }
 
+      TYPESCRIPT_TYPES = {
+        'node' =>        'React.ReactNode',
+        'bool' =>        'boolean',
+        'boolean' =>     'boolean',
+        'string' =>      'string',
+        'number' =>      'number',
+        'object' =>      'object',
+        'array' =>       'Array<any>',
+        'shape' =>       'object',
+        'element' =>     'object',
+        'func' =>        'object',
+        'function' =>    'object',
+        'any' =>         'any',
+
+        'instanceOf' => ->(type) {
+          type.to_s.camelize
+        },
+
+        'oneOf' => ->(*opts) {
+          opts.map{ |k| "'#{k.to_s}'" }.join(" | ")
+        },
+
+        'oneOfType' => ->(*opts) {
+          opts.map{ |k| "#{ts_lookup(k.to_s, k.to_s)}" }.join(" | ")
+        }
+      }
+
       def create_component_file
         template_extension = if options[:coffee]
           'js.jsx.coffee'
+        elsif options[:ts]
+          'js.jsx.tsx'
         elsif options[:es6] || webpacker?
           'es6.jsx'
         else
@@ -101,7 +135,13 @@ module React
         # Prefer webpacker to sprockets:
         if webpacker?
           new_file_name = file_name.camelize
-          extension = options[:coffee] ? 'coffee' : 'js'
+          extension = if options[:coffee]
+            'coffee'
+          elsif options[:ts]
+            'tsx'
+          else
+            'js'
+          end
           target_dir = webpack_configuration.source_path
             .join('components')
             .relative_path_from(::Rails.root)
@@ -128,6 +168,7 @@ module React
 
       def file_header
         if webpacker?
+          return %|import * as React from "react"\n| if options[:ts]
           %|import React from "react"\nimport PropTypes from "prop-types"\n|
         else
           ''
@@ -146,23 +187,58 @@ module React
         defined?(Webpacker)
       end
 
-       def parse_attributes!
-         self.attributes = (attributes || []).map do |attr|
-           name = ''
-           type = ''
-           options = ''
-           options_regex = /(?<options>{.*})/
+      def parse_attributes!
+        self.attributes = (attributes || []).map do |attr|
+          name = ''
+          type = ''
+          args = ''
+          args_regex = /(?<args>{.*})/
+
+          name, type = attr.split(':')
+
+          if matchdata = args_regex.match(type)
+            args = matchdata[:args]
+            type = type.gsub(args_regex, '')
+          end
+
+          if options[:ts]
+            { :name => name, :type => ts_lookup(name, type, args), :union => union?(args) }
+          else
+            { :name => name, :type => lookup(type, args) }
+          end
+        end
+      end
+
+      def union?(args = '')
+        return args.to_s.gsub(/[{}]/, '').split(',').count > 1
+      end
 
-           name, type = attr.split(':')
+      def self.ts_lookup(name, type = 'node', args = '')
+        ts_type = TYPESCRIPT_TYPES[type]
+        if ts_type.blank?
+          if type =~ /^[[:upper:]]/
+            ts_type = TYPESCRIPT_TYPES['instanceOf']
+          else
+            ts_type = TYPESCRIPT_TYPES['node']
+          end
+        end
 
-           if matchdata = options_regex.match(type)
-             options = matchdata[:options]
-             type = type.gsub(options_regex, '')
-           end
+        args = args.to_s.gsub(/[{}]/, '').split(',')
 
-           { :name => name, :type => lookup(type, options) }
-         end
-       end
+        if ts_type.respond_to? :call
+          if args.blank?
+            return ts_type.call(type)
+          end
+
+          ts_type = ts_type.call(*args)
+        end
+
+        ts_type
+      end
+
+      def ts_lookup(name, type = 'node', args = '')
+        self.class.ts_lookup(name, type, args)
+      end
 
        def self.lookup(type = 'node', options = '')
          react_prop_type = REACT_PROP_TYPES[type]

data/lib/generators/react/install_generator.rb

@@ -16,6 +16,19 @@ module React
         default: false,
         desc: "Don't generate server_rendering.js or config/initializers/react_server_rendering.rb"
 
+      # For Shakapacker below version 7, we need to set relative path for source_entry_path
+      def modify_webpacker_yml
+        webpacker_yml_path = 'config/webpacker.yml'
+        if webpacker? && Pathname.new(webpacker_yml_path).exist?
+          gsub_file(
+            webpacker_yml_path,
+            "source_entry_path: /\n",
+            "source_entry_path: packs\n"
+          )
+          reloaded_webpacker_config
+        end
+      end
+
       # Make an empty `components/` directory in the right place:
       def create_directory
         components_dir = if webpacker?
@@ -25,7 +38,7 @@ module React
         end
         empty_directory File.join(components_dir, 'components')
         unless options[:skip_git]
-          create_file File.join(components_dir, 'components/.gitkeep')
+          create_file File.join(components_dir, 'components/.keep')
         end
       end
 
@@ -96,9 +109,9 @@ module React
 
       WEBPACKER_SETUP_UJS = <<-JS
 // Support component names relative to this directory:
-var componentRequireContext = require.context("components", true)
-var ReactRailsUJS = require("react_ujs")
-ReactRailsUJS.useContext(componentRequireContext)
+var componentRequireContext = require.context("components", true);
+var ReactRailsUJS = require("react_ujs");
+ReactRailsUJS.useContext(componentRequireContext);
 JS
 
       def setup_react_webpacker
@@ -119,6 +132,11 @@ JS
           Webpacker::Configuration.source_path.join(Webpacker::Configuration.entry_path) # Webpacker <3
         end
       end
+
+      def reloaded_webpacker_config
+        Webpacker.instance.instance_variable_set(:@config, nil)
+        Webpacker.config
+      end
     end
   end
 end

data/lib/generators/templates/component.js.jsx.tsx

@@ -0,0 +1,36 @@
+<%= file_header %>
+<% unions = attributes.select{ |a| a[:union] } -%>
+<% if unions.size > 0 -%>
+<% unions.each do |e| -%>
+type <%= e[:name].titleize %> = <%= e[:type]%>
+<% end -%>
+<% end -%>
+
+interface I<%= component_name %>Props {
+<% if attributes.size > 0 -%>
+<% attributes.each do | attribute | -%>
+<% if attribute[:union] -%>
+  <%= attribute[:name].camelize(:lower) %>: <%= attribute[:name].titleize %>;
+<% else -%>
+  <%= attribute[:name].camelize(:lower) %>: <%= attribute[:type] %>;
+<% end -%>
+<% end -%>
+<% end -%>
+}
+
+interface I<%= component_name %>State {
+}
+
+class <%= component_name %> extends React.Component <I<%= component_name %>Props, I<%= component_name %>State> {
+  render() {
+    return (
+      <React.Fragment>
+  <% attributes.each do |attribute| -%>
+      <%= attribute[:name].titleize %>: {this.props.<%= attribute[:name].camelize(:lower) %>}
+  <% end -%>
+    </React.Fragment>
+    );
+  }
+}
+
+<%= file_footer %>

data/lib/generators/templates/server_rendering_pack.js

@@ -1,5 +1,5 @@
 // By default, this pack is loaded for server-side rendering.
 // It must expose react_ujs as `ReactRailsUJS` and prepare a require context.
-var componentRequireContext = require.context("components", true)
-var ReactRailsUJS = require("react_ujs")
-ReactRailsUJS.useContext(componentRequireContext)
+var componentRequireContext = require.context("components", true);
+var ReactRailsUJS = require("react_ujs");
+ReactRailsUJS.useContext(componentRequireContext);

data/lib/react/jsx/sprockets_strategy.rb

@@ -23,7 +23,7 @@ module React
       # @return [Symbol] based on the environment, return a method name to call with the sprockets environment
       def detect_strategy
         sprockets_version = Gem::Version.new(Sprockets::VERSION)
-        if sprockets_version >= Gem::Version.new('4.x')
+        if sprockets_version >= Gem::Version.new('4.a')
           :register_processors
         elsif sprockets_version >= Gem::Version.new('3.0.0')
           :register_engine_with_mime_type

data/lib/react/rails/component_mount.rb

@@ -11,6 +11,10 @@ module React
       attr_accessor :output_buffer
       mattr_accessor :camelize_props_switch
 
+      def initialize
+        @cache_ids = []
+      end
+
       # {ControllerLifecycle} calls these hooks
       # You can use them in custom helper implementations
       def setup(controller)
@@ -40,6 +44,9 @@ module React
             data[:react_class] = name
             data[:react_props] = (props.is_a?(String) ? props : props.to_json)
             data[:hydrate] = 't' if prerender_options
+
+            num_components = @cache_ids.count { |c| c.start_with? name }
+            data[:react_cache_id] = "#{name}-#{num_components}"
           end
         end
         html_tag = html_options[:tag] || :div

data/lib/react/rails/railtie.rb

@@ -58,6 +58,7 @@ module React
 
         ActiveSupport.on_load(:action_view) do
           include ::React::Rails::ViewHelper
+          ActionDispatch::IntegrationTest.send(:include, React::Rails::TestHelper) if ::Rails.env.test?
         end
       end
 

data/lib/react/rails/test_helper.rb

@@ -0,0 +1,23 @@
+module React
+  module Rails
+    module TestHelper
+      extend ActiveSupport::Concern
+
+      # assert react_component render
+      #
+      # assert_react_component("HelloWorld") do |props|
+      #   assert_equal "Hello world", props[:message]
+      # end
+      def assert_react_component(name)
+        assert_select "div[data-react-class=?]", name do |dom|
+          if block_given?
+            props = JSON.parse(dom.attr("data-react-props"))
+            props.deep_symbolize_keys!
+
+            yield(props)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/react/rails/version.rb

@@ -2,6 +2,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = '2.4.7'
+    VERSION = '2.7.1'
   end
 end

data/lib/react/server_rendering/webpacker_manifest_container.rb

@@ -9,7 +9,7 @@ module React
     class WebpackerManifestContainer
 
       begin
-        MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find { |gem_spec| gem_spec.name == 'webpacker' }.version.segments
+        MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find { |gem_spec| gem_spec.name == 'webpacker' || gem_spec.name == 'shakapacker' }.version.segments
       rescue
         MAJOR, MINOR, PATCH, _ = [0,0,0]
       end
@@ -27,7 +27,7 @@ module React
           asset_path = manifest.lookup(logical_path).to_s
           if asset_path.start_with?('http')
             # Get a file from the webpack-dev-server
-            dev_server_asset = open(asset_path).read
+            dev_server_asset = URI.open(asset_path).read
             # Remove `webpack-dev-server/client/index.js` code which causes ExecJS to 💥
             dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
             dev_server_asset
@@ -44,7 +44,7 @@ module React
             ds = Webpacker.dev_server
             # Remove the protocol and host from the asset path. Sometimes webpacker includes this, sometimes it does not
             asset_path.slice!("#{ds.protocol}://#{ds.host_with_port}")
-            dev_server_asset = open("#{ds.protocol}://#{ds.host_with_port}#{asset_path}").read
+            dev_server_asset = URI.open("#{ds.protocol}://#{ds.host_with_port}#{asset_path}").read
             dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
             dev_server_asset
           else
@@ -79,7 +79,7 @@ module React
         end
       elsif MAJOR >= 3
         def file_path path
-          ::Rails.root.join('public', manifest.lookup(path)[1..-1])
+          ::Rails.root.join('public', manifest.lookup!(path)[1..-1])
         end
       else # 1.0 and 1.1 support
         def file_path path

data/lib/react-rails.rb

@@ -2,3 +2,9 @@ require 'react'
 require 'react/jsx'
 require 'react/rails'
 require 'react/server_rendering'
+
+module React
+  module Rails
+    autoload :TestHelper, 'react/rails/test_helper'
+  end
+end

data/lib/react.rb

@@ -3,17 +3,19 @@ module React
   # @param props [Object] If it's a Hash or Array, it will be recursed. Otherwise it will be returned.
   # @return [Hash] a new hash whose keys are camelized strings
   def self.camelize_props(props)
-    case props
+    props_as_json = props.as_json
+
+    case props_as_json
     when Hash
-      props.each_with_object({}) do |(key, value), new_props|
+      props_as_json.each_with_object({}) do |(key, value), new_props|
         new_key = key.to_s.camelize(:lower)
         new_value = camelize_props(value)
         new_props[new_key] = new_value
       end
     when Array
-      props.map { |item| camelize_props(item) }
+      props_as_json.map { |item| camelize_props(item) }
     else
-      props
+      props_as_json
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.7.1
 platform: ruby
 authors:
 - Paul O’Shannessy
 - Robert Mosolgo
 - Gregory Myers
 - Tsukuru Tanimichi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -31,16 +31,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.4.9
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,6 +223,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turbolinks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +346,7 @@ files:
 - lib/generators/templates/component.es6.jsx
 - lib/generators/templates/component.js.jsx
 - lib/generators/templates/component.js.jsx.coffee
+- lib/generators/templates/component.js.jsx.tsx
 - lib/generators/templates/react_server_rendering.rb
 - lib/generators/templates/server_rendering.js
 - lib/generators/templates/server_rendering_pack.js
@@ -321,6 +364,7 @@ files:
 - lib/react/rails/controller_lifecycle.rb
 - lib/react/rails/controller_renderer.rb
 - lib/react/rails/railtie.rb
+- lib/react/rails/test_helper.rb
 - lib/react/rails/version.rb
 - lib/react/rails/view_helper.rb
 - lib/react/server_rendering.rb
@@ -338,7 +382,7 @@ homepage: https://github.com/reactjs/react-rails
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -353,9 +397,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.12
+signing_key:
 specification_version: 4
 summary: React integration for Ruby on Rails
 test_files: []