react_on_rails 9.0.0.beta.11 → 9.0.0.beta.12

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb

@@ -50,7 +50,7 @@ Detected the following stale generated files:
   #{stale_files.join("\n  ")}
 
 React on Rails will ensure your JavaScript generated files are up to date, using your
-/client level package.json `#{ReactOnRails.configuration.npm_build_test_command}` command.
+`#{ReactOnRails::Utils.prepend_cd_node_modules_directory(ReactOnRails.configuration.build_test_command)}` command.
 
         MSG
         # rubocop:enable Layout/IndentHeredoc

data/lib/react_on_rails/test_helper/webpack_assets_compiler.rb

@@ -8,7 +8,9 @@ module ReactOnRails
       def compile_assets
         puts "\nBuilding Webpack assets..."
 
-        cmd = "cd client && #{ReactOnRails.configuration.npm_build_test_command}"
+        cmd = ReactOnRails::Utils.prepend_cd_node_modules_directory(
+          ReactOnRails.configuration.build_test_command
+        )
 
         ReactOnRails::Utils.invoke_and_exit_if_failed(cmd, "Error in building webpack assets!")
 

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -10,16 +10,18 @@ module ReactOnRails
   module TestHelper
     class WebpackAssetsStatusChecker
       include Utils::Required
-      # client_dir is typically /client, where all client files go
-      attr_reader :client_dir, :generated_assets_dir
+      # source_path is typically configured in the webpacker.yml file
+      # for `source_path`
+      # or for legacy React on Rails, it's /client, where all client files go
+      attr_reader :source_path, :generated_assets_dir
 
       def initialize(
         generated_assets_dir: required("generated_assets_dir"),
-        client_dir: required("client_dir"),
+        source_path: required("source_path"),
         webpack_generated_files: required("webpack_generated_files")
       )
         @generated_assets_dir = generated_assets_dir
-        @client_dir = client_dir
+        @source_path = source_path
         @webpack_generated_files = webpack_generated_files
       end
 
@@ -53,13 +55,15 @@ module ReactOnRails
           webpack_generated_files = @webpack_generated_files.map do |bundle_name|
             ReactOnRails::Utils.bundle_js_file_path(bundle_name)
           end
+
           if webpack_generated_files.present?
             webpack_generated_files
           else
             file_list = make_file_list(make_globs(generated_assets_dir)).to_ary
             puts "V" * 80
             puts "Please define config.webpack_generated_files (array) so the test helper knows "\
-            "which files are required."
+            "which files are required. If you are using webpacker, you typically need to only "\
+            "include 'manifest.json'."
             puts "Detected the possible following files to check for webpack compilation in "\
               "#{generated_assets_dir}"
             puts file_list.join("\n")
@@ -70,7 +74,7 @@ module ReactOnRails
       end
 
       def client_files
-        @client_files ||= make_file_list(make_globs(client_dir)).to_ary
+        @client_files ||= make_file_list(make_globs(source_path)).to_ary
       end
 
       def make_globs(dirs)

data/lib/react_on_rails/utils.rb

@@ -81,8 +81,8 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
 
     def self.bundle_js_file_path(bundle_name)
       if using_webpacker?
-        # Next line will throw if the file or manifest does not exist
-        Rails.root.join(File.join("public", Webpacker.manifest.lookup(bundle_name))).to_s
+        return bundle_name if bundle_name == "manifest.json"
+        bundle_js_file_path_from_webpacker(bundle_name)
       else
         # Default to the non-hashed name in the specified output directory, which, for legacy
         # React on Rails, this is the output directory picked up by the asset pipeline.
@@ -116,14 +116,45 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
       end
     end
 
+    def self.prepend_cd_node_modules_directory(cmd)
+      return cmd unless ReactOnRails.configuration.node_modules_location.present?
+      "cd #{ReactOnRails.configuration.node_modules_location} && #{cmd}"
+    end
+
+    def self.source_path
+      using_webpacker? ? webpacker_source_path : ReactOnRails.configuration.node_modules_location
+    end
+
+    def self.generated_assets_dir
+      using_webpacker? ? webpacker_public_output_path : ReactOnRails.configuration.generated_assets_dir
+    end
+
     ###########################################################################
     # WEBPACKER WRAPPERS
     ###########################################################################
-
     def self.using_webpacker?
       ActionController::Base.helpers.respond_to?(:asset_pack_path)
     end
 
+    def self.bundle_js_file_path_from_webpacker(bundle_name)
+      hashed_bundle_name = Webpacker.manifest.lookup(bundle_name)
+      if Webpacker.dev_server.running?
+        result = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
+        result
+      else
+        # Next line will throw if the file or manifest does not exist
+        Rails.root.join(File.join("public", hashed_bundle_name)).to_s
+      end
+    end
+
+    def self.webpacker_source_path
+      Webpacker.config.source_path
+    end
+
+    def self.webpacker_public_output_path
+      Webpacker.config.public_output_path
+    end
+
     def self.manifest_exists?
       Webpacker.config.public_manifest_path.exist?
     end

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "9.0.0.beta.11"
+  VERSION = "9.0.0.beta.12"
 end

