react_on_rails 12.0.3.beta.0 → 12.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f71a30ded8cae1a38bfc7f419bbd39eed35d83e365eab74c148102f23e6d083
-  data.tar.gz: 70f4b3c869c3810804c7d01996699a1c7a6c145fca3cc35b7add4e0984c5bbce
+  metadata.gz: d21e318bd7a5cd5a23314d208656044b3b6f6671dc83f856286a251f2fab1e80
+  data.tar.gz: cbdc47532388cb7d82d58407d6df26873836f2ee4c81637cb023ce39b34a649d
 SHA512:
-  metadata.gz: 3849a1ebf62f6d81625c3c23e48dc1928990eecd4acc3d44c005e2d09859d39e86dd4c9a3c35b3db4da70ee8588e406c98d6396f8157a3874c0a83d6629ae901
-  data.tar.gz: 707c8b7a6fe991315b6d433324d4c4fef5a170f1b0b09241d9faee034bd8d82cb2551634a6a157d35af89640017030fccf4a283175118ec1e06f1b4299877389
+  metadata.gz: cddbe6aa508f27ce7517d26dab65c3a28021f6bb0d36d0fb681c033f7811e73f1da8b17e6c3893c4ecedce9731c4dcbf916b058a76823202b38e0ae81eb28b75
+  data.tar.gz: f9cdf4391e482786f77a386f3c12148e4d2ad065f41e109902fed660e074cff5be9c9d6f8cc2b2995279751eb94a76ad12090f9174c689cf92193d58d667d912

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
@@ -31,9 +31,9 @@ aliases:
   - &install-package-node-modules
     name: Install Node modules with Yarn for renderer package
     command: |
+      sudo yarn global add yalc
       yarn install --no-progress --no-emoji
       yarn run eslint -v
-      sudo yarn global add yalc
 
   # Install/update Node modules for dummy app unless existing set of modules is satisfying Yarn.
   - &install-dummy-app-node-modules
@@ -274,6 +274,16 @@ jobs:
           # TODO -- need to leverage Circle CI containers
           command: |
             bundle exec rake run_rspec:all_dummy
+      # The following step will run only if the main job is finished successfully.
+      # Build hook is triggered by curl command described here https://docs.netlify.com/configure-builds/build-hooks/
+      # NETLIFY_HOOK is an environment variable on CircleCI to keep sensitive data outside the repo
+      - run:
+          name: Deploy SC website
+          command: |
+            if [ $CIRCLE_BRANCH = "master" ]; then
+              curl -X POST -d '{}' ${NETLIFY_HOOK}
+            fi
+          when: on_success
       - store_test_results:
           path: ~/rspec
       - store_artifacts:

data/.eslintrc

@@ -1,4 +1,3 @@
----
 extends:
   - eslint-config-shakacode
   - prettier
@@ -32,8 +31,10 @@ overrides:
       - "@typescript-eslint"
     rules:
       "@typescript-eslint/no-namespace": 0
+      "@typescript-eslint/no-shadow": ["error"]
 
 rules:
+  no-shadow: 0
   no-console: 0
   function-paren-newline: 0
   object-curly-newline: 0

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/.prettierrc

@@ -8,9 +8,6 @@ bracketSpacing: true
 jsxBracketSameLine: false
 parser: flow
 
-extends:
-- tslint-config-prettier
-
 overrides:
 - files: "*.@(css|scss)"
   options:

data/.rubocop.yml

@@ -1,7 +1,11 @@
 # This is the configuration used to check the rubocop source code.
 # Check out: https://github.com/bbatsov/rubocop
+require:
+  - rubocop-performance
+  - rubocop-rspec
 
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
   TargetRubyVersion: 2.5
 
@@ -13,34 +17,25 @@ AllCops:
     - '**/*.rake'
 
   Exclude:
