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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152c5b1177a2a18b4f42911852dc05e8d317ca1d
-  data.tar.gz: d4d456575c0bc79630f9f2ae6df6b38e241437e1
+  metadata.gz: a99cdeb5818a06173daa27fe511864be5f3b6890
+  data.tar.gz: 1e8963da13595accc8eb5c1febab8e0d95c6b8d6
 SHA512:
-  metadata.gz: e8e80dc096f8aac19a20abcc62e7b8a2b249a036fdf933a59cff68e2b3dc6e2521c411e37ce6774b65a5ba2d37bc3fb63e11e1b651eb1c1be53c78b7ca8be7b6
-  data.tar.gz: ece4de2349632633fce5f2a070713a39e686dac7fe34150112455085ee7d91cc6c303608358c8bbed07840f82dd82809e8e39b3628dca49fad9955cec40da50e
+  metadata.gz: 6fbd64f6e6a1535b359a503b484dd35ed967ae3327b990b13fa9a7a6ab1ca47008fcb14defa92abb3ce6ba07e42f6d3ee0eb4f1ef01c6255153bc5205fd7ae94
+  data.tar.gz: 03fa4ec625fe040028715c0860222fe03e3f83f061eb5b23aaac62f8184bfa9ccb4929a800f550312fdbc36d6e82d7dd89cc6fe805e4ecda08c07a20ee11a873

data/.eslintignore

@@ -2,6 +2,7 @@ node_modules
 coverage
 spec/react_on_rails/dummy-for-generators
 spec/dummy
+spec/dummy_no_webpacker
 node_package/lib/
 node_package/tests/node_modules
 node_package/webpack.config.js
@@ -12,3 +13,4 @@ node_package/webpack.config.js
 **/app/assets/javascripts/application.js
 **/coverage/**
 **/cable.js
+**/public/packs*/*

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/Gemfile.rails32.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -27,6 +27,10 @@ AllCops:
     - 'spec/dummy/bin/**/*'
     - 'spec/dummy/client/node_modules/**/*'
     - 'spec/dummy/client/node_modules/**/.*'
+    - 'spec/dummy_no_webpacker/Procfile.*'
+    - 'spec/dummy_no_webpacker/bin/**/*'
+    - 'spec/dummy_no_webpacker/client/node_modules/**/*'
+    - 'spec/dummy_no_webpacker/client/node_modules/**/.*'
     - 'gen-examples/examples/**/.*'
     - 'gen-examples/examples/**/*'
 
@@ -34,6 +38,7 @@ Style/FileName:
   Exclude:
     - 'Gemfile'
     - 'spec/dummy/Gemfile'
+    - 'spec/dummy_no_webpacker/Gemfile'
 
 # Turn off until we require 2.3 ruby
 Style/SafeNavigation:

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   # Rails 5 requires 2.2
   - 2.3.1
   - 2.4.1
+  - 2.2.6
 services:
   - docker
 
@@ -17,6 +18,7 @@ cache:
 
 gemfile:
   - spec/dummy/Gemfile
+  - spec/dummy_no_webpacker/Gemfile.rails32
 
 env:
   global:
@@ -49,6 +51,15 @@ before_script:
 script:
   - bundle exec rake
 
+matrix:
+  exclude:
+    - gemfile: spec/dummy_no_webpacker/Gemfile.rails32
+      rvm: 2.3.1
+    - gemfile: spec/dummy_no_webpacker/Gemfile.rails32
+      rvm: 2.4.1
+    - gemfile: spec/dummy/Gemfile
+      rvm: 2.2.6
+
 notifications:
   slack:
     secure: LfcUk4AJ4vAxWwRIyw4tFh8QNbYefMwfG/oLfsN3CdRMWMOtCOHR1GGsRhAOlfVVJ/FvHqVqWj5gK7z7CaO5Uvl7rD3/zJ8QzExKx/iH9yWj55iIPuKLzwFNnBwRpFW/cqyU2lFPPRxGD50BUn3c+qybkuSqtKZ6qtTowwqlxLa5iyM3N95aZp7MEIKCP7cPcnHfLbJyP8wBpotp/rtw62eXM2HIRJJwgjcp+n+My7VFR9DnBXNFf6R91aZHM4U4cHHDbu15HFtH8honVrzK1JQdyqMNHga+j04dFuaS7z9Q369/hsELMOBp/227+Pz7ZRfWZFK4UASguOvyeX7RmGTRpTuWLm1XJeUzfsPZVROecaSVQBve+U7F12yKqilt97QlvRXn2EGyBILqvxtFNNR4S9kgAf72/6EFgiM1TKq7i9zy6lVOnagU2+7amq7UeopX1uoFsUfNKMR7YbgV1WjF0IK95UP0b0/7ZOJlPYgi5zzkQi129qAFWSMmxGk+ZpsttHh/tjJtvAh0A3mHq/zb5w4ub/MbSyZqeDUNgGj72QArOWUFSAStQT1ybsVLeDoKPgOvVq7OV1D64rpcHjBXcqOCit8tDZ+TqkFhcYJo2cITSaqE4zJXn+4F5s7So5O8CyfKYQq+kFJCooYGmfgTUckJpGl7eIvKmL4TN9Q=