data/lib/react_on_rails/version_checker.rb

@@ -37,7 +37,7 @@ module ReactOnRails
             "            node package: #{node_package_version.raw}\n" \
             "Ensure the installed version of the gem is the same as the version of \n"\
             "your installed node package.\n"\
-            "Run `cd client && yarn add react-on-rails`"
+            "Run `#{ReactOnRails::Utils.prepend_cd_node_modules_directory('yarn add react-on-rails')}`"
       raise msg
     end
 

data/lib/tasks/assets.rake

@@ -51,11 +51,19 @@ namespace :react_on_rails do
     desc <<-DESC.strip_heredoc
       Compile assets with webpack
       Uses command defined with ReactOnRails.configuration.npm_build_production_command
-      sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
+
+      sh "#{ReactOnRails::Utils.prepend_cd_node_modules_directory('<ReactOnRails.configuration.npm_build_production_command>')}"
     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.npm_build_production_command.present?
-        sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
+        sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
+          ReactOnRails.configuration.npm_build_production_command
+        ).to_s
       end
     end
   end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "9.0.0-beta.11",
+  "version": "9.0.0-beta.12",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -85,5 +85,9 @@
   "bugs": {
     "url": "https://github.com/shakacode/react_on_rails/issues"
   },
-  "homepage": "https://github.com/shakacode/react_on_rails#readme"
+  "homepage": "https://github.com/shakacode/react_on_rails#readme",
+  "dependencies": {
+    "react-on-rails": "^9.0.0-beta.11",
+    "react-redux": "^5.0.6"
+  }
 }

data/rakelib/dummy_apps.rake

@@ -14,6 +14,15 @@ 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

@@ -38,20 +38,16 @@ module ReactOnRails
         Dir.exist?(dir)
       end
 
-      def client_dir
-        File.join(dir, "client")
-      end
-
-      def source_package_json
-        File.join(gem_root, "lib/generators/react_on_rails/templates/base/base/client/package.json.tt")
+      def node_modules_location
+        dir
       end
 
       def node_modules_dir
-        File.join(client_dir, "node_modules")
+        File.join(node_modules_location, "node_modules")
       end
 
       def webpack_bundles_dir
-        File.join(dir, "public", "webpack", "test")
+        File.join(dir, "public", "packs-test")
       end
 
       def webpack_bundles
@@ -68,7 +64,7 @@ module ReactOnRails
       end
 
       def package_json
-        File.join(client_dir, "package.json")
+        File.join(node_modules_location, "package.json")
       end
 
       # Gems we need to add to the Gemfile before bundle installing
@@ -79,7 +75,7 @@ module ReactOnRails
 
       # Options we pass when running `rails new` from the command-line
       def rails_options
-        "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
+        "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record --webpack=react"
       end
 
       %w[gen prepare clean clobber npm_install build_webpack_bundles].each do |task_type|
@@ -108,12 +104,12 @@ module ReactOnRails
         FileList.new(all_files_in_dir(dir)) do |fl|
           fl.include(gemfile)                          # explicitly declared file (dependency of Gemfile.lock)
           fl.include(package_json)                     # explicitly declared file (dependency of NPM Install)
-          fl.exclude(%r{client(/node_modules(.+)?)?$}) # leave node_modules folder
+          fl.exclude(%r{(/node_modules(.+)?)?$})       # leave node_modules folder
         end
       end
 
       def generated_client_files
-        generated_files.exclude { |f| !f.start_with?(client_dir) }
+        generated_files.exclude { |f| !f.start_with?(node_modules_location) }
       end
 
       # generated files plus explicitly included files resulting from running
@@ -129,13 +125,6 @@ module ReactOnRails
         generated_files
       end
 
-      # Assumes we are inside client folder
-      def build_webpack_bundles_shell_commands
-        webpack_command = File.join("$(yarn bin)", "webpack")
-        shell_commands = []
-        shell_commands << "NODE_ENV=test #{webpack_command} --config webpack.config.js"
-      end
-
       # Assumes we are inside a rails app's folder and necessary gems have been installed
       def generator_shell_commands
         shell_commands = []

data/rakelib/examples.rake

@@ -40,14 +40,12 @@ namespace :examples do
 
     # BUILD WEBPACK BUNDLES
     task example_type.build_webpack_bundles_task_name_short => example_type.npm_install_task_name do
-      sh_in_dir(example_type.client_dir, example_type.build_webpack_bundles_shell_commands)
+      sh_in_dir(example_type.node_modules_location, example_type.build_webpack_bundles_shell_commands)
     end
 
-    # YARN INSTALL
+    # # YARN INSTALL
     task example_type.npm_install_task_name_short => example_type.package_json do
-      unless uptodate?(example_type.node_modules_dir, [example_type.source_package_json])
-        sh_in_dir(example_type.client_dir, "yarn install --mutex network")
-      end
+      sh_in_dir(example_type.node_modules_location, "yarn install --mutex network")
     end
 
     # CLEAN

