webpack-rails-react 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0da8cf4f7d6b95ba1a7cb9da36e7404392bb7bd9
-  data.tar.gz: 805c1c43baab1db2c655ed4b059b8788df501f5a
+  metadata.gz: 0666af5c95adea9310b4b46f5a79fb08ab91c89f
+  data.tar.gz: c7a947c1895d8df2d6e03b5ae1a54f4cf03e07a4
 SHA512:
-  metadata.gz: b23afced5ca978ba91d38bb3914ee2ad591d4ae33616b052381082410f1043cfe8cf3510968f8a055d60600258bf891c9b4d12077e3179f22e852ef7cc103de8
-  data.tar.gz: f221bbbe50ce4d88c8f8991d1c29eb52d8a7c73c959ef678c79d0f3f079d69888387723a4f0e80acc854c2d5c2bd812c0f89577b7fc260bd981e5affcb7822fe
+  metadata.gz: 3df17e31cd4c474108d35037d4c8ee68d81ec7cfce060d8e8e0643ede832cda05b6c12971d2f491b75a152989ae715ab445b04eacdabe0c954908917fd42d388
+  data.tar.gz: 77c527eab7a0c5ccbac5043fdb039d6b60e2a8b6688bbf12c0c34b33a5eab5ace67ec1b732d7c1b20bcc641f0401ae9d13e1f80fee86c15d41c40d4b5e6679fd

data/README.md

@@ -101,6 +101,15 @@ If you're using `[chunkhash]` in your build asset filenames (which you should be
 * Add eslint to client
 * Integration tests
 
+
+## Experimental
+A view generator has been added.
+
+  1.Generate a controller
+  2.Add at least an index route for the controller
+  3.rails g webpack_rails_react:view name_of_view (should be singular and match controller)
+
+
 ## Contributing
 
 Pull requests & issues welcome. Advice & criticism regarding webpack config approach also welcome.

data/example/boilerplate/views/ContainerTemplate.js

@@ -0,0 +1,8 @@
+import React from 'react';
+
+const Placeholder = () => (
+  <div>
+  </div>
+)
+
+export default Placeholder;

data/example/boilerplate/views/ViewTemplate.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import Placeholder from './containers/Placeholder';
+
+ReactDOM.render(
+  <Placeholder />,
+  document.getElementById('react')
+);

data/example/boilerplate/views/rails_view.html.erb

@@ -0,0 +1,5 @@
+<% content_for(:body_attributes) do %>
+  data-no-turbolink="true"
+<% end %>
+<div id="react"></div>
+<%= javascript_include_tag *webpack_asset_paths('placeholder') %>

data/example/package.json

@@ -2,6 +2,10 @@
   "name": "webpack-rails",
   "version": "0.0.1",
   "license": "MIT",
