react_on_rails 5.2.0 → 6.0.0.beta.1

data/rakelib/examples_config.yml

@@ -4,11 +4,11 @@ example_type_data:
     generator_options: ""
   -
     name: basic-server-rendering
-    generator_options: --server-rendering
+    generator_options: --example-server-rendering
   -
     name: redux
     generator_options: --redux
   -
     name: redux-server-rendering
-    generator_options: --redux --server-rendering
+    generator_options: --redux --example-server-rendering
 

data/react_on_rails.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rainbow", "~> 2.1"
   s.add_dependency "rails", ">= 3.2"
   s.add_dependency "foreman"
+  s.add_dependency "addressable"
 
   s.add_development_dependency "bundler", "~> 1.10"
   s.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0.beta.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -322,8 +336,9 @@ files:
 - docs/additional-reading/babel.md
 - docs/additional-reading/heroku-deployment.md
 - docs/additional-reading/hot-reloading-rails-development.md
-- docs/additional-reading/installation-overview.md
 - docs/additional-reading/node-dependencies-and-npm.md
+- docs/additional-reading/node-server-rendering.md
+- docs/additional-reading/rails-assets.md
 - docs/additional-reading/rails_view_rendering_from_inline_javascript.md
 - docs/additional-reading/react-and-redux.md
 - docs/additional-reading/react-router.md
@@ -333,11 +348,18 @@ files:
 - docs/additional-reading/tips.md
 - docs/additional-reading/turbolinks.md
 - docs/additional-reading/updating-dependencies.md
+- docs/additional-reading/webpack-dev-server.md
 - docs/additional-reading/webpack.md
-- docs/coding-style/linters.md
+- docs/api/javascript-api.md
+- docs/api/ruby-api-hot-reload-view-helpers.md
+- docs/api/ruby-api.md
+- docs/basics/generator.md
+- docs/basics/installation-overview.md
+- docs/basics/migrating-from-react-rails.md
 - docs/coding-style/style.md
 - docs/contributor-info/contributing.md
 - docs/contributor-info/generator-testing.md
+- docs/contributor-info/linters.md
 - docs/contributor-info/releasing.md
 - docs/misc/code_of_conduct.md
 - docs/misc/doctrine.md
@@ -351,55 +373,54 @@ files:
 - lib/generators/react_on_rails/install_generator.rb
 - lib/generators/react_on_rails/react_no_redux_generator.rb
 - lib/generators/react_on_rails/react_with_redux_generator.rb
+- lib/generators/react_on_rails/templates/base/base/.DS_Store
 - lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt
-- lib/generators/react_on_rails/templates/base/base/REACT_ON_RAILS.md
 - lib/generators/react_on_rails/templates/base/base/app/controllers/hello_world_controller.rb
 - lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
 - lib/generators/react_on_rails/templates/base/base/client/.babelrc
-- lib/generators/react_on_rails/templates/base/base/client/REACT_ON_RAILS_CLIENT_README.md
 - lib/generators/react_on_rails/templates/base/base/client/app/bundles/HelloWorld/components/HelloWorldWidget.jsx.tt
-- lib/generators/react_on_rails/templates/base/base/client/app/bundles/HelloWorld/startup/clientRegistration.jsx.tt
+- lib/generators/react_on_rails/templates/base/base/client/node/package.json
+- lib/generators/react_on_rails/templates/base/base/client/node/server.js
 - lib/generators/react_on_rails/templates/base/base/client/package.json.tt
-- lib/generators/react_on_rails/templates/base/base/client/webpack.client.base.config.js
-- lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.config.js
+- lib/generators/react_on_rails/templates/base/base/client/webpack.config.js
 - lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
 - lib/generators/react_on_rails/templates/base/base/lib/tasks/assets.rake.tt
+- lib/generators/react_on_rails/templates/base/base/lib/tasks/load_test.rake
 - lib/generators/react_on_rails/templates/base/base/package.json.tt
