react_webpack_rails 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63660480d9bc4607d4ed78cf2f51224cabf6ffbb
-  data.tar.gz: 7a2c1e3d02812e344fee8d76a851de4d51f1df90
+  metadata.gz: bc3c752488603fdb973882bb3e20ba9f7f41ede7
+  data.tar.gz: fa127620618ef5c6b0ee93ca066684d28ecbc02a
 SHA512:
-  metadata.gz: d341a43a62f93cfdcadfbb15e3ea6a871c9e6bd616d906f7518b5b9dc77553fb429fa72f53f358ca5e83bd1e4576c6d78e19b156a5f363eda815ee3abc973d26
-  data.tar.gz: b6f51b56c5962acb48aeaffb74fdc156cf98c876b48b0f717d49c41eca405e54f8d21cf045febebe6767c520c7e8bf9522f2c3fb497d09207bee93a18785f57f
+  metadata.gz: f85dc801dd5df4ea8f60b5f759806e0d935dce4bb9dfbee7133a7d6231d075b3bc98ccd99314598c2a8fe936e966604c56496b8b5446437cadb1cb4ed6890305
+  data.tar.gz: cb4e64ca3e72c7033ae05bc527d09ca063e3614953c5610cdbaabb70ec782bb59df1783fe96f148dcdaae798f121a79a0ecf6d1d261b0187d8c8dafbe95861eb

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 0.4.0
+* Use React 15.x
+* Added Redux Generator
+* Add css/scss hot reload (css modules support)
+* Fix CamelizeKeys service - accept arrays
+
+#### migration 0.3.1 -> 0.4.0
+1. Install `style-loader` & `css-loader`:
+  ```
+  $ npm install --save style-loader css-loader
+  ```
+2. update webpack configuration:
+  1. In your `webpack.config.js` in `loaders` section replace:
+  ```js
+    {
+      key: 'scss',
+      test: /\.scss$/,
+      loader: ExtractTextPlugin.extract('css!sass')
+    },
+    {
+      key: 'css',
+      test: /\.css$/,
+      loader: ExtractTextPlugin.extract('css!sass')
+    }
+  ```
+  with:
+  ```js
+    {
+      key: 'style',
+      test: /\.s?css$/,
+      loader: ExtractTextPlugin.extract('css!sass')
+    }
+  ```
+  2. in your `webpack/hot-dev-config.js` add:
+  ```js
+    var scssLoader = config.module.loaders.filter(function(loader) { return loader.key == 'style' })[0]
+    scssLoader.loader = 'style!css!sass!';
+  ```
+
 ## 0.3.1
 * show depreciation warning only when integrations/react-router is used
 * throw an error when integration is missing

data/README.md

