Merge pull request #2529 from sass/merge-main

Merge origin/main into feature.v2

Author: nex3

.github/util/initialize/action.yml

@@ -31,7 +31,7 @@ runs:
     - run: npm install
       shell: ${{ runner.os == 'Windows' && 'powershell' || 'bash' }}
 
-    - uses: bufbuild/buf-setup-action@v1.46.0
+    - uses: bufbuild/buf-setup-action@v1.50.0
       with: {github_token: "${{ inputs.github-token }}"}
 
     # This composite action requires bash, but bash is not available on windows-arm64 runner.

.github/workflows/build-linux.yml

@@ -26,7 +26,7 @@ jobs:
           - image: docker.io/library/dart
             platform: linux/arm/v7
             target: linux-arm
-          - image: docker.io/library/debian:unstable-slim
+          - image: docker.io/library/debian:trixie-slim
             platform: linux/riscv64
             target: linux-riscv64
           - image: ghcr.io/dart-musl/dart
@@ -70,7 +70,7 @@ jobs:
         run: docker run --privileged --rm registry.fedoraproject.org/fedora-minimal /bin/sh -c "microdnf install --assumeyes --nodocs --setopt=install_weak_deps=False qemu-user-static systemd-udev && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && /usr/lib/systemd/systemd-binfmt --unregister && /usr/lib/systemd/systemd-binfmt"
 
       - name: Build
-        if: matrix.image != 'ghcr.io/dart-android/dart' && matrix.image != 'docker.io/library/debian:unstable-slim'
+        if: matrix.image != 'ghcr.io/dart-android/dart' && matrix.image != 'docker.io/library/debian:trixie-slim'
         run: |
           docker run --rm -i \
                      --platform ${{ matrix.platform }} \
@@ -92,17 +92,17 @@ jobs:
                      --workdir "$PWD" \
                      ${{ matrix.image }} <<'EOF'
           set -e
-          export DART_SDK=/system/${{ endsWith(matrix.target, '64') && 'lib64' || 'lib' }}/dart
+          export DART_SDK=/system/${{ matrix.target != 'android-arm' && 'lib64' || 'lib' }}/dart
           export PATH=$DART_SDK/bin:$PATH
           dart pub get
           dart run grinder pkg-standalone-${{ matrix.target }}
           EOF
 
       # https://github.com/dart-lang/dart-docker/issues/96#issuecomment-1669860829
-      # There is no official riscv64 dart container image yet, build on debian:unstable instead.
+      # There is no official riscv64 dart container image yet, build on debian:trixie instead.
       # The setup is adopted from: https://github.com/dart-lang/dart-docker/blob/main/Dockerfile-debian.template
       - name: Build
-        if: matrix.image == 'docker.io/library/debian:unstable-slim'
+        if: matrix.image == 'docker.io/library/debian:trixie-slim'
         run: |
           DART_CHANNEL=stable
           DART_VERSION=$(curl -fsSL https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/release/latest/VERSION | yq .version)
@@ -115,7 +115,7 @@ jobs:
                      ${{ matrix.image }} <<'EOF'
           set -e
           apt-get update
-          apt-get install -y --no-install-recommends ca-certificates curl dnsutils git openssh-client unzip
+          apt-get install -y --no-install-recommends bind9-dnsutils ca-certificates curl git openssh-client unzip
 
           export DART_SDK=/usr/lib/dart
           export PATH=$DART_SDK/bin:/root/.pub-cache/bin:$PATH

.github/workflows/release.yml

@@ -129,19 +129,24 @@ jobs:
 
         # The repo package has a file dependency, but the released version needs
         # a real dependency on the released version of Sass.
-      - run: npm install sass@${{ steps.version.outputs.version }}
+      - name: Get Dart Sass version
+        id: dart-sass-version
+        run: echo "version=${GITHUB_REF##*/}" | tee --append "$GITHUB_OUTPUT"
+      - run: npm install sass@${{ steps.dart-sass-version.outputs.version }}
         working-directory: pkg/sass-parser/
 
+      - run: npm run compile
+        working-directory: pkg/sass-parser/
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
         working-directory: pkg/sass-parser/
 
-      - name: Get version
-        id: version
+      - name: Get Sass parser version
+        id: sass-parser-version
         run: |
           echo "version=$(jq .version pkg/sass-parser/package.json)" | tee --append "$GITHUB_OUTPUT"
-      - run: git tag sass-parser/${{ steps.version.outputs.version }}
+      - run: git tag sass-parser/${{ steps.sass-parser-version.outputs.version }}
       - run: git push --tag
 
   deploy_homebrew:

.github/workflows/test.yml

@@ -14,8 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: dart-lang/setup-dart@v1
-    - run: dart format --fix .
+    - uses: ./.github/util/initialize
+      with: {github-token: "${{ github.token }}"}
+    - run: dart format .
+    - run: dart fix --apply
     - run: git diff --exit-code
 
   static_analysis:

CHANGELOG.md

@@ -4,6 +4,101 @@
   parsing associated with it. It is now parsed like any other unknown plain CSS
   at-rule, where Sass features are only allowed within `#{}` interpolation.
 