-- lib/generators/react_on_rails/templates/base/server_rendering/client/app/bundles/HelloWorld/startup/serverRegistration.jsx
-- lib/generators/react_on_rails/templates/base/server_rendering/client/webpack.server.rails.config.js
 - lib/generators/react_on_rails/templates/dev_tests/.rspec
 - lib/generators/react_on_rails/templates/dev_tests/spec/features/hello_world_spec.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb
 - lib/generators/react_on_rails/templates/dev_tests/spec/spec_helper.rb
 - lib/generators/react_on_rails/templates/no_redux/base/client/app/bundles/HelloWorld/containers/HelloWorld.jsx
-- lib/generators/react_on_rails/templates/no_redux/base/client/app/bundles/HelloWorld/startup/HelloWorldAppClient.jsx.tt
-- lib/generators/react_on_rails/templates/no_redux/server_rendering/client/app/bundles/HelloWorld/startup/HelloWorldAppServer.jsx
+- lib/generators/react_on_rails/templates/no_redux/base/client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx.tt
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/actions/helloWorldActionCreators.jsx
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/constants/helloWorldConstants.jsx
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/containers/HelloWorld.jsx
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/helloWorldReducer.jsx
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/index.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/startup/HelloWorldAppClient.jsx.tt
+- lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx.tt
 - lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/store/helloWorldStore.jsx
-- lib/generators/react_on_rails/templates/redux/base/client/app/lib/middlewares/loggerMiddleware.js
-- lib/generators/react_on_rails/templates/redux/server_rendering/client/app/bundles/HelloWorld/startup/HelloWorldAppServer.jsx
 - lib/react_on_rails.rb
 - lib/react_on_rails/configuration.rb
 - lib/react_on_rails/controller.rb
 - lib/react_on_rails/engine.rb
 - lib/react_on_rails/git_utils.rb
 - lib/react_on_rails/prerender_error.rb
+- lib/react_on_rails/react_component/options.rb
 - lib/react_on_rails/server_rendering_pool.rb
+- lib/react_on_rails/server_rendering_pool/exec.rb
+- lib/react_on_rails/server_rendering_pool/node.rb
 - lib/react_on_rails/test_helper.rb
 - lib/react_on_rails/test_helper/ensure_assets_compiled.rb
+- lib/react_on_rails/test_helper/node_process_launcher.rb
 - lib/react_on_rails/test_helper/webpack_assets_compiler.rb
 - lib/react_on_rails/test_helper/webpack_assets_status_checker.rb
-- lib/react_on_rails/test_helper/webpack_process_checker.rb
 - lib/react_on_rails/utils.rb
 - lib/react_on_rails/version.rb
 - lib/react_on_rails/version_checker.rb
 - lib/react_on_rails/version_syntax_converter.rb
+- lib/tasks/assets.rake
 - npm-shrinkwrap.json
 - package.json
 - rakelib/docker.rake
@@ -433,12 +454,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.

data/lib/generators/react_on_rails/templates/base/base/REACT_ON_RAILS.md

