react_on_rails 9.0.0.beta.5 → 9.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a6f5fa7cce290d5f0a141ceb31d2747635424d
-  data.tar.gz: 49886bec43fe521a65392a26f8942a952d95d360
+  metadata.gz: 87401aa3f78e7c02c43df0ba13f2befc6c0d6f7a
+  data.tar.gz: 6fee72ba5bdab701ae4c270ebd2622b2c20005e3
 SHA512:
-  metadata.gz: 1a9ba177c8893c8eba72a7b41ca80a465631f6deeb610c0cff18c9b3838195c08146108abbf2598e202e9472fdf3f416ce18eced884771d42d0bcc87372192d7
-  data.tar.gz: b2792d30ad81f3fb797608c1e6d5163f51c90e0bea6ad1fc3d9fa6e8f5f69fb14723563c40a8836fb26eb1bdefa268601a7ddb2828d741f07fcfd66dde9ce4a1
+  metadata.gz: 43b5ea95a1424cac2a0537bd727158e7903a59174438335bcdfe29a0d744f9f9e1faab21397bb0787b6da6a978d061f81fd98d1718447824b12324262d0d9bdd
+  data.tar.gz: 6429193a7bd2741c5d0a7ea26d00e3dd6dad7a4c64d84e497a0e5f89fda1f5af301b7d576b308b3b1f2b9174c4c298639c251d216ad66bc9d8a1ea2d1f77f234

data/CHANGELOG.md

@@ -8,6 +8,9 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests.*
 