data/CHANGELOG.md

@@ -14,11 +14,16 @@ Changes since last non-beta release.
 ## 9.0 from 8.x. Upgrade Instructions
 All 9.0.0 beta versions can be viewed in [PR 908](https://github.com/shakacode/react_on_rails/pull/908)
 
-- Update the gemfile. Switch over to using Webpacker on the ShakaCode branch:
+- Breaking Configuration Changes
+  1. Added `config.node_modules_location` which defaults to `""` if Webpacker is installed. You may want to set this to 'client'` to `config/initializers/react_on_rails.rb` to keep your node_modules inside of `/client`
+  2. Renamed
+   * config.npm_build_test_command ==> config.build_test_command
+   * config.npm_build_production_command ==> config.build_production_command
+
+- Update the gemfile. Switch over to using the webpacker gem.
 
 ```rb
-gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-    branch: "issue-464-merge-webpacker-lite-into-webpacker-v5"
+gem "webpacker"
 ```
 
 - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration.
@@ -80,22 +85,26 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
   - Rename `webpack_public_output_dir` to `public_output_path`.
   
 - Edit your Procfile.dev
-  - For static loading, either:
-    - Comment out or remove the dev_server area of your config.
-    - Edit your static procfile to set env value WEBPACKER_DEV_SERVER=FALSE
-  - For hot loading, either:
+  - Remove the env value WEBPACKER_DEV_SERVER as it's not used
+  - For hot loading:
     - Set the `hmr` key in your `webpacker.yml` to `true`.
-    - Edit your hot procfile to set env value WEBPACKER_HMR=TRUE
     
     
 #### Troubleshooting
-* Be sure to    
    
     
   
 ### [9.0.0]
 *Diffs for the beta to master*
 
+### [9.0.0-beta.12]
+- Updated for latest rails/webpacker using the official gem
+- hot reloading working in generator
+
+### [9.0.0-beta.11]
+- Updated for latest rails_webpacker.
+- hot reloading working in spec/dummy
+
 ### [9.0.0-beta.10]
 - Updated for the latest rails/webpacker. Added the cache_manifest setting.
 
@@ -131,6 +140,10 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
 ### [9.0.0-beta.1]
 - First version of depending on Webpacker rather than Webpacker Lite  
 
+### [8.0.7]
+#### fixed
+- Fixes generator bug by keeping blank line at top in case existing .gitignore does not end in a newline. [#916](https://github.com/shakacode/react_on_rails/pull/916) by [justin808](https://github.com/justin808).
+
 ### [8.0.6]
 #### fixed
 - Fixes server rendering when using a CDN. Server rendering would try to fetch a file with the "asset_host". This change updates the webpacker_lite dependency to 2.1.0 which has a new helper `pack_path`. [#901](https://github.com/shakacode/react_on_rails/pull/901) by [justin808](https://github.com/justin808). Be sure to update webpacker_lite to 2.1.0.
@@ -751,6 +764,7 @@ Best done with Object destructing:
 
 [Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.11
 [9.0.0]: https://github.com/shakacode/react_on_rails/compare/master...9.0.0-beta.11
+[9.0.0-beta.12]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.11...9.0.0-beta.12
 [9.0.0-beta.11]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.10...9.0.0-beta.11
 [9.0.0-beta.10]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.9...9.0.0-beta.10
 [9.0.0-beta.9]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.8...9.0.0-beta.9
@@ -762,6 +776,7 @@ Best done with Object destructing:
 [9.0.0-beta.3]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.2...9.0.0-beta.3
 [9.0.0-beta.2]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...9.0.0-beta.2
 [9.0.0-beta.1]: https://github.com/shakacode/react_on_rails/compare/master...9.0.0-beta.1
+[8.0.7]: https://github.com/shakacode/react_on_rails/compare/8.0.6...8.0.7
 [8.0.6]: https://github.com/shakacode/react_on_rails/compare/8.0.5...8.0.6
 [8.0.5]: https://github.com/shakacode/react_on_rails/compare/8.0.3...8.0.5
 [8.0.3]: https://github.com/shakacode/react_on_rails/compare/8.0.2...8.0.3

data/Gemfile

@@ -38,10 +38,10 @@ gem "chromedriver-helper"
 gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"
-gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-                 branch: "issue-464-merge-webpacker-lite-into-webpacker-v5"
+gem "webpacker", "~> 3.0"
 
 # TODO: remove once we get out of beta.
 # gem 'webpacker', path: "../../forks/webpacker"
 
+gem "equivalent-xml", github: "mbklein/equivalent-xml"
 gem "rainbow"

data/Gemfile.rails32

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+eval_gemfile File.expand_path("../react_on_rails.gemspec", __FILE__)
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "rails", "~> 3.2"
+# Use sqlite3 as the database for Active Record
+gem "sqlite3"
+# Use SCSS for stylesheets
+gem "sass-rails"
+# Use Uglifier as compressor for JavaScript assets
+gem "uglifier"
+# Use CoffeeScript for .coffee assets and views
+gem "coffee-rails"
+
+# Use jquery as the JavaScript library
+gem "jquery-rails"
+
+gem "puma"
+
+# 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
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+gem "mini_racer"
+gem "connection_pool"
+gem "rainbow"
+gem "addressable"
+gem "execjs"
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "awesome_print"
+  gem "listen"
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-doc"
+  gem "pry-rails"
+  gem "pry-rescue"
+  gem "pry-stack_explorer"
+  gem "rubocop", require: false
+  gem "ruby-lint", require: false
+  gem "scss_lint", require: false
+
+end
+
+group :test do
+  gem "capybara"
+  gem "capybara-screenshot"
+  gem "coveralls", require: false
+  # install trouble with updated
+  # gem "capybara-webkit"
+  gem "chromedriver-helper"
+  gem "generator_spec"
+  gem "launchy"
+  gem "poltergeist"
+  gem "rspec-rails"
+  gem "rspec-retry"
+  gem "selenium-webdriver"
+  gem 'test-unit', '~> 3.0'
+  gem "equivalent-xml", github: "mbklein/equivalent-xml"
+end

data/README.md

@@ -2,6 +2,8 @@
 
 *If this projects helps you, please give us a star!*
 
+[rails/webpacker](https://github.com/rails/webpacker) just shipped 3.0. This now enables me to ship version 9.0. See [PR #908](https://github.com/shakacode/react_on_rails/pull/908) for more details.
+
 ## Thank you from Justin Gordon and [ShakaCode](http://www.shakacode.com)
 
 Thank you for considering using [React on Rails](https://github.com/shakacode/react_on_rails).
@@ -92,7 +94,7 @@ React on Rails integrates Facebook's [React](https://github.com/facebook/react)
 + [Features](#features)
 + [Why Webpack?](#why-webpack)
 + [Getting Started](#getting-started)
-    - [Installation Summary](#installation-summary)
+    - [Installation Overview](#installation-overview)
     - [Initializer Configuration: config/initializers/react_on_rails.rb](#initializer-configuration)
     - [Including your React Component in your Rails Views](#including-your-react-component-in-your-rails-views)
     - [I18n](#i18n)
@@ -105,7 +107,7 @@ React on Rails integrates Facebook's [React](https://github.com/facebook/react)
     - [ReactOnRails JavaScript API](#reactonrails-javascript-api)
     - [React-Router](#react-router)
     - [Deployment](#deployment)
-+ [Integration with Node](#integration-with-node)
++ [Integration with Node.js for Server Rendering](#user-content-integration-with-nodejs-for-server-rendering)
 + [Additional Documentation](#additional-documentation)
 + [Contributing](#contributing)
 + [License](#license)
@@ -144,9 +146,17 @@ To upgrade existing apps to React on Rails 8 see the [Installation Overview](doc
 
   ```ruby
   gem "react_on_rails", "9.0.0"
+  gem "webpacker", "~> 3.0"
   ```
 
-2. Commit this to git (you cannot run the generator unless you do this or pass the option `--ignore-warnings`).
+2. Run the following 2 commands to install Webpacker with React:
+   ```
+   bundle exec rails webpacker:install
+   bundle exec rails webpacker:install:react
+   
+   ```
+
+2. Commit this to git (or else you cannot run the generator unless you pass the option `--ignore-warnings`).
 
 3. See help for the generator:
 
@@ -160,13 +170,7 @@ To upgrade existing apps to React on Rails 8 see the [Installation Overview](doc
   rails generate react_on_rails:install
   ```
 
-5. Bundle and NPM install. Make sure you are on a recent version of node. Please use at least Node v5. Bundle is for adding execJs. You can remove that if you are sure you will not server render.
-
-  ```bash
-  bundle && yarn
-  ```
-
-6. Ensure that you have `foreman` installed: `gem install foreman`.
+5. Ensure that you have `foreman` installed: `gem install foreman`.
 
 7. Start your Rails server:
 
@@ -405,12 +409,12 @@ end
 In this case, a prop and value for `somethingUseful` will go into the railsContext passed to all react_component and redux_store calls. You may set any values available in the view rendering context.
 
 ### Globally Exposing Your React Components
-Place your JavaScript code inside of the provided `client/app` folder. Use modules just as you would when using webpack alone. The difference here is that instead of mounting React components directly to an element using `React.render`, you **register your components to ReactOnRails and then mount them with helpers inside of your Rails views**.
+Place your JavaScript code inside of the default `app/javascript` folder. Use modules just as you would when using webpack alone. The difference here is that instead of mounting React components directly to an element using `React.render`, you **register your components to ReactOnRails and then mount them with helpers inside of your Rails views**.
 
 This is how to expose a component to the `react_component` view helper.
 
   ```javascript
-  // client/app/bundles/HelloWorld/startup/HelloWorld.jsx
+  // app/javascript/packs/hello-world-bundle.js
   import HelloWorld from '../components/HelloWorld';
   import ReactOnRails from 'react-on-rails';
   ReactOnRails.register({ HelloWorld });
@@ -610,6 +614,7 @@ If you want to use a node server for server rendering, [get in touch](mailto:jus
 + **Development**
   + [React on Rails Basic Installation Tutorial](./docs/tutorial.md) ([live demo](https://hello-react-on-rails.herokuapp.com))
   + [Installation Overview](./docs/basics/installation-overview.md)
+  + [Configuration](./docs/basics/configuration.md)
   + [Migration from react-rails](./docs/basics/migrating-from-react-rails.md)
   + [Recommended Project Structure](./docs/additional-reading/recommended-project-structure.md)
   + [Generator Tips](./docs/basics/generator.md)

data/Rakefile

@@ -3,12 +3,19 @@
 # Rake will automatically load any *.rake files inside of the "rakelib" folder
 # See rakelib/
 tasks = %w[run_rspec lint]
+prepare_for_ci = %w[node_package dummy_apps examples]
+
 if ENV["USE_COVERALLS"] == "TRUE"
   require "coveralls/rake/task"
   Coveralls::RakeTask.new
   tasks << "coveralls:push"
 end
 
+if File.basename(ENV["BUNDLE_GEMFILE"] || "") == "Gemfile.rails32"
+  tasks = %w[run_rspec:gem_rails32 run_rspec:dummy_no_webpacker]
+  prepare_for_ci = %w[node_package dummy_apps:dummy_no_webpacker]
+end
+
 desc "Run all tests and linting"
 task default: tasks
 
@@ -16,7 +23,7 @@ desc "All actions but no examples, good for local developer run."
 task all_but_examples: ["run_rspec:all_but_examples", "lint"]
 
 desc "Prepare for ci, including node_package, dummy app, and generator examples"
-task prepare_for_ci: %w[node_package dummy_apps examples]
+task prepare_for_ci: prepare_for_ci
 
 desc "Runs prepare_for_ci and tasks"
 task ci: [:prepare_for_ci, *tasks]

data/app/helpers/react_on_rails_helper.rb

@@ -183,7 +183,7 @@ module ReactOnRailsHelper
   end
 
   def sanitized_props_string(props)
-    props.is_a?(String) ? ERB::Util.json_escape(props) : props.to_json
+    ReactOnRails::JsonOutput.escape(props.is_a?(String) ? props : props.to_json)
   end
 
   # Helper method to take javascript expression and returns the output from evaluating it.

data/docs/additional-reading/asset-pipeline.md

@@ -0,0 +1,20 @@
+# Asset Pipeline
+
+The plumbing of webpack produced assets through the asset pipeline is deprecated as of v9.0.
+
+The information in this document is here for those that have not yet upgraded.
+
+
+
+
+This option still works for your `/config/initializers/react_on_rails.rb` if you are still using the
+asset pipeline.
+```
+  ################################################################################
+  # MISCELLANEOUS OPTIONS
+  ################################################################################
+  # If you want to use webpack for CSS and images, and still use the asset pipeline,
+  # see https://github.com/shakacode/react_on_rails/blob/master/docs/additional-reading/rails-assets.md
+  # And you will use a setting like this.
+  config.symlink_non_digested_assets_regex = /\.(png|jpg|jpeg|gif|tiff|woff|ttf|eot|svg|map)/
+```

data/docs/additional-reading/hot-reloading-rails-development.md

@@ -20,8 +20,6 @@ We'll use a Webpack Dev server on port 3500 to provide the assets to Rails, rath
 
 `Procfile.static` provides an alternative that uses "static" assets, similar to a production deployment.
 
-The secret sauce is in the [app/views/layouts/application.html.erb](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/app/views/layouts/application.html.erb) where it uses view helps to configure the correct assets to load, being either the "hot" assets or the "static" assets.
-
 ## Places to Configure (Files to Examine)
 
 1. See the Webpack config files. Note, these examples are now setup for using [CSS Modules](https://github.com/css-modules/css-modules).
@@ -44,76 +42,3 @@ The secret sauce is in the [app/views/layouts/application.html.erb](https://gith
 ## Code Snippets
 Please refer to the examples linked above in `spec/dummy` as these code samples might be out of date.
 
-
-### config/initializers/assets.rb
-
-```ruby
-# Add folder with webpack generated assets to assets.paths
-Rails.application.config.assets.paths << Rails.root.join("app", "assets", "webpack")
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile << "server-bundle.js"
-
-type = ENV["REACT_ON_RAILS_ENV"] == "HOT" ? "non_webpack" : "static"
-Rails.application.config.assets.precompile +=
-  [
-    "application_#{type}.js",
-    "application_#{type}.css"
-  ]
-```
-
-### app/views/layouts/application.html.erb
-
-```erb
-<head>
-  <title>Dummy</title>
-
-  <!-- These do use turbolinks 5 -->
-  <%= env_stylesheet_link_tag(static: 'application_static',
-                              hot: 'application_non_webpack',
-                              media: 'all',
-                              'data-turbolinks-track' => "reload") %>
-
-  <!-- These do not use turbolinks, so no data-turbolinks-track -->
-  <!-- This is to load the hot assets. -->
-  <%= env_javascript_include_tag(hot: ['http://localhost:3500/vendor-bundle.js',
-                                       'http://localhost:3500/app-bundle.js']) %>
-
-  <!-- These do use turbolinks 5 -->
-  <%= env_javascript_include_tag(static: 'application_static',
-                                 hot: 'application_non_webpack',
-                                 'data-turbolinks-track' => "reload") %>
-
-  <%= csrf_meta_tags %>
-</head>
-```
-
-### Procfile.static
-```
-  # Run Rails without hot reloading (static assets).
-  rails: REACT_ON_RAILS_ENV= rails s -b 0.0.0.0
-  
-  # Build client assets, watching for changes.
-  rails-client-assets: yarn run build:dev:client
-  
-  # Build server assets, watching for changes. Remove if not server rendering.
-  rails-server-assets: yarn run build:dev:server
-```
-
-### Procfile.hot
-
-```
-# Procfile for development with hot reloading of JavaScript and CSS 
-
-# Development rails requires both rails and rails-assets
-# (and rails-server-assets if server rendering)
-rails: REACT_ON_RAILS_ENV=HOT rails s -b 0.0.0.0
-
-# Run the hot reload server for client development
-hot-assets: HOT_RAILS_PORT=3500 yarn run hot-assets
-
-# Keep the JS fresh for server rendering. Remove if not server rendering
-rails-server-assets: yarn run build:dev:server
-```
-