react_on_rails 11.0.5 → 13.4.0

data/package.json

@@ -1,73 +1,79 @@
 {
   "name": "react-on-rails",
-  "version": "11.0.5",
+  "version": "13.4.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-react-transform": "^2.0.2",
-    "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-runtime": "^6.25.0",
-    "babel-tape-runner": "^2.0.1",
-    "babel-types": "^6.25.0",
-    "babelify": "^7.3.0",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-typescript": "^7.20.13",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/types": "^7.20.7",
+    "@types/jest": "^28.1.3",
+    "@types/react": "^16.14.35",
+    "@types/react-dom": "^16.9.17",
+    "@types/turbolinks": "^5.2.0",
+    "@types/webpack-env": "^1.18.0",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "babelify": "^10.0.0",
     "blue-tape": "^1.0.0",
-    "create-react-class": "^15.6.0",
-    "eslint": "^3.19.0",
-    "eslint-config-shakacode": "^15.0.0",
-    "eslint-plugin-import": "^2.6.1",
-    "eslint-plugin-jsx-a11y": "^5.1.1",
-    "eslint-plugin-react": "^7.1.0",
-    "flow-bin": "^0.51.1",
-    "jsdom": "^11.1.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.6.1",
-    "react-dom": "^15.6.1",
+    "create-react-class": "^15.7.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^7.0.0",
+    "eslint-config-shakacode": "^16.0.1",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-react": "^7.32.1",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
+    "jsdom": "^16.4.0",
+    "nps": "^5.9.3",
+    "prettier": "^2.8.3",
+    "prettier-eslint-cli": "^5.0.0",
+    "prop-types": "^15.8.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "react-transform-hmr": "^1.0.4",
-    "redux": "^3.7.2",
-    "release-it": "^2.8.2",
-    "tap-spec": "^4.1.1",
-    "tape": "^4.7.0",
-    "webpack": "^3.4.1",
-    "webpack-manifest-plugin": "^1.2.1"
+    "redux": "^4.2.0",
+    "ts-jest": "^28.0.8",
+    "typescript": "^4.9.4"
+  },
+  "dependencies": {
+    "@babel/runtime-corejs3": "^7.12.5",
+    "concurrently": "^5.1.0"
   },
   "peerDependencies": {
-    "babel-runtime": ">= 6",
     "js-yaml": ">= 3.0.0",
-    "react": ">= 0.14",
-    "react-dom": ">= 0.14"
+    "react": ">= 16",
+    "react-dom": ">= 16"
   },
   "files": [
     "node_package/lib",
     "webpackConfigLoader.js"
   ],
   "scripts": {
-    "test": "babel-tape-runner -r node_package/tests/helpers/test_helper.js node_package/tests/*.js | tap-spec",
+    "test": "jest node_package/tests",
     "clean": "rm -rf node_package/lib",
-    "prepublish": "yarn run build",
-    "babel": "babel --out-dir node_package/lib node_package/src",
-    "build": "yarn run clean && yarn run babel",
-    "build-watch": "babel --watch --out-dir node_package/lib node_package/src",
-    "eslint": "eslint .",
-    "flow": "flow check node_package",
-    "lint": "yarn run eslint && yarn run flow",
-    "check": "yarn run lint && yarn run flow && yarn run test",
+    "start": "nps",
+    "prepare": "yarn run build",
+    "build": "yarn run clean && yarn run tsc --declaration",
+    "build-watch": "yarn run clean && yarn run tsc --watch",
+    "lint": "nps eslint",
+    "check": "yarn run lint && yarn run test && yarn run type-check",
+    "type-check": "yarn run tsc --noEmit --noErrorTruncation",
     "prerelease": "yarn run check && yarn run clean && yarn run build",
     "release:patch": "node_package/scripts/release patch",
     "release:minor": "node_package/scripts/release minor",
     "release:major": "node_package/scripts/release major",
     "dummy:install": "rake dummy_apps",
-    "dummy:spec": "rake run_rspec:dummy",
-    "install-react-on-rails": "yarn link"
+    "dummy:spec": "rake run_rspec:dummy"
   },
   "repository": {
     "type": "git",
@@ -86,6 +92,5 @@
   "bugs": {
     "url": "https://github.com/shakacode/react_on_rails/issues"
   },
-  "homepage": "https://github.com/shakacode/react_on_rails#readme",
-  "dependencies": {}
+  "homepage": "https://github.com/shakacode/react_on_rails#readme"
 }

