Merge resolved

Author: BookOfGreg

CHANGELOG.md

@@ -2,10 +2,17 @@
 
 #### Breaking Changes
 
+- React Deprecations for 15.4, 15.5, 15.6 in preparation for 16 handled in prebundled version
+
 #### New Features
 
+- Generator now makes modern style `createReactClass`(JS) or `extends React.Component`(ES6, CoffeeScript) code
+
 #### Deprecation
 
+- Next version will drop the addons option as they are not supported with React 16
+- TheRubyRacer's newest version (0.12.3 at time of writing) only supports libV8 (3.16.14.15) which is too old for some new JS features, future versions of this gem will need more modern ExecJS runtimes such as mini_racer (currently on libV8 5.9.x)
+
 #### Bug Fixes
 
 ## 2.3.0

README.md

@@ -402,7 +402,7 @@ var Post = createReactClass({
       </div>
     );
   }
-});
+};
 ```
 
 The generator also accepts options:
@@ -474,6 +474,8 @@ You can also specify this option in `react_component`:
 ## Development
 
 - Run tests with `rake test` or `appraisal rake test`
+  - Integration tests run in Headless Chrome which is included in Chrome (59+ linux,OSX | 60+ Windows)
+  - ChromeDriver is included with `chromedriver-helper` gem so no need to manually install that 👍
 - Update React assets with `rake react:update`
 - Update the UJS with `rake ujs:update`
 - Releases:

lib/assets/react-source/development/react-server.js

@@ -137,11 +137,7 @@ def file_header
 
       def file_footer
         if webpacker?
-          if options[:es6]
-            %|export default #{component_name}|
-          else
-            %|module.exports = #{component_name}|
-          end
+          %|export default #{component_name}|
         else
           ''
         end

lib/assets/react-source/development/react.js

@@ -1,4 +1,4 @@
-class @<%= component_name %> extends React.Component
+<%= file_header %>class @<%= component_name %> extends React.Component
 <% if attributes.size > 0 -%>
   @propTypes =
 <% attributes.each do |attribute| -%>
@@ -16,3 +16,4 @@ class @<%= component_name %> extends React.Component
 <% else -%>
     `<div />`
 <% end -%>
+<%= file_footer %>

lib/assets/react-source/production/react-server.js

@@ -1,7 +1,9 @@
 var React = require("react");
 var ReactDOM = require("react-dom");
 var createReactClass = require("create-react-class");
+var PropTypes = require("prop-types");
 
 window.React = React;
 window.ReactDOM = ReactDOM;
 window.createReactClass = createReactClass;
+window.PropTypes = PropTypes;

lib/assets/react-source/production/react.js

@@ -1,7 +1,9 @@
 var React = require("react");
 var ReactDOMServer = require("react-dom/server");
 var createReactClass = require("create-react-class");
+var PropTypes = require("prop-types");
 
 global.React = React;
 global.ReactDOMServer = ReactDOMServer;
 global.createReactClass = createReactClass;
+global.PropTypes = PropTypes;