Merge pull request #4421 from vinkas0/vinkas/t-48574

chomp before regex manifest
This commit is contained in:
Robin Ward 2016-08-25 11:15:50 -04:00 committed by GitHub
commit 40e0298db4
1 changed files with 1 additions and 0 deletions

View File

@ -64,6 +64,7 @@ module PrettyText
manifest = File.read("#{Rails.root}/app/assets/javascripts/pretty-text-bundle.js")
root_path = "#{Rails.root}/app/assets/javascripts/"
manifest.each_line do |l|
l = l.chomp
if l =~ /\/\/= require (\.\/)?(.*)$/
apply_es6_file(ctx, root_path, Regexp.last_match[2])
elsif l =~ /\/\/= require_tree (\.\/)?(.*)$/