react_on_rails 6.6.0.alpha.1 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1b7d12ce69670b3e7e037d28aecc1401350e75
-  data.tar.gz: 03d40c296e959ad85e2f539055036ee0273e3fc1
+  metadata.gz: 9df3146f1b1852d86faa068f5d22dc82ac0a29d5
+  data.tar.gz: e3850f41f59ac558263173e8407088b2c18f0c5b
 SHA512:
-  metadata.gz: f6f6b663282dd9b93aaa29df3448ad26669e9b3c2ef3f9a1e6d06d5aa7bb77889a90eb1c2dd9f13f693db24104a56430bb3c582b64c9610642fd8800eaf3ad1a
-  data.tar.gz: 9c6dfe03fa58428e87e2b0d769ce6ef63789df2323387c081eb8309e880003cc288b248d165e1304ac691f212230df132438ddcb83612446a0e52c14d2b2ac31
+  metadata.gz: c36020f6688cc06c004eba51a42b543c0d206e0b9664e544b04c3b5f0542af65ed875baf78923e905b7b5fc08999687cdb4c35506b7009c366588e9ec953d2f6
+  data.tar.gz: 101064964aa15e85d333dba3c6ebfd053834e3770b7f14569249fc20f67ba639df80fbf81d66954a8eda445227ea30e95d4ae06477009b973f87262d5beee5c9

data/.bookignore