@@ -1,16 +0,0 @@
-The `react_on_rails` gem has been installed. You can view the documentation online at
-[React on Rails](https://github.com/shakacode/react_on_rails).
-
-Also, check out the [example application](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/client/server.js)
-for a live example and code.
-
-The "Hello World" example has been installed.
-
-+ The view is located at `app/views/hello_world/index.html.erb`
-+ The controller is located at `app/controllers/hello_world_controller.rb`
-
-See [the documentation](https://github.com/shakacode/react_on_rails) for how to build your bundles and
-install your packages. Then you can view the example as follows:
-
-- Rails Server: [localhost:3000/hello_world](http://localhost:3000/hello_world)
-- Webpack Development Server with HMR: [localhost:4000/hello_world](http://localhost:4000/hello_world)

data/lib/generators/react_on_rails/templates/base/base/client/REACT_ON_RAILS_CLIENT_README.md

@@ -1,3 +0,0 @@
-Client folder generated by React on Rails gem.
-
-See documentation [on github](https://github.com/shakacode/react_on_rails) for details on how it is organized.

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

@@ -1,65 +0,0 @@
-// Common client-side webpack configuration used by webpack.hot.config and webpack.rails.config.
-
-const webpack = require('webpack');
-const path = require('path');
-
-const devBuild = process.env.NODE_ENV !== 'production';
-const nodeEnv = devBuild ? 'development' : 'production';
-
-module.exports = {
-
-  // the project dir
-  context: __dirname,
-  entry: {
-
-    // See use of 'vendor' in the CommonsChunkPlugin inclusion below.
-    vendor: [
-      'babel-polyfill',
-      'jquery',
-    ],
-
-    // This will contain the app entry points defined by webpack.hot.config and
-    // webpack.rails.config
-    app: [
-      './app/bundles/HelloWorld/startup/clientRegistration',
-    ],
-  },
-  resolve: {
-    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),
-      },
-    }),
-
-    // https://webpack.github.io/docs/list-of-plugins.html#2-explicit-vendor-chunk
-    new webpack.optimize.CommonsChunkPlugin({
-
-      // This name 'vendor' ties into the entry definition
-      name: 'vendor',
-
-      // We don't want the default vendor.js name
-      filename: 'vendor-bundle.js',
-
-      // Passing Infinity just creates the commons chunk, but moves no modules into it.
-      // In other words, we only put what's in the vendor entry definition in vendor-bundle.js
-      minChunks: Infinity,
-    }),
-  ],
-  module: {
-    loaders: [
-
-      // Not all apps require jQuery. Many Rails apps do, such as those using TurboLinks or
-      // bootstrap js
-      { test: require.resolve('jquery'), loader: 'expose?jQuery' },
-      { test: require.resolve('jquery'), loader: 'expose?$' },
-    ],
-  },
-};

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

@@ -1,53 +0,0 @@
-// Run like this:
-// cd client && npm run build:dev:client
-// Note that Foreman (Procfile.dev) has also been configured to take care of this.
-
-// NOTE: All style sheets handled by the asset pipeline in rails
-
-const webpack = require('webpack');
-const config = require('./webpack.client.base.config');
-const devBuild = process.env.NODE_ENV !== 'production';
-
-config.output = {
-  filename: '[name]-bundle.js',
-  path: '../app/assets/webpack',
-};
-
-// You can add entry points specific to rails here
-// The es5-shim/sham is for capybara testing
-config.entry.vendor.unshift(
-  'es5-shim/es5-shim',
-  'es5-shim/es5-sham'
-);
-
-// jquery-ujs MUST GO AFTER jquery, so must use 'push'
-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: require.resolve('jquery-ujs'),
-    loader: 'imports?jQuery=jquery',
-  }
-);
-
-module.exports = config;
-
-if (devBuild) {
-  console.log('Webpack dev build for Rails'); // eslint-disable-line no-console
-  module.exports.devtool = 'eval-source-map';
-} else {
-  config.plugins.push(
-    new webpack.optimize.DedupePlugin()
-  );
-  console.log('Webpack production build for Rails'); // eslint-disable-line no-console
-}

data/lib/generators/react_on_rails/templates/base/server_rendering/client/app/bundles/HelloWorld/startup/serverRegistration.jsx

@@ -1,4 +0,0 @@
-import ReactOnRails from 'react-on-rails';
-import HelloWorldApp from './HelloWorldAppServer';
-
-ReactOnRails.register({ HelloWorldApp });

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

@@ -1,39 +0,0 @@
-// Webpack configuration for server bundle
-
-const webpack = require('webpack');
-const path = require('path');
-
-const devBuild = process.env.NODE_ENV !== 'production';
-const nodeEnv = devBuild ? 'development' : 'production';
-
-module.exports = {
-
-  // the project dir
-  context: __dirname,
-  entry: [
-    'babel-polyfill',
-    './app/bundles/HelloWorld/startup/serverRegistration',
-  ],
-  output: {
-    filename: 'server-bundle.js',
-    path: '../app/assets/webpack',
-  },
-  resolve: {
-    extensions: ['', '.js', '.jsx'],
-    alias: {
-      lib: path.join(process.cwd(), 'app', 'lib'),
-    },
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify(nodeEnv),
-      },
-    }),
-  ],
-  module: {
-    loaders: [
-      { test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ },
-    ],
-  },
-};

