Skip to content

Commit

Permalink
Update WebpackerLite 2.1 fixes server rendering
Browse files Browse the repository at this point in the history
Uses new helper pack_path to get the path of the server bundle without
worrying about any CDN set in the asset_host.
  • Loading branch information
justin808 committed Jul 19, 2017
1 parent 41e4c06 commit 3e82da9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ All notable changes to this project's source code will be documented in this fil
Contributors: please follow the recommendations outlined at [keepachangelog.com](http://keepachangelog.com/). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare to the latest release version.

## [Unreleased]
### [8.0.6]
#### fixed
- The package.json file created by the generator now creates minified javascript production builds by default. This was done by adding the -p flag to webpack on the build:production script.

Changes since last non-beta release.

*Please add entries here for your pull requests.*

- Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock)
### [8.0.6]
#### fixed
- Fixes server rendering when using a CDN. Server rendering would try to fetch a file with the "asset_host". This change updates the webpacker_lite dependency to 2.1.0 which has a new helper `pack_path`. [#901](https://github.com/shakacode/react_on_rails/pull/901) by [justin808](https://github.com/justin808).
- The package.json file created by the generator now creates minified javascript production builds by default. This was done by adding the -p flag to webpack on the build:production script. [#895](https://github.com/shakacode/react_on_rails/pull/895) by [serodriguez68 ](https://github.com/serodriguez68)
- Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock).

## [8.0.5]
### fixed
- Corrects `devBuild` value for webpack production build from webpackConfigLoader. [#877](https://github.com/shakacode/react_on_rails/pull/877) by [chenqingspring](https://github.com/chenqingspring).
- Remove contentBase deprecation warning message. [#878](https://github.com/shakacode/react_on_rails/pull/878) by [ened ](https://github.com/ened).
- Removes invalid reference to _railsContext in the generated files. [#886](https://github.com/shakacode/react_on_rails/pull/8876) by [justin808](https://github.com/justin808)
- Removes invalid reference to _railsContext in the generated files. [#886](https://github.com/shakacode/react_on_rails/pull/886) by [justin808](https://github.com/justin808).
- All tests run against Rails 5.1.2

*Note: 8.0.4 skipped.*
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ gem "chromedriver-helper"
gem "launchy"
gem "poltergeist"
gem "selenium-webdriver"
gem "webpacker_lite"
gem "webpacker_lite", "~> 2.1"

gem "rainbow"
3 changes: 2 additions & 1 deletion lib/react_on_rails/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def self.bundle_js_file_path(bundle_name)

if using_webpacker_lite? && WebpackerLite::Manifest.lookup(bundle_name)
# If using webpacker_lite gem
public_subdir_hashed_file_name = ActionController::Base.helpers.asset_pack_path(bundle_name)
# Per https://github.com/rails/webpacker/issues/571, this path might
public_subdir_hashed_file_name = ActionController::Base.helpers.pack_path(bundle_name)
return File.join("public", public_subdir_hashed_file_name)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ gem "sdoc", group: :doc

gem "react_on_rails", path: "../.."

gem "webpacker_lite", "2.0.4"
gem "webpacker_lite", "2.1.0"

gem "mini_racer"

Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ GEM
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.2.1)
webpacker_lite (2.0.4)
webpacker_lite (2.1.0)
activesupport (>= 4.2)
multi_json (~> 1.2)
railties (>= 4.2)
Expand Down Expand Up @@ -326,7 +326,7 @@ DEPENDENCIES
sqlite3
turbolinks (~> 5.0)
uglifier
webpacker_lite (= 2.0.4)
webpacker_lite (= 2.1.0)

BUNDLED WITH
1.15.1

0 comments on commit 3e82da9

Please sign in to comment.