react_on_rails 12.0.4 → 12.0.5.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc3d5e5e388d5f126ac4629c9716ab1e0bbad148617aae2aa0b29a1b8728bf8
-  data.tar.gz: e7890cf4cd11ddc3c1301d4ec3d7b085335e73964498d554c9a6bd67a6155e9c
+  metadata.gz: 7c3761565aa14795caa2b5c486de9016269ff3d39230c11c0d7bd582a507daa4
+  data.tar.gz: 21ef8af0d15a75a828852ca179e0b6a9e7ba930036db6ecde58de0e09b5637e5
 SHA512:
-  metadata.gz: 012bd1f23efd28c306541db16d630ff8732aaeb50828f2c2d595d18d3600c359778a7177943d1331b9a7c24b3c03fc79542098cb166a721d54816f680410db1d
-  data.tar.gz: 1b35e5642aaa762ac451d3098e6250b7b42a2ef100680b235500212269d8d2459d23360b82ee60fa881e8e7ff4d44a3150d435eb015904b00df6ab09b2aa07a5
+  metadata.gz: 3c2c6a6cd0c2e584cfda8bb0ed3be9ad42c5ae14b196d436c3e99813a61df2278ba10940bfaad1968ea868daeb14b844f04ff440bd6424e3ae9bd3cdaf8119ee
+  data.tar.gz: 0bcfac754d871893719d1604d6e42022c55048e608e6e345d0b9ce5948af3a16a5af8e18d36c4b7232dcd064f931905476981553582203f92d1df4bc189f3be2

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 
 aliases:
   - &docker-image
-    - image: circleci/ruby:2.6-node-browsers
+    - image: circleci/ruby:2.7-node-browsers
 
   # Print critical data and executables versions.
   - &print-system-info

data/.github/workflows/lint-js-and-ruby.yml

@@ -6,8 +6,8 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [2.6]
-        node: [12]
+        ruby: [2.7]
+        node: [14]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Setup Node
-      uses: actions/setup-node@v1.4.3
+      uses: actions/setup-node@v2-beta
       with:
         node-version: ${{ matrix.node }}
     - name: Print system information

data/.github/workflows/main.yml

@@ -6,8 +6,8 @@ jobs:
   build-dummy-app-webpack-test-bundles:
     strategy:
       matrix:
-        ruby: [2.6]
-        node: [12]
+        ruby: [2.7]
+        node: [14]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Setup Node
-      uses: actions/setup-node@v1.4.3
+      uses: actions/setup-node@v2-beta
       with:
         node-version: ${{ matrix.node }}
     - name: Print system information
@@ -70,8 +70,8 @@ jobs:
     needs: build-dummy-app-webpack-test-bundles
     strategy:
       matrix:
-        ruby: [2.6]
-        node: [12]
+        ruby: [2.7]
+        node: [14]
         rake_task: ['run_rspec:all_dummy', 'run_rspec:all_but_examples', 'run_rspec:examples']
     runs-on: ubuntu-latest
     steps:
@@ -81,7 +81,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Setup Node
-      uses: actions/setup-node@v1.4.3
+      uses: actions/setup-node@v2-beta
       with:
         node-version: ${{ matrix.node }}
     - name: Print system information

data/.github/workflows/package-js-tests.yml

@@ -6,12 +6,12 @@ jobs:
   build:
     strategy:
       matrix:
-        node: [12]
+        node: [12, 14]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Setup Node
-      uses: actions/setup-node@v1.4.3
+      uses: actions/setup-node@v2-beta
       with:
         node-version: ${{ matrix.node }}
     - name: Print system information

data/.github/workflows/rspec-package-specs.yml

@@ -6,8 +6,8 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [2.6]
-        node: [12]
+        ruby: [2.7]
+        node: [14]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -1,5 +1,6 @@
 # This is the configuration used to check the rubocop source code.
 # Check out: https://github.com/bbatsov/rubocop
+require: rubocop-performance
 
 AllCops:
   NewCops: enable
@@ -18,16 +19,10 @@ AllCops:
     - <%= path.sub(/^!! /, '') %>
   <% end %>
     - '**/*.js'
-    - '**/log/**/*'
     - '**/node_modules/**/*'
     - '**/public/**/*'
     - '**/tmp/**/*'
-    - '.git/**/*'
-    - 'bin/**/*'
     - 'coverage/**/*'
-    - 'db/**/*'
-    - 'db/schema.rb'
-    - 'db/seeds.rb'
     - 'gen-examples/examples/**/*'
     - 'node_modules/**/*'
     - 'spec/dummy/bin/*'
@@ -39,7 +34,6 @@ AllCops:
 Naming/FileName:
   Exclude:
     - 'Gemfile'
-    - 'spec/dummy/Gemfile'
 
 Layout/LineLength:
   Max: 120

data/Gemfile.development_dependencies

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-
-# We'll revert this before the final merge.
-# gem "webpacker", git: 'https://github.com/rails/webpacker.git'
 gem "webpacker"
 gem "bootsnap", ">= 1.1.0", require: false
 gem "rails"
