react_on_rails 11.2.1 → 12.0.0.pre.beta.2

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "11.2.1".freeze
+  VERSION = "12.0.0-beta.2"
 end

data/lib/react_on_rails/version_checker.rb

@@ -5,6 +5,7 @@ module ReactOnRails
   # against each otherat runtime.
   class VersionChecker
     attr_reader :node_package_version
+
     MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/.freeze
 
     def self.build

data/lib/react_on_rails/webpacker_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module WebpackerUtils
     def self.using_webpacker?
@@ -10,7 +12,9 @@ module ReactOnRails
       Webpacker.dev_server.running?
     end
 
-    # This returns either a URL for the webpack-dev-server or a file path
+    # This returns either a URL for the webpack-dev-server, non-server bundle or
+    # the hashed server bundle if using the same bundle for the client.
+    # Otherwise returns a file path.
     def self.bundle_js_uri_from_webpacker(bundle_name)
       # Note Webpacker 3.4.3 manifest lookup is inside of the public_output_path
       # [2] (pry) ReactOnRails::WebpackerUtils: 0> Webpacker.manifest.lookup("app-bundle.js")
@@ -18,7 +22,14 @@ module ReactOnRails
       # Next line will throw if the file or manifest does not exist
       hashed_bundle_name = Webpacker.manifest.lookup!(bundle_name)
 
-      if Webpacker.dev_server.running?
+      # support for hashing the server-bundle and having that built
+      # by a webpack watch process and not served by the webpack-dev-server, then we
+      # need an extra config value "same_bundle_for_client_and_server" where a value of false
+      # would mean that the bundle is created by a separate webpack watch process.
+      is_server_bundle = bundle_name == ReactOnRails.configuration.server_bundle_js_file
+
+      if Webpacker.dev_server.running? && (!is_server_bundle ||
+        ReactOnRails.configuration.same_bundle_for_client_and_server)
         "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
       else
         File.expand_path(File.join("public", hashed_bundle_name)).to_s

data/lib/tasks/assets.rake

@@ -1,48 +1,25 @@
 # frozen_string_literal: true
 
-require "react_on_rails/assets_precompile"
-require "active_support"
-
-if defined?(Sprockets)
-  namespace :react_on_rails do
-    namespace :assets do
-      desc "Creates non-digested symlinks for the assets in the public asset dir"
-      task symlink_non_digested_assets: :"assets:environment" do
-        ReactOnRails::AssetsPrecompile.new.symlink_non_digested_assets
-      end
+# Important: The default assets:precompile is modified ONLY if the rails/webpacker webpack config
+# does not exist!
 
-      desc "Cleans all broken symlinks for the assets in the public asset dir"
-      task delete_broken_symlinks: :"assets:environment" do
-        ReactOnRails::AssetsPrecompile.new.delete_broken_symlinks
-      end
-
-      # In this task, set prerequisites for the assets:precompile task
-      desc <<-DESC.strip_heredoc
-        Create webpack assets before calling assets:environment
-        The webpack task must run before assets:environment task.
-        Otherwise Sprockets cannot find the files that webpack produces.
-        This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
-      DESC
-      task compile_environment: :webpack do
-        Rake::Task["assets:environment"].invoke
-      end
+require "active_support"
 
-      desc "Delete assets created with webpack, in the generated assetst directory (/app/assets/webpack)"
-      task clobber: :environment do
-        ReactOnRails::AssetsPrecompile.new.clobber
-      end
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+webpacker_webpack_config_abs_path = File.join(Rails.root, "config/webpack/#{ENV["NODE_ENV"]}.js")
+webpack_config_path = Pathname.new(webpacker_webpack_config_abs_path).relative_path_from(Rails.root).to_s
+
+unless File.exists?(webpacker_webpack_config_abs_path)
+  if Rake::Task.task_defined?("assets:precompile")
+    Rake::Task["assets:precompile"].enhance do
+      Rake::Task["react_on_rails:assets:webpack"].invoke
+      puts "Invoking task wepacker:clean from React on Rails"
+      Rake::Task["webpacker:clean"].invoke
     end
+  else
+    Rake::Task.define_task("assets:precompile" => ["react_on_rails:assets:webpack"])
   end
-
-  # These tasks run as pre-requisites of assets:precompile.
-  # Note, it's not possible to refer to ReactOnRails configuration values at this point.
-  Rake::Task["assets:precompile"]
-    .clear_prerequisites
-    .enhance([:environment, "react_on_rails:assets:compile_environment"])
-    .enhance do
-      Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
-      Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
-    end
 end
 
 # Sprockets independent tasks
@@ -53,13 +30,11 @@ namespace :react_on_rails do
       Uses command defined with ReactOnRails.configuration.build_production_command
 
       sh "#{ReactOnRails::Utils.prepend_cd_node_modules_directory('<ReactOnRails.configuration.build_production_command>')}"
+
+      Note: This command is not automatically added to assets:precompile if the rails/webpacker
+      configuration file #{webpack_config_path} exists.
     DESC
     task webpack: :locale do
-      if Rake::Task.task_defined?("webpacker:compile")
-        # TODO: Eventually, this will need reconsideration if we use any of the Webpacker compilation
-        Rake::Task["webpacker:compile"].clear
-      end
-
       if ReactOnRails.configuration.build_production_command.present?
         sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
           ReactOnRails.configuration.build_production_command