-    - 'vendor/**/*'
-    - 'spec/fixtures/**/*'
-    - 'node_modules/**/.*'
-    - 'node_modules/**/*'
+  <% `git status --ignored --porcelain`.lines.grep(/^!! /).each do |path| %>
+    - <%= path.sub(/^!! /, '') %>
+  <% end %>
+    - '**/*.js'
+    - '**/node_modules/**/*'
+    - '**/public/**/*'
+    - '**/tmp/**/*'
     - 'coverage/**/*'
-    - 'db/**/*'
-    - 'db/schema.rb'
-    - 'db/seeds.rb'
-    - 'client/node_modules/**/*.*'
-    - 'client/node_modules/**/.*'
-    - 'bin/**/*'
-    - !ruby/regexp /old_and_unused\.rb$/
-    - 'spec/react_on_rails/dummy-for-generators/**/*'
-    - 'spec/dummy/Procfile.*'
-    - 'spec/dummy/bin/**/*'
-    - 'spec/dummy/node_modules/**/*'
-    - 'spec/dummy/node_modules/**/.*'
-    - 'gen-examples/examples/**/.*'
     - 'gen-examples/examples/**/*'
+    - 'node_modules/**/*'
+    - 'spec/dummy/bin/*'
+    - 'spec/fixtures/**/*'
+    - 'spec/react_on_rails/dummy-for-generators/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
 
 Naming/FileName:
   Exclude:
     - 'Gemfile'
-    - 'spec/dummy/Gemfile'
-
-# Turn off until we require 2.3 ruby
-Style/SafeNavigation:
-  Enabled: false
 
 Layout/LineLength:
   Max: 120
@@ -94,28 +89,41 @@ Metrics/ModuleLength:
 Naming/RescuedExceptionsVariableName:
   Enabled: false
 
-Style/GlobalVars:
+RSpec/AnyInstance:
   Exclude:
-    - 'spec/dummy/config/environments/development.rb'
+    - 'spec/react_on_rails/git_utils_spec.rb'
+    - 'spec/react_on_rails/locales_to_js_spec.rb'
 
-Style/FrozenStringLiteralComment:
-  EnforcedStyle: always
+RSpec/DescribeClass:
+  Enabled: false
 
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
+RSpec/ExampleLength:
+  Enabled: false
 
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
+RSpec/MessageSpies:
+  Enabled: false
 
-Lint/RaiseException:
-  Enabled: true
+RSpec/NestedGroups:
+  Max: 4
 
-Lint/StructNewOverride:
-  Enabled: true
+RSpec/BeforeAfterAll:
+  Exclude:
+    - 'spec/react_on_rails/generators/dev_tests_generator_spec.rb'
+    - 'spec/react_on_rails/generators/install_generator_spec.rb'
 
-Style/ExponentialNotation:
-  Enabled: true
+RSpec/MessageChain:
+  Enabled: false
 
-Style/SlicingWithRange:
-  Enabled: true
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleDescribes:
+  Exclude:
+    - 'spec/dummy/spec/system/integration_spec.rb'
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 12
 
+Style/GlobalVars:
+  Exclude:
+    - 'spec/dummy/config/environments/development.rb'

data/CHANGELOG.md

@@ -17,7 +17,23 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
 