data/rakelib/run_rspec.rake

@@ -18,6 +18,15 @@ 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 --exclude-pattern "\
+                 "\"**/generators/*_spec.rb,**/test_helper/*_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)
@@ -34,6 +43,14 @@ 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"

data/yarn.lock

@@ -2250,6 +2250,10 @@ hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
+hoist-non-react-statics@^2.2.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
+
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -2366,6 +2370,12 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
+invariant@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
 invariant@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.1.tgz#b097010547668c7e337028ebe816ebe36c8a8d54"
@@ -2714,6 +2724,10 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+lodash-es@^4.2.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
+
 lodash-es@^4.2.1:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.16.4.tgz#4dc3e2cf33a8c343028aa7f7e06d1c9697042599"
@@ -3339,6 +3353,10 @@ react-dom@^15.6.1:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-on-rails@^9.0.0-beta.11:
+  version "9.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-9.0.0-beta.11.tgz#f6951129d7c2a67479281ca900859d5ac0aab978"
+
 react-proxy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -3346,6 +3364,17 @@ react-proxy@^1.1.7:
     lodash "^4.6.1"
     react-deep-force-update "^1.0.0"
 
+react-redux@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946"
+  dependencies:
+    hoist-non-react-statics "^2.2.1"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    lodash-es "^4.2.0"
+    loose-envify "^1.1.0"
+    prop-types "^15.5.10"
+
 react-transform-hmr@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz#e1a40bd0aaefc72e8dfd7a7cda09af85066397bb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta.11
+  version: 9.0.0.beta.12
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -325,6 +325,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.rails32
 - KUDOS.md
 - NEWS.md
 - PROJECTS.md
@@ -335,6 +336,7 @@ files:
 - book.json
 - docs/LICENSE.md
 - docs/additional-reading/angular-js-integration-migration.md
+- docs/additional-reading/asset-pipeline.md
 - docs/additional-reading/babel.md
 - docs/additional-reading/code-splitting.md
 - docs/additional-reading/elastic-beanstalk.md
@@ -363,6 +365,7 @@ files:
 - docs/api/javascript-api.md
 - docs/api/ruby-api-hot-reload-view-helpers.md
 - docs/api/ruby-api.md
+- docs/basics/configuration.md
 - docs/basics/generator.md
 - docs/basics/i18n.md
 - docs/basics/installation-overview.md
@@ -381,37 +384,30 @@ files:
 - lib/generators/react_on_rails/generator_helper.rb
 - lib/generators/react_on_rails/generator_messages.rb
 - lib/generators/react_on_rails/install_generator.rb
-- lib/generators/react_on_rails/node_generator.rb
 - lib/generators/react_on_rails/react_no_redux_generator.rb
 - lib/generators/react_on_rails/react_with_redux_generator.rb
 - lib/generators/react_on_rails/templates/.eslintrc
-- lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt
+- lib/generators/react_on_rails/templates/base/base/Procfile.dev
+- lib/generators/react_on_rails/templates/base/base/Procfile.dev-server
 - lib/generators/react_on_rails/templates/base/base/app/controllers/hello_world_controller.rb
+- lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx
+- lib/generators/react_on_rails/templates/base/base/app/javascript/packs/registration.js.tt
 - lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
-- lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb.tt
-- lib/generators/react_on_rails/templates/base/base/client/.babelrc
-- lib/generators/react_on_rails/templates/base/base/client/REACT_ON_RAILS_CLIENT_README.md
-- lib/generators/react_on_rails/templates/base/base/client/app/bundles/HelloWorld/components/HelloWorld.jsx
-- lib/generators/react_on_rails/templates/base/base/client/app/bundles/HelloWorld/startup/registration.jsx.tt
-- lib/generators/react_on_rails/templates/base/base/client/package.json.tt
-- lib/generators/react_on_rails/templates/base/base/client/webpack.config.js
-- lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
-- lib/generators/react_on_rails/templates/base/base/config/webpacker.yml
-- lib/generators/react_on_rails/templates/base/base/package.json.tt
+- lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb
+- lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb
+- lib/generators/react_on_rails/templates/dev_tests/.eslintrc
 - lib/generators/react_on_rails/templates/dev_tests/.rspec
 - lib/generators/react_on_rails/templates/dev_tests/spec/features/hello_world_spec.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/spec_helper.rb
-- lib/generators/react_on_rails/templates/node/base/client/node/package.json
-- lib/generators/react_on_rails/templates/node/base/client/node/server.js
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/actions/helloWorldActionCreators.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/components/HelloWorld.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/constants/helloWorldConstants.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/containers/HelloWorldContainer.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/helloWorldReducer.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/store/helloWorldStore.jsx
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/actions/helloWorldActionCreators.js
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/constants/helloWorldConstants.js
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/containers/HelloWorldContainer.js
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/reducers/helloWorldReducer.js
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.jsx
+- lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/store/helloWorldStore.js
 - lib/react_on_rails.rb
 - lib/react_on_rails/assets_precompile.rb
 - lib/react_on_rails/configuration.rb