Skip to content

Commit 92aa0c8

Browse files
committed
Update converter to support v3.4.0
1 parent 418073f commit 92aa0c8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tasks/converter/less_conversion.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def process_stylesheet_assets
6767
log_processing name
6868
# apply common conversions
6969
file = convert_less(file)
70+
file = replace_all file, %r{/\* stylelint-disable.*?\*/\n*}, '', optional: true
7071
if name.start_with?('mixins/')
7172
file = varargify_mixin_definitions(file, *VARARG_MIXINS)
7273
%w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
@@ -325,10 +326,10 @@ def replace_file_imports(less, target_path = '')
325326
%Q(@import "#{target_path}\\1";)
326327
end
327328

328-
def replace_all(file, regex, replacement = nil, &block)
329+
def replace_all(file, regex, replacement = nil, optional: false, &block)
329330
log_transform regex, replacement
330331
new_file = file.gsub(regex, replacement, &block)
331-
raise "replace_all #{regex}, #{replacement} NO MATCH" if file == new_file
332+
raise "replace_all #{regex}, #{replacement} NO MATCH" if !optional && file == new_file
332333
new_file
333334
end
334335

@@ -465,7 +466,7 @@ def replace_mixins(less, mixin_names)
465466
def replace_ms_filters(file)
466467
log_transform
467468
file.gsub(
468-
/filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)",argb\(([\-$\w]+)\),argb\(([\-$\w]+)\)\)\);/,
469+
/filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)", ?argb\(([\-$\w]+)\), ?argb\(([\-$\w]+)\)\)\);/,
469470
%Q(filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='\#{ie-hex-str(\\2)}', endColorstr='\#{ie-hex-str(\\3)}', GradientType=\\1);)
470471
)
471472
end

0 commit comments

Comments
 (0)