data/rakelib/docker.rake

@@ -6,11 +6,6 @@ namespace :docker do
     sh "docker-compose run lint rake lint:rubocop"
   end
 
-  desc "Run ruby-lint linter from docker"
-  task :ruby do
-    sh "docker-compose run lint rake lint:ruby"
-  end
-
   desc "Run scss-lint linter from docker"
   task :scss do
     sh "docker-compose run lint rake lint:scss"

data/rakelib/dummy_apps.rake

@@ -8,6 +8,7 @@ namespace :dummy_apps do
   task :yarn_install do
     yarn_install_cmd = "yarn install --mutex network"
     sh_in_dir(dummy_app_dir, yarn_install_cmd)
+    sh_in_dir(dummy_app_dir, "yalc link react-on-rails")
   end
 
   task dummy_app: [:yarn_install] do
@@ -15,16 +16,12 @@ namespace :dummy_apps do
     bundle_install_in(dummy_app_dir)
   end
 
-  task :dummy_no_webpacker do
-    npm_install_cmd = "npm install"
-    install_react_on_rails_cmd = "yarn run install-react-on-rails"
-    dummy_app_dir = File.join(gem_root, "spec/dummy_no_webpacker")
-    sh_in_dir(File.join(gem_root, "spec/dummy_no_webpacker/client"), npm_install_cmd)
-    sh_in_dir(dummy_app_dir, install_react_on_rails_cmd)
-    sh_in_dir(dummy_app_dir, "BUNDLE_GEMFILE=Gemfile.rails32 bundle install")
+  task :generate_packs do
+    dummy_app_dir = File.join(gem_root, "spec/dummy")
+    sh_in_dir(dummy_app_dir, "bundle exec rake react_on_rails:generate_packs")
   end
 
-  task dummy_apps: %i[dummy_app node_package] do
+  task dummy_apps: %i[dummy_app node_package generate_packs] do
     puts "Prepared all Dummy Apps"
   end
 end

data/rakelib/example_type.rb

@@ -45,12 +45,21 @@ module ReactOnRails
       # Gems we need to add to the Gemfile before bundle installing
       def required_gems
         relative_gem_root = Pathname(gem_root).relative_path_from(Pathname(dir))
-        ["gem 'react_on_rails', path: '#{relative_gem_root}'"]
+        [
+          "gem 'react_on_rails', path: '#{relative_gem_root}'",
+          "gem 'shakapacker'"
+        ]
       end
 
       # Options we pass when running `rails new` from the command-line.
+      attr_writer :rails_options
+
       def rails_options
-        "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
+        @rails_options ||= if ReactOnRails::Utils.rails_version_less_than("7.0")
+                             "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record -J"
+                           else
+                             "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record -j webpack"
+                           end
       end
 
       %w[gen clobber npm_install build_webpack_bundles].each do |task_type|
@@ -72,7 +81,7 @@ module ReactOnRails
       # Assumes we are inside a rails app's folder and necessary gems have been installed
       def generator_shell_commands
         shell_commands = []
-        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings"
+        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings --force"
         shell_commands << "rails generate react_on_rails:dev_tests #{generator_options}"
       end
 

data/rakelib/examples.rake

@@ -6,6 +6,8 @@
 # Also see example_type.rb
 
 require "yaml"
+require "rails/version"
+
 require_relative "example_type"
 require_relative "task_helpers"
 
