react_on_rails 11.0.0 → 12.0.0

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,15 +16,6 @@ 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")
-  end
-
   task dummy_apps: %i[dummy_app node_package] do
     puts "Prepared all Dummy Apps"
   end

data/rakelib/example_type.rb

@@ -49,8 +49,10 @@ module ReactOnRails
       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 ||= "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
       end
 
       %w[gen clobber npm_install build_webpack_bundles].each do |task_type|

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"
 
@@ -28,6 +30,7 @@ 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 += " --webpack" if Rails.version >= "5.1" && Rails.version < "6"
       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")

data/rakelib/lint.rake

@@ -26,13 +26,8 @@ namespace :lint do # rubocop:disable Metrics/BlockLength
     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")
-  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 ruby-lint and 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

@@ -41,7 +41,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
@@ -60,19 +60,15 @@ 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 --non-interactive --npm.publish".dup
-  release_it_command << " --dry-run --verbose" if is_dry_run
+  release_it_command = "$(yarn bin)/release-it".dup
   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
   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
 end
 # rubocop:enable Metrics/BlockLength

data/rakelib/run_rspec.rake

@@ -18,16 +18,6 @@ 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)
@@ -44,14 +34,6 @@ namespace :run_rspec do
                  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"
@@ -77,6 +59,11 @@ namespace :run_rspec 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
+
   desc "run all tests"
   task run_rspec: %i[all_but_examples examples] do
     puts "Completed all RSpec tests"

data/react_on_rails.gemspec

@@ -23,16 +23,17 @@ 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.5.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 "rainbow", "~> 2.2"
+  s.add_dependency "rainbow", "~> 3.0"
+  s.add_dependency "webpacker", ">= 4.0"
 
   s.add_development_dependency "awesome_print"
-  s.add_development_dependency "bundler", "~> 1"
+  s.add_development_dependency "bundler", "~> 2"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "gem-release"
   s.add_development_dependency "generator_spec"
@@ -41,14 +42,12 @@ Gem::Specification.new do |s|
   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.add_development_dependency "rubocop", "0.85.0"
 
   s.post_install_message = '
 --------------------------------------------------------------------------------

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];