repack 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adec7fb8dd623e161217547c202c16ce14c70c26
-  data.tar.gz: f7ade025adcf0f7a2a5a5ba811bdb6d13b6ed0ef
+  metadata.gz: 3d7448ed529be30cd53fdd1ba62d2a18bf59e607
+  data.tar.gz: 70cee6ab8e90ed36202d3d050ab4137aa55302e7
 SHA512:
-  metadata.gz: 7dca33c49c3202d25fa7cd731b639bd8dbf0d7b410938a238b041f398964d508da2acb8e5b49fa558067a78f9115f8260839456e311a7e5b4585542cb8327f65
-  data.tar.gz: c80d97d626c0652a1f1162422e2e57b30d909982bbfad19d6cd3d249044ea78afb09a6309edb1497c3355c10e34ccaad3d84951a0ddc59d9426bcd99a719ef4c
+  metadata.gz: 3327ba53a50986b3fead93997c37e31704d7efaff4c3024f5494a4b3998a4b5300ea6ea07ba756e1c5e3789c8d24fe61138cc1c9d3b7b8ce7b1e47ef31335ed9
+  data.tar.gz: 204a26b9b2559112d226b7268d7a95373de60f3b77637eb4d427634113d258c25bd7ca7f3ef6edc0ac8c9305d96fd421cc2b8b3f7de5923307dcecf65be96aa9

data/README.md

@@ -120,7 +120,7 @@ A view generator has been added.
 
 Pull requests & issues welcome. Advice & criticism regarding webpack config approach also welcome.
 
-Please ensure that pull requests pass both rubocop & rspec. New functionality should be discussed in an issue first.
+Please ensure that pull requests pass rspec. New functionality should be discussed in an issue first.
 
 ## Acknowledgements
 

data/Rakefile

@@ -6,14 +6,12 @@ end
 
 require 'rdoc/task'
 require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'WebpackRails'
+  rdoc.title    = 'Repack'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -21,4 +19,4 @@ end
 
 Bundler::GemHelper.install_tasks
 
-task default: [:rubocop, :spec]
+task default: [:spec]

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

@@ -0,0 +1,4 @@
+- content_for(:body_attributes) do
+  data-no-turbolink="true"
+#react
+= javascript_include_tag *webpack_asset_paths('placeholder')

data/lib/generators/repack/install_generator.rb

@@ -2,14 +2,11 @@ module Repack
   # :nodoc:
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.expand_path("../../../../example", __FILE__)
-
     desc "Install everything you need for a basic webpack-rails integration"
     class_option :router, type: :boolean, default: false, description: 'Add React Router'
     class_option :redux, type: :boolean, default: false, description: 'Add Redux'
-
     def copy_package_json
       copy_file "package.json", "package.json"
-
       if options[:router]
         insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
@@ -17,7 +14,6 @@ module Repack
           RUBY
         end
       end
-
       if options[:redux]
         insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
@@ -27,7 +23,6 @@ module Repack
           RUBY
         end
       end
-
       if options[:router] && options[:redux]
           insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
@@ -36,17 +31,14 @@ module Repack
          end
       end
     end
-
     def copy_webpack_conf
       copy_file "webpack.config.js", "config/webpack.config.js"
       copy_file "webpack.config.heroku.js", "config/webpack.config.heroku.js"
     end
-
     def create_webpack_application_js
       empty_directory "client"
       empty_directory "client/containers"
       empty_directory "client/components"
-
       if options[:router] && options[:redux]
         copy_file "boilerplate/router_redux/application.js", "client/application.js"
         copy_file "boilerplate/routes.js", "client/routes.js"
@@ -70,9 +62,7 @@ module Repack
         copy_file "boilerplate/application.js", "client/application.js"
         copy_file "boilerplate/App.js", "client/containers/App.js"
       end
-
       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'
@@ -90,7 +80,6 @@ module Repack
         puts "\n\n***WARNING*** HAML NOT SUPPORTED IN applictaion.html additional steps required\n\n"
       end
     end
-
     def add_to_gitignore
       append_to_file ".gitignore" do
         <<-EOF.strip_heredoc
@@ -100,17 +89,13 @@ module Repack
         EOF
       end
     end
-
     def run_npm_install
       run "npm install" if yes?("Would you like us to run 'npm install' for you?")
     end
-
     def whats_next
       puts <<-EOF.strip_heredoc
-
         We've set up the basics of repack for you, but you'll still
         need to:
