Merged ViXP into update-react-15

Author: BookOfGreg

lib/generators/react/component_generator.rb

@@ -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/generators/templates/component.js.jsx.coffee

@@ -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 %>

test/generators/component_generator_test.rb

@@ -22,7 +22,7 @@ def filename
     assert_file filename do |contents|
       if WebpackerHelpers.available?
         assert_match /^import React from "react"/, contents
-        assert_match /module\.exports = GeneratedComponent\n$/m, contents
+        assert_match /export default GeneratedComponent\n$/m, contents
       end
     end
   end