webpack_react_on_rails 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb39b321561aab0c6d212638e275421d3faae851
-  data.tar.gz: fe9c2785523a68139224dac135aa3255e7de18d6
+  metadata.gz: 29b605af265426460dd4e9e7c1763af73fce413a
+  data.tar.gz: 837c87c989797bdfd7c5d6f6e396bd61de0386ad
 SHA512:
-  metadata.gz: 57719a6bd96ae8ace6bb14ec7feb1f446f9decac49c290923c8e8ad40bf0c2272aa8e56392b72919925b1750b013e7991c81772783931fe4f26bfca2b5520d50
-  data.tar.gz: a3c37743ca9c2fa513d9a6bbf1cd0369fc7dac5c664aa2ca3295583fc32c974fe1fb57b33e13ff2fe7d6bedad178dd1c6da5dac3808c49ac65abb8b1ebbcf6f3
+  metadata.gz: bd36a55bbcfb1a16f433dfd7b4ac3b1d0c795ecc495aac3761fcf6e4d9e99cec32a2ea4cf0a0d006fffbbcd39e1332ff40295f819188b9a24dceef10a2752582
+  data.tar.gz: 0b6c754ed1769a4c1566d050bf6e047f9cad37693720d2f5ba33db9e8fb4f0404ea4aaf771bba09572a3701db1b28c4bb372103a021f6cb44f800c87b6912da6

data/lib/generators/webpack_react_on_rails/install_generator.rb

@@ -2,20 +2,28 @@ require 'rails/generators'
 
 module WebpackReactOnRails
   class InstallGenerator < Rails::Generators::Base
-    TEMPLATES_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '../../templates')
+    source_root File.expand_path('../templates', __FILE__)
 
     def create_scaffold_file
-      generate_package_file('package', "#{Rails.root}/package.json")
+      inside 'config' do
+        inject_into_file "application.rb", "\n    config.webpack = {\n      :use_manifest => false,\n      :asset_manifest => {},\n      :common_manifest => {}\n    }\n", after: "class Application < Rails::Application"
 
-      generate_config_file('webpack_development_config', "#{Rails.root}/webpack_development.config.js")
-
-      generate_config_file('webpack_production_config', "#{Rails.root}/webpack_production.config.js")
+        inside 'environments' do
+          inject_into_file "production.rb", "  config.webpack[:use_manifest] = true\n", before: /^end/
+        end
 
-      generate_config_file('webpack_initializer', "#{Rails.root}/config/initializers/webpack.rb")
+        inside 'initializers' do
+          copy_file "../../../templates/config/initializers/webpack.rb", "webpack.rb"
+        end
 
-      inject_into_file "config/application.rb", "\n    config.webpack = {\n      :use_manifest => false,\n      :asset_manifest => {},\n      :common_manifest => {}\n    }\n", after: "class Application < Rails::Application"
+        inside 'webpack' do
+          copy_file "../../../templates/config/webpack/main.config.js", "main.config.js"
+          copy_file "../../../templates/config/webpack/development.config.js", "development.config.js"
+          copy_file "../../../templates/config/webpack/production.config.js", "production.config.js"
+        end
+      end
 
-      inject_into_file "config/environments/production.rb", "  config.webpack[:use_manifest] = true\n", before: /^end/
+      copy_file "../templates/package.json", "./package.json"
 
       # Update .gitignore to include app/assets/javascripts, /node_modules
       gitignore_path = File.join(Rails.root, '.gitignore')
@@ -26,22 +34,5 @@ module WebpackReactOnRails
         end
       end
     end
-
-    private
-
-    def rails_application_name
-      Rails.application.class.parent.to_s
-    end
-
-    def generate_package_file(template_name, file_path)
-      template = File.read(File.join(TEMPLATES_DIR, template_name))
-      template.gsub!('APPLICATION_NAME', rails_application_name)
-      create_file file_path, template
-    end
-
-    def generate_config_file(template_name, file_path)
-      template = File.read(File.join(TEMPLATES_DIR, template_name))
-      create_file file_path, template
-    end
   end
 end

data/lib/generators/webpack_react_on_rails/templates/config/webpack/development.config.js