-
           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 'npm run dev_server' to run the webpack-dev-server
@@ -119,18 +104,14 @@ module Repack
              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'
-
           FOR HEROKU DEPLOYS:
           1.  npm run heroku-setup
           2.  Push to heroku the post-build hook will take care of the rest
-
         See the README.md for this gem at
         https://github.com/cottonwoodcoding/repack/blob/master/README.md
         for more info.
-
         Thanks for using repack!
-
       EOF
     end
   end
-end
+end

data/lib/generators/repack/view_generator.rb

@@ -37,9 +37,15 @@ module Repack
     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
+      if Gem.loaded_specs.has_key? 'haml-rails'
+        file = "app/views/#{name.pluralize}/index.html.haml"
+        copy_file "boilerplate/views/rails_view.html.haml", file
+        gsub_file file, /placeholder/, name
+      else
+        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
 end

data/lib/repack.rb

@@ -1 +1 @@
-require 'webpack/rails'
+require 'repack/rails'

data/lib/repack/helper.rb

@@ -0,0 +1,32 @@
+require 'action_view'
+require 'repack/manifest'
+
+module Repack
+# Asset path helpers for use with webpack
+  module Helper
+    # Return asset paths for a particular webpack entry point.
+    #
+    # Response may either be full URLs (eg http://localhost/...) if the dev server
+    # is in use or a host-relative URl (eg /webpack/...) if assets are precompiled.
+    #
+    # Will raise an error if our manifest can't be found or the entry point does
+    # not exist.
+    def webpack_asset_paths(source, extension: nil)
+      return "" unless source.present?
+
+      paths = Repack::Manifest.asset_paths(source)
+      paths = paths.select {|p| p.ends_with? ".#{extension}" } if extension
+
+      host = ::Rails.configuration.repack.dev_server.host
+      port = ::Rails.configuration.repack.dev_server.port
+
+      if ::Rails.configuration.repack.dev_server.enabled
+        paths.map! do |p|
+          "//#{host}:#{port}#{p}"
+        end
+      end
+
+      paths
+    end
+  end
+end

data/lib/repack/manifest.rb

@@ -0,0 +1,87 @@
+require 'net/http'
+require 'uri'
+
+module Repack
+  # Webpack manifest loading, caching & entry point retrieval
+  class Manifest
+    # Raised if we can't read our webpack manifest for whatever reason
+    class ManifestLoadError < StandardError
+      def initialize(message, orig)
+        super "#{message} (original error #{orig})"
+      end
+    end
+
+    # Raised if a supplied entry point does not exist in the webpack manifest
+    class EntryPointMissingError < StandardError
+    end
+
+    class << self
+      # :nodoc:
+      def asset_paths(source)
+        paths = manifest["assetsByChunkName"][source]
+        if paths
+          # Can be either a string or an array of strings.
+          # Do not include source maps as they are not javascript
+          [paths].flatten.reject { |p| p =~ /.*\.map$/ }.map do |p|
+            "/#{::Rails.configuration.repack.public_path}/#{p}"
+          end
+        else
+          raise EntryPointMissingError, "Can't find entry point '#{source}' in webpack manifest"
+        end
+      end
+
+      private
+
+      def manifest
+        if ::Rails.configuration.repack.dev_server.enabled
+          # Don't cache if we're in dev server mode, manifest may change ...
+          load_manifest
+        else
+          # ... otherwise cache at class level, as JSON loading/parsing can be expensive
+          @manifest ||= load_manifest
+        end
+      end
+
+      def load_manifest
+        data = if ::Rails.configuration.repack.dev_server.enabled
+          load_dev_server_manifest
+        else
+          load_static_manifest
+        end
+        JSON.parse(data)
+      end
+
+      def load_dev_server_manifest
+        http = Net::HTTP.new(
+          "localhost",
+          ::Rails.configuration.repack.dev_server.port)
+        http.use_ssl = ::Rails.configuration.repack.dev_server.https
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.get(dev_server_path).body
+      rescue => e
+        raise ManifestLoadError.new("Could not load manifest from webpack-dev-server at #{dev_server_url} - is it running, and is stats-webpack-plugin loaded?", e)
+      end
+
+      def load_static_manifest
+        File.read(static_manifest_path)
+      rescue => e
+        raise ManifestLoadError.new("Could not load compiled manifest from #{static_manifest_path} - have you run `rake webpack:compile`?", e)
+      end
+
+      def static_manifest_path
+        ::Rails.root.join(
+          ::Rails.configuration.repack.output_dir,
+          ::Rails.configuration.repack.manifest_filename
+        )
+      end
+
+      def dev_server_path
+        "/#{::Rails.configuration.repack.public_path}/#{::Rails.configuration.repack.manifest_filename}"
+      end
+
+      def dev_server_url
+        "http://localhost:#{::Rails.configuration.repack.dev_server.port}#{dev_server_path}"
+      end
+    end
+  end
+end

