From 64ad8c3f8f73e58ae70cad75b35dea5875cc1a3b Mon Sep 17 00:00:00 2001 From: Chen Qing Date: Thu, 22 Jun 2017 14:37:56 +0800 Subject: [PATCH 1/6] fix devBuild --- webpackConfigLoader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpackConfigLoader.js b/webpackConfigLoader.js index 0ab351b3a..8591dfe72 100644 --- a/webpackConfigLoader.js +++ b/webpackConfigLoader.js @@ -56,7 +56,7 @@ const configLoader = (configPath) => { const ymlConfigPath = join(configPath, 'webpacker_lite.yml'); const configuration = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv]; - const devBuild = env !== 'production'; + const devBuild = env.NODE_ENV !== 'production'; const hotReloadingHost = configuration.hot_reloading_host || DEFAULT_HOT_RELOADING_HOST; // NOTE: Rails path is hard coded to `/public` From 19fb359a84b71b6ef3e4bf34612b756439dc3d9d Mon Sep 17 00:00:00 2001 From: Chen Qing Date: Fri, 30 Jun 2017 23:10:41 +0800 Subject: [PATCH 2/6] Set devBuild with configEnv --- webpackConfigLoader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpackConfigLoader.js b/webpackConfigLoader.js index 8591dfe72..c859849e2 100644 --- a/webpackConfigLoader.js +++ b/webpackConfigLoader.js @@ -55,8 +55,8 @@ const configLoader = (configPath) => { const configEnv = (process.env.NODE_ENV || process.env.RAILS_ENV || 'development'); const ymlConfigPath = join(configPath, 'webpacker_lite.yml'); const configuration = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv]; - - const devBuild = env.NODE_ENV !== 'production'; + + const devBuild = configEnv !== 'production'; const hotReloadingHost = configuration.hot_reloading_host || DEFAULT_HOT_RELOADING_HOST; // NOTE: Rails path is hard coded to `/public` From 607a039ec836365421ebba9c5dd5874a86ea2562 Mon Sep 17 00:00:00 2001 From: Chen Qing Date: Sat, 1 Jul 2017 08:56:09 +0800 Subject: [PATCH 3/6] Update CHANGELOG.md about fixing devBuild --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f596b559e..af69664a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Changes since last non-beta release. *Please add entries here for your pull requests.* +- Fixed `devBuild` for webpack production build. + ## [8.0.3] ### Fixed - Ruby 2.1 issue due to `<<~` as reported in [issue #870](https://github.com/shakacode/react_on_rails/issues/870). [#867](https://github.com/shakacode/react_on_rails/pull/867) by [justin808](https://github.com/justin808) From ca4cd8a6473579deb59b0e3a8f4aaa73c7b4e1cf Mon Sep 17 00:00:00 2001 From: CHEN Qing Date: Sat, 1 Jul 2017 10:33:19 +0800 Subject: [PATCH 4/6] fix eslint & reformat CHANGELOG.md --- CHANGELOG.md | 3 ++- webpackConfigLoader.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af69664a1..a0ca92a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ Changes since last non-beta release. *Please add entries here for your pull requests.* -- Fixed `devBuild` for webpack production build. +### Fixed + - Fixed `devBuild` for webpack production build. [#877](https://github.com/shakacode/react_on_rails/pull/877) by [chenqingspring](https://github.com/chenqingspring) ## [8.0.3] ### Fixed diff --git a/webpackConfigLoader.js b/webpackConfigLoader.js index c859849e2..7b4e2a6da 100644 --- a/webpackConfigLoader.js +++ b/webpackConfigLoader.js @@ -55,7 +55,6 @@ const configLoader = (configPath) => { const configEnv = (process.env.NODE_ENV || process.env.RAILS_ENV || 'development'); const ymlConfigPath = join(configPath, 'webpacker_lite.yml'); const configuration = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv]; - const devBuild = configEnv !== 'production'; const hotReloadingHost = configuration.hot_reloading_host || DEFAULT_HOT_RELOADING_HOST; From bb20af058ea5e062c4844852c9aa41ce735c96bf Mon Sep 17 00:00:00 2001 From: CHEN Qing Date: Sat, 1 Jul 2017 11:01:32 +0800 Subject: [PATCH 5/6] add release number as 8.0.4 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ca92a97..fa3d4598e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Changes since last non-beta release. *Please add entries here for your pull requests.* +## [8.0.4] ### Fixed - Fixed `devBuild` for webpack production build. [#877](https://github.com/shakacode/react_on_rails/pull/877) by [chenqingspring](https://github.com/chenqingspring) From 71bacd0b701adfca67b641b982bc3bb7a942601b Mon Sep 17 00:00:00 2001 From: CHEN Qing Date: Sat, 1 Jul 2017 14:22:32 +0800 Subject: [PATCH 6/6] add reference diff link on 8.0.4 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa3d4598e..7489aa70e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -615,7 +615,8 @@ Best done with Object destructing: ##### Fixed - Fix several generator related issues. -[Unreleased]: https://github.com/shakacode/react_on_rails/compare/8.0.3...master +[Unreleased]: https://github.com/shakacode/react_on_rails/compare/8.0.4...master +[8.0.4]: https://github.com/shakacode/react_on_rails/compare/8.0.3...8.0.4 [8.0.3]: https://github.com/shakacode/react_on_rails/compare/8.0.2...8.0.3 [8.0.2]: https://github.com/shakacode/react_on_rails/compare/8.0.1...8.0.2 [8.0.1]: https://github.com/shakacode/react_on_rails/compare/8.0.0...8.0.1