react_on_rails 5.1.1 → 5.2.0

data/lib/generators/react_on_rails/templates/base/base/client/package.json.tt

@@ -1,31 +1,12 @@
 <%- require "react_on_rails/version_syntax_converter" -%>
 {
   "name": "react-webpack-rails-tutorial",
-  "version": "1.1.0",
-  "description": "Built using the react_on_rails generator.",
-  "main": "server.js",
+  "version": "0.0.1",
   "engines": {
-    "node": "5.0.0",
+    "node": "5.10.0",
     "npm": "3.5.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/shakacode/react-webpack-rails-tutorial.git"
-  },
-  "keywords": [
-    "react",
-    "tutorial",
-    "comment",
-    "example"
-  ],
-  "author": "justin808",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
-  },
-  "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
   "scripts": {
-    "start": "node server.js",
     "build:client": "NODE_ENV=production webpack --config webpack.client.rails.config.js",
     <%- if options.server_rendering? -%>
     "build:server": "NODE_ENV=production webpack --config webpack.server.rails.config.js",
@@ -38,11 +19,6 @@
     <%- if options.server_rendering? -%>
     "build:production:server": "NODE_ENV=production webpack --config webpack.server.rails.build.config.js",
     <%- end -%>
-    <%- unless options.skip_js_linters? -%>
-    "lint": "npm run eslint && npm run jscs",
-    "eslint": "eslint --ext .js,.jsx .",
-    "jscs": "jscs --verbose .",
-    <%- end -%>
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
@@ -71,11 +47,8 @@
     <%- if options.redux? -%>
     "mirror-creator": "1.1.0",
     <%- end -%>
-    "react": "^0.14.8",
-    <%- unless options.skip_bootstrap? -%>
-    "react-bootstrap": "^0.28.5",
-    <%- end -%>
-    "react-dom": "^0.14.8",
+    "react": "^0.14.8 || ^15.0.0",
+    "react-dom": "^0.14.8 || ^15.0.0",
     "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
     <%- if options.redux? -%>
     "react-redux": "^4.4.1",
@@ -86,28 +59,5 @@
     "webpack": "^1.12.14"
   },
   "devDependencies": {
-    "babel-plugin-react-transform": "^2.0.2",
-    <%- unless options.skip_bootstrap? -%>
-    "bootstrap-sass": "^3.3.6",
-    "bootstrap-sass-loader": "^1.0.10",
-    <%- end -%>
-    "css-loader": "^0.23.1",
-    <%- unless options.skip_js_linters? -%>
-    "eslint": "^2.6.0",
-    "eslint-config-shakacode": "^4.0.0",
-    "eslint-plugin-react": "^4.2.3",
-    <%- end -%>
-    "express": "^4.13.4",
-    "file-loader": "^0.8.5",
-    "jade": "^1.11.0",
-    <%- unless options.skip_js_linters? -%>
-    "jscs": "^2.11.0",
-    <%- end -%>
-    "node-sass": "^3.4.2",
-    "react-transform-hmr": "^1.0.4",
-    "sass-loader": "^3.2.0",
-    "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack-dev-server": "^1.14.1"
   }
 }

data/lib/generators/react_on_rails/templates/base/base/package.json.tt

@@ -1,15 +1,12 @@
 {
   "name": "react-webpack-rails-tutorial",
-  "version": "1.1.1",
-  "description": "Built using the react_on_rails generator. Allows you to run npm install from root.",
-  "main": "server.js",
+  "version": "0.0.1",
   "engines": {
-    "node": "4.2.0",
-    "npm": "3.3.6"
+    "node": "5.10.0",
+    "npm": "3.5.0"
   },
   "scripts": {
     "postinstall": "cd client && npm install",
-    "express-server": "echo 'visit http://localhost:4000' && cd client && npm start",
     "rails-server": "echo 'visit http://localhost:3000/hello_world' && foreman start -f Procfile.dev",
     "build:production:client": "(cd client && npm run build:production:client --silent)",
     <%- if options.server_rendering? -%>
@@ -23,23 +20,6 @@
     <%- if options.server_rendering? -%>
     "build:dev:server": "(cd client && npm run build:dev:server --silent)",
     <%- end -%>
-    "test": "rspec && (cd client && npm run lint)"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/shakacode/react-webpack-rails-tutorial.git"
-  },
-  "keywords": [
-    "react",
-    "tutorial",
-    "comment",
-    "example"
-  ],
-  "author": "justin808",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
-  },
-  "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
-  "dependencies": {}
+    "test": "rspec"
+  }
 }

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "5.1.1".freeze
+  VERSION = "5.2.0".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -24,8 +24,8 @@
     "eslint-plugin-react": "^4.2.3",
     "jscs": "^2.11.0",
     "jsdom": "^8.2.0",