data/lib/repack/rails.rb

@@ -0,0 +1,2 @@
+require 'repack/version'
+require 'repack/railtie' if defined? ::Rails::Railtie

data/lib/repack/railtie.rb

@@ -0,0 +1,33 @@
+require 'rails'
+require 'rails/railtie'
+require 'repack/helper'
+
+module Repack
+  # :nodoc:
+  class Railtie < ::Rails::Railtie
+    config.after_initialize do
+      ActiveSupport.on_load(:action_view) do
+        include Repack::Helper
+      end
+    end
+
+    config.repack = ActiveSupport::OrderedOptions.new
+    config.repack.config_file = 'config/repack.config.js'
+    config.repack.binary = 'node_modules/.bin/repack'
+
+    config.repack.dev_server = ActiveSupport::OrderedOptions.new
+    config.repack.dev_server.host = 'localhost'
+    config.repack.dev_server.port = 3808
+    config.repack.dev_server.https = false # note - this will use OpenSSL::SSL::VERIFY_NONE
+    config.repack.dev_server.binary = 'node_modules/.bin/repack-dev-server'
+    config.repack.dev_server.enabled = !::Rails.env.production?
+
+    config.repack.output_dir = "public/client"
+    config.repack.public_path = "client"
+    config.repack.manifest_filename = "manifest.json"
+
+    rake_tasks do
+      load "tasks/webpack.rake"
+    end
+  end
+end

data/lib/repack/version.rb

@@ -0,0 +1,3 @@
+module Repack
+  VERSION = "2.0.1"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dave Jungst
@@ -53,6 +53,7 @@ files:
 - example/boilerplate/views/ContainerTemplate.js
 - example/boilerplate/views/ViewTemplate.js
 - example/boilerplate/views/rails_view.html.erb
+- example/boilerplate/views/rails_view.html.haml
 - example/dot_gitignore
 - example/package.json
 - example/webpack.config.heroku.js
@@ -60,12 +61,12 @@ files:
 - lib/generators/repack/install_generator.rb
 - lib/generators/repack/view_generator.rb
 - lib/repack.rb
+- lib/repack/helper.rb
+- lib/repack/manifest.rb
+- lib/repack/rails.rb
+- lib/repack/railtie.rb
+- lib/repack/version.rb
 - lib/tasks/webpack.rake
-- lib/webpack/rails.rb
-- lib/webpack/rails/react/helper.rb
-- lib/webpack/rails/react/manifest.rb
-- lib/webpack/rails/react/version.rb
-- lib/webpack/railtie.rb
 homepage: https://github.com/cottonwoodcoding/reapack
 licenses:
 - MIT

data/lib/webpack/rails.rb

@@ -1,2 +0,0 @@
-require 'webpack/rails/react/version'
-require 'webpack/railtie' if defined? ::Rails::Railtie

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

@@ -1,36 +0,0 @@
-require 'action_view'
-require 'webpack/rails/react/manifest'
-
-module Webpack
-  module Rails
-    module React
-      # Asset path helpers for use with webpack
-      module Helper
-        # Return asset paths for a particular webpack entry point.
-        #
-        # Response may either be full URLs (eg http://localhost/...) if the dev server
-        # is in use or a host-relative URl (eg /webpack/...) if assets are precompiled.
-        #
-        # Will raise an error if our manifest can't be found or the entry point does
-        # not exist.
-        def webpack_asset_paths(source, extension: nil)
-          return "" unless source.present?
-
-          paths = Webpack::Rails::React::Manifest.asset_paths(source)
-          paths = paths.select {|p| p.ends_with? ".#{extension}" } if extension
-
-          host = ::Rails.configuration.webpack.dev_server.host
-          port = ::Rails.configuration.webpack.dev_server.port
-
-          if ::Rails.configuration.webpack.dev_server.enabled
-            paths.map! do |p|
-              "//#{host}:#{port}#{p}"
-            end
-          end
-
-          paths
-        end
-      end
-    end
-  end
-end

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