@@ -0,0 +1,31 @@
+var path = require('path');
+var webpack = require('webpack');
+var _ = require('lodash');
+var config = module.exports = require('./main.config.js');
+
+config = _.merge(config, {
+  debug: true,
+  displayErrorDetails: true,
+  outputPathinfo: true,
+  devtool: 'sourcemap',
+});
+
+config.entry = _.merge(config.entry, {
+  webpackDev: 'webpack/hot/only-dev-server',
+});
+
+// this config dicates where compiled bundles end up
+config.output = _.merge(config.output, {
+  // this is our app/assets/javascripts directory, which is part of the Sprockets pipeline
+  path: path.join(__dirname, '../../app', 'assets', 'javascripts', 'bundle'),
+
+  // the filename of the compiled bundle, e.g. app/assets/javascripts/bundle.js
+  filename: '[name].js',
+
+  // if the webpack code-splitting feature is enabled, this is the path it'll use to download bundles
+  publicPath: '/assets',
+});
+
+config.plugins.push(
+  new webpack.HotModuleReplacementPlugin()
+);

data/lib/generators/webpack_react_on_rails/templates/config/webpack/main.config.js

@@ -0,0 +1,32 @@
+var path = require('path');
+var webpack = require('webpack');
+
+var config = module.exports = {
+  context: path.join(__dirname, '../', '../')
+};
+
+config.module = {
+  loaders: [{
+    test: /\.jsx?$/,
+    exclude: /node_modules/,
+    loader: 'babel'
+  }]
+};
+
+config.resolve = {
+  extensions: ['', '.js', '.jsx'],
+  modulesDirectories: ['node_modules'],
+};
+
+// the main entry point for our application's frontend js
+// anything not required by this file will never end up in the compiled bundle
+// passing an object provides multiple entries points
+config.entry = {
+  // your entry points
+};
+
+config.output = {
+  // your outputs
+  // we'll be overriding some of these in the production config, to support
+  // writing out bundles with digests in their filename
+}

data/lib/{templates/webpack_production_config → generators/webpack_react_on_rails/templates/config/webpack/production.config.js}

@@ -1,33 +1,16 @@
 var path = require('path');
 var webpack = require('webpack');
 var ChunkManifestPlugin = require('chunk-manifest-webpack-plugin');
+var _ = require('lodash');
+var config = module.exports = require('./main.config.js');
 
-var config = module.exports = {
-  entry: {
-    // The entry point for the application js i.e. './app/frontend/javascripts/app.js'
-  }
-};
-
-config.module = {
-  loaders: [{
-    test: /\.jsx?$/,
-    exclude: /node_modules/,
-    loader: 'babel'
-  }]
-};
-
-config.output = {
-  path: path.join(__dirname, 'public', 'assets', 'bundle'),
+config.output = _.merge(config.output, {
+  path: path.join(__dirname, '../../public', 'assets', 'bundle'),
   filename: '[name]-bundle-[chunkhash].js',
   chunkFilename: '[id]-bundle-[chunkhash].js'
-};
-
-config.resolve = {
-  extensions: ['', '.js', '.jsx'],
-  modulesDirectories: ['node_modules'],
-};
+});
 