@@ -9,7 +9,6 @@ spec/*
 
 # files in repo root to ignore
 Gemfile
-npm-shrinkwrap.json
 package.json
 Rakefile
 react_on_rails.gemspec

data/.gitignore

@@ -24,6 +24,8 @@ node_modules
 
 /node_package/lib
 
+yarn-debug.*
+spec/dummy/client/yarn-debug.log*
 npm-debug.*
 spec/dummy/client/npm-debug.log*
 

data/.travis.yml

@@ -15,6 +15,7 @@ cache:
   bundler: true
   directories:
     - node_modules # NPM packages
+  yarn: true
 
 gemfile:
   - spec/dummy/Gemfile
@@ -37,9 +38,8 @@ before_install:
 install:
   - nvm install node
   - node -v
-  - npm install -g npm@3.10.7
-  - npm config set spin false
-  - npm install
+  - npm i -g yarn@0.20.3
+  - yarn
   - bundle install
   - rake dummy_apps
   - rake examples

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [6.6.0] - 2017-02-18
+### Added
+- Switched to yarn! [#715](https://github.com/shakacode/react_on_rails/pull/715) by [squadette](https://github.com/squadette).
+
 ## [6.5.1] - 2017-02-11
 ### Fixed
 - Allow using gem without sprockets. [#671](https://github.com/shakacode/react_on_rails/pull/671) by [fc-arny](https://github.com/fc-arny).
@@ -448,7 +452,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.5.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.6.0...master
+[6.6.0]: https://github.com/shakacode/react_on_rails/compare/6.5.1...6.6.0
 [6.5.1]: https://github.com/shakacode/react_on_rails/compare/6.5.0...6.5.1
 [6.5.0]: https://github.com/shakacode/react_on_rails/compare/6.4.2...6.5.0
 [6.4.2]: https://github.com/shakacode/react_on_rails/compare/6.4.1...6.4.2

data/CONTRIBUTING.md

@@ -45,12 +45,12 @@ When making doc changes, we want the change to work on both the gitbook and the
 * After updating code via git, to prepare all examples and run all tests:
 
 ```
-bundle && npm i && rake examples:prepare_all && rake node_package && rake
+bundle && yarn && rake examples:prepare_all && rake node_package && rake
 ```
 
 In order to run tests in browser
 ```
-npm i -g browserify babelify tape-run faucet
+yarn global add  browserify babelify tape-run faucet
 browserify -t babelify node_package/tests/*.js | tape-run | faucet
 ```
 
@@ -86,37 +86,17 @@ Note that you will need to bundle install after making this change, but also tha
 First, be **sure** to build the NPM package
 
 ```sh
-npm i
-npm run build
+yarn
+yarn run build
 ```
 
 Use a relative path in your `package.json`, like this:
 ```sh
 cd client
-npm install --save "react-on-rails@../../react_on_rails"
+yarn add "react-on-rails@../../react_on_rails"
 ```
 
-When you use a relative path, be sure to run the above `npm install` command whenever you change the node package for react-on-rails.
-
-While we'd prefer to use `npm link`, we get errors. If you can figure out how to get `npm link react-on-rails` to work with this project, please file an issue or PR! This used to work with babel 5.
-
-This is the error:
-
-```
-16:34:11 rails-client-assets.1 | ERROR in /react_on_rails/node_package/lib/ReactOnRails.js
-16:34:11 rails-client-assets.1 | Module build failed: ReferenceError: Unknown plugin "react-transform" specified in "base" at 0, attempted to resolve relative to "/react_on_rails/node_package/lib"
-16:34:11 rails-client-assets.1 |     at /react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/options/option-manager.js:193:17
-16:34:11 rails-client-assets.1 |     at Array.map (native)
-16:34:11 rails-client-assets.1 |     at Function.normalisePlugins (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/options/option-manager.js:173:20)
-16:34:11 rails-client-assets.1 |     at OptionManager.mergeOptions (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/options/option-manager.js:271:36)
-16:34:11 rails-client-assets.1 |     at OptionManager.init (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/options/option-manager.js:416:10)
-16:34:11 rails-client-assets.1 |     at File.initOptions (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/index.js:191:75)
-16:34:11 rails-client-assets.1 |     at new File (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/file/index.js:122:22)
-16:34:11 rails-client-assets.1 |     at Pipeline.transform (/react-webpack-rails-tutorial/client/node_modules/babel-core/lib/transformation/pipeline.js:42:16)
-16:34:11 rails-client-assets.1 |     at transpile (/react-webpack-rails-tutorial/client/node_modules/babel-loader/index.js:14:22)
-16:34:11 rails-client-assets.1 |     at Object.module.exports (/react-webpack-rails-tutorial/client/node_modules/babel-loader/index.js:88:12)
-16:34:11 rails-client-assets.1 |  @ ./app/bundles/comments/startup/clientRegistration.jsx 15:20-45
-```
+When you use a relative path, be sure to run the above `yarn` command whenever you change the node package for react-on-rails.
 
 # Development Setup for Gem and Node Package Contributors
 
@@ -133,16 +113,16 @@ After checking out the repo, making sure you have rvm and nvm setup (setup ruby
 Additionally, our RSpec tests use the poltergeist web driver. You will need to install the phantomjs node module:
 
 ```sh
-npm install -g phantomjs
+yarn global add phantomjs
 ```
 
 Note this *must* be installed globally for the dummy test project rspec runner to see it properly.
 
 ### Local Node Package
-Because the example and dummy apps rely on the react-on-rails node package, they should link directly to your local version to pick up any changes you may have made to that package. To achieve this, switch to the teat app's root directory and run this command below which runs something like [this script](spec/dummy/package.json#L14)
+Because the example and dummy apps rely on the react-on-rails node package, they should link directly to your local version to pick up any changes you may have made to that package. To achieve this, switch to the test app's root directory and run this command below which runs something like [this script](spec/dummy/package.json#L14)
 
 ```sh
-npm run install-react-on-rails
+yarn run install-react-on-rails
 ```
 
 From now on, the example and dummy apps will use your local node_package folder as the react-on-rails node package. This will also be done automatically for you via the `rake examples:prepare_all` rake task.
@@ -162,11 +142,11 @@ From now on, the example and dummy apps will use your local node_package folder
 
 ```sh
 cd <top level>
-npm i
+yarn
 npm build
 ```
 
-Or run this which builds the npm package, then the webpack files for spec/dummy, and runs tests in
+Or run this which builds the yarn package, then the webpack files for spec/dummy, and runs tests in
 spec/dummy.
 
 
@@ -174,14 +154,14 @@ spec/dummy.
 # Optionally change default selenium_firefox driver
 export DRIVER=poltergeist
 cd <top level>
-npm run dummy:spec
+yarn run dummy:spec
 ```
 
 ### Run NPM JS tests
 
 ```sh
 cd <top level>
-npm test
+yarn test
 ```
 
 ### Run spec/dummy tests
@@ -195,7 +175,7 @@ Eventually, we may have JS tests:
 
 ```sh
 cd spec/dummy/client
-npm run test
+yarn run test
 ```
 
 ### Run most tests and linting
@@ -206,7 +186,7 @@ npm run check
 ```
 
 ### Starting the Dummy App
-To run the test app, it's **CRITICAL** to not just run `rails s`. You have to run `foreman start`. If you don't do this, then `webpack` will not generate a new bundle, and you will be seriously confused when you change JavaScript and the app does not change. If you change the webpack configs, then you need to restart foreman. If you change the JS code for react-on-rails, you need to run `npm run build`. Since the react-on-rails package should be sym linked, you don't have to `npm i react-on-rails` after every change.
+To run the test app, it's **CRITICAL** to not just run `rails s`. You have to run `foreman start`. If you don't do this, then `webpack` will not generate a new bundle, and you will be seriously confused when you change JavaScript and the app does not change. If you change the webpack configs, then you need to restart foreman. If you change the JS code for react-on-rails, you need to run `yarn run build`. Since the react-on-rails package should be sym linked, you don't have to `yarn react-on-rails` after every change.
 
 ### RSpec Testing
 Run `rake` for testing the gem and `spec/dummy`. Otherwise, the `rspec` command only works for testing within the sample apps, like `spec/dummy`.

data/Gemfile

@@ -40,4 +40,3 @@ gem "chromedriver-helper"
 gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"
-gem "yajl-ruby"

data/PROJECTS.md

@@ -9,7 +9,7 @@
 * **[Pivotal Tracker](http://www.pivotaltracker.com/)**: The first (and most-loved) agile project management tool built on Rails.  React on Rails has greatly simplified integration and workflow for our React components in Rails!
 * **[Blink Inc](https://www.blinkinc.com)**: Website and more built by [ShakaCode](http://www.shakacode.com).
 * **[Madrone Analytics](http://madroneco.com/)**: The original client of [ShakaCode](http://www.shakacode.com) that led to the development of React on Rails, as described in [Fast Rich Client Rails Development With Webpack and the ES6 Transpiler](http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/).
-* **[Deliveroo](https://deliveroo.co.uk/)**: The leading food delivery site in Europe has gone live with React on Rails, with multi-lingual JavaScript support! 
+* **[Deliveroo](https://deliveroo.co.uk/)**: The leading food delivery site in Europe has gone live with React on Rails, with multi-lingual JavaScript support!
 ![2016-05-03_19-18-34](https://cloud.githubusercontent.com/assets/1118459/15027253/91fd151a-11de-11e6-93e3-720518995fe0.png)
 * **[Airgoat](https://airgoat.com/)**: Marketplace for sneakers.
 * **[Apprentus](https://www.apprentus.com/)**: A marketplace to find the best private teachers. Using react-on-rails from the homepage to infinity!
@@ -17,6 +17,10 @@
 * **[Flyhomes](https://www.flyhomes.com/)**: Real estate brokerage service that awards frequent flyer miles.
 * **[Undeveloped](https://undeveloped.com/)**: Buy and sell domain names. ![image](https://cloud.githubusercontent.com/assets/1118459/19623703/7c6d63d0-9870-11e6-83f2-8b83ca49daa9.png)
 * **[Foxford.ru](http://foxford.ru/)**: Online School ![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
+* **[CareerBuilder for Employers](https://hiring.careerbuilder.com/)**: CareerBuilder's marketing/ecommerce website. We've integrated React on Rails and have deployed the application via Cloud 66, and are busy integrating this into other projects!
+
+## Open Source Projects Live
+* [github.com/empirical-org/Empirical-Core](https://github.com/empirical-org/Empirical-Core): [Quill.org](https://quill.org/) Provides free tools to make your students better writers.
 
 ## Demos and Tutorials
 * [reactrails.com](http://www.reactrails.com), source code [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/)

data/README.md

@@ -2,7 +2,7 @@
 
 **For a complete example of this gem, see our live demo at [www.reactrails.com](http://www.reactrails.com). ([Source Code](https://github.com/shakacode/react-webpack-rails-tutorial))**
 
-Aloha from Justin Gordon ([bio](http://www.railsonmaui.com/about)) and the [ShakaCode](http://www.shakacode.com) Team! We're actively looking for new projects involving React, React-Native, and Rails. Please [contact me](mailto:justin@shakacode.com) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing ScreenHero plus Slack/Github based coaching for React on Rails. See our blog post [Can ShakaCode Help You?](https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9) for more information. 
+Aloha from Justin Gordon ([bio](http://www.railsonmaui.com/about)) and the [ShakaCode](http://www.shakacode.com) Team! We're actively looking for new projects involving React, React-Native, and Rails. Please [contact me](mailto:justin@shakacode.com) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing ScreenHero plus Slack/Github based coaching for React on Rails. See our blog post [Can ShakaCode Help You?](https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9) for more information.
 
 I'm offering a free half-hour project consultation, on anything from React on Rails to any aspect of web application development for both consumer and enterprise products. In addition to React.js and Rails, we're doing React-Native iOS and Android apps!
 
@@ -22,7 +22,7 @@ Please [Subscribe](https://app.mailerlite.com/webforms/landing/l1d9x5) to keep i
 * **[@ShakaCode on Twitter](https://twitter.com/shakacode)**
 
 # Testimonials
-From Joel Hooks, Co-Founder, Chief Nerd at [egghead.io](https://egghead.io/), January 30, 2017: 
+From Joel Hooks, Co-Founder, Chief Nerd at [egghead.io](https://egghead.io/), January 30, 2017:
 ![2017-01-30_11-33-59](https://cloud.githubusercontent.com/assets/1118459/22443635/b3549fb4-e6e3-11e6-8ea2-6f589dc93ed3.png)
 
 For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
@@ -34,7 +34,7 @@ For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
 * [React on Rails, 2000+ 🌟 Stars](https://medium.com/shakacode/react-on-rails-2000-stars-32ff5cfacfbf#.6gmfb2gpy)
 * [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
 
-### Videos 
+### Videos
 
 1. [egghead.io: Creating a component with React on Rails](https://egghead.io/lessons/react-creating-a-component-with-react-on-rails)
 1. [egghead.io: Creating a redux component with React on Rails](https://egghead.io/lessons/react-add-redux-state-management-to-a-react-on-rails-project)
@@ -130,7 +130,7 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
 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 && npm install
+  bundle && yarn
   ```
 
 6. Ensure that you have `foreman` installed: `gem install foreman`.
@@ -141,7 +141,7 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
   foreman start -f Procfile.dev
   ```
 
-7. Visit [localhost:3000/hello_world](http://localhost:3000/hello_world)
+8. Visit [localhost:5000/hello_world](http://localhost:5000/hello_world). Note, `foreman` defaults to PORT 5000 unless you set the value of PORT in your environment. For example, you can `export PORT=3000` to use the Rails default port of 3000.
 
 ### Installation Summary
 
@@ -198,7 +198,7 @@ See the [How to add I18n](docs/basics/i18n.md) for a summary of adding I18n.
 All JavaScript in React On Rails is loaded from npm: [react-on-rails](https://www.npmjs.com/package/react-on-rails). To manually install this (you did not use the generator), assuming you have a standard configuration, run this command:
 
 ```
-cd client && npm i --saveDev react-on-rails
+cd client && yarn add react-on-rails
 ```
 
 That will install the latest version and update your package.json.
@@ -494,7 +494,7 @@ If you are using [jquery-ujs](https://github.com/rails/jquery-ujs) for AJAX call
 ## Integration with Node
 Node.js can be used as the backend for server-side rendering instead of [execJS](https://github.com/rails/execjs). Before you try this, consider the tradeoff of extra complexity with your deployments versus *potential* performance gains. We've found that using ExecJS with [mini_racer](https://github.com/discourse/mini_racer) to be "fast enough" so far. That being said, we've heard of other large websites using Node.js for better server rendering performance. See [Node.js for Server Rendering](docs/additional-reading/node-server-rendering.md) for more information.
 
-## Additional Documentation 
+## Additional Documentation
 **Try out our new [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference!**
 + **Rails**
   + [Rails Assets](docs/additional-reading/rails-assets.md)
@@ -504,7 +504,7 @@ Node.js can be used as the backend for server-side rendering instead of [execJS]
   + [Turbolinks](docs/additional-reading/turbolinks.md)
 
 + **Javascript**
-  + [Node Dependencies and NPM](docs/additional-reading/node-dependencies-and-npm.md)
+  + [Node Dependencies, NPM, and Yarn](docs/additional-reading/node-dependencies-and-npm.md)
   + [Babel](docs/additional-reading/babel.md)
   + [React Router](docs/additional-reading/react-router.md)
   + [React & Redux](docs/additional-reading/react-and-redux.md)
@@ -551,7 +551,7 @@ Node.js can be used as the backend for server-side rendering instead of [execJS]
 + [spec app](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy): Great simple examples used for our tests.
   ```
   cd spec/dummy
-  bundle && npm i
+  bundle && yarn
   foreman start
   ```
 

data/SUMMARY.md

@@ -7,7 +7,7 @@
  * [Turbolinks](docs/additional-reading/turbolinks.md)
 
 ### **Javascript**
- * [Node Dependencies and NPM](docs/additional-reading/node-dependencies-and-npm.md)
+ * [Node Dependencies, NPM, and Yarn](docs/additional-reading/node-dependencies-and-npm.md)
  * [Babel](docs/additional-reading/babel.md)
  * [React Router](docs/additional-reading/react-router.md)
  * [React & Redux](docs/additional-reading/react-and-redux.md)

data/app/helpers/react_on_rails_helper.rb

@@ -6,7 +6,6 @@
 require "react_on_rails/prerender_error"
 require "addressable/uri"
 require "react_on_rails/utils"
-require "yajl"
 
 module ReactOnRailsHelper
   include ReactOnRails::Utils::Required
@@ -104,13 +103,13 @@ module ReactOnRailsHelper
 
     # Setup the page_loaded_js, which is the same regardless of prerendering or not!
     # The reason is that React is smart about not doing extra work if the server rendering did its job.
-    
+
     component_specification_tag =
-    content_tag(:div,
-                "",
-                class: "js-react-on-rails-component",
-                style: options.style,
-                data: options.data)
+      content_tag(:div,
+                  "",
+                  class: "js-react-on-rails-component",
+                  style: options.style,
+                  data: options.data)
 
     # Create the HTML rendering part
     result = server_rendered_react_component_html(options.props, options.name, options.dom_id,
@@ -175,7 +174,7 @@ module ReactOnRailsHelper
   end
 
   def sanitized_props_string(props)
-    props.is_a?(String) ? ERB::Util.json_escape(props) : props.to_json
+    props.is_a?(String) ? json_escape(props) : props.to_json
   end
 
   # Helper method to take javascript expression and returns the output from evaluating it.
@@ -226,36 +225,30 @@ module ReactOnRailsHelper
 
   private
 
-  def json_safe_and_pretty(something)
-    if defined?(Rails) && Rails.env.development?
-      ERB::Util.json_escape(JSON.pretty_generate(something.as_json))
-    else
-      ERB::Util.json_escape(something.to_json)
-    end
-  end
-
   # prepend the rails_context if not yet applied
   def prepend_render_rails_context(render_value)
     return render_value if @rendered_rails_context
 
-    data = rails_context(server_side: false)
+    data = {
+      rails_context: rails_context(server_side: false)
+    }
 
     @rendered_rails_context = true
 
-    rails_context_content = content_tag(:script,
-                                        "#{json_safe_and_pretty(data)}".html_safe,
-                                        type: 'application/json',
-                                        id: 'js-react-on-rails-context')
-
+    rails_context_content = content_tag(:div,
+                                        "",
+                                        id: "js-react-on-rails-context",
+                                        style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
+                                        data: data)
     "#{rails_context_content}\n#{render_value}".html_safe
   end
 
   def render_redux_store_data(redux_store_data)
-    result = content_tag(:script,
-                         "#{json_safe_and_pretty(redux_store_data[:props])}".html_safe,
-                         type: 'application/json',
-                         'data-js-react-on-rails-store' => redux_store_data[:store_name].html_safe)
-    
+    result = content_tag(:div,
+                         "",
+                         class: "js-react-on-rails-store",
+                         style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
+                         data: redux_store_data)
     prepend_render_rails_context(result)
   end
 

data/docs/additional-reading/heroku-deployment.md

@@ -24,7 +24,7 @@ Rake::Task["assets:precompile"]
 ```    
 
 ## Caching Node Modules
-By default Heroku will cache the root `node_modules` directory between deploys but since we're installing in `client/node_modules` you'll need to add the following line to the `package.json` in your root directory (otherwise you'll have to sit through a full `npm install` on each deploy):
+By default Heroku will cache the root `node_modules` directory between deploys but since we're installing in `client/node_modules` you'll need to add the following line to the `package.json` in your root directory (otherwise you'll have to sit through a full `yarn` on each deploy):
 
 ```js
 "cacheDirectories": [

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

@@ -87,10 +87,10 @@ Rails.application.config.assets.precompile +=
   rails: REACT_ON_RAILS_ENV= rails s -b 0.0.0.0
   
   # Build client assets, watching for changes.
-  rails-client-assets: npm run build:dev:client
+  rails-client-assets: yarn run build:dev:client
   
   # Build server assets, watching for changes. Remove if not server rendering.
-  rails-server-assets: npm run build:dev:server
+  rails-server-assets: yarn run build:dev:server
 ```
 
 ### Procfile.hot
@@ -103,9 +103,9 @@ Rails.application.config.assets.precompile +=
 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 npm run hot-assets
+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: npm run build:dev:server
+rails-server-assets: yarn run build:dev:server
 ```
 

data/docs/additional-reading/node-dependencies-and-npm.md

@@ -1,29 +1,19 @@
-# Node Dependencies and NPM
+# Node Dependencies, NPM, and Yarn
+
 ## Updating
-After installing the files, you may want to update the node dependencies. This is analogous to updating gem versions:
 
-```bash
-cd client
-npm install -g npm-check-updates
-rm npm-shrinkwrap.json
-npm-check-updates -u
-npm install
-npm prune
-npm shrinkwrap
-```
+You can check for outdated versions of packages with `yarn outdated` in your `client` directory.
 
-Confirm that the hot replacement dev server and the Rails server both work. You may have to delete `node_modules` and `npm-shrinkwrap.json` and then run `npm shrinkwrap`.
+To upgrade package version, use `yarn upgrade [package]`.  To update all dependencies, use `yarn upgrade`.
 
-*Note: `npm prune` is required before running `npm shrinkwrap` to remove dependencies that are no longer needed after doing updates.*
+Confirm that the hot replacement dev server and the Rails server both work.
 
 ## Adding New Dependencies
-Typically, you can add your Node dependencies as you normally would. Occasionally, adding a new dependency may require removing and re-running `npm shrinkwrap`:
+Typically, you can add your Node dependencies as you normally would.
 
 ```bash
 cd client
-npm install --save module_name@version
+yarn add module_name@version
 # or
-# npm install --save_dev module_name@version
-rm npm-shrinkwrap.json
-npm shrinkwrap
+# yarn add --dev module_name@version
 ```