From 3c71b43739854e0328c05082c18a809a8199caf5 Mon Sep 17 00:00:00 2001 From: Kevin Choi Date: Sat, 14 Nov 2020 11:39:34 -0500 Subject: [PATCH 1/4] Update cli_pkg version to ^1.1.0. Update dart-sass version to 1.30.0. This makes the main function (cli_pkg_main_0) return a Promise instead of void. --- CHANGELOG.md | 4 ++++ pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fedab79c5..784501e73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.30.0 + +* The generated main function now returns a promise. + ## 1.29.1 * Fix a bug where `@at-root (without: all)` wouldn't properly remove a diff --git a/pubspec.yaml b/pubspec.yaml index 77a2b2416..2d589699a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.29.1-dev +version: 1.30.0 description: A Sass implementation in Dart. author: Sass Team homepage: https://github.com/sass/dart-sass @@ -34,7 +34,7 @@ dependencies: dev_dependencies: archive: ">=1.0.0 <3.0.0" analyzer: "^0.40.0" - cli_pkg: "^1.0.0-beta.13" + cli_pkg: "^1.1.0" crypto: ">=0.9.2 <3.0.0" dart_style: "^1.2.0" grinder: "^0.8.0" From 75f1b41b6fca7d2fd9761d840392fc1a4f932ef7 Mon Sep 17 00:00:00 2001 From: Kevin Choi Date: Sun, 22 Nov 2020 17:21:41 -0500 Subject: [PATCH 2/4] import cache changed? --- lib/src/import_cache.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/import_cache.dart b/lib/src/import_cache.dart index 110fb5c5c..13887aca2 100644 --- a/lib/src/import_cache.dart +++ b/lib/src/import_cache.dart @@ -162,7 +162,6 @@ Relative canonical URLs are deprecated and will eventually be disallowed. baseImporter: baseImporter, baseUrl: baseUrl, forImport: forImport); if (tuple == null) return null; var stylesheet = importCanonical(tuple.item1, tuple.item2, tuple.item3); - if (stylesheet == null) return null; return Tuple2(tuple.item1, stylesheet); } From 3a35e46ff7f0781480d7b27100a8aa2745a2bfe2 Mon Sep 17 00:00:00 2001 From: Kevin Choi Date: Sun, 22 Nov 2020 20:27:54 -0500 Subject: [PATCH 3/4] refresh import cache? --- lib/src/import_cache.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/import_cache.dart b/lib/src/import_cache.dart index e09fab67d..1ac8ad7d5 100644 --- a/lib/src/import_cache.dart +++ b/lib/src/import_cache.dart @@ -162,6 +162,7 @@ Relative canonical URLs are deprecated and will eventually be disallowed. baseImporter: baseImporter, baseUrl: baseUrl, forImport: forImport); if (tuple == null) return null; var stylesheet = importCanonical(tuple.item1, tuple.item2, tuple.item3); + if (stylesheet == null) return null; return Tuple2(tuple.item1, stylesheet); } From 981c52e62aea5f1f3726118fc9703192036e34c8 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Mon, 23 Nov 2020 12:07:53 -0800 Subject: [PATCH 4/4] Rewrite CHANGELOG entry --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 784501e73..f9684679d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ ## 1.30.0 -* The generated main function now returns a promise. - -## 1.29.1 - * Fix a bug where `@at-root (without: all)` wouldn't properly remove a `@keyframes` context when parsing selectors. +### Node JS API + +* The generated `main()` function in `sass.js` now returns a `Promise` that + completes when the executable is finished running. + ### Dart API * Fix a bug that prevented importers from returning null when loading from a