@@ -1,91 +0,0 @@
-require 'net/http'
-require 'uri'
-
-module Webpack
-  module Rails
-    module React
-      # Webpack manifest loading, caching & entry point retrieval
-      class Manifest
-        # Raised if we can't read our webpack manifest for whatever reason
-        class ManifestLoadError < StandardError
-          def initialize(message, orig)
-            super "#{message} (original error #{orig})"
-          end
-        end
-
-        # Raised if a supplied entry point does not exist in the webpack manifest
-        class EntryPointMissingError < StandardError
-        end
-
-        class << self
-          # :nodoc:
-          def asset_paths(source)
-            paths = manifest["assetsByChunkName"][source]
-            if paths
-              # Can be either a string or an array of strings.
-              # Do not include source maps as they are not javascript
-              [paths].flatten.reject { |p| p =~ /.*\.map$/ }.map do |p|
-                "/#{::Rails.configuration.webpack.public_path}/#{p}"
-              end
-            else
-              raise EntryPointMissingError, "Can't find entry point '#{source}' in webpack manifest"
-            end
-          end
-
-          private
-
-          def manifest
-            if ::Rails.configuration.webpack.dev_server.enabled
-              # Don't cache if we're in dev server mode, manifest may change ...
-              load_manifest
-            else
-              # ... otherwise cache at class level, as JSON loading/parsing can be expensive
-              @manifest ||= load_manifest
-            end
-          end
-
-          def load_manifest
-            data = if ::Rails.configuration.webpack.dev_server.enabled
-              load_dev_server_manifest
-            else
-              load_static_manifest
-            end
-            JSON.parse(data)
-          end
-
-          def load_dev_server_manifest
-            http = Net::HTTP.new(
-              "localhost",
-              ::Rails.configuration.webpack.dev_server.port)
-            http.use_ssl = ::Rails.configuration.webpack.dev_server.https
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            http.get(dev_server_path).body
-          rescue => e
-            raise ManifestLoadError.new("Could not load manifest from webpack-dev-server at #{dev_server_url} - is it running, and is stats-webpack-plugin loaded?", e)
-          end
-
-          def load_static_manifest
-            File.read(static_manifest_path)
-          rescue => e
-            raise ManifestLoadError.new("Could not load compiled manifest from #{static_manifest_path} - have you run `rake webpack:compile`?", e)
-          end
-
-          def static_manifest_path
-            ::Rails.root.join(
-              ::Rails.configuration.webpack.output_dir,
-              ::Rails.configuration.webpack.manifest_filename
-            )
-          end
-
-          def dev_server_path
-            "/#{::Rails.configuration.webpack.public_path}/#{::Rails.configuration.webpack.manifest_filename}"
-          end
-
-          def dev_server_url
-            "http://localhost:#{::Rails.configuration.webpack.dev_server.port}#{dev_server_path}"
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-module Webpack
-  # :nodoc:
-  module Rails
-    module React
-      VERSION = "2.0.0"
-    end
-  end
-end

data/lib/webpack/railtie.rb

@@ -1,33 +0,0 @@
-require 'rails'
-require 'rails/railtie'
-require 'webpack/rails/react/helper'
-
-module Webpack
-  # :nodoc:
-  class Railtie < ::Rails::Railtie
-    config.after_initialize do
-      ActiveSupport.on_load(:action_view) do
-        include Webpack::Rails::React::Helper
-      end
-    end
-
-    config.webpack = ActiveSupport::OrderedOptions.new
-    config.webpack.config_file = 'config/webpack.config.js'
-    config.webpack.binary = 'node_modules/.bin/webpack'
-
-    config.webpack.dev_server = ActiveSupport::OrderedOptions.new
-    config.webpack.dev_server.host = 'localhost'
-    config.webpack.dev_server.port = 3808
-    config.webpack.dev_server.https = false # note - this will use OpenSSL::SSL::VERIFY_NONE
-    config.webpack.dev_server.binary = 'node_modules/.bin/webpack-dev-server'
-    config.webpack.dev_server.enabled = !::Rails.env.production?
-
-    config.webpack.output_dir = "public/client"
-    config.webpack.public_path = "client"
-    config.webpack.manifest_filename = "manifest.json"
-
-    rake_tasks do
-      load "tasks/webpack.rake"
-    end
-  end
-end