+- Fix regression where `react_component(... prerender: true)` wouldn't find the generated asset bundle, because it wasn't looking for the hashed path.
+
+
 ## 9.0 from 8.x. Upgrade Instructions
 All 9.0.0 beta versions can be viewed in [PR 908](https://github.com/shakacode/react_on_rails/pull/908)
 
@@ -32,7 +35,7 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
       port: 8080
       https: false
       # Can be enabled by export WEBPACKER_HMR=TRUE in env
-      hot: false   
+      hmr: false
     ```
   - See the example `spec/dummy/config/webpacker.yml`.
   - Remove keys `hot_reloading_host` and `hot_reloading_enabled_by_default`. These are replaced by the `dev_server` key.
@@ -43,7 +46,7 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
     - Comment out or remove the dev_server area of your config.
     - Edit your static procfile to set env value WEBPACKER_DEV_SERVER=FALSE
   - For hot loading, either:
-    - Set the hot key in your `webpacker.yml` to `true`.
+    - Set the `hmr` key in your `webpacker.yml` to `true`.
     - Edit your hot procfile to set env value WEBPACKER_HMR=TRUE
     
     

data/README.md

@@ -143,7 +143,7 @@ To upgrade existing apps to React on Rails 8 see the [Installation Overview](doc
 1. Add the following to your Gemfile and `bundle install`. We recommend fixing the version of React on Rails, as you will need to keep the exact version in sync with the version in your `client/package.json` file.
 
   ```ruby
-  gem "react_on_rails", "8.0.0"
+  gem "react_on_rails", "9.0.0"
   ```
 
 2. Commit this to git (you cannot run the generator unless you do this or pass the option `--ignore-warnings`).
@@ -236,6 +236,11 @@ cd client && yarn add react-on-rails
 
 That will install the latest version and update your package.json.
 
+## Webpacker Configuration
+
+React on Rails users should set configuration value `compile` to false, as React on Railsh andles compilation for test and production environments.
+
+
 ## How it Works
 The generator installs your webpack files in the `client` folder. Foreman uses webpack to compile your code and output the bundled results to `app/assets/webpack`, which are then loaded by sprockets. These generated bundle files have been added to your `.gitignore` for your convenience.
 

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

@@ -14,7 +14,7 @@ development:
 #    port: 8080
 #    https: false
 #    # Can be enabled by export WEBPACKER_HMR=TRUE in env
-#    hot: false
+#    hmr: false
 
 test:
   <<: *default

data/lib/react_on_rails/utils.rb

@@ -75,11 +75,11 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
         # If using webpacker gem per https://github.com/rails/webpacker/issues/571
         hashed_name = Webpacker::Manifest.lookup(bundle_name, throw_if_missing: false)
         hashed_name = bundle_name if hashed_name.blank?
-        Rails.root.join(File.join(Webpacker::Configuration.output_path, hashed_name))
+        Rails.root.join(File.join(Webpacker::Configuration.output_path, hashed_name)).to_s
+      else
         # Else either the file is not in the manifest, so we'll default to the non-hashed name.
+        File.join(ReactOnRails.configuration.generated_assets_dir, bundle_name)
       end
-
-      File.join(ReactOnRails.configuration.generated_assets_dir, bundle_name)
     end
 
     def self.using_webpacker?
@@ -106,7 +106,7 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
       rails_version_less_than("4.1.1")
     end
 
-    def manifest_exists?
+    def self.manifest_exists?
       Webpacker::Configuration.manifest_path.exist?
     end
 

data/lib/react_on_rails/version.rb

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

data/package.json

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

data/webpackConfigLoader.js

@@ -2,7 +2,7 @@
  * Allow defaults for the config/webpacker.yml. Thee values in this file MUST match values
  * in https://github.com/rails/webpacker/blob/master/lib/install/config/webpacker.yml
  *
- * NOTE: for hot reloading, env.WEBPACKER_HMR value will override any config value. This env value
+ * NOTE: for HMR reloading, env.WEBPACKER_HMR value will override any config value. This env value
  * should be set to TRUE to turn this on.
  */
 const { join, resolve } = require('path');
@@ -14,13 +14,13 @@ const DEFAULT_PUBLIC_OUTPUT_PATH = 'packs';
 const DEFAULT_DEV_SERVER_HOST = 'localhost';
 const DEFAULT_DEV_SERVER_PORT = '8080';
 const DEFAULT_DEV_SERVER_HTTPS = false;
-const DEFAULT_DEV_SERVER_HOT = false;
+const DEFAULT_DEV_SERVER_HMR = false;
 
 /**
  * @param configPath, location where webpacker.yml will be found
  * @returns {{
  * devBuild,
- * hotReloadingEnabled,
+ * hmrReloadingEnabled,
  * devServerEnabled,
  * devServerHost,
  * devServerPort,
@@ -42,7 +42,7 @@ const configLoader = (configPath) => {
   const devServerHost = devServerValues && (devServerValues.host || DEFAULT_DEV_SERVER_HOST);
   const devServerPort = devServerValues && (devServerValues.port || DEFAULT_DEV_SERVER_PORT);
   const devServerHttps = devServerValues && (devServerValues.https || DEFAULT_DEV_SERVER_HTTPS);
-  const devServerHot = devServerValues && (devServerValues.hot || DEFAULT_DEV_SERVER_HOT);
+  const devServerHmr = devServerValues && (devServerValues.hmr || DEFAULT_DEV_SERVER_HMR);
 
   // NOTE: Rails path is hard coded to `/public`
   const webpackPublicOutputDir = configuration.public_output_path ||
@@ -52,7 +52,7 @@ const configLoader = (configPath) => {
   const manifest = MANIFEST;
 
   const devServerEnabled = !!devServerValues;
-  const hotReloadingEnabled = !!devServerHot || env.WEBPACKER_HMR === 'TRUE';
+  const hmrReloadingEnabled = !!devServerHmr || env.WEBPACKER_HMR === 'TRUE';
 
   let devServerUrl = null;
   if (devServerValues) {
@@ -61,7 +61,7 @@ const configLoader = (configPath) => {
 
   return {
     devBuild,
-    hotReloadingEnabled,
+    hmrReloadingEnabled,
     devServerEnabled,
     devServerHost,
     devServerPort,

metadata

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