Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the latest version of cli_pkg #1532

Merged
merged 3 commits into from Oct 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/io/node.dart
Expand Up @@ -182,9 +182,9 @@ T _systemErrorToFileSystemException<T>(T callback()) {
try {
return callback();
} catch (error) {
var systemError = error as JsSystemError;
if (error is! JsSystemError) rethrow;
throw FileSystemException._(
_cleanErrorMessage(systemError), systemError.path);
_cleanErrorMessage(error), error.path);
}
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/sass_api/CHANGELOG.md
@@ -1,3 +1,7 @@
## 1.0.0-beta.16

* No user-visible changes.

## 1.0.0-beta.15

* Fix an issue where `RecursiveAstVisitor` was not implementing
Expand Down
4 changes: 2 additions & 2 deletions pkg/sass_api/pubspec.yaml
Expand Up @@ -2,15 +2,15 @@ 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: 1.0.0-beta.15
version: 1.0.0-beta.16
description: Additional APIs for Dart Sass.
homepage: https://github.com/sass/dart-sass

environment:
sdk: '>=2.12.0 <3.0.0'

dependencies:
sass: 1.43.1
sass: 1.43.2

dependency_overrides:
sass: {path: ../..}
4 changes: 2 additions & 2 deletions pubspec.yaml
@@ -1,5 +1,5 @@
name: sass
version: 1.43.2-dev
version: 1.43.2
description: A Sass implementation in Dart.
homepage: https://github.com/sass/dart-sass

Expand Down Expand Up @@ -34,7 +34,7 @@ dependencies:
dev_dependencies:
analyzer: ^2.4.0
archive: ^3.1.2
cli_pkg: ^1.7.0
cli_pkg: ^2.0.0
crypto: ^3.0.0
dart_style: ^2.0.0
grinder: ^0.9.0
Expand Down
2 changes: 1 addition & 1 deletion test/legacy_node_api/api.dart
Expand Up @@ -20,7 +20,7 @@ import 'package:sass/src/node/legacy/render_options.dart';
import 'package:sass/src/node/legacy/render_result.dart';

/// The Sass module.
final sass = _requireSass(p.absolute("build/npm/sass.dart"));
final sass = _requireSass(p.absolute("build/npm/sass.default.dart"));

/// A `null` that's guaranteed to be represented by JavaScript's `null` value,
/// not by `undefined`.
Expand Down
5 changes: 4 additions & 1 deletion tool/grind.dart
Expand Up @@ -28,7 +28,10 @@ void main(List<String> args) {
pkg.chocolateyNuspec.value = _nuspec;
pkg.homebrewRepo.value = "sass/homebrew-sass";
pkg.homebrewFormula.value = "sass.rb";
pkg.jsRequires.value = {"chokidar": "chokidar", "readline": "readline"};
pkg.jsRequires.value = [
pkg.JSRequire("chokidar", target: pkg.JSRequireTarget.cli),
pkg.JSRequire("readline", target: pkg.JSRequireTarget.cli)
];
pkg.jsModuleMainLibrary.value = "lib/src/node.dart";
pkg.jsDevFlags.value.add("-Dnew-js-api=true");
pkg.npmPackageJson.fn = () =>
Expand Down