-### [12.0.3] - 2020-09-02
+### [12.2.0] - 2021-03-25
+#### Added
+- Ability to configure server react rendering to throw rather than just logging the error. Useful for
+  React on Rails Pro Node rendering [PR 1365](https://github.com/shakacode/react_on_rails/pull/1365) by [justin808](https://github.com/justin808).
+  
+### [12.1.0] - 2021-03-23
+#### Added
+- Added the ability to assign a module with a `call` method to `config.build_production_command`. See [the configuration docs](./docs/basics/configuration.md). [PR 1362: Accept custom module for config.build_production_command](https://github.com/shakacode/react_on_rails/pull/1362).
+
+#### Fixed
+- Stop setting NODE_ENV value during precompile, as it interferred with rails/webpacker's setting of NODE_ENV to production by default. Fixes [#1334](https://github.com/shakacode/react_on_rails/issues/1334). [PR 1356: Don't set NODE_ENV in assets.rake](https://github.com/shakacode/react_on_rails/pull/1356) by [alexrozanski](https://github.com/alexrozanski).
+
+### [12.0.4] - 2020-11-14
+#### Fixed
+- Install generator now specifies the version. Fixes [React on Rails Generator installs the older npm package #1336](https://github.com/shakacode/react_on_rails/issues/1336). [PR 1338: Fix Generator to use Exact NPM Version](https://github.com/shakacode/react_on_rails/pull/1338) by [justin808](https://github.com/justin808).
+
+### [12.0.3] - 2020-09-20
 #### Fixed
 - Async script loading optimizes page load speed. With this fix, a bundle
   can be loaded "async" and a handler function can determine when to hydrate.
@@ -27,7 +43,7 @@ Changes since last non-beta release.
 
 ### [12.0.2] - 2020-07-09
 #### Fixed
-- Remove dependency upon Redux for Typescript types. [PR 1323](https://github.com/shakacode/react_on_rails/pull/1306) by [justin808](https://github.com/justin808). 
+- Remove dependency upon Redux for Typescript types. [PR 1323](https://github.com/shakacode/react_on_rails/pull/1306) by [justin808](https://github.com/justin808).
 
 ### [12.0.1] - 2020-07-09
 #### Fixed
@@ -53,8 +69,8 @@ invoked to return the React component. In that case, you won't need to pass any
 See [docs/basics/upgrading-react-on-rails](./docs/basics/upgrading-react-on-rails.md#upgrading-to-v12)
 for details.         
 
-#### Other Updates 
-* `react_on_rails` fully supports `rails/webpacker`. The example test app in `spec/dummy` was recently converted over to use rails/webpacker v4+. It's a good example of how to leverage rails/webpacker's webpack configuration for server-side rendering. 
+#### Other Updates
+* `react_on_rails` fully supports `rails/webpacker`. The example test app in `spec/dummy` was recently converted over to use rails/webpacker v4+. It's a good example of how to leverage rails/webpacker's webpack configuration for server-side rendering.
 * Changed the precompile task to use the rails/webpacker one by default
 * Updated generators to use React hooks
 * Requires the use of rails/webpacker view helpers
@@ -69,19 +85,19 @@ for details.
 * Added configuration option `same_bundle_for_client_and_server` with default `false` because
 
   1. Production applications would typically have a server bundle that differs from the client bundle
-  2. This change only affects trying to use HMR with react_on_rails with rails/webpacker. 
-  
-  The previous behavior was to always go to the webpack-dev-server for the server bundle if the 
-  webpack-dev-server was running _and_ the server bundle was found in the `manifest.json`. 
-  
+  2. This change only affects trying to use HMR with react_on_rails with rails/webpacker.
+
+  The previous behavior was to always go to the webpack-dev-server for the server bundle if the
+  webpack-dev-server was running _and_ the server bundle was found in the `manifest.json`.
+
   If you are using the **same bundle for client and server rendering**, then set this configuration option
   to `true`. By [justin808](https://github.com/shakacode/react_on_rails/pull/1240).
-  
+
 * Added support to export locales in JSON format. New option added `i18n_output_format` which allows to
   specify locales format either `JSON` or `JS`. **`JSON` format is now the default.**
- 
+
   **Use this config setting to get the old behavior: config.i18n_output_format = 'js'**
-  
+
   [PR 1271](https://github.com/shakacode/react_on_rails/pull/1271) by [ashgaliyev](https://github.com/ashgaliyev).
 
 - Added Typescript definitions to the Node package. By [justin808](https://github.com/justin808) and [judahmeek](https://github.com/judahmeek) in [PR 1287](https://github.com/shakacode/react_on_rails/pull/1287).
@@ -943,7 +959,10 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/12.0.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/12.2.0...master
+[12.2.0]: https://github.com/shakacode/react_on_rails/compare/12.1.0...12.2.0
+[12.1.0]: https://github.com/shakacode/react_on_rails/compare/12.0.4...12.1.0
+[12.0.4]: https://github.com/shakacode/react_on_rails/compare/12.0.3...12.0.4
 [12.0.3]: https://github.com/shakacode/react_on_rails/compare/12.0.2...12.0.3
 [12.0.2]: https://github.com/shakacode/react_on_rails/compare/12.0.1...12.0.2
 [12.0.1]: https://github.com/shakacode/react_on_rails/compare/12.0.0...12.0.1

data/CONTRIBUTING.md

@@ -5,6 +5,7 @@
 * See other docs in [docs/contributor-info](./docs/contributor-info)
 
 ## To run tests:
+* [Yalc](https://github.com/whitecolor/yalc) must be installed globally for most local development.
 * After updating code via git, to prepare all examples and run all tests:
 
 ```sh
@@ -64,7 +65,7 @@ yarn
 # Update the lib directory with babel compiled files
 yarn run build-watch
 ```
-   
+
 You need to do this once:
 
 ```
@@ -192,7 +193,7 @@ Then run `bundle`.
 
 The main installer can be run with ```rails generate react_on_rails:install```
 
-Then use yalc to add the npm module. 
+Then use yalc to add the npm module.
 
 Be sure that your ran this first at the top level of React on Rails
 

data/Gemfile

@@ -5,36 +5,4 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in react_on_rails.gemspec
 gemspec
 
-# The following gems are dependencies of the gem's dummy/example apps, not the gem itself.
-# They must be defined here because of the way Travis CI works, in that it will only
-# bundle install from a single Gemfile. Therefore, all gems that we will need for any dummy/example
-# app have to be manually added to this file.
-gem "bootsnap", ">= 1.1.0", require: false
-gem "bootstrap-sass"
-gem "jbuilder"
-gem "jquery-rails"
-gem "mini_racer"
-gem "puma"
-gem "rails_12factor"
-gem "ruby-lint", require: false
-gem "sass-rails"
-gem "scss_lint", require: false
-gem "sdoc", group: :doc
-gem "spring"
-gem "sprockets", "~>3.0"
-gem "sqlite3", "~> 1.3.6"
-gem "turbolinks"
-gem "uglifier"
-gem "web-console", group: :development
-
-# below are copied from spec/dummy/Gemfile
-gem "capybara"
-gem "capybara-screenshot"
-gem "launchy"
-gem "rspec-rails"
-gem "rspec-retry"
-gem "selenium-webdriver"
-gem "webpacker", ">= 4.0.0"
-
-gem "equivalent-xml", github: "mbklein/equivalent-xml"
-gem "rainbow"
+eval_gemfile File.expand_path("./Gemfile.development_dependencies", __dir__)

data/Gemfile.development_dependencies

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+gem "webpacker"
+gem "bootsnap", require: false
+gem "rails"
+gem "sqlite3"
+gem "sass-rails"
+gem "uglifier"
+gem "jquery-rails"
+gem "puma"
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem "jbuilder"
+# bundle exec rake doc:rails generates the API under doc/api.
+gem "sdoc", group: :doc
+
+gem "sprockets"
+
+gem "amazing_print"
+gem "mini_racer"
+
+group :development, :test do
+  gem "listen"
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-doc"
+  gem "pry-rails"
+  gem "pry-rescue"
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rspec", require: false
+  gem "scss_lint", require: false
+  gem "spring"
+end
+
+group :test do
+  gem "capybara"
+  gem "capybara-screenshot"
+  gem "coveralls", require: false
+  gem "equivalent-xml"
+  gem "generator_spec"
+  gem "launchy"
+  gem "rspec_junit_formatter"
+  gem "rspec-rails"
+  gem "rspec-retry"
+  gem "selenium-webdriver"
+  gem "webdrivers", "3.9.4"
+end