Skip to content

Commit 4ff78a6

Browse files
committed
Emit deprecation
1 parent 1f21b67 commit 4ff78a6

File tree

6 files changed

+56
-10
lines changed

6 files changed

+56
-10
lines changed

lib/src/async_compile.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,19 @@ Future<CompileResult> _compileStylesheet(
194194
'More info: https://sass-lang.com/d/legacy-js-api',
195195
);
196196
}
197+
if (sourceMapIncludeSources == SourceMapIncludeSources.true_ ||
198+
sourceMapIncludeSources == SourceMapIncludeSources.false_) {
199+
logger?.warnForDeprecation(
200+
Deprecation.sourceMapIncludeSourcesBoolean,
201+
'Passing boolean value for Options.sourceMapIncludeSources is deprecated '
202+
'and will be removed in Dart Sass 2.0.0.\n\n'
203+
'More info: https://sass-lang.com/d/source-map-include-sources-boolean',
204+
);
205+
sourceMapIncludeSources =
206+
sourceMapIncludeSources == SourceMapIncludeSources.true_
207+
? SourceMapIncludeSources.always
208+
: SourceMapIncludeSources.never;
209+
}
197210
var evaluateResult = await evaluateAsync(
198211
stylesheet,
199212
importCache: importCache,

lib/src/compile.dart

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// DO NOT EDIT. This file was generated from async_compile.dart.
66
// See tool/grind/synchronize.dart for details.
77
//
8-
// Checksum: 989c62e01aba777bc022501357a6f1be4e683c9c
8+
// Checksum: f4ec464ef3d537a5d315f3041d5afdfae6dd9911
99
//
1010
// ignore_for_file: unused_import
1111

@@ -203,6 +203,19 @@ CompileResult _compileStylesheet(
203203
'More info: https://sass-lang.com/d/legacy-js-api',
204204
);
205205
}
206+
if (sourceMapIncludeSources == SourceMapIncludeSources.true_ ||
207+
sourceMapIncludeSources == SourceMapIncludeSources.false_) {
208+
logger?.warnForDeprecation(
209+
Deprecation.sourceMapIncludeSourcesBoolean,
210+
'Passing boolean value for Options.sourceMapIncludeSources is deprecated '
211+
'and will be removed in Dart Sass 2.0.0.\n\n'
212+
'More info: https://sass-lang.com/d/source-map-include-sources-boolean',
213+
);
214+
sourceMapIncludeSources =
215+
sourceMapIncludeSources == SourceMapIncludeSources.true_
216+
? SourceMapIncludeSources.always
217+
: SourceMapIncludeSources.never;
218+
}
206219
var evaluateResult = evaluate(
207220
stylesheet,
208221
importCache: importCache,

lib/src/deprecation.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enum Deprecation {
1515
// DO NOT EDIT. This section was generated from the language repo.
1616
// See tool/grind/generate_deprecations.dart for details.
1717
//
18-
// Checksum: 6fc524360d067b73c243c666e27a9a9ea7e08841
18+
// Checksum: d6dc089a2bcab991dd117a6592f2f55d1caafccd
1919

2020
/// Deprecation for passing a string directly to meta.call().
2121
callString('call-string',
@@ -151,6 +151,12 @@ enum Deprecation {
151151
deprecatedIn: '1.95.0',
152152
description: 'The Sass if(\$condition, \$if-true, \$if-false) function.'),
153153

154+
/// Deprecation for passing a boolean value to as Options.sourceMapIncludeSources.
155+
sourceMapIncludeSourcesBoolean('source-map-include-sources-boolean',
156+
deprecatedIn: '1.99.0',
157+
description:
158+
'Passing a boolean value to as Options.sourceMapIncludeSources.'),
159+
154160
// END AUTOGENERATED CODE
155161

156162
/// Used for deprecations coming from user-authored code.

lib/src/js/utils.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,10 @@ SourceMapIncludeSources parseSourceMapIncludeSources(
276276
Object? sourceMapIncludeSources) =>
277277
switch (sourceMapIncludeSources) {
278278
null || 'auto' => SourceMapIncludeSources.auto,
279-
true || 'always' => SourceMapIncludeSources.always,
280-
false || 'never' => SourceMapIncludeSources.never,
279+
'always' => SourceMapIncludeSources.always,
280+
'never' => SourceMapIncludeSources.never,
281+
true => SourceMapIncludeSources.true_,
282+
false => SourceMapIncludeSources.false_,
281283
_ => jsThrow(JsError(
282284
'Unknown sourceMapIncludeSources "$sourceMapIncludeSources".')),
283285
};

lib/src/source_map_include_sources.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@ enum SourceMapIncludeSources {
1414

1515
/// Never include source contents.
1616
never,
17+
18+
@Deprecated('Use always instead.')
19+
true_,
20+
21+
@Deprecated('Use never instead.')
22+
false_,
1723
}

lib/src/util/source_map.dart

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ import 'package:source_maps/source_maps.dart';
77
import '../source_map_include_sources.dart';
88

99
Map<String, dynamic> sourceMapToJson(SingleMapping sourceMap,
10-
{required SourceMapIncludeSources sourceMapIncludeSources}) =>
11-
sourceMap.toJson(
12-
includeSourceContents:
13-
sourceMapIncludeSources == SourceMapIncludeSources.always ||
14-
(sourceMapIncludeSources == SourceMapIncludeSources.auto &&
15-
sourceMap.files.any((file) => file != null)));
10+
{required SourceMapIncludeSources sourceMapIncludeSources}) {
11+
if (sourceMapIncludeSources == SourceMapIncludeSources.true_) {
12+
sourceMapIncludeSources = SourceMapIncludeSources.always;
13+
} else if (sourceMapIncludeSources == SourceMapIncludeSources.false_) {
14+
sourceMapIncludeSources = SourceMapIncludeSources.never;
15+
}
16+
return sourceMap.toJson(
17+
includeSourceContents:
18+
sourceMapIncludeSources == SourceMapIncludeSources.always ||
19+
(sourceMapIncludeSources == SourceMapIncludeSources.auto &&
20+
sourceMap.files.any((file) => file != null)));
21+
}

0 commit comments

Comments
 (0)