-    "react": "^0.14.8",
-    "react-dom": "^0.14.8",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
     "react-transform-hmr": "^1.0.4",
     "redux": "^3.3.1",
     "release-it": "^2.3.1",

data/rakelib/examples_config.yml

@@ -11,9 +11,4 @@ example_type_data:
   -
     name: redux-server-rendering
     generator_options: --redux --server-rendering
-  -
-    name: heroku-deployment
-    generator_options: --heroku-deployment
-  -
-    name: skip-bootstrap
-    generator_options: --skip-bootstrap
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -345,17 +345,12 @@ files:
 - docs/tutorial.md
 - lib/generators/USAGE
 - lib/generators/react_on_rails/base_generator.rb
-- lib/generators/react_on_rails/bootstrap_generator.rb
 - lib/generators/react_on_rails/dev_tests_generator.rb
 - lib/generators/react_on_rails/generator_helper.rb
 - lib/generators/react_on_rails/generator_messages.rb
-- lib/generators/react_on_rails/heroku_deployment_generator.rb
 - lib/generators/react_on_rails/install_generator.rb
-- lib/generators/react_on_rails/js_linters_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/ruby_linters_generator.rb
-- lib/generators/react_on_rails/templates/base/base/Procfile.dev-hot.tt
 - 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
@@ -364,33 +359,19 @@ files:
 - 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/index.jade
 - lib/generators/react_on_rails/templates/base/base/client/package.json.tt
-- lib/generators/react_on_rails/templates/base/base/client/server.js
 - 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.hot.config.js.tt
 - lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.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/linters.rake.tt
 - 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/bootstrap/app/assets/stylesheets/_bootstrap-custom.scss
-- lib/generators/react_on_rails/templates/bootstrap/client/assets/stylesheets/_post-bootstrap.scss
-- lib/generators/react_on_rails/templates/bootstrap/client/assets/stylesheets/_pre-bootstrap.scss
-- lib/generators/react_on_rails/templates/bootstrap/client/assets/stylesheets/_react-on-rails-sass-helper.scss
-- lib/generators/react_on_rails/templates/bootstrap/client/bootstrap-sass.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/heroku_deployment/Procfile
-- lib/generators/react_on_rails/templates/heroku_deployment/config/puma.rb
-- lib/generators/react_on_rails/templates/js_linters/client/.eslintignore
-- lib/generators/react_on_rails/templates/js_linters/client/.eslintrc
-- lib/generators/react_on_rails/templates/js_linters/client/.jscsrc
 - 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
@@ -403,11 +384,6 @@ files:
 - 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/generators/react_on_rails/templates/ruby_linters/.rubocop.yml
-- lib/generators/react_on_rails/templates/ruby_linters/.scss-lint.yml
-- lib/generators/react_on_rails/templates/ruby_linters/lib/tasks/brakeman.rake
-- lib/generators/react_on_rails/templates/ruby_linters/lib/tasks/ci.rake
-- lib/generators/react_on_rails/templates/ruby_linters/ruby-lint.yml.tt
 - lib/react_on_rails.rb
 - lib/react_on_rails/configuration.rb
 - lib/react_on_rails/controller.rb

data/lib/generators/react_on_rails/bootstrap_generator.rb