+## 1.85.2-dev
+
+* No user-visible changes.
+
+## 1.85.1
+
+* Fix a bug where global Sass functions whose names overlap with CSS math
+  functions could incorrectly be treated as CSS math functions even though they
+  used Sass-only features, causing compilation failures. For example,
+  `round(-$var / 2)` previously threw an error but now works as intended.
+
+## 1.85.0
+
+* No longer fully trim redundant selectors generated by `@extend`. This caused
+  unacceptable performance issues for certain heavy users of `@extend`. We'll
+  try to find a more performant way to accomplish it in the future.
+
+## 1.84.0
+
+* Allow newlines in whitespace in the indented syntax.
+
+* **Potentially breaking bug fix**: Selectors with unmatched brackets now always
+  produce a parser error. Previously, some edge cases like `[foo#{"]:is(bar"}) {a:
+  b}` would compile without error, but this was an unintentional bug.
+
+* Fix a bug in which various Color Level 4 functions weren't allowed in plain
+  CSS.
+
+* Fix the error message for `@extend` without a selector and possibly other
+  parsing edge-cases in contexts that allow interpolation.
+
+### Embedded Host
+
+* Fixed the implementation of the `SassBoolean` type to adhere to the spec,
+  now using a class instead of an interface.
+
+## 1.83.4
+
+* No user-visible changes.
+
+## 1.83.3
+
+* No user-visible changes.
+
+## 1.83.2
+
+* Properly display deprecation IDs for the JS Sass API.
+
+* Don't display deprecation IDs for user-defined deprecations.
+
+## 1.83.1
+
+* Fix a bug where `--quiet-deps` would get deactivated for `@content` blocks,
+  even when those blocks were entirely contained within dependencies.
+
+* Include deprecation IDs in deprecation warnings to make it easier to determine
+  what to pass to `--silence-deprecation` or `--fatal-deprecation`.
+
+## 1.83.0
+
+* Allow trailing commas in *all* argument and parameter lists.
+
+## 1.82.0
+
+### Command-Line Interface
+
+* Improve `--watch` mode reliability when making multiple changes at once, such
+  as checking out a different Git branch.
+
+* Parse the `calc-size()` function as a calculation now that it's supported in
+  some browsers.
+
+### Dart API
+
+* Add a `SassCalculation.calcSize()` function.
+
+## 1.81.1
+
+* No user-visible changes.
+
+## 1.81.0
+
+* Fix a few cases where deprecation warnings weren't being emitted for global
+  built-in functions whose names overlap with CSS calculations.
+
+* Add support for the CSS `round()` calculation with a single argument, as long
+  as that argument might be a unitless number.
+
+## 1.80.7
+
+### Embedded Host
+
+* Don't treat `0` as `undefined` for the `green` and `blue` channels in the
+  `LegacyColor` constructor.
+
 ## 1.80.6
 
 ### Command-Line Interface

bin/sass.dart

@@ -49,20 +49,29 @@ Future<void> main(List<String> args) async {
     options.futureDeprecations;
     options.fatalDeprecations;
 
-    var graph = StylesheetGraph(ImportCache(
+    var graph = StylesheetGraph(
+      ImportCache(
         importers: [...options.pkgImporters, FilesystemImporter.noLoadPath],
-        loadPaths: options.loadPaths));
+        loadPaths: options.loadPaths,
+      ),
+    );
     if (options.watch) {
       await watch(options, graph);
       return;
     }
 
-    await compileStylesheets(options, graph, options.sourcesToDestinations,
-        ifModified: options.update);
+    await compileStylesheets(
+      options,
+      graph,
+      options.sourcesToDestinations,
+      ifModified: options.update,
+    );
   } on UsageException catch (error) {
     print("${error.message}\n");
-    print("Usage: sass <input.scss> [output.css]\n"
-        "       sass <input.scss>:<output.css> <input/>:<output/> <dir/>\n");
+    print(
+      "Usage: sass <input.scss> [output.css]\n"
+      "       sass <input.scss>:<output.css> <input/>:<output/> <dir/>\n",
+    );
     print(ExecutableOptions.usage);
     exitCode = 64;
   } catch (error, stackTrace) {
@@ -75,7 +84,8 @@ Future<void> main(List<String> args) async {
     buffer.writeln();
     buffer.writeln();
     buffer.write(
-        Trace.from(getTrace(error) ?? stackTrace).terse.toString().trimRight());
+      Trace.from(getTrace(error) ?? stackTrace).terse.toString().trimRight(),
+    );
     printError(buffer);
     exitCode = 255;
   }
@@ -92,8 +102,9 @@ Future<String> _loadVersion() async {
     return version;
   }
 
-  var libDir =
-      p.fromUri(await Isolate.resolvePackageUri(Uri.parse('package:sass/')));
+  var libDir = p.fromUri(
+    await Isolate.resolvePackageUri(Uri.parse('package:sass/')),
+  );
   var pubspec = readFile(p.join(libDir, '..', 'pubspec.yaml'));
   return pubspec
       .split("\n")