@@ -22,9 +19,7 @@ gem "sdoc", group: :doc
 
 gem "sprockets"
 
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-gem "awesome_print"
+gem "amazing_print"
 gem "mini_racer"
 
 group :development, :test do
@@ -34,7 +29,8 @@ group :development, :test do
   gem "pry-doc"
   gem "pry-rails"
   gem "pry-rescue"
-  gem "rubocop", "1.2.0", require: false
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
   gem "scss_lint", require: false
   gem "spring"
 end

data/README.md

@@ -94,35 +94,35 @@ Ruby on Rails >=5 and rails/webpacker 4.2+.
 Note, the best way to understand how to use ReactOnRails is to study a few simple examples. You can do a quick demo setup, either on your existing app or on a new Rails app. 
 
 1. Do the quick [tutorial](docs/tutorial.md).
-2. Add React on Rails to an existing Rails app per [the instructions](docs/basics/installation-into-an-existing-rails-app.md).
-3. Look at [spec/dummy](spec/dummy), a simple, no DB example.
-3. Look at [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial); it's a full-featured example live at [www.reactrails.com](http://www.reactrails.com).
+1. Add React on Rails to an existing Rails app per [the instructions](docs/basics/installation-into-an-existing-rails-app.md).
+1. Look at [spec/dummy](spec/dummy), a simple, no DB example. This has an example of using `rails/webpacker` to configure server-side rendering.
+1. See the example repo of [React on Rails Tutorial With SSR, HMR fast refresh, and TypeScript](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh) for a new way to setup the creation of your SSR bundle with `rails/webpacker`.
+1. Look at [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial); it's a full-featured example live at [www.reactrails.com](http://www.reactrails.com).
 
 ## Basic Installation
 
 *See also [the instructions for installing into an existing Rails app](docs/basics/installation-into-an-existing-rails-app.md).*
 
-2. Add the `react_on_rails` gem to Gemfile:
-
-   ```bash
-   bundle add react_on_rails --strict
-   ```
-
-4. Commit this to git (or else you cannot run the generator unless you pass the option `--ignore-warnings`).
+1. Add the `rails/webpacker` gem if you don't yet have it.
+   
+1. Add the `react_on_rails` gem to Gemfile. _Use the latest version for react_on_rails._
+  ```bash
+    bundle add react_on_rails --version=12.0.4 --strict
+  ```
 
-5. Run the generator:
+1. Commit this to git (or else you cannot run the generator unless you pass the option `--ignore-warnings`).
 
+1. Run the generator:
    ```bash
    rails generate react_on_rails:install
    ```
 
-6. Start the app:
-
+1. Start the app:
    ```bash
    rails s
    ```
 
-7. Visit http://localhost:3000/hello_world.
+1. Visit http://localhost:3000/hello_world.
 
   
 ### Turning on server rendering

data/docs/basics/installation-into-an-existing-rails-app.md

