From bc3c3d56e0ef5338d75f7237d9a22f031c0a64c3 Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Fri, 7 May 2021 06:58:57 -1000 Subject: [PATCH] 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 --- bin/ember-cli | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/ember-cli b/bin/ember-cli index 21ac6b8241d..b8c2f5bb8f6 100755 --- a/bin/ember-cli +++ b/bin/ember-cli @@ -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"