@@ -1,86 +0,0 @@
-require "rails/generators"
-require_relative "generator_helper"
-require_relative "generator_messages"
-
-module ReactOnRails
-  module Generators
-    class BootstrapGenerator < Rails::Generators::Base
-      include GeneratorHelper
-      Rails::Generators.hide_namespace(namespace)
-      source_root(File.expand_path("../templates", __FILE__))
-
-      def copy_bootstrap_files
-        base_path = "bootstrap/"
-        %w(app/assets/stylesheets/_bootstrap-custom.scss
-           client/assets/stylesheets/_post-bootstrap.scss
-           client/assets/stylesheets/_pre-bootstrap.scss
-           client/assets/stylesheets/_react-on-rails-sass-helper.scss
-           client/bootstrap-sass.config.js).each { |file| copy_file(base_path + file, file) }
-      end
-
-      # if there still is not application.scss, just create one
-      def create_application_scss_if_necessary
-        path = File.join(destination_root, "app/assets/stylesheets/application.scss")
-        return if File.exist?(path)
-        File.open(path, "w") { |f| f.puts "// Created by React on Rails gem\n\n" }
-      end
-
-      def prepend_to_application_scss
-        data = <<-DATA.strip_heredoc
-          // DO NOT REQUIRE TREE! It will interfere with load order!
-
-          // Account for differences between Rails and Webpack Sass code.
-          $rails: true;
-
-          // Included from bootstrap-sprockets gem and loaded in app/assets/javascripts/application.rb
-          @import 'bootstrap-sprockets';
-
-          // Customizations - needs to be imported after bootstrap-sprocket but before bootstrap-custom!
-          // The _pre-bootstrap.scss file is located under
-          // client/assets/stylesheets, which has been added to the Rails asset
-          // pipeline search path. See config/application.rb.
-          @import 'pre-bootstrap';
-
-          // These scss files are located under client/assets/stylesheets
-          // (which has been added to the Rails asset pipeline search path in config/application.rb).
-          @import 'bootstrap-custom';
-
-          // This must come after all the boostrap styles are loaded so that these styles can override those.
-          @import 'post-bootstrap';
-
-        DATA
-
-        application_scss = File.join(destination_root, "app/assets/stylesheets/application.scss")
-
-        append_to_file(application_scss, data)
-      end
-
-      def strip_application_scss_of_incompatible_sprockets_statements
-        application_scss = File.join(destination_root, "app/assets/stylesheets/application.scss")
-        gsub_file(application_scss, "*= require_tree .", "")
-        gsub_file(application_scss, "*= require_self", "")
-      end
-
-      def add_bootstrap_sprockets_to_gemfile
-        append_to_file("Gemfile", "\ngem 'bootstrap-sass'\n")
-      end
-
-      def add_bootstrap_sprockets_to_application_js
-        data = <<-DATA.strip_heredoc
-
-          // bootstrap-sprockets depends on vendor-bundle for jQuery.
-          //= require bootstrap-sprockets
-
-        DATA
-
-        app_js_path = "app/assets/javascripts/application.js"
-        found_app_js = dest_file_exists?(app_js_path) || dest_file_exists?(app_js_path + ".coffee")
-        if found_app_js
-          append_to_file(found_app_js, data)
-        else
-          create_file(app_js_path, data)
-        end
-      end
-    end
-  end
-end

data/lib/generators/react_on_rails/heroku_deployment_generator.rb

@@ -1,29 +0,0 @@
-require "rails/generators"
-require_relative "generator_helper"
-
-module ReactOnRails
-  module Generators
-    class HerokuDeploymentGenerator < Rails::Generators::Base
-      include GeneratorHelper
-      Rails::Generators.hide_namespace(namespace)
-      source_root(File.expand_path("../templates", __FILE__))
-
-      def copy_heroku_deployment_files
-        base_path = "heroku_deployment"
-        %w(Procfile
-           config/puma.rb).each { |file| copy_file("#{base_path}/#{file}", file) }
-      end
-
-      def add_heroku_production_gems
-        gem_text = <<-GEMS.strip_heredoc
-
-          # For Heroku deployment
-          gem 'rails_12factor', group: :production
-          gem 'puma', group: :production
-
-        GEMS
-        append_to_file("Gemfile", gem_text)
-      end
-    end
-  end
-end

data/lib/generators/react_on_rails/js_linters_generator.rb

@@ -1,19 +0,0 @@
-require "rails/generators"
-
-module ReactOnRails
-  module Generators
-    class JsLintersGenerator < Rails::Generators::Base
-      Rails::Generators.hide_namespace(namespace)
-      source_root File.expand_path("../templates", __FILE__)
-
-      # NOTE: linter modules are included via template in base/base/client/package.json.tt
-
-      def copy_js_linter_config_files
-        base_path = "js_linters/"
-        %w(client/.eslintrc
-           client/.eslintignore
-           client/.jscsrc).each { |file| copy_file(base_path + file, file) }
-      end
-    end
-  end
-end

data/lib/generators/react_on_rails/ruby_linters_generator.rb