@@ -10,7 +10,7 @@ See [0.3-stable](https://github.com/netguru/react_webpack_rails/tree/0.3-stable)
 ## Features
 * [Install Generator](https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md) for quick [Webpack](http://webpack.github.io/) setup.
 * Integrated [react-hot-loader](https://github.com/gaearon/react-hot-loader)
-* ES6/7 support with [bablejs](https://babeljs.io/).
+* ES6/7 support with [babeljs](https://babeljs.io/).
 * Node.js based [server-side JavaScript execution](https://github.com/netguru/react_webpack_rails/blob/master/docs/server_side_rendering.md).
 * [React](https://facebook.github.io/react/) integration with server prerender option.
 * [React-router](https://github.com/rackt/react-router) integration.
@@ -36,19 +36,7 @@ Then run installation:
 
     $ rails g react_webpack_rails:install
 
-*read more about [install  generator](https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md) here*
-
-
-Establish the node packages (may take a few moments)
-
-    $ npm install    # you may see warnings to consider updating the provided package.json file with license and repository
-
-And require integration and bundle files in `application.js`
-
-```js
-//= require react_integration
-//= require react_bundle
-```
+*read more about [`install  generator`](https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md)*
 
 ### Babel
 

data/docs/README.md

@@ -1,14 +1,21 @@
 # Docs
+
 1. [Api](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md)
+
   1.1 [React](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#React)
     * [js: registerComponent](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#registercomponent)
     * [js: createComponent](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#getcomponent)
     * [js: renderComponent](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#rendercomponent)
     * [js: unmountComponent](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#unmountcomponent)
     * [ruby: react_component](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#react_component)
+
   1.2 [ReactRouter](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#ReactRouter)
     * [js: getRouter](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#getrouter)
     * [js: renderRouter](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#renderrouter)
     * [ruby: react_router](https://github.com/netguru/react_webpack_rails/blob/master/docs/api.md#react_router)
+
 2. [Server-Side Rendering](https://github.com/netguru/react_webpack_rails/blob/master/docs/server_side_rendering.md)
-3. [Install Generator]((https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md))
+
+3. [Install Generator](https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md)
+
+4. [Deployment](https://github.com/netguru/react_webpack_rails/blob/master/docs/deployment.md)

data/docs/install_generator.md

@@ -46,10 +46,11 @@ And modify:
 - `app/views/layouts/application.html.erb` by adding hot_reload partial.
 
 ### Options
-* *--no-example* - skip example generator
-* *--no-hot-reload* - skip hot_reload generator
-* *--no-server-side* - skip server_side  generator
-* *--no-karma-setup* - skip karma_setup generator
-* *--react-router* - run react_rotuer generator [DEPRECIATED since v0.3.0 - use [rwr-react_router](https://github.com/netguru/rwr-react_router) instead]
+* `--no-example` - skip example generator
+* `--no-hot-reload` - skip hot_reload generator
+* `--no-server-side` - skip server_side  generator
+* `--no-karma-setup` - skip karma_setup generator
+* `--react-router` - run react_rotuer generator [DEPRECIATED since v0.3.0 - use [rwr-react_router](https://github.com/netguru/rwr-react_router) instead]
+* `--redux` - install and setup [`rwr-redux`](https://github.com/netguru/rwr-redux) gem
 
 *Detailed description of generators coming soon...*

data/js/src/version.js

@@ -1 +1 @@
-export default '0.3.1';
+export default '0.4.0';

data/lib/generators/react_webpack_rails/install/hot_reload_generator.rb

@@ -25,6 +25,15 @@ module ReactWebpackRails
         copy_file 'partial/_react_hot_assets.html.erb', 'app/views/layouts/_react_hot_assets.html.erb'
         settings = template_language_settings("render 'layouts/react_hot_assets'")
 
+        missing_layout_info = <<-NO_MANIFEST.strip_heredoc
+          Application Layout not found.
+
+          Application Layout (normally app/views/layouts/appliaction.html.erb) could not be found.
+          Please add in you main layout: "render 'layouts/react_hot_assets'"
+        NO_MANIFEST
+
+        return say_status(:not_found, missing_layout_info, :red) if settings == :no_application_layout
+
         inject_into_file settings[:layout_file], settings[:parsed_command], after: "#{settings[:body_tag]}\n"
       end
 
@@ -32,6 +41,7 @@ module ReactWebpackRails
 
       def template_language_settings(command)
         layout_file = Dir.glob('app/views/layouts/application.*').first
+        return :no_application_layout if layout_file.nil?
 
         case File.extname(layout_file)
         when '.slim'

data/lib/generators/react_webpack_rails/install/redux_generator.rb

@@ -0,0 +1,56 @@
+module ReactWebpackRails
+  module Install
+    require 'generators/react_webpack_rails/merge_helpers'
+
+    class ReduxGenerator < Rails::Generators::Base
+      include MergeHelpers
+      desc 'Add redux setup'
+      source_root File.expand_path('../../templates', __FILE__)
+
+      REACT_INDEX_FILE = 'app/react/index.js'
+
+      class_option :tmp_package,
+                   type: :boolean,
+                   default: false,
+                   desc: 'Force update tmp/package.json instead package.json'
+
+      def package
+        merge_options = options.tmp_package ? { package_file: 'tmp/package.json', force: true } : {}
+        merge_into_package 'packages/redux.json', merge_options
+      end
+
+      def add_import
+        inject_into_file REACT_INDEX_FILE, after: "import RWR from 'react-webpack-rails';\n" do
+          <<-'JS'.strip_heredoc
+            import RWRRedux from 'rwr-redux';
+
+          JS
+        end
+      end
+
+      def gsub_rwr_import
+        old_line = "import RWR from 'react-webpack-rails';"
+        new_line = "import RWR, { integrationsManager } from 'react-webpack-rails';"
+        gsub_file REACT_INDEX_FILE, old_line, new_line
+      end
+
+      def add_integration_managers
+        inject_into_file REACT_INDEX_FILE, after: "RWR.run();\n" do
+          <<-'JS'.strip_heredoc
+
+            integrationsManager.register('redux-store', RWRRedux.storeIntegrationWrapper);
+            integrationsManager.register('redux-container', RWRRedux.containerIntegrationWrapper);
+          JS
+        end
+      end
+
+      def add_rwr_redux
+        append_file 'Gemfile' do
+          <<-'RB'.strip_heredoc
+            gem 'rwr-redux'
+          RB
+        end
+      end
+    end
+  end
+end

data/lib/generators/react_webpack_rails/install_generator.rb

@@ -23,6 +23,10 @@ module ReactWebpackRails
                  type: :boolean,
                  default: false,
                  desc: 'Run react_router generator'
+    class_option :redux,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Run redux generator'
 
     def generate_core
       generate 'react_webpack_rails:install:core --tmp-package'
@@ -56,6 +60,11 @@ module ReactWebpackRails
       generate 'react_webpack_rails:install:react_router --tmp_package'
     end
 
+    def generate_redux
+      return unless options.redux
+      generate 'react_webpack_rails:install:redux --tmp_package'
+    end
+
     def copy_package
       create_file 'package.json', File.read(Rails.root.join('tmp/package.json'))
     end
@@ -64,6 +73,15 @@ module ReactWebpackRails
       remove_file('tmp/package.json')
     end
 
+    def install_gems
+      return unless options.redux
+      run 'bundle install'
+    end
+
+    def install_packages
+      run 'npm install'
+    end
+
     private
 
     def deprecation_warning

data/lib/generators/react_webpack_rails/templates/packages/core.json

@@ -12,12 +12,15 @@
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-1": "^6.3.13",
+    "css-loader": "^0.23.1",
     "extract-text-webpack-plugin": "^0.8.2",
     "node-sass": "^3.3.3",
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0",
+    "react": "^15.0.1",
+    "react-addons-test-utils": "^15.0.1",
+    "react-dom": "^15.0.1",
     "react-webpack-rails": "^0.3.0",
     "sass-loader": "^3.0.0",
+    "style-loader": "^0.13.1",
     "webpack": "^1.12.1"
   },
   "scripts": {

data/lib/generators/react_webpack_rails/templates/packages/redux.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "react-redux": "^4.4.4",
+    "redux": "^3.4.0",
+    "rwr-redux": "^0.2.0"
+  }
+}

data/lib/generators/react_webpack_rails/templates/react/components/hello-world-test.jsx

@@ -1,5 +1,5 @@
-import React from 'react/addons';
-const TestUtils = React.addons.TestUtils;
+import React from 'react';
+import TestUtils from 'react-addons-test-utils';
 import expect from 'expect';
 import HelloWorld from './hello-world';
 

data/lib/generators/react_webpack_rails/templates/webpack/hot-dev.config.js

@@ -3,6 +3,9 @@ var config = require('./dev.config');
 var jsxLoader = config.module.loaders.filter(function(loader) { return loader.key == 'jsx' })[0]
 jsxLoader.loaders.unshift('react-hot');
 
+var scssLoader = config.module.loaders.filter(function(loader) { return loader.key == 'style' })[0]
+scssLoader.loader = 'style!css!sass!';
+
 config.output.publicPath = 'http://localhost:8080/assets/'
 
 config.entry.main.push(

data/lib/generators/react_webpack_rails/templates/webpack.config.js

@@ -17,13 +17,8 @@ module.exports = {
         loaders: ['babel']
       },
       {
-        key: 'scss',
-        test: /\.scss$/,
-        loader: ExtractTextPlugin.extract('css!sass')
-      },
-      {
-        key: 'css',
-        test: /\.css$/,
+        key: 'style',
+        test: /\.s?css$/,
         loader: ExtractTextPlugin.extract('css!sass')
       }
     ]

data/lib/react_webpack_rails/services/camelize_keys.rb

@@ -1,11 +1,24 @@
 module ReactWebpackRails
   module Services
     class CamelizeKeys
-      def self.call(props)
-        return props unless props.is_a?(Hash)
-        props.inject({}) do |h, (k, v)|
-          h[k.to_s.camelize(:lower)] = v.is_a?(Hash) ? self.call(v) : v
-          h
+      def call(data)
+        case data.class.name
+        when 'Array' then data.map { |element| call(element) }
+        when 'Hash' then camelize_hash(data)
+        else data
+        end
+      end
+
+      def self.call(data)
+        new.call(data)
+      end
+
+      private
+
+      def camelize_hash(data)
+        data.inject({}) do |hash, (key, value)|
+          hash[key.to_s.camelize(:lower)] = call(value)
+          hash
         end
       end
     end

data/lib/react_webpack_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactWebpackRails
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-webpack-rails",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Js part of react_webpack_rails - webpack based React & Rails integration.",
   "main": "js/lib/index.js",
   "files": [
@@ -28,11 +28,13 @@
   },
   "homepage": "https://github.com/netguru/react_webpack_rails#readme",
   "peerDependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0"
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0"
   },
   "dependencies": {
-    "babel-polyfill": "^6.3.0"
+    "babel-polyfill": "^6.3.0",
+    "react": "^15.0.1",
+    "react-dom": "^15.0.1"
   },
   "devDependencies": {
     "babel-cli": "^6.4.0",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_webpack_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Rafał Gawlik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - lib/generators/react_webpack_rails/install/hot_reload_generator.rb
 - lib/generators/react_webpack_rails/install/karma_setup_generator.rb
 - lib/generators/react_webpack_rails/install/react_router_generator.rb
+- lib/generators/react_webpack_rails/install/redux_generator.rb
 - lib/generators/react_webpack_rails/install/server_side_generator.rb
 - lib/generators/react_webpack_rails/install_generator.rb
 - lib/generators/react_webpack_rails/merge_helpers.rb
@@ -127,6 +128,7 @@ files:
 - lib/generators/react_webpack_rails/templates/packages/hot-reload.json
 - lib/generators/react_webpack_rails/templates/packages/js-specs.json
 - lib/generators/react_webpack_rails/templates/packages/react-router.json
+- lib/generators/react_webpack_rails/templates/packages/redux.json
 - lib/generators/react_webpack_rails/templates/packages/server-side.json
 - lib/generators/react_webpack_rails/templates/partial/_react_hot_assets.html.erb
 - lib/generators/react_webpack_rails/templates/react/components/hello-world-test.jsx
@@ -172,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: React and Rails integration done with webpack