data/lib/tasks/locale.rake

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require "react_on_rails/locales_to_js"
+require "react_on_rails/locales/base"
+require "react_on_rails/locales/to_js"
+require "react_on_rails/locales/to_json"
 require "active_support"
 
 namespace :react_on_rails do
@@ -10,6 +12,6 @@ namespace :react_on_rails do
     the "ReactOnRails.configuration.i18n_dir".
   DESC
   task locale: :environment do
-    ReactOnRails::LocalesToJs.new
+    ReactOnRails::Locales.compile
   end
 end

data/package-scripts.yml

@@ -1,12 +1,12 @@
 scripts:
   lint:
-    description: Run all linters (eslint, flow)
+    description: Run all linters (eslint, tsc)
     script: concurrently --prefix "[{name}]" --names "ESLINT" -c "blue,yellow,magenta,orange" "nps eslint"
 
   eslint:
     default:
       description: Run eslint.
-      script: eslint . --ext ".js,.jsx"
+      script: eslint . --ext ".js,.jsx,.ts"
     fix:
       description: Run eslint and auto-fix.
       script: nps "eslint --fix"
@@ -17,30 +17,33 @@ scripts:
   format:
     default:
       description: Format files using prettier.
-      script: concurrently --prefix "[{name}]" --names "js,json" -c "yellow,magenta,green" "nps format.js" "nps format.json"
+      script: concurrently --prefix "[{name}]" --names "ts,js,json" -c "yellow,magenta,green" "nps format.js" "nps format.json"
     listDifferent:
       description: Check that all files were formatted using prettier.
       script: |
         concurrently \
           --prefix "[{name}]" \
-          --names "js,css,json" \
-          -c "yellow,magenta,green" \
+          --names "ts,js,json" \
+          -c "yellow,magenta" \
           "nps format.js.listDifferent" \
           "nps format.json.listDifferent"
     js:
       default:
         description: Run prettier-eslint on JS.
-        script: prettier "packages/**/*.@(js|jsx)" "spec/dummy/client/app/**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --write
+        #script: prettier "packages/**/*.@(js|jsx)" "spec/dummy/client/app/**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --write
+        script: prettier "**/*.@(js|jsx)" --write
       listDifferent:
         description: Check if any JS files would change by running prettier-eslint.
-        script: prettier "**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --list-different
+        # script: prettier "**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --list-different
+        script: prettier "**/*.@(js|jsx)" --list-different
     json:
       default:
         description: Run prettier on JSON files.
         script: rm -rf packages/vm-renderer/tests/tmp && prettier "**/*.json" --write
       listDifferent:
         description: Check if any JSON files would change by running prettier-eslint.
-        script: prettier "**/*.json" "../spec/**/*.json" --list-different
+        script: prettier "**/*.json" --list-different
+
   renderer:
     description: Starts the node renderer.
     script: node renderer.js

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "11.2.1",
+  "version": "12.0.0-beta.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -9,70 +9,75 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/plugin-transform-typescript": "^7.8.7",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/types": "^7.0.0",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^13.9.0",
+    "@types/react": "^16.9.23",
+    "@types/react-dom": "^16.9.5",
+    "@types/turbolinks": "^5.2.0",
+    "@typescript-eslint/eslint-plugin": "^2.23.0",
+    "@typescript-eslint/parser": "^2.23.0",
     "babel-loader": "^8.0.2",
-    "babel-tape-runner": "^3.0.0",
     "babelify": "^10.0.0",
     "blue-tape": "^1.0.0",
     "create-react-class": "^15.6.0",
-    "eslint": "^5.7.0",
-    "eslint-config-prettier": "^3.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-config-shakacode": "^16.0.1",
     "eslint-plugin-import": "^2.6.1",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-react": "^7.1.0",
-    "flow-bin": "^0.83.0",
+    "jest": "^25.1.0",
     "jsdom": "^11.1.0",
     "nps": "^5.9.3",
-    "prettier": "^1.14.3",
-    "prettier-eslint-cli": "^4.7.1",
+    "prettier": "^2.0.1",
+    "prettier-eslint-cli": "^5.0.0",
     "prop-types": "^15.5.10",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "react-transform-hmr": "^1.0.4",
     "redux": "^4.0.1",
     "release-it": "^8.2.0",
-    "tap-spec": "^5.0.0",
-    "tape": "^4.7.0",
+    "ts-jest": "^25.2.1",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^3.8.3",
     "webpack": "^3.4.1",
     "webpack-manifest-plugin": "^1.2.1"
   },
   "dependencies": {
-    "@babel/runtime-corejs2": "^7.0.0"
+    "@babel/runtime-corejs3": "^7.9.6",
+    "concurrently": "^5.1.0"
   },
   "peerDependencies": {
     "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",
+    "start": "nps",
     "prepare": "yarn run build",
-    "prepublish": "npm run prepare",
-    "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",
+    "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",
@@ -91,9 +96,5 @@
   "bugs": {
     "url": "https://github.com/shakacode/react_on_rails/issues"
   },
-  "jest": {
-    "verbose": true,
-    "testURL": "http://localhost/"
-  },
   "homepage": "https://github.com/shakacode/react_on_rails#readme"
 }

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

@@ -69,12 +69,6 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   # Release the new gem version
   unless is_dry_run
     sh_in_dir(gem_root, "gem release")
-
-    # Update master with new npm version
-    sleep 5 # short pause to make sure npmjs has time to update
-    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"