@@ -1,35 +0,0 @@
-require "rails/generators"
-require_relative "generator_helper"
-
-module ReactOnRails
-  module Generators
-    class RubyLintersGenerator < Rails::Generators::Base
-      include GeneratorHelper
-      Rails::Generators.hide_namespace(namespace)
-      source_root File.expand_path("../templates", __FILE__)
-
-      def add_ruby_linter_gems_to_gemfile
-        linter_gems = <<-GEMS.strip_heredoc
-
-          # require: false is necessary for the linters as we only want them loaded
-          # when used by the linting rake tasks.
-          group :development do
-            gem("rubocop", require: false)
-            gem("ruby-lint", require: false)
-            gem("scss_lint", require: false)
-          end
-        GEMS
-        append_to_file("Gemfile", linter_gems)
-      end
-
-      def copy_ruby_linting_and_auditing_tasks
-        base_path = "ruby_linters/"
-        %w(lib/tasks/brakeman.rake
-           lib/tasks/ci.rake
-           .rubocop.yml
-           .scss-lint.yml).each { |file| copy_file(base_path + file, file) }
-        template("ruby_linters/ruby-lint.yml.tt", "ruby-lint.yml")
-      end
-    end
-  end
-end

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev-hot.tt

@@ -1,4 +0,0 @@
-web: rails s
-# TODO: MIGRATE from tutorial
-client: sh -c 'rm app/assets/webpack/* || true && cd client && npm run build:dev:client'
-<%- if options.server_rendering? %>server: sh -c 'cd client && npm run build:dev:server'<%- end %>

data/lib/generators/react_on_rails/templates/base/base/client/index.jade

@@ -1,15 +0,0 @@
-doctype html
-html
-
-  head
-    title Hello, React
-
-  body
-
-    h1.alert.alert-info.this-works webpack dev server (with HMR)
-    #app
-
-    script(src="vendor-bundle.js")
-    script(src="app-bundle.js")
-    script.
-      ReactOnRails.render("HelloWorldApp", {name: "Stranger"}, 'app');

data/lib/generators/react_on_rails/templates/base/base/client/server.js

@@ -1,72 +0,0 @@
-// This file is used by the webpack HMR dev server to load your component without using Rails
-// It should simply match routes to basic HTML or jade files that render your component
-/* eslint-disable no-console, func-names, no-var */
-var webpack = require('webpack');
-var WebpackDevServer = require('webpack-dev-server');
-var jade = require('jade');
-var config = require('./webpack.client.hot.config');
-
-const PORT = 4000;
-const compiler = webpack(config);
-
-var server = new WebpackDevServer(compiler, {
-  publicPath: config.output.publicPath,
-  hot: true,
-  historyApiFallback: true,
-  stats: {
-    colors: true,
-    hash: false,
-    version: false,
-    chunks: false,
-    children: false,
-  },
-});
-
-// The following code is commented out because the HelloWorld example
-// does not use any asynchronous functionality. It is meant to serve
-// as an example of how one might implement an API in express for their
-// webpack dev server
-// Note, it would be necessary to run `npm i --save body-parser sleep` for
-// the following to work:
-// var bodyParser = require('body-parser');
-// var sleep = require('sleep');
-// See tutorial for example of using AJAX:
-// https://github.com/shakacode/react-webpack-rails-tutorial
-
-// server.app.use(bodyParser.json(null));
-// server.app.use(bodyParser.urlencoded({extended: true}));
-// server.app.get('/hello_world.json', function(req, res) {
-//   res.setHeader('Content-Type', 'application/json');
-//   res.send(JSON.stringify(name));
-// });
-
-// server.app.post('/hello_world.json', function(req, res) {
-//   console.log('Processing name: %j', req.body.name);
-//   console.log('(shhhh...napping 1 seconds)');
-//   sleep.sleep(1);
-//   console.log('Just got done with nap!');
-//   name = req.body.name;
-//   res.setHeader('Content-Type', 'application/json');
-//   res.send(JSON.stringify(req.body.name));
-// });
-
-var initialName = 'Stranger';
-
-server.app.use('/', (req, res) => {
-  var locals = {
-    props: JSON.stringify(initialName),
-  };
-  var layout = `${process.cwd()}/index.jade`;
-  var html = jade.compileFile(layout, { pretty: true })(locals);
-  res.send(html);
-});
-
-server.listen(PORT, 'localhost', err => {
-  if (err) console.error(err);
-  console.log(
-    `=> 🔥  Webpack development server is running on port ${PORT}`
-  );
-});
-compiler.plugin('done', () => {
-  process.stdout.write('Webpack: Done compiling assets!\n');
-});