+  "scripts": {
+    "dev_server": "./node_modules/.bin/webpack-dev-server --config config/webpack.config.js",
+    "build": "webpack --config=config/webpack.config.js -p"
+  },
   "dependencies": {
     "react": "^15.1.0",
     "react-dom": "^15.1.0",

data/lib/generators/webpack_rails_react/install_generator.rb

@@ -7,18 +7,6 @@ module WebpackRailsReact
     class_option :router, type: :boolean, default: false, description: 'Add React Router'
     class_option :redux, type: :boolean, default: false, description: 'Add Redux'
 
-    def add_foreman_to_gemfile
-      gem 'foreman'
-    end
-
-    def copy_procfile
-      if File.exists? "Procfile"
-        append_file "Procfile", "webpack: ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js"
-      else
-        copy_file "Procfile", "Procfile"
-      end
-    end
-
     def copy_package_json
       copy_file "package.json", "package.json"
 
@@ -82,17 +70,23 @@ module WebpackRailsReact
         copy_file "boilerplate/App.js", "webpack/containers/App.js"
       end
 
-      insert_into_file 'app/views/layouts/application.html.erb', before: /<\/body>/ do
-          <<-'RUBY'
-<%= javascript_include_tag *webpack_asset_paths('application') %>
-          RUBY
-      end
-      insert_into_file 'app/views/layouts/application.html.erb', before: /<\/head>/ do
-          <<-'RUBY'
-    <% if Rails.env.development? %>
-      <script src="http://localhost:3808/webpack-dev-server.js"></script>
-    <% end %>
-          RUBY
+      application_view = 'app/views/layouts/application.html.erb'
+
+      if File.exists? application_view
+        insert_into_file 'app/views/layouts/application.html.erb', before: /<\/body>/ do
+            <<-'RUBY'
+<%= ja  vascript_include_tag *webpack_asset_paths('application') %>
+            RUBY
+        end
+        insert_into_file 'app/views/layouts/application.html.erb', before: /<\/head>/ do
+            <<-'RUBY'
+      <% if Rails.env.development? %>
+        <script src="http://localhost:3808/webpack-dev-server.js"></script>
+      <% end %>
+            RUBY
+        end
+      else
+        puts "\n\n***WARNING*** HAML NOT SUPPORTED IN applictaion.html additional steps required\n\n"
       end
     end
 
@@ -110,10 +104,6 @@ module WebpackRailsReact
       run "npm install" if yes?("Would you like us to run 'npm install' for you?")
     end
 
-    def run_bundle_install
-      run "bundle install" if yes?("Would you like us to run 'bundle install' for you?")
-    end
-
     def whats_next
       puts <<-EOF.strip_heredoc
 
@@ -122,8 +112,9 @@ module WebpackRailsReact
 
           1. Add an element with an id of 'app' to your layout
           2. To disable hot module replacement remove <script src="http://localhost:3808/webpack-dev-server.js"></script> from layout
-          3. Run 'foreman start' to run the webpack-dev-server and rails server
-          4. If you are using react-router and want to sync server routes add:
+          3. Run 'npm run dev_server' to run the webpack-dev-server
+          4. Run 'bundle exec rails s' to run the rails server (both servers must be running)
+          5. If you are using react-router and want to sync server routes add:
              get '*unmatched_route', to: <your client controller>#<default action>
              This must be the very last route in your routes.rb file
              e.g. get '*unmatched_route', to: 'home#index'

data/lib/generators/webpack_rails_react/view_generator.rb

@@ -0,0 +1,45 @@
+module WebpackRailsReact
+  # :nodoc:
+  class ViewGenerator < ::Rails::Generators::Base
+    source_root File.expand_path("../../../../example", __FILE__)
+
+    desc "Generate a view with webpack entry / rails view / and webpack container"
+
+    def normalize_view_name
+      raise "View name argument missing" if args.length == 0
+      @view = args[0]
+    end
+
+    def update_webpack_entry
+      name = @view.downcase.gsub(/ /, "_")
+      path = "'#{name}': './webpack/#{name}.js',"
+      insert_into_file 'config/webpack.config.js', after: /entry: {\n/ do
+        <<-CONFIG
+    #{path}
+        CONFIG
+      end
+    end
+
+    def create_entry_file
+      file = "webpack/#{@view.gsub(/ /, '')}.js"
+      name = @view.titleize.gsub(/ /, '')
+      copy_file "boilerplate/views/ViewTemplate.js", file
+      gsub_file file, /Placeholder/, name
+    end
+
+    def create_container
+      name = @view.titleize.gsub(/ /, '')
+      file = "webpack/containers/#{name}.js"
+      copy_file "boilerplate/views/ContainerTemplate.js", file
+      gsub_file file, /Placeholder/, name
+    end
+
+    def create_rails_view
+      name = @view.downcase.gsub(/ /, '_')
+      empty_directory "app/views/#{name.pluralize}"
+      file = "app/views/#{name.pluralize}/index.html.erb"
+      copy_file "boilerplate/views/rails_view.html.erb", file
+      gsub_file file, /placeholder/, name
+    end
+  end
+end

data/lib/webpack/rails/react/helper.rb

@@ -33,4 +33,4 @@ module Webpack
       end
     end
   end
-end
+end

data/lib/webpack/rails/react/version.rb

@@ -2,7 +2,7 @@ module Webpack
   # :nodoc:
   module Rails
     module React
-      VERSION = "1.0.8"
+      VERSION = "1.0.9"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpack-rails-react
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Dave Jungst
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,10 +50,14 @@ files:
 - example/boilerplate/router_redux/reducers.js
 - example/boilerplate/router_redux/store.js
 - example/boilerplate/routes.js
+- example/boilerplate/views/ContainerTemplate.js
+- example/boilerplate/views/ViewTemplate.js
+- example/boilerplate/views/rails_view.html.erb
 - example/dot_gitignore
 - example/package.json
 - example/webpack.config.js
 - lib/generators/webpack_rails_react/install_generator.rb
+- lib/generators/webpack_rails_react/view_generator.rb
 - lib/tasks/webpack.rake
 - lib/webpack-rails-react.rb
 - lib/webpack/rails.rb
@@ -81,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Webpack / Rails / React