@@ -4,19 +4,26 @@
 
 **If you have rails-5 API only project**, first [convert the rails-5 API only app to rails app](#convert-rails-5-api-only-app-to-rails-app) before [getting started](#getting-started-with-an-existing-rails-app).
 
-1. Add the following to your Gemfile and `bundle install`. We recommend fixing the version of React on Rails, as you will need to keep the exact version in sync with the version in your `client/package.json` file.
+1. Add the following to your Gemfile and `bundle install`. We recommend fixing the version of React on Rails, as you will need to keep the exact version in sync with the version in your `package.json` file.
 
    ```ruby
    gem "react_on_rails", "12.0.0" # Update to the current version
    gem "webpacker", "~> 5"
    ```
 
-2. Run the following 2 commands to install Webpacker with React. Note, if you are using an older version of Rails than 5.1, you'll need to install webpacker with React per the instructions [here](https://github.com/rails/webpacker).
+1. Add the webpacker and react_on_rails gems
+_Use the latest version for react_on_rails._
 
+```
+bundle add webpacker                 
+bundle add react_on_rails --version=12.0.4 --strict
+```
+
+2. Run the following 2 commands to install Webpacker with React. Note, if you are using an older version of Rails than 5.1, you'll need to install webpacker with React per the instructions [here](https://github.com/rails/webpacker).
 
    ```bash
-   $ bundle exec rails webpacker:install
-   $ bundle exec rails webpacker:install:react
+   bundle exec rails webpacker:install
+   bundle exec rails webpacker:install:react
    ```
 
 3. Commit this to git (or else you cannot run the generator unless you pass the option `--ignore-warnings`).

data/docs/tutorial.md

@@ -59,11 +59,21 @@ cd test-react-on-rails
 bundle
 ```
 
-## Add the webpacker gem
+## Add the webpacker and react_on_rails gems
+To avoid issues regarding inconsistent gem and npm versions, you should specify the exact versions
+of both the gem and npm package. In other words, don't use the `^` or `~` in the version specifications.
+_Use the latest version for react_on_rails._
 
 ```
+gem 'react_on_rails', '12.0.4'         # prefer exact gem version to match npm version
+```
+
+Note: The latest released React On Rails version is considered stable. Please use the latest
+version to ensure you get all the security patches and the best support.
+
+```bash
 bundle add webpacker                 
-bundle add react_on_rails
+bundle add react_on_rails --version=12.0.4 --strict
 ```
 
 ## Run the webpacker generator
@@ -82,25 +92,7 @@ git add -A
 git commit -m "Initial commit"
 ```
 
-## Add the **React On Rails** gem to your `Gemfile`:
-
-To avoid issues regarding inconsistent gem and npm versions, you should specify the exact versions
-of both the gem and npm package. In other words, don't use the `^` or `~` in the version specifications.
-
-```
-gem 'react_on_rails', '12.0.0'         # prefer exact gem version to match npm version
-```
-
-Note: The latest released React On Rails version is considered stable. Please use the latest 
-version to ensure you get all the security patches and the best support.
-
-Run `bundle` and commit the changes.
-
-```
-bundle
-
-git commit -am "Added React on Rails Gem"
-```
+## Run the React on Rails Generator
 
 Install React on Rails: `rails generate react_on_rails:install`. You need to first git commit your files before running the generator, or else it will generate an error.
 

data/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb

@@ -17,7 +17,7 @@ if ENV["COVERAGE"] == "true"
 
     # Don't report anything that has "spec" in the path
     add_filter do |src|
-      src.filename =~ %r{/spec/}
+      src.filename.include?("/spec/")
     end
   end
 end

data/lib/react_on_rails/helper.rb

@@ -170,7 +170,7 @@ module ReactOnRails
     def redux_store_hydration_data
       return if @registered_stores_defer_render.blank?
 
-      @registered_stores_defer_render.reduce("".dup) do |accum, redux_store_data|
+      @registered_stores_defer_render.reduce(+"") do |accum, redux_store_data|
         accum << render_redux_store_data(redux_store_data)
       end.html_safe
     end
@@ -487,13 +487,13 @@ module ReactOnRails
     end
 
     def initialize_redux_stores
-      result = <<-JS.dup
+      result = +<<-JS
       ReactOnRails.clearHydratedStores();
       JS
 
       return result unless @registered_stores.present? || @registered_stores_defer_render.present?
 
-      declarations = "var reduxProps, store, storeGenerator;\n".dup
+      declarations = +"var reduxProps, store, storeGenerator;\n"
       all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
 
       result << all_stores.each_with_object(declarations) do |redux_store_data, memo|

data/lib/react_on_rails/locales/base.rb

@@ -32,12 +32,12 @@ module ReactOnRails
       end
 
       def exist_files
-        @exist_files ||= files.select(&File.method(:exist?))
+        @exist_files ||= files.select { |file| File.exist?(file) }
       end
 
       def files_are_outdated
-        latest_yml = locale_files.map(&File.method(:mtime)).max
-        earliest = exist_files.map(&File.method(:mtime)).min
+        latest_yml = locale_files.map { |file| File.mtime(file) }.max
+        earliest = exist_files.map { |file| File.mtime(file) }.min
         latest_yml > earliest
       end
 

data/lib/react_on_rails/prerender_error.rb

@@ -46,7 +46,7 @@ module ReactOnRails
     private
 
     def calc_message(component_name, console_messages, err, js_code, props)
-      message = "ERROR in SERVER PRERENDERING\n".dup
+      message = +"ERROR in SERVER PRERENDERING\n"
       if err
         message << <<~MSG
           Encountered error: \"#{err}\"

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "12.0.4"
+  VERSION = "12.0.5.beta.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "12.0.4",
+  "version": "12.0.5-beta.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/release.rake

@@ -59,7 +59,7 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   sh_in_dir(gem_root, "git add .")
 
   # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
-  release_it_command = "$(yarn bin)/release-it".dup
+  release_it_command = +"$(yarn bin)/release-it"
   release_it_command << " #{npm_version}" unless npm_version.strip.empty?
   release_it_command << " --non-interactive --npm.publish"
   release_it_command << " --dry-run --verbose" if is_dry_run

data/rakelib/run_rspec.rake

@@ -106,7 +106,7 @@ def run_tests_in(dir, options = {})
 
   command_name = options.fetch(:command_name, path.basename)
   rspec_args = options.fetch(:rspec_args, "")
-  env_vars = "#{options.fetch(:env_vars, '')} TEST_ENV_COMMAND_NAME=\"#{command_name}\"".dup
+  env_vars = +"#{options.fetch(:env_vars, '')} TEST_ENV_COMMAND_NAME=\"#{command_name}\""
   env_vars << "COVERAGE=true" if ENV["USE_COVERALLS"]
   sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 12.0.4
+  version: 12.0.5.beta.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -326,9 +326,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: