don't make coffee sourcemaps, it's easier to debug real js

Change-Id: Icf625903b2550cda469703d8d9049725c876d568
Reviewed-on: https://gerrit.instructure.com/55491
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
Tested-by: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Ryan Shaw 2015-05-28 15:10:14 -06:00
parent 5c3abaefe8
commit 0aff0e8c7b
4 changed files with 2 additions and 15 deletions

1
.gitignore vendored
View File

@ -31,7 +31,6 @@ Gemfile.lock3
Gemfile.lock4
/log/
/node_modules
/public/app/
/public/assets/
/public/doc/api/
/public/javascripts/compiled/

View File

@ -1,11 +0,0 @@
if Rails.env.development? && ENV["CANVAS_SOURCE_MAPS"] != "0"
app_dir = File.expand_path "#{Rails.root}/public/app"
FileUtils.makedirs(app_dir) unless File.exist?(app_dir)
symlink = File.expand_path "#{Rails.root}/public/app/coffeescripts"
target = File.expand_path "#{Rails.root}/app/coffeescripts"
unless File.symlink?(symlink) && File.readlink(symlink) == target
File.unlink(symlink) if File.exist?(symlink)
File.symlink(target,symlink)
end
end

View File

@ -92,7 +92,7 @@ module Guard
if Canvas::CoffeeScript.coffee_script_binary_is_available?
Parallel.each(directories.map, :in_threads => Parallel.processor_count) do |(directory, scripts)|
FileUtils.mkdir_p(File.expand_path(directory)) if !File.directory?(directory) && !options[:noop]
system('coffee', '-m', '-c', '-o', directory, *scripts)
system('coffee', '-c', '-o', directory, *scripts)
if $?.exitstatus != 0
Formatter.error("Unable to compile coffeescripts in #{directory}")
else

View File

@ -247,8 +247,7 @@ namespace :js do
Parallel.each(dirs, :in_threads => Parallel.processor_count) do |dir|
destination = coffee_destination(dir)
FileUtils.mkdir_p(destination)
flags = "-m" if ENV["CANVAS_SOURCE_MAPS"] != "0"
system("coffee #{flags} -c -o #{destination} #{dir}/*.coffee")
system("coffee -c -o #{destination} #{dir}/*.coffee")
raise "Unable to compile coffeescripts in #{dir}" if $?.exitstatus != 0
end
else