Merge pull request #2246 from sass/deprecation-cli

Fix deprecation flags in the CLI and add tests
sass · May 15, 2024 · bdc08fd · bdc08fd
2 parents 54a6dec 9a9e483
commit bdc08fd
Show file tree

Hide file tree

Showing 10 changed files with 570 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3  1,12 @@
 ## 1.77.2
 
 ### Command-Line Interface
 
 * Properly handle the `--silence-deprecation` flag.
 
 * Handle the `--fatal-deprecation` and `--future-deprecation` flags for
   `--interactive` mode.
 
 ## 1.77.1
 
 * Fix a crash that could come up with importers in certain contexts.

diff --git a/lib/src/executable/compile_stylesheet.dart b/lib/src/executable/compile_stylesheet.dart
@@ -110,6  110,7 @@ Future<void> _compileStylesheetWithoutErrorHandling(ExecutableOptions options,
               verbose: options.verbose,
               sourceMap: options.emitSourceMap,
               charset: options.charset,
               silenceDeprecations: options.silenceDeprecations,
               fatalDeprecations: options.fatalDeprecations,
               futureDeprecations: options.futureDeprecations)
           : await compileAsync(source,
@@ -121,6  122,7 @@ Future<void> _compileStylesheetWithoutErrorHandling(ExecutableOptions options,
               verbose: options.verbose,
               sourceMap: options.emitSourceMap,
               charset: options.charset,
               silenceDeprecations: options.silenceDeprecations,
               fatalDeprecations: options.fatalDeprecations,
               futureDeprecations: options.futureDeprecations);
     } else {
@@ -135,6  137,7 @@ Future<void> _compileStylesheetWithoutErrorHandling(ExecutableOptions options,
               verbose: options.verbose,
               sourceMap: options.emitSourceMap,
               charset: options.charset,
               silenceDeprecations: options.silenceDeprecations,
               fatalDeprecations: options.fatalDeprecations,
               futureDeprecations: options.futureDeprecations)
           : compile(source,
@@ -146,6  149,7 @@ Future<void> _compileStylesheetWithoutErrorHandling(ExecutableOptions options,
               verbose: options.verbose,
               sourceMap: options.emitSourceMap,
               charset: options.charset,
               silenceDeprecations: options.silenceDeprecations,
               fatalDeprecations: options.fatalDeprecations,
               futureDeprecations: options.futureDeprecations);
     }

diff --git a/lib/src/executable/repl.dart b/lib/src/executable/repl.dart
@@ -12,6  12,7 @@ import '../exception.dart';
 import '../executable/options.dart';
 import '../import_cache.dart';
 import '../importer/filesystem.dart';
 import '../logger/deprecation_processing.dart';
 import '../logger/tracking.dart';
 import '../parse/parser.dart';
 import '../utils.dart';
@@ -20,7  21,12 @@ import '../visitor/evaluate.dart';
 /// Runs an interactive SassScript shell according to [options].
 Future<void> repl(ExecutableOptions options) async {
   var repl = Repl(prompt: '>> ');
-  var logger = TrackingLogger(options.logger);
   var trackingLogger = TrackingLogger(options.logger);
   var logger = DeprecationProcessingLogger(trackingLogger,
       silenceDeprecations: options.silenceDeprecations,
       fatalDeprecations: options.fatalDeprecations,
       futureDeprecations: options.futureDeprecations,
       limitRepetition: !options.verbose);
   var evaluator = Evaluator(
       importer: FilesystemImporter.cwd,
       importCache: ImportCache(
@@ -46,8  52,8 @@ Future<void> repl(ExecutableOptions options) async {
         print(evaluator.evaluate(Expression.parse(line, logger: logger)));
       }
     } on SassException catch (error, stackTrace) {
-      _logError(
-          error, getTrace(error) ?? stackTrace, line, repl, options, logger);
       _logError(error, getTrace(error) ?? stackTrace, line, repl, options,
           trackingLogger);
     }
   }
 }

diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
@@ -1,3  1,7 @@
 ## 10.4.2
 
 * No user-visible changes.
 
 ## 10.4.1
 
 * No user-visible changes.

diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
@@ -2,18  2,18 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 10.4.1
 version: 10.4.2
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.77.1
   sass: 1.77.2
 
 dev_dependencies:
-  dartdoc: ^6.0.0
   dartdoc: ">=6.0.0 <9.0.0"
 
 dependency_overrides:
   sass: { path: ../.. }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5  1,5 @@
 name: sass
-version: 1.77.1
 version: 1.77.2
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass
 

diff --git a/test/cli/dart/deprecations_test.dart b/test/cli/dart/deprecations_test.dart
@@ -0,0  1,15 @@
 // Copyright 2024 Google Inc. Use of this source code is governed by an
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
 
 import 'package:test/test.dart';
 
 import '../dart_test.dart';
 import '../shared/deprecations.dart';
 
 void main() {
   setUpAll(ensureSnapshotUpToDate);
   sharedTests(runSass);
 }
diff --git a/test/cli/node/deprecations_test.dart b/test/cli/node/deprecations_test.dart
@@ -0,0  1,17 @@
 // Copyright 2024 Google Inc. Use of this source code is governed by an
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
 @Tags(['node'])
 
 import 'package:test/test.dart';
 
 import '../../ensure_npm_package.dart';
 import '../node_test.dart';
 import '../shared/deprecations.dart';
 
 void main() {
   setUpAll(ensureNpmPackage);
   sharedTests(runSass);
 }