Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: do not cd into yarn dir, use --cwd argument to yarn instead (#12986) 

* DEV: do not cd into yarn dir, use --cwd argument to yarn instead

Co-authored-by: Robin Ward <robin.ward@gmail.com>
This commit is contained in:
Jeff Wong 2021-05-07 06:58:57 -10:00 committed by GitHub
parent 10449ff794
commit bc3c3d56e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/ember-cli
View File

@ -6,8 +6,7 @@ require 'pathname'
RAILS_ROOT = File.expand_path("../../", Pathname.new(__FILE__).realpath)
PORT = ENV["UNICORN_PORT"] ||= "3000"
Dir.chdir(RAILS_ROOT) # rubocop:disable Discourse/NoChdir
Dir.chdir("app/assets/javascripts/discourse") # rubocop:disable Discourse/NoChdir
yarn_dir = File.join(RAILS_ROOT, "app/assets/javascripts/discourse")
PROXY =
if ARGV.include?("--try")
@ -20,10 +19,10 @@ if ARGV.include?("-h") || ARGV.include?("--help")
puts "ember-cli OPTIONS"
puts "--try To proxy try.discourse.org", ""
puts "The rest of the arguments are passed to ember server per:", ""
exec "yarn run ember server --help"
exec "yarn --cwd #{yarn_dir} run ember server --help"
end
args = ["run", "ember", "server"] + ARGV.reject { |a| a == "--try" }
args = ["--cwd", yarn_dir, "run", "ember", "server"] + ARGV.reject { |a| a == "--try" }
if !args.include?("--proxy")
args << "--proxy"