diff --git a/tasks/updater/js.rb b/tasks/updater/js.rb index 766a627b..ae352807 100644 --- a/tasks/updater/js.rb +++ b/tasks/updater/js.rb @@ -51,7 +51,7 @@ def bootstrap_js_files # Get the imports from the ES6 files to order requires correctly. read_files('js/src', src_files).each do |name, content| file_imports = content.scan(%r{import *(?:[a-zA-Z]*|\{[a-zA-Z ,]*\}) *from '([\w/.-]+)}).flatten(1).map do |f| - Pathname.new(name).dirname.join("#{f}.js").cleanpath.to_s + Pathname.new(name).dirname.join(f).cleanpath.to_s end.uniq imports.add name, *(file_imports - INLINED_SRCS) end diff --git a/tasks/updater/scss.rb b/tasks/updater/scss.rb index b98ac716..d14ad304 100644 --- a/tasks/updater/scss.rb +++ b/tasks/updater/scss.rb @@ -4,7 +4,7 @@ def update_scss_assets log_status 'Updating scss...' save_to = @save_to[:scss] contents = {} - bootstrap_scss_files = get_paths_by_type('scss', /\.scss$/) + bootstrap_scss_files = get_paths_by_type('scss', /\.scss$/).reject { |p| p.start_with?('tests/') } read_files('scss', bootstrap_scss_files).each do |name, file| contents[name] = file save_file("#{save_to}/#{name}", file)