-config.plugins = [
+config.plugins.push(
   new webpack.optimize.UglifyJsPlugin({
     minimize: true,
     compress: {
@@ -43,4 +26,4 @@ config.plugins = [
       'NODE_ENV': JSON.stringify('production')
     }
   })
-];
+);

data/lib/tasks/webpack/compile.rake

@@ -1,7 +1,7 @@
 namespace :webpack do
   desc 'compile bundles using webpack'
   task :compile do
-    cmd = 'node_modules/.bin/webpack --config ./webpack_production.config.js --json'
+    cmd = 'node_modules/.bin/webpack --config ./config/webpack/production.config.js --json'
     output = `#{cmd}`
 
     stats = JSON.parse(output)

data/lib/webpack_react_on_rails/action_view/webpack_helpers.rb

@@ -13,7 +13,7 @@ module WebpackReactOnRails
 
         src = "#{compute_asset_host}/assets/#{path_name}"
       else
-        src = "#{compute_asset_host}/assets/#{bundle}-bundle"
+        src = "#{compute_asset_host}/assets/#{bundle}"
       end
 
       javascript_include_tag(src)

data/lib/webpack_react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module WebpackReactOnRails
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/dummy/config/application.rb

@@ -7,6 +7,12 @@ require "webpack_react_on_rails"
 
 module Dummy
   class Application < Rails::Application
+    config.webpack = {
+      :use_manifest => false,
+      :asset_manifest => {},
+      :common_manifest => {}
+    }
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/test/dummy/log/development.log

@@ -1,76 +0,0 @@
-
-
-Started GET "/" for ::1 at 2016-09-17 22:04:00 -0700
-
-Gem::LoadError (Specified 'sqlite3' for database adapter, but the gem is not loaded. Add `gem 'sqlite3'` to your Gemfile (and ensure its version is at the minimum required by ActiveRecord).):
-  activerecord (4.2.7.1) lib/active_record/connection_adapters/connection_specification.rb:177:in `rescue in spec'
-  activerecord (4.2.7.1) lib/active_record/connection_adapters/connection_specification.rb:174:in `spec'
-  activerecord (4.2.7.1) lib/active_record/connection_handling.rb:50:in `establish_connection'
-  activerecord (4.2.7.1) lib/active_record/railtie.rb:120:in `block (2 levels) in <class:Railtie>'
-  activesupport (4.2.7.1) lib/active_support/lazy_load_hooks.rb:38:in `instance_eval'
-  activesupport (4.2.7.1) lib/active_support/lazy_load_hooks.rb:38:in `execute_hook'
-  activesupport (4.2.7.1) lib/active_support/lazy_load_hooks.rb:45:in `block in run_load_hooks'
-  activesupport (4.2.7.1) lib/active_support/lazy_load_hooks.rb:44:in `each'
-  activesupport (4.2.7.1) lib/active_support/lazy_load_hooks.rb:44:in `run_load_hooks'
-  activerecord (4.2.7.1) lib/active_record/base.rb:315:in `<module:ActiveRecord>'
-  activerecord (4.2.7.1) lib/active_record/base.rb:26:in `<top (required)>'
-  activerecord (4.2.7.1) lib/active_record/migration.rb:383:in `connection'
-  activerecord (4.2.7.1) lib/active_record/migration.rb:370:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
-  activesupport (4.2.7.1) lib/active_support/callbacks.rb:88:in `__run_callbacks__'
-  activesupport (4.2.7.1) lib/active_support/callbacks.rb:778:in `_run_call_callbacks'
-  activesupport (4.2.7.1) lib/active_support/callbacks.rb:81:in `run_callbacks'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/reloader.rb:73:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/remote_ip.rb:78:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
-  railties (4.2.7.1) lib/rails/rack/logger.rb:38:in `call_app'
-  railties (4.2.7.1) lib/rails/rack/logger.rb:20:in `block in call'
-  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:68:in `block in tagged'
-  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:26:in `tagged'
-  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:68:in `tagged'
-  railties (4.2.7.1) lib/rails/rack/logger.rb:20:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/request_id.rb:21:in `call'
-  rack (1.6.4) lib/rack/methodoverride.rb:22:in `call'
-  rack (1.6.4) lib/rack/runtime.rb:18:in `call'
-  activesupport (4.2.7.1) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
-  rack (1.6.4) lib/rack/lock.rb:17:in `call'
-  actionpack (4.2.7.1) lib/action_dispatch/middleware/static.rb:120:in `call'
-  rack (1.6.4) lib/rack/sendfile.rb:113:in `call'
-  railties (4.2.7.1) lib/rails/engine.rb:518:in `call'
-  railties (4.2.7.1) lib/rails/application.rb:165:in `call'
-  rack (1.6.4) lib/rack/lock.rb:17:in `call'
-  rack (1.6.4) lib/rack/content_length.rb:15:in `call'
-  rack (1.6.4) lib/rack/handler/webrick.rb:88:in `service'
-  /Users/hskang/.rvm/rubies/ruby-2.2.1/lib/ruby/2.2.0/webrick/httpserver.rb:138:in `service'
-  /Users/hskang/.rvm/rubies/ruby-2.2.1/lib/ruby/2.2.0/webrick/httpserver.rb:94:in `run'
-  /Users/hskang/.rvm/rubies/ruby-2.2.1/lib/ruby/2.2.0/webrick/server.rb:294:in `block in start_thread'
-
-
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_source.erb (3.7ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (2.2ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (0.8ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb within rescues/layout (63.3ms)
-
-
-Started GET "/" for ::1 at 2016-09-17 22:04:28 -0700
-Processing by Rails::WelcomeController#index as HTML
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/railties-4.2.7.1/lib/rails/templates/rails/welcome/index.html.erb (1.7ms)
-Completed 200 OK in 17ms (Views: 17.3ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/" for ::1 at 2016-09-17 22:05:57 -0700
-Processing by IndexController#index as HTML
-  Rendered index/index.html.erb within layouts/application (6.0ms)
-Completed 500 Internal Server Error in 26ms (ActiveRecord: 0.0ms)
-
-ActionView::Template::Error (undefined method `webpack' for #<Rails::Application::Configuration:0x007fc3b227f470>):
-    1: <%= webpack_bundle_tag 'index' %>
-  app/views/index/index.html.erb:1:in `_app_views_index_index_html_erb__853855545836545768_70239244771960'
-
-
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_source.erb (8.4ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (4.7ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (11.0ms)
-  Rendered /Users/hskang/.rvm/gems/ruby-2.2.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb within rescues/layout (74.8ms)