Change webpack-bundle to hello-world-bundle

For the generator
shakacode · Aug 16, 2017 · 3f4ab24 · 3f4ab24
1 parent 0b0461b
commit 3f4ab24
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 19 deletions.
diff --git a/docs/additional-reading/rails-assets-relative-paths.md b/docs/additional-reading/rails-assets-relative-paths.md
@@ -138,7 +138,7 @@ module.exports = {
   ],
 
   output: {
-    filename: 'webpack-bundle.js',
+    filename: 'hello-world-bundle.js',
     path: '../app/assets/webpack'
   },
 

diff --git a/docs/additional-reading/rspec-configuration.md b/docs/additional-reading/rspec-configuration.md
@@ -35,7 +35,7 @@ The following `config/react_on_rails.rb` settings **must** match your setup:
   config.generated_assets_dir = File.join(%w[public webpack], Rails.env)
 
   # Define the files we need to check for webpack compilation when running tests.
-  config.webpack_generated_files = %w( webpack-bundle.js )
+  config.webpack_generated_files = %w( hello-world-bundle.js )
 
   # If you are using the ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
   # with rspec then this controls what yarn command is run

diff --git a/docs/api/ruby-api-hot-reload-view-helpers.md b/docs/api/ruby-api-hot-reload-view-helpers.md
@@ -17,7 +17,7 @@ static vs. hot is picked based on whether `ENV["REACT_ON_RAILS_ENV"] == "HOT"`
  <!-- This is to load the hot assets. -->
  
  <!-- Note, you can have multiple files here. It's an array. -->
- <%= env_javascript_include_tag(hot: ['http://localhost:3500/webpack-bundle.js]') %>
+ <%= env_javascript_include_tag(hot: ['http://localhost:3500/hello-world-bundle.js]') %>
 
  <!-- These do use turbolinks -->
  <%= env_javascript_include_tag(static: 'application_static',

diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb
@@ -114,9 +114,9 @@ def print_helpful_message
 
           What to do next:
 
-            - Include your webpack assets to your application layout.
+            - Include your webpack assets to your application layout. Change hello-world-bundle as needed.
 
-              <%= javascript_pack_tag 'main' %>
+                <%= javascript_pack_tag 'hello-world-bundle' %>
 
             - Ensure your bundle and yarn installs of dependencies are up to date.
 

diff --git a/lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb.tt b/lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb.tt
@@ -3,10 +3,7 @@
   <head>
     <title>ReactOnRailsWithWebpacker</title>
     <%%= csrf_meta_tags %>
-
-    <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-    <%%= javascript_pack_tag 'webpack-bundle' %>
+    <%%= javascript_pack_tag 'hello-world-bundle' %>
   </head>
 
   <body>

diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js b/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js
@@ -16,7 +16,7 @@ const config = {
   context: resolve(__dirname),
 
   entry: {
-    'webpack-bundle': [
+    'hello-world-bundle': [
       'es5-shim/es5-shim',
       'es5-shim/es5-sham',
       'babel-polyfill',

diff --git a/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt b/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
@@ -7,13 +7,13 @@ ReactOnRails.configure do |config|
   config.generated_assets_dir = File.join(%w[public webpack], Rails.env)
 
   # Define the files we need to check for webpack compilation when running tests.
-  config.webpack_generated_files = %w( webpack-bundle.js )
+  config.webpack_generated_files = %w( hello-world-bundle.js )
 
   # This is the file used for server rendering of React when using `(prerender: true)`
   # If you are never using server rendering, you may set this to "".
   # If you are using the same file for client and server rendering, having this set probably does
   # not affect performance.
-  config.server_bundle_js_file = "webpack-bundle.js"
+  config.server_bundle_js_file = "hello-world-bundle.js"
 
   # If you are using the ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
   # with rspec then this controls what yarn command is run

diff --git a/lib/generators/react_on_rails/templates/node/base/client/node/package.json b/lib/generators/react_on_rails/templates/node/base/client/node/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-      "start": "node ./server.js -s webpack-bundle.js"
+      "start": "node ./server.js -s hello-world-bundle.js"
   },
   "dependencies": {
   }

diff --git a/lib/react_on_rails/configuration.rb b/lib/react_on_rails/configuration.rb
@@ -59,7 +59,7 @@ def self.configure_generated_assets_dirs_deprecation
   def self.ensure_webpack_generated_files_exists
     return unless @configuration.webpack_generated_files.empty?
 
-    files = ["webpack-bundle.js"]
+    files = ["hello-world-bundle.js"]
     if @configuration.server_bundle_js_file.present?
       files << @configuration.server_bundle_js_file
     end

diff --git a/rakelib/example_type.rb b/rakelib/example_type.rb
@@ -56,7 +56,7 @@ def webpack_bundles_dir
 
       def webpack_bundles
         bundles = []
-        bundles << File.join(webpack_bundles_dir, "webpack-bundle.js")
+        bundles << File.join(webpack_bundles_dir, "hello-world-bundle.js")
       end
 
       def gemfile

diff --git a/spec/react_on_rails/generators/install_generator_spec.rb b/spec/react_on_rails/generators/install_generator_spec.rb
@@ -79,9 +79,9 @@
 
         What to do next:
 
-          - Include your webpack assets to your application layout.
+          - Include your webpack assets to your application layout. Change hello-world-bundle as needed.
 
-            <%= javascript_pack_tag 'main' %>
+            <%= javascript_pack_tag 'hello-world-bundle' %>
 
           - Ensure your bundle and yarn installs of dependencies are up to date.
 
@@ -107,9 +107,9 @@
 
         What to do next:
 
-          - Include your webpack assets to your application layout.
+          - Include your webpack assets to your application layout. Change hello-world-bundle as needed.
 
-            <%= javascript_pack_tag 'main' %>
+            <%= javascript_pack_tag 'hello-world-bundle' %>
 
           - Ensure your bundle and yarn installs of dependencies are up to date.