Skip to content

Commit 79718d9

Browse files
authored
Remove setting RAILS_ENV from RACK_ENV, NODE_ENV defaults RAILS_ENV (#3239)
* Remove setting RAILS_ENV from RACK_ENV Per #3200 * Have NODE_ENV default to RAILS_ENV
1 parent 65c799f commit 79718d9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lib/install/bin/webpack

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ require "bundler/setup"
55
require "webpacker"
66
require "webpacker/webpack_runner"
77

8-
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
9-
ENV["NODE_ENV"] ||= "development"
8+
ENV["RAILS_ENV"] ||= "development"
9+
ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
1010
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
1111

1212
APP_ROOT = File.expand_path("..", __dir__)

lib/install/bin/webpack-dev-server

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22

3-
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
4-
ENV["NODE_ENV"] ||= "development"
3+
ENV["RAILS_ENV"] ||= "development"
4+
ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
55

66
require "pathname"
77
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

test/test_app/bin/webpack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env ruby
22

3-
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
3+
ENV["RAILS_ENV"] ||= "development"
44
ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
55

66
require "pathname"

test/test_app/bin/webpack-dev-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env ruby
22

3-
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
3+
ENV["RAILS_ENV"] ||= "development"
44
ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
55

66
require "pathname"

0 commit comments

Comments
 (0)