data/lib/generators/react_on_rails/templates/no_redux/base/client/app/bundles/HelloWorld/startup/HelloWorldAppClient.jsx.tt

@@ -1,6 +0,0 @@
-import React from 'react';
-import HelloWorld from '../containers/HelloWorld';
-
-export default (props) => (
-  <HelloWorld {...props} />
-);

data/lib/generators/react_on_rails/templates/no_redux/server_rendering/client/app/bundles/HelloWorld/startup/HelloWorldAppServer.jsx

@@ -1,6 +0,0 @@
-import React from 'react';
-import HelloWorld from '../containers/HelloWorld';
-
-export default (props) => (
-  <HelloWorld {...props} />
-);

data/lib/generators/react_on_rails/templates/redux/base/client/app/lib/middlewares/loggerMiddleware.js

@@ -1,21 +0,0 @@
-/* eslint no-console: 0 */
-
-// This logger should be configured not to run in a production environment.
-// See https://github.com/petehunt/webpack-howto#6-feature-flags for how you might turn this
-// off for production.
-export default function logger({ getState }) {
-  return next => action => {
-    console.log('will dispatch', action);
-
-    // Call the next dispatch method in the middleware chain.
-    const result = next(action);
-
-    const immutableState = getState();
-
-    console.log('state after dispatch', JSON.stringify(immutableState));
-
-    // This will likely be the action itself, unless
-    // a middleware further in chain changed it.
-    return result;
-  };
-}

data/lib/generators/react_on_rails/templates/redux/server_rendering/client/app/bundles/HelloWorld/startup/HelloWorldAppServer.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-
-import createStore from '../store/helloWorldStore';
-import HelloWorld from '../containers/HelloWorld';
-
-// See documentation for https://github.com/reactjs/react-redux.
-// This is how you get props from the Rails view into the redux store.
-// This code here binds your smart component to the redux store.
-// This is how the server redux gets hydrated with data.
-export default (props) => {
-  const store = createStore(props);
-  const reactComponent = (
-    <Provider store={store}>
-      <HelloWorld />
-    </Provider>
-  );
-  return reactComponent;
-};

data/lib/react_on_rails/test_helper/webpack_process_checker.rb

@@ -1,54 +0,0 @@
-# You can replace this implementation with your own for use by the
-# ReactOnRails::TestHelper.ensure_assets_compiled helper
-module ReactOnRails
-  module TestHelper
-    class WebpackProcessChecker
-      def initialize
-        @printed_once = {}
-        @needs_client_compile = true
-        @needs_server_compile = Utils.server_rendering_is_enabled?
-        @wait_longer = false
-      end
-
-      # Return true if we should keep waiting
-      # type is either client or server
-      def client_running?
-        client_running = check_running_for_type("client")
-        return false unless client_running
-      end
-
-      def server_running?
-        if Utils.server_rendering_is_enabled?
-          return true if check_running_for_type("server")
-        end
-        false
-      end
-
-      def hot_running?
-        _response = `pgrep -fl 'babel-node +server-rails-hot.js'`
-        Utils.last_process_completed_successfully?
-      end
-
-      private
-
-      def check_running_for_type(type)
-        type = type.to_sym
-
-        response = `pgrep -fl 'bin/webpack\s(\\-w|\\-\\-watch)\s\\-\\-config\s.*#{type}.*\\.js'`
-        is_running = Utils.last_process_completed_successfully?
-
-        if is_running
-          if @printed_once.empty?
-            puts "\nDetected Webpack processes running to rebuild your generated files:"
-          end
-          unless @printed_once[type]
-            puts "#{type}:  #{response}"
-            @printed_once[type] = true
-          end
-        end
-
-        is_running
-      end
-    end
-  end
-end