@@ -14,7 +16,7 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
   # Loads data from examples_config.yml and instantiates corresponding ExampleType objects
   examples_config_file = File.expand_path("examples_config.yml", __dir__)
   examples_config = symbolize_keys(YAML.safe_load(File.read(examples_config_file)))
-  examples_config[:example_type_data].each { |example_type_data| ExampleType.new(symbolize_keys(example_type_data)) }
+  examples_config[:example_type_data].each { |example_type_data| ExampleType.new(**symbolize_keys(example_type_data)) }
 
   # Define tasks for each example type
   ExampleType.all.each do |example_type|
@@ -28,13 +30,12 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
     desc "Generates #{example_type.name_pretty}"
     task example_type.gen_task_name_short => example_type.clobber_task_name do
       mkdir_p(example_type.dir)
+      example_type.rails_options += "--skip-javascript"
       sh_in_dir(examples_dir, "rails new #{example_type.name} #{example_type.rails_options}")
       sh_in_dir(example_type.dir, "touch .gitignore")
-      sh_in_dir(example_type.dir, "rake webpacker:install")
-      sh_in_dir(example_type.dir, "bundle binstubs --path=#{example_type.dir}/bin webpacker")
-      sh_in_dir(example_type.dir, "rake webpacker:install:react")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
+      sh_in_dir(example_type.dir, "rake webpacker:install")
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)
       sh_in_dir(example_type.dir, "yarn")
     end

data/rakelib/lint.rake

@@ -2,18 +2,12 @@
 
 require_relative "task_helpers"
 
-namespace :lint do # rubocop:disable Metrics/BlockLength
+namespace :lint do
   include ReactOnRails::TaskHelpers
 
   desc "Run Rubocop as shell"
   task :rubocop do
-    sh_in_dir(gem_root, "bundle exec rubocop .")
-  end
-
-  desc "Run ruby-lint as shell"
-  task :ruby do
-    puts "See /ruby-lint.yml for what directories are included."
-    sh_in_dir(gem_root, "bundle exec ruby-lint .")
+    sh_in_dir(gem_root, "bundle exec rubocop --version", "bundle exec rubocop .")
   end
 
   desc "Run scss-lint as shell"
@@ -23,16 +17,11 @@ namespace :lint do # rubocop:disable Metrics/BlockLength
 
   desc "Run eslint as shell"
   task :eslint do
-    sh_in_dir(gem_root, "yarn run eslint")
-  end
-
-  desc "Run flow from shell"
-  task :flow do
-    sh_in_dir(gem_root, "yarn run flow")
+    sh_in_dir(gem_root, "yarn run eslint --version", "yarn run eslint .")
   end
 
-  desc "Run all eslint, flow, rubocop linters. Skip ruby-lint and scss"
-  task lint: %i[eslint flow rubocop] do
+  desc "Run all eslint & rubocop linters. Skip scss"
+  task lint: %i[eslint rubocop] do
     puts "Completed all linting"
   end
 end

data/rakelib/node_package.rake

@@ -6,8 +6,8 @@ namespace :node_package do
   include ReactOnRails::TaskHelpers
 
   task :build do
-    puts "Building Node Package and running 'yarn link'"
-    sh "yarn run build && yarn link"
+    puts "Building Node Package and running 'yalc publish'"
+    sh "yarn run build && yalc publish"
   end
 end
 

data/rakelib/release.rake

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
 
+require "bundler"
 require_relative "task_helpers"
 require_relative File.join(gem_root, "lib", "react_on_rails", "version_syntax_converter")
 require_relative File.join(gem_root, "lib", "react_on_rails", "git_utils")
 require_relative File.join(gem_root, "lib", "react_on_rails", "utils")
