react_on_rails 9.0.0.beta.8 → 9.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b37e03f8046df8e87fb888e436fbdf3dc2886f9
-  data.tar.gz: 4c50d0400481d3814ba89d270ae0e81ab7ed1230
+  metadata.gz: 2ba6646e46775e165a0d0f7c8e43de2dad2eb1fc
+  data.tar.gz: c422212818cb28ef17dffd3a7da41410099dce0c
 SHA512:
-  metadata.gz: cf5b00d1eb32e6d1ef0499a2b3c5cf066ef40d8b7acfb87189ff01183dddc3fd77c5522366fdc290a2dd78ec385b0d35e261d080a5200002329586f3455eb427
-  data.tar.gz: 43febb1ff94bcc47fb725965141f528c0f8492cb1b8df87832d45b673703489a3a3cfdf10931dfdb1ec3ee6c053bfe1ae798fbf3a79e357f456f8b359f77ae7d
+  metadata.gz: bc8d53a1b6b89290382b2b12736116f33cf54d1bb7c8efb6f5b6ad45886bb534d4192709fb39fb7af11c2ae3ef0670477f36f8da7c9561ee835bc7efeb6e2b5d
+  data.tar.gz: 16e42224c49bbda250b2ecf3e23bb3eafb0d9f199d7991c0402433eafc48f38d8b4bb1175a35696493a54f244841f8c43e641e08e8107514943a8e05ade82656

data/CHANGELOG.md

@@ -18,7 +18,7 @@ All 9.0.0 beta versions can be viewed in [PR 908](https://github.com/shakacode/r
 
 ```rb
 gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-    branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
+    branch: "issue-464-merge-webpacker-lite-into-webpacker-v3"
 ```
 
 - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration.
@@ -54,6 +54,10 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
   
 
 - Find your `webpacker_lite.yml` and rename it to `webpacker.yml`
+  - Add a default setting
+    ```
+    custom_compile: true
+    ```
   - Add a section like this under your development env:
     ```
     dev_server:
@@ -75,16 +79,20 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
     
     
 #### Troubleshooting
-If you want to skip using the dev server (as is current for beta.3 and below), then be sure to either
-set WEBPACKER_DEV_SERVER=FALSE or comment out the dev_server section of your `config/webpacker.yml` file.
-
-Otherwise, you'll get an error that the bundle can't be found, because your Rails server thinks you are
-deploying assets using the webpack-dev-server.
+* Be sure to    
+   
     
   
 ### [9.0.0]
 *Diffs for the beta to master*
 
+### [9.0.0-beta.9]
+- Fixes precompile task going to Webpacker's. You need to set `custom_compile: true` in your `webpacker.yml`.
+- Changed webpack-bundle.js name to hello-world-bundle.js
+- Update for latest from rails/webpacker
+gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
+    branch: "issue-464-merge-webpacker-lite-into-webpacker-v3"
+
 ### [9.0.0-beta.8]
 - bugfix for server rendering
 
@@ -729,7 +737,8 @@ Best done with Object destructing:
 - Fix several generator related issues.
 
 [Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.8
-[9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.8...master
+[9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.9...master
+[9.0.0-beta.9]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.9...9.0.0-beta.8
 [9.0.0-beta.8]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.8...9.0.0-beta.7
 [9.0.0-beta.7]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.7...9.0.0-beta.6
 [9.0.0-beta.6]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.6...9.0.0-beta.5

data/Gemfile

@@ -39,7 +39,7 @@ gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"
 gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-                 branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
+                 branch: "issue-464-merge-webpacker-lite-into-webpacker-v3"
 
 # TODO: remove once we get out of beta.
 # gem 'webpacker', path: "../../forks/webpacker"

data/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'
   },
 

data/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

data/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',

data/lib/generators/react_on_rails/base_generator.rb

@@ -75,7 +75,7 @@ module ReactOnRails
 
         gem 'mini_racer', platforms: :ruby
         gem 'webpacker', git: "https://github.com/shakacode/webpacker.git",
-                         branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
+                         branch: "issue-464-merge-webpacker-lite-into-webpacker-v3"
         GEMS
         append_to_file("Gemfile",
                        gems)
@@ -114,9 +114,9 @@ module ReactOnRails
 
           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.
 

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt

@@ -1,9 +1,3 @@
-# To ensure that Rails uses static assets rather than the webpack-dev-server
-# you may set ENV value WEBPACKER_DEV_SERVER=FALSE or delete or comment out the dev_server section
-# of config/webpacker.yml
-# For example:
-# web: WEBPACKER_DEV_SERVER=FALSE rails s -p 3000
-
 web: rails s -p 3000
 
 # Next line runs a watch process with webpack

data/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>

data/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',

data/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

data/lib/generators/react_on_rails/templates/base/base/config/webpacker.yml

@@ -2,6 +2,7 @@
 default: &default
   # Critical to set compile as false for React on Rails projects
   compile: false
+  custom_compile: true
 
 development:
   <<: *default
@@ -21,5 +22,5 @@ test:
 
 production:
   <<: *default
-  # generated files for tests, in /public/webpack/production
+  # generated files for production, in /public/webpack/production
   public_output_path: webpack/production

data/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": {
   }

data/lib/react_on_rails/configuration.rb

@@ -59,7 +59,7 @@ module ReactOnRails
   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

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "9.0.0.beta.8"
+  VERSION = "9.0.0.beta.9"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "9.0.0-beta.8",
+  "version": "9.0.0-beta.9",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/example_type.rb

@@ -56,7 +56,7 @@ module ReactOnRails
 
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta.8
+  version: 9.0.0.beta.9
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow