diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
| commit | ed490b781f9347b77eb2305e33ba6dd83f3539b0 (patch) | |
| tree | 4f958ce8da072e35ef654cf5ae0a152f613f3ad8 /bin/webpack | |
| parent | a817f084eafaf5527445c29ab1d68f42b1a2872f (diff) | |
| parent | 50529cbceb84e611bca497624a7a4c38113e5135 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rb
Diffstat (limited to 'bin/webpack')
| -rwxr-xr-x | bin/webpack | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/webpack b/bin/webpack index 9d3800c74..0869ad277 100755 --- a/bin/webpack +++ b/bin/webpack @@ -1,11 +1,7 @@ #!/usr/bin/env ruby -# frozen_string_literal: true -# -# This file was generated by Bundler. -# -# The application 'webpack' is installed as part of a gem, and -# this file is here to facilitate running it. -# + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= ENV["NODE_ENV"] || "development" require "pathname" ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", @@ -14,4 +10,6 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", require "rubygems" require "bundler/setup" -load Gem.bin_path("webpacker", "webpack") +require "webpacker" +require "webpacker/webpack_runner" +Webpacker::WebpackRunner.run(ARGV) |