+
+class RaisingMessageHandler
+  def add_error(error)
+    raise error
+  end
+end
+
+# rubocop:disable Metrics/BlockLength
+
 desc("Releases both the gem and node package using the given version.
 
 IMPORTANT: the gem version must be in valid rubygem format (no dashes).
@@ -12,26 +22,20 @@ for the node package version. This only makes a difference for pre-release
 versions such as `3.0.0.beta.1` (yarn version would be `3.0.0-beta.1`).
 
 This task depends on the gem-release (ruby gem) and release-it (node package)
-which are installed via `bundle install` and `yarn`
+which are installed via `bundle install` and `yarn global add release-it`
 
 1st argument: The new version in rubygem format (no dashes). Pass no argument to
               automatically perform a patch version bump.
 2nd argument: Perform a dry run by passing 'true' as a second argument.
 
-Example: `rake release[2.1.0,false]`")
+Note, accept defaults for npmjs options. Script will pause to get 2FA tokens.
 
-# rubocop:disable Metrics/BlockLength
+Example: `rake release[2.1.0,false]`")
 task :release, %i[gem_version dry_run tools_install] do |_t, args|
   include ReactOnRails::TaskHelpers
 
-  class MessageHandler
-    def add_error(error)
-      raise error
-    end
-  end
-
   # Check if there are uncommited changes
-  ReactOnRails::GitUtils.uncommitted_changes?(MessageHandler.new)
+  ReactOnRails::GitUtils.uncommitted_changes?(RaisingMessageHandler.new)
   args_hash = args.to_hash
 
   is_dry_run = ReactOnRails::Utils.object_to_boolean(args_hash[:dry_run])
@@ -41,7 +45,7 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   npm_version = if gem_version.strip.empty?
                   ""
                 else
-                  VersionSyntaxConverter.new.rubygem_to_npm(gem_version)
+                  ReactOnRails::VersionSyntaxConverter.new.rubygem_to_npm(gem_version)
                 end
 
   # Having the examples prevents publishing
@@ -56,23 +60,33 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   # Update dummy app's Gemfile.lock
   bundle_install_in(dummy_app_dir)
 
-  # Stage changes so far
-  sh_in_dir(gem_root, "git add .")
-
+  puts "Carefully add your OTP for NPM. If you get an error, 'git reset --hard' and start over."
   # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
-  release_it_command = "$(yarn bin)/release-it --non-interactive --npm.publish".dup
-  release_it_command << " --dry-run --verbose" if is_dry_run
+  release_it_command = +"release-it"
   release_it_command << " #{npm_version}" unless npm_version.strip.empty?
+  release_it_command << " --npm.publish --no-git.requireCleanWorkingDir"
+  release_it_command << " --dry-run --verbose" if is_dry_run
   sh_in_dir(gem_root, release_it_command)
 
   # Release the new gem version
-  unless is_dry_run
-    sh_in_dir(gem_root, "gem release")
 
-    # Update master with new npm version
-    sh_in_dir(File.join(gem_root, "spec", "dummy", "client"), "yarn add react-on-rails@#{npm_version} --exact")
-    sh_in_dir(gem_root, "git commit -am 'Updated spec/dummy/client/package.json latest version'")
-    sh_in_dir(gem_root, "git push")
-  end
+  puts "Carefully add your OTP for Rubygems. If you get an error, run 'gem release' again."
+  sh_in_dir(gem_root, "gem release") unless is_dry_run
+
+  msg = <<~MSG
+    Once you have successfully published, run these commands to update the spec apps:
+
+    cd #{dummy_app_dir}; bundle update react_on_rails
+    cd #{gem_root}#{' '}
+    git commit -a -m 'Update Gemfile.lock for spec app'
+    git push
+  MSG
+  puts msg
 end
 # rubocop:enable Metrics/BlockLength
+
+task :test do
+  unbundled_sh_in_dir(gem_root, "cd #{dummy_app_dir}; bundle update react_on_rails")
+  sh_in_dir(gem_root, "git commit -a -m 'Update Gemfile.lock for spec app'")
+  sh_in_dir(gem_root, "git push")
+end

data/rakelib/run_rspec.rake

@@ -18,40 +18,18 @@ namespace :run_rspec do
     run_tests_in("", rspec_args: File.join("spec", "react_on_rails"))
   end
 
-  desc "Run RSpec with rails32 gemfile"
-  task :gem_rails32 do
-    rspec_args = "spec/react_on_rails --tag ~webpacker --exclude-pattern "\
-                 "\"**/generators/*_spec.rb,"\
-                 "**/test_helper/webpack_*_spec.rb\""
-    run_tests_in("",
-                 rspec_args: rspec_args,
-                 env_vars: "BUNDLE_GEMFILE=spec/dummy_no_webpacker/Gemfile.rails32")
-  end
-
   desc "Runs dummy rspec with turbolinks"
   task dummy: ["dummy_apps:dummy_app"] do
-    clean_gen_assets(spec_dummy_dir)
-    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir)
   end
 
   desc "Runs dummy rspec without turbolinks"
   task dummy_no_turbolinks: ["dummy_apps:dummy_app"] do
