Add migration steps and minor cleanup

CHANGELOG.md

@@ -39,6 +39,17 @@ All notable changes to this project will be documented in this file. Items under
 - JS Linter uses ShakaCode JavaScript style: https://github.com/shakacode/style-guide-javascript 
 - Generators account these differences.
 
+### Migration Steps
+[Example of upgrading](https://github.com/shakacode/react-webpack-rails-tutorial/commit/5b1b8698e8daf0f0b94e987740bc85ee237ef608)
+
+1. Update the `react_on_rails` gem
+2. Search you app for 'generator_function' and remove lines in layouts and rb files that contain it. Determination of a generator function is handled automatically.
+3. Find your files where you registered client and server globals, and use the new ReactOnRails.register syntax. Optionally rename the files `clientRegistration.jsx` and `serverRegistration.jsx` rather than `Globals`.
+4. Update your index.jade to use the new API `ReactOnRails.render("MyApp", !{props}, 'app');`
+5. Update your webpack files per the example commit. Remove globally exposing React and ReactDom, as well as their inclusion in the `entry` section. These are automatically included now.
+
+That's it!
+
 ## v1.2.2
 ### Fixed
 - Missing Lodash from generated package.json [#175](https://github.com/shakacode/react_on_rails/pull/175)

docs/additional_reading/manual_installation.md

@@ -74,7 +74,7 @@ module.exports = {
     //libraryTarget: 'this',
   },
   resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx', 'config.js'],
+    extensions: ['', '.js', '.jsx'],
   },
   module: {
     loaders: [

lib/generators/react_on_rails/templates/base/base/client/webpack.client.base.config.js

@@ -16,8 +16,6 @@ module.exports = {
     vendor: [
       'babel-polyfill',
       'jquery',
-      'react',
-      'react-dom',
     ],
 
     // This will contain the app entry points defined by webpack.hot.config and webpack.rails.config
@@ -26,15 +24,14 @@ module.exports = {
     ],
   },
   resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx', '.scss', '.css', 'config.js'],
+    extensions: ['', '.js', '.jsx'],
     alias: {
       lib: path.join(process.cwd(), 'app', 'lib'),
       react: path.resolve('./node_modules/react'),
       'react-dom': path.resolve('./node_modules/react-dom'),
     },
   },
   plugins: [
-
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: JSON.stringify(nodeEnv),

lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.config.js

@@ -25,8 +25,15 @@ config.entry.vendor.push('jquery-ujs');
 
 // See webpack.common.config for adding modules common to both the webpack dev server and rails
 config.module.loaders.push(
-  { test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ },
-  { test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham' }
+  {
+    test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/
+  },
+  {
+    test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham'
+  },
+  {
+     test: require.resolve('jquery-ujs'), loader: 'imports?jQuery=jquery'
+   }
 );
 
 module.exports = config;

lib/generators/react_on_rails/templates/base/server_rendering/client/webpack.server.rails.config.js

@@ -19,7 +19,7 @@ module.exports = {
     path: '../app/assets/javascripts/generated',
   },
   resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx', 'config.js'],
+    extensions: ['', '.js', '.jsx'],
     alias: {
       lib: path.join(process.cwd(), 'app', 'lib'),
     },