react-rails 1.11.0 → 2.0.0

data/lib/react/server_rendering/{sprockets_renderer → bundle_renderer}/console_replay.js

@@ -1,6 +1,6 @@
 (function (history) {
   if (history && history.length > 0) {
-    result += '\n<scr'+'ipt>';
+    result += '\n<scr'+'ipt class="react-rails-console-replay">';
     history.forEach(function (msg) {
       result += '\nconsole.' + msg.level + '.apply(console, ' + JSON.stringify(msg.arguments) + ');';
     });

data/lib/react/server_rendering/bundle_renderer/console_reset.js

@@ -0,0 +1,3 @@
+if (typeof console !== "undefined" && console.history) {
+  console.history = [];
+}

data/lib/react/server_rendering/exec_js_renderer.rb

@@ -5,6 +5,9 @@ module React
     # - No Rails dependency
     # - No browser concerns
     class ExecJSRenderer
+      # @return [ExecJS::Runtime::Context] The JS context for this renderer
+      attr_reader :context
+
       def initialize(options={})
         js_code = options[:code] || raise("Pass `code:` option to instantiate a JS context!")
         @context = ExecJS.compile(GLOBAL_WRAPPER + js_code)
@@ -38,7 +41,7 @@ module React
 
       def main_render(component_name, props, prerender_options)
         render_function = prerender_options.fetch(:render_function, "renderToString")
-        "ReactDOMServer.#{render_function}(React.createElement(#{component_name}, #{props}))"
+        "this.ReactRailsUJS.serverRender('#{render_function}', '#{component_name}', #{props})"
       end
 
       def compose_js(before, main, after)

data/lib/react/server_rendering/webpacker_manifest_container.rb

@@ -0,0 +1,34 @@
+require "open-uri"
+
+module React
+  module ServerRendering
+    # Get a compiled file from Webpacker. It may come from:
+    #
+    # - webpack-dev-server
+    # - compiled pack
+    class WebpackerManifestContainer
+      # This pattern matches the code that initializes the dev-server client.
+      CLIENT_REQUIRE = %r{__webpack_require__\(.*webpack-dev-server\/client\/index\.js.*\n}
+
+      def find_asset(logical_path)
+        # raises if not found
+        asset_path = Webpacker::Manifest.lookup(logical_path).to_s
+        if asset_path.start_with?("http")
+          # Get a file from the webpack-dev-server
+          dev_server_asset = open(asset_path).read
+          # Remove `webpack-dev-server/client/index.js` code which causes ExecJS to 💥
+          dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
+          dev_server_asset
+        else
+          # Read the already-compiled pack:
+          full_path = Webpacker::Manifest.lookup_path(logical_path).to_s
+          File.read(full_path)
+        end
+      end
+
+      def self.compatible?
+        !!defined?(Webpacker)
+      end
+    end
+  end
+end

data/lib/react/server_rendering/yaml_manifest_container.rb

@@ -1,6 +1,6 @@
 module React
   module ServerRendering
-    # Get asset content by reading the compiled file from disk using the generated maniftest.yml file
+    # Get asset content by reading the compiled file from disk using the generated manifest.yml file
     #
     # This is good for Rails production when assets are compiled to public/assets
     # but sometimes, they're compiled to other directories (or other servers)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Paul O’Shannessy
+- Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -248,9 +249,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Compile your JSX on demand or precompile for production.
+description: Render components in views or controller actions. Server-side rendering
+  powered by ExecJS. Transform JSX in the asset pipeline or use Webpacker.
 email:
 - paul@oshannessy.com
+- rmosolgo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -260,13 +263,6 @@ files:
 - README.md
 - lib/assets/javascripts/JSXTransformer.js
 - lib/assets/javascripts/react_ujs.js
-- lib/assets/javascripts/react_ujs_event_setup.js
-- lib/assets/javascripts/react_ujs_mount.js
-- lib/assets/javascripts/react_ujs_native.js
-- lib/assets/javascripts/react_ujs_pjax.js
-- lib/assets/javascripts/react_ujs_turbolinks.js
-- lib/assets/javascripts/react_ujs_turbolinks_classic.js
-- lib/assets/javascripts/react_ujs_turbolinks_classic_deprecated.js
 - lib/assets/react-source/development-with-addons/react-server.js
 - lib/assets/react-source/development-with-addons/react.js
 - lib/assets/react-source/development/react-server.js
@@ -277,10 +273,12 @@ files:
 - lib/assets/react-source/production/react.js
 - lib/generators/react/component_generator.rb
 - lib/generators/react/install_generator.rb
-- lib/generators/react/ujs_generator.rb
 - lib/generators/templates/component.es6.jsx
 - lib/generators/templates/component.js.jsx
 - lib/generators/templates/component.js.jsx.coffee
+- lib/generators/templates/react_server_rendering.rb
+- lib/generators/templates/server_rendering.js
+- lib/generators/templates/server_rendering_pack.js
 - lib/react-rails.rb
 - lib/react.rb
 - lib/react/jsx.rb
@@ -298,13 +296,15 @@ files:
 - lib/react/rails/version.rb
 - lib/react/rails/view_helper.rb
 - lib/react/server_rendering.rb
+- lib/react/server_rendering/bundle_renderer.rb
+- lib/react/server_rendering/bundle_renderer/console_polyfill.js
+- lib/react/server_rendering/bundle_renderer/console_replay.js
+- lib/react/server_rendering/bundle_renderer/console_reset.js
+- lib/react/server_rendering/bundle_renderer/timeout_polyfill.js
 - lib/react/server_rendering/environment_container.rb
 - lib/react/server_rendering/exec_js_renderer.rb
 - lib/react/server_rendering/manifest_container.rb
-- lib/react/server_rendering/sprockets_renderer.rb
-- lib/react/server_rendering/sprockets_renderer/console_polyfill.js
-- lib/react/server_rendering/sprockets_renderer/console_replay.js
-- lib/react/server_rendering/sprockets_renderer/timeout_polyfill.js
+- lib/react/server_rendering/webpacker_manifest_container.rb
 - lib/react/server_rendering/yaml_manifest_container.rb
 homepage: https://github.com/reactjs/react-rails
 licenses:
@@ -329,5 +329,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: React/JSX adapter for the Ruby on Rails asset pipeline.
+summary: React integration for Ruby on Rails
 test_files: []

data/lib/assets/javascripts/react_ujs_event_setup.js

@@ -1,29 +0,0 @@
-;(function(document, window) {
-  // jQuery is optional. Use it to support legacy browsers.
-  var $ = (typeof window.jQuery !== 'undefined') && window.jQuery;
-  if ($) {
-    ReactRailsUJS.handleEvent = function(eventName, callback) {
-      $(document).on(eventName, callback);
-    };
-  } else {
-    ReactRailsUJS.handleEvent = function(eventName, callback) {
-      document.addEventListener(eventName, callback);
-    };
-  }
-  // Detect which kind of events to set up:
-  if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
-    if (typeof Turbolinks.EVENTS !== 'undefined') {
-      // Turbolinks.EVENTS is in classic version 2.4.0+
-      ReactRailsUJS.TurbolinksClassic.setup();
-    } else if (typeof Turbolinks.controller !== "undefined") {
-      // Turbolinks.controller is in version 5+
-      ReactRailsUJS.Turbolinks.setup();
-    } else {
-      ReactRailsUJS.TurbolinksClassicDeprecated.setup();
-    }
-  } else if ($ && typeof $.pjax === 'function') {
-    ReactRailsUJS.pjax.setup();
-  } else {
-    ReactRailsUJS.Native.setup();
-  }
-})(document, window);

data/lib/assets/javascripts/react_ujs_mount.js

@@ -1,104 +0,0 @@
-;(function(document, window) {
-  // jQuery is optional. Use it to support legacy browsers.
-  var $ = (typeof window.jQuery !== 'undefined') && window.jQuery;
-
-  window.ReactRailsUJS = {
-    // This attribute holds the name of component which should be mounted
-    // example: `data-react-class="MyApp.Items.EditForm"`
-    CLASS_NAME_ATTR: 'data-react-class',
-
-    // This attribute holds JSON stringified props for initializing the component
-    // example: `data-react-props="{\"item\": { \"id\": 1, \"name\": \"My Item\"} }"`
-    PROPS_ATTR: 'data-react-props',
-
-    // helper method for the mount and unmount methods to find the
-    // `data-react-class` DOM elements
-    findDOMNodes: function(searchSelector) {
-      // we will use fully qualified paths as we do not bind the callbacks
-      var selector, parent;
-
-      switch (typeof searchSelector) {
-        case 'undefined':
-          selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
-          parent = document;
-          break;
-        case 'object':
-          selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
-          parent = searchSelector;
-          break;
-        case 'string':
-          selector = searchSelector + '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + '], ' +
-                     searchSelector + ' [' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
-          parent = document;
-          break
-        default:
-          break;
-      }
-
-      if ($) {
-        return $(selector, parent);
-      } else {
-        return parent.querySelectorAll(selector);
-      }
-    },
-
-    // Get the constructor for a className
-    getConstructor: function(className) {
-      // Assume className is simple and can be found at top-level (window).
-      // Fallback to eval to handle cases like 'My.React.ComponentName'.
-      // Also, try to gracefully import Babel 6 style default exports
-      //
-      var constructor;
-
-      // Try to access the class globally first
-      constructor = window[className];
-
-      // If that didn't work, try eval
-      if (!constructor) {
-        constructor = eval.call(window, className);
-      }
-
-      // Lastly, if there is a default attribute try that
-      if (constructor && constructor['default']) {
-        constructor = constructor['default'];
-      }
-
-      return constructor;
-    },
-
-    // Within `searchSelector`, find nodes which should have React components
-    // inside them, and mount them with their props.
-    mountComponents: function(searchSelector) {
-      var nodes = window.ReactRailsUJS.findDOMNodes(searchSelector);
-
-      for (var i = 0; i < nodes.length; ++i) {
-        var node = nodes[i];
-        var className = node.getAttribute(window.ReactRailsUJS.CLASS_NAME_ATTR);
-        var constructor = this.getConstructor(className);
-        var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
-        var props = propsJson && JSON.parse(propsJson);
-
-        if (typeof(constructor) === "undefined") {
-          var message = "Cannot find component: '" + className + "'"
-          if (console && console.log) { console.log("%c[react-rails] %c" + message + " for element", "font-weight: bold", "", node) }
-          var error = new Error(message + ". Make sure your component is globally available to render.")
-          throw error
-        } else {
-          ReactDOM.render(React.createElement(constructor, props), node);
-        }
-      }
-    },
-
-    // Within `searchSelector`, find nodes which have React components
-    // inside them, and unmount those components.
-    unmountComponents: function(searchSelector) {
-      var nodes = window.ReactRailsUJS.findDOMNodes(searchSelector);
-
-      for (var i = 0; i < nodes.length; ++i) {
-        var node = nodes[i];
-
-        ReactDOM.unmountComponentAtNode(node);
-      }
-    }
-  };
-})(document, window);

data/lib/assets/javascripts/react_ujs_native.js

@@ -1,18 +0,0 @@
-;(function(document, window) {
-  // jQuery is optional. Use it to support legacy browsers.
-  var $ = (typeof window.jQuery !== 'undefined') && window.jQuery;
-
-  window.ReactRailsUJS.Native = {
-    // Attach handlers to browser events to mount & unmount components
-    setup: function() {
-      if ($) {
-        $(function() {window.ReactRailsUJS.mountComponents()});
-      } else if ('addEventListener' in window) {
-        document.addEventListener('DOMContentLoaded', function() {window.ReactRailsUJS.mountComponents()});
-      } else {
-        // add support to IE8 without jQuery
-        window.attachEvent('onload', function() {window.ReactRailsUJS.mountComponents()});
-      }
-    }
-  };
-})(document, window);

data/lib/assets/javascripts/react_ujs_pjax.js

@@ -1,10 +0,0 @@
-;(function(document, window) {
-  window.ReactRailsUJS.pjax = {
-    // pjax support
-    setup: function() {
-      ReactRailsUJS.handleEvent('ready', function() {window.ReactRailsUJS.mountComponents()});
-      ReactRailsUJS.handleEvent('pjax:end', function(e) {window.ReactRailsUJS.mountComponents(e.target)});
-      ReactRailsUJS.handleEvent('pjax:beforeReplace', function(e) {window.ReactRailsUJS.unmountComponents(e.target)});
-    }
-  };
-})(document, window);

data/lib/assets/javascripts/react_ujs_turbolinks.js

@@ -1,9 +0,0 @@
-;(function(document, window) {
-  window.ReactRailsUJS.Turbolinks = {
-    // Turbolinks 5+ got rid of named events (?!)
-    setup: function() {
-      ReactRailsUJS.handleEvent('turbolinks:load', function() {window.ReactRailsUJS.mountComponents()});
-      ReactRailsUJS.handleEvent('turbolinks:before-render', function() {window.ReactRailsUJS.unmountComponents()});
-    }
-  };
-})(document, window);

data/lib/assets/javascripts/react_ujs_turbolinks_classic.js

@@ -1,10 +0,0 @@
-;(function(document, window) {
-  window.ReactRailsUJS.TurbolinksClassic = {
-    // Attach handlers to Turbolinks-Classic events
-    // for mounting and unmounting components
-    setup: function() {
-      ReactRailsUJS.handleEvent(Turbolinks.EVENTS.CHANGE, function() {window.ReactRailsUJS.mountComponents()});
-      ReactRailsUJS.handleEvent(Turbolinks.EVENTS.BEFORE_UNLOAD, function() {window.ReactRailsUJS.unmountComponents()});
-    }
-  };
-})(document, window);

data/lib/assets/javascripts/react_ujs_turbolinks_classic_deprecated.js

@@ -1,13 +0,0 @@
-;(function(document, window) {
-  window.ReactRailsUJS.TurbolinksClassicDeprecated = {
-    // Before Turbolinks 2.4.0, Turbolinks didn't
-    // have named events and didn't have a before-unload event.
-    // Also, it didn't work with the Turbolinks cache, see
-    // https://github.com/reactjs/react-rails/issues/87
-    setup: function() {
-      Turbolinks.pagesCached(0)
-      ReactRailsUJS.handleEvent('page:change', function() {window.ReactRailsUJS.mountComponents()});
-      ReactRailsUJS.handleEvent('page:receive', function() {window.ReactRailsUJS.unmountComponents()});
-    }
-  };
-})(document, window);

data/lib/generators/react/ujs_generator.rb

@@ -1,44 +0,0 @@
-module React
-  module Generators
-    class UjsGenerator < ::Rails::Generators::Base
-      desc "Create a custom copy of react_ujs for your application"
-
-      class_option :output, required: true, desc: "File path for new react_ujs.js"
-
-      class_option :turbolinks, type: :boolean, default: true, desc: "Include Turbolinks 5 support?"
-      class_option :turbolinks_classic, type: :boolean, default: true, desc: "Include Turbolinks 2.4 / 3 support?"
-      class_option :turbolinks_classic_deprecated, type: :boolean, default: true, desc: "Include Turbolinks < 2.4 support?"
-      class_option :pjax, type: :boolean, default: true, desc: "Include PJAX support?"
-      class_option :native, type: :boolean, default: true, desc: "Include native events support?"
-
-      EVENT_SUPPORT_OPTIONS = [
-        :turbolinks,
-        :turbolinks_classic,
-        :turbolinks_classic_deprecated,
-        :pjax,
-        :native,
-      ]
-
-      def create_ujs_file
-        files_to_merge = ["react_ujs_mount.js"]
-
-        EVENT_SUPPORT_OPTIONS.each do |event_support_option|
-          if options[event_support_option]
-            files_to_merge << "react_ujs_#{event_support_option}.js"
-          end
-        end
-
-        files_to_merge << "react_ujs_event_setup.js"
-
-        asset_dir = File.expand_path("../../../assets/javascripts", __FILE__)
-
-        custom_ujs_content = files_to_merge
-          .map { |filename| File.read(File.join(asset_dir, filename)) }
-          .join("\n")
-
-        new_ujs_path = options[:output]
-        create_file(new_ujs_path, custom_ujs_content)
-      end
-    end
-  end
-end