-    clean_gen_assets(spec_dummy_dir)
-    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir,
                  env_vars: "DISABLE_TURBOLINKS=TRUE",
                  command_name: "dummy_no_turbolinks")
   end
 
-  desc "Runs dummy_no_webpacker rspec"
-  task :dummy_no_webpacker do
-    dummy_app_dir = File.join(gem_root, "spec/dummy_no_webpacker")
-    clean_gen_assets(dummy_app_dir)
-    run_tests_in(dummy_app_dir,
-                 env_vars: "BUNDLE_GEMFILE=Gemfile.rails32")
-  end
-
   # Dynamically define Rake tasks for each example app found in the examples directory
   ExampleType.all.each do |example_type|
     desc "Runs RSpec for #{example_type.name_pretty} only"
@@ -65,15 +43,15 @@ namespace :run_rspec do
     ExampleType.all.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
   end
 
-  desc "(HACK) Run RSpec on spec/empty_spec in order to have SimpleCov generate a coverage report from cache"
-  task :empty do
-    sh %(#{ENV['USE_COVERALLS'] ? 'COVERAGE=true' : ''} rspec spec/empty_spec.rb)
-  end
-
   Coveralls::RakeTask.new if ENV["USE_COVERALLS"] == "TRUE"
 
   desc "run all tests no examples"
-  task all_but_examples: %i[gem dummy_no_turbolinks dummy empty js_tests] do
+  task all_but_examples: %i[gem dummy_no_turbolinks dummy js_tests] do
+    puts "Completed all RSpec tests"
+  end
+
+  desc "run all dummy tests"
+  task all_dummy: %i[dummy_no_turbolinks dummy] do
     puts "Completed all RSpec tests"
   end
 
@@ -99,16 +77,15 @@ task run_rspec: ["run_rspec:run_rspec"]
 private
 
 def calc_path(dir)
-  path = if dir.is_a?(String)
-           if dir.start_with?(File::SEPARATOR)
-             Pathname.new(dir)
-           else
-             Pathname.new(File.join(gem_root, dir))
-           end
-         else
-           dir
-         end
-  path
+  if dir.is_a?(String)
+    if dir.start_with?(File::SEPARATOR)
+      Pathname.new(dir)
+    else
+      Pathname.new(File.join(gem_root, dir))
+    end
+  else
+    dir
+  end
 end
 
 # Runs rspec in the given directory.
@@ -120,12 +97,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
-
-def clean_gen_assets(dir)
-  path = calc_path(dir)
-  sh_in_dir(path.realpath, "yarn run build:clean")
-end

data/rakelib/task_helpers.rb

@@ -16,14 +16,26 @@ module ReactOnRails
       File.join(gem_root, "spec/dummy")
     end
 
+    # Executes a string or an array of strings in a shell in the given directory in an unbundled environment
+    def sh_in_dir(dir, *shell_commands)
+      shell_commands.flatten.each { |shell_command| sh %(cd #{dir} && #{shell_command.strip}) }
+    end
+
     # Executes a string or an array of strings in a shell in the given directory
-    def sh_in_dir(dir, shell_commands)
-      shell_commands = [shell_commands] if shell_commands.is_a?(String)
-      shell_commands.each { |shell_command| sh %(cd #{dir} && #{shell_command.strip}) }
+    def unbundled_sh_in_dir(dir, *shell_commands)
+      Dir.chdir(dir) do
+        # Without `with_unbundled_env`, running bundle in the child directories won't correctly
+        # update the Gemfile.lock
+        Bundler.with_unbundled_env do
+          shell_commands.flatten.each do |shell_command|
+            sh(shell_command.strip)
+          end
+        end
+      end
     end
 
     def bundle_install_in(dir)
-      sh_in_dir(dir, "bundle install")
+      unbundled_sh_in_dir(dir, "bundle install")
     end
 
     def bundle_install_in_no_turbolinks(dir)

data/react_on_rails.gemspec

@@ -23,37 +23,21 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.1.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "addressable"
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
-  s.add_dependency "rails", ">= 3.2"
+  s.add_dependency "rails", ">= 5.2"
   s.add_dependency "rainbow", "~> 3.0"
 
-  s.add_development_dependency "awesome_print"
-  s.add_development_dependency "bundler", "~> 1"
-  s.add_development_dependency "coveralls"
+  s.add_development_dependency "bundler", "~> 2"
   s.add_development_dependency "gem-release"
-  s.add_development_dependency "generator_spec"
-  s.add_development_dependency "listen"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "pry-doc"
-  s.add_development_dependency "pry-rescue"
-  s.add_development_dependency "pry-stack_explorer"
-  s.add_development_dependency "pry-state"
-  s.add_development_dependency "pry-toys"
-  s.add_development_dependency "rails", "~> 5.2"
-
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rubocop", "0.55.0"
-
   s.post_install_message = '
 --------------------------------------------------------------------------------
-Email contact@shakacode.com for access to our slack room and information about our "pro support plan"
-which supports better performance, via caching helpers and our node rendering server.
+Checkout https://www.shakacode.com/react-on-rails-pro for information about
+"React on Rails Pro" which includes one hour a month of support and a gem for
+better performance, via caching helpers, and our node rendering server.
 --------------------------------------------------------------------------------
 '
 end

data/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "esModuleInterop": true,
+    "jsx": "react",
+    "lib": ["dom", "es2015"],
+    "module": "CommonJS",
+    "noImplicitAny": true,
+    "outDir": "node_package/lib",
+    "strict": true,
+    "target": "es5"
+  },
+  "include": ["node_package/src/**/*"]
+}

data/webpackConfigLoader.js

@@ -1,4 +1,6 @@
 /**
+ * TODO: THIS SHOULD BE REMOVED
+ *
  * Allow defaults for the config/webpacker.yml. Thee values in this file MUST match values
  * in https://github.com/rails/webpacker/blob/master/lib/install/config/webpacker.yml
  *
@@ -11,15 +13,14 @@ const { env } = require('process');
 const { safeLoad } = require('js-yaml');
 const { readFileSync } = require('fs');
 
-
 function removeOuterSlashes(string) {
   return string.replace(/^\/*/, '').replace(/\/*$/, '');
 }
 
 function formatPublicPath(settings) {
   if (settings.dev_server) {
-    const host = settings.dev_server.host;
-    const port = settings.dev_server.port;
+    const { host } = settings.dev_server;
+    const { port } = settings.dev_server;
     const path = settings.public_output_path;
     const hostWithHttp = `http://${host}:${port}`;
 
@@ -48,7 +49,7 @@ function formatPublicPath(settings) {
  */
 const configLoader = (configPath) => {
   // Some test environments might not have the NODE_ENV set, so we'll have fallbacks.
-  const configEnv = (env.NODE_ENV || env.RAILS_ENV || 'development');
+  const configEnv = env.NODE_ENV || env.RAILS_ENV || 'development';
   const ymlConfigPath = join(configPath, 'webpacker.yml');
   const settings = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv];