Skip to content

Commit 537c12a

Browse files
committed
Merge remote-tracking branch 'origin/main' into merge-main
2 parents e409a92 + 7516e17 commit 537c12a

File tree

962 files changed

+386
-15598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

962 files changed

+386
-15598
lines changed

.github/workflows/ci.yml

+1-27
Original file line numberDiff line numberDiff line change
@@ -69,33 +69,7 @@ jobs:
6969

7070
- name: Run specs
7171
run: npm run sass-spec -- --dart dart-sass
72-
73-
libsass:
74-
name: "Language | LibSass"
75-
runs-on: ubuntu-latest
76-
if: "github.event_name != 'pull_request' || !contains(github.event.pull_request.body, 'skip libsass')"
77-
78-
steps:
79-
- uses: actions/checkout@v3
80-
- uses: actions/setup-node@v3
81-
with: {node-version: "${{ env.NODE_VERSION }}"}
82-
- run: npm install
83-
84-
- name: Install SassC
85-
run: |
86-
export SASS_LIBSASS_PATH=$BUILD_DIR/../libsass
87-
export SASS_SASSC_PATH=$BUILD_DIR/../sassc
88-
git clone https://github.com/sass/libsass.git $SASS_LIBSASS_PATH
89-
(cd $SASS_LIBSASS_PATH; git checkout $GITISH)
90-
git clone https://github.com/sass/sassc.git $SASS_SASSC_PATH
91-
(cd $SASS_SASSC_PATH; git checkout $GITISH)
92-
make -C $SASS_SASSC_PATH
93-
env:
94-
BUILD_DIR: "${{ github.workspace }}"
95-
96-
- name: Run specs
97-
run: npm run sass-spec -- --impl libsass -c ../sassc/bin/sassc
98-
72+
9973
# The versions should be kept up-to-date with the latest LTS Node releases.
10074
# They next need to be rotated October 2021. See
10175
# https://github.com/nodejs/Release.

README.md

+10-24
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,8 @@ npm run sass-spec -- --dart $DART_SASS_PATH
6666

6767
#### LibSass
6868

69-
To run specs against [LibSass][], the C++ Sass implementation that's used for
70-
[Node Sass][] and other languages' Sass wrappers, you'll need to be able to
71-
[build LibSass][]. Once you have all the build dependencies:
72-
73-
[LibSass]: https://sass-lang.com/libsass
74-
[Node Sass]: https://npmjs.com/package/node-sass
75-
[build LibSass]: https://github.com/sass/libsass/blob/master/docs/build.md
76-
77-
```sh
78-
# If you already have a clone of the LibSass repo, you can use that instead.
79-
git clone https://github.com/sass/libsass
80-
(cd libsass; ./script/bootstrap; make sassc)
81-
export SASSC_PATH=`pwd`/libsass/sassc/bin/sassc
82-
83-
npm run sass-spec -- --impl libsass -c $SASSC_PATH
84-
```
69+
As LibSass is approaching end-of-life and hasn't had new feature changes in
70+
years, this repository no longer supports running tests against it.
8571

8672
### Spec Structure
8773

@@ -183,8 +169,8 @@ against `error`.
183169
Sometimes different Sass implementations produce different but equally-valid CSS
184170
outputs or error messages for the same input. To accommodate this,
185171
implementation-specific output, error, and warning files may be created by
186-
adding `-dart-sass` or `-libsass` after the file's name (but before its
187-
extension, in the case of `output.css`).
172+
adding `-dart-sass` after the file's name (but before its extension, in the case
173+
of `output.css`).
188174

189175
When a spec is running for an implementation with an implementations-specific
190176
expectation, the normal expectation is ignored completely in favor of the
@@ -208,7 +194,7 @@ eventually be removed.
208194
```yaml
209195
---
210196
:todo:
211-
- sass/libsass#2827
197+
- sass/dart-sass#123456
212198
```
213199
214200
This option indicates implementations that should add support for a spec, but
@@ -238,7 +224,7 @@ these specs.
238224
```yaml
239225
---
240226
:warning_todo:
241-
- sass/libsass#2834
227+
- sass/dart-sass#123456
242228
```
243229

244230
This option works like [`:todo`](#todo), except instead of skipping the entire
@@ -251,7 +237,7 @@ normal. This should not be used for error specs.
251237
```yaml
252238
---
253239
:ignore_for:
254-
- libsass
240+
- dart-sass
255241
```
256242

257243
This option indicates implementations that are never expected to be compatible
@@ -282,9 +268,9 @@ Output does not match expectation.
282268
i. Show me the input.
283269
d. show diff.
284270
O. Update expected output and pass test.
285-
I. Migrate copy of test to pass on libsass.
286-
T. Mark spec as todo for libsass.
287-
G. Ignore test for libsass FOREVER.
271+
I. Migrate copy of test to pass on dart-sass.
272+
T. Mark spec as todo for dart-sass.
273+
G. Ignore test for dart-sass FOREVER.
288274
f. Mark as failed.
289275
X. Exit testing.
290276
```

STYLE_GUIDE.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ be named "other" (`_other.scss`, `_other.sass`, etc).
794794
<===> slash_slash_string/options.yml
795795
---
796796
:todo:
797-
- sass/libsass#2840
797+
- sass/dart-sass#123456
798798
799799
<===> slash_slash_string/input.scss
800800
a {b: 1 / 2 / foo()}
@@ -811,7 +811,7 @@ a {
811811
<===> slash_slash_string/options.yml
812812
---
813813
:todo:
814-
- libsass
814+
- dart-sass
815815
816816
<===> slash_slash_string/input.scss
817817
a {b: 1 / 2 / foo()}
@@ -1036,7 +1036,7 @@ directory. It just serves to visually separate specs from one another.
10361036
<===> top_level/options.yml
10371037
---
10381038
:warning_todo:
1039-
- sass/libsass#2834
1039+
- sass/dart-sass#123456
10401040
:ignore_for:
10411041
- ruby-sass
10421042
@@ -1081,7 +1081,7 @@ declare new variables. Consider adding `$var: null` at the top level.
10811081
<===> top_level/options.yml
10821082
---
10831083
:warning_todo:
1084-
- sass/libsass#2834
1084+
- sass/dart-sasss#123456
10851085
:ignore_for:
10861086
- ruby-sass
10871087

lib/cli-args.ts

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export interface CliArgs {
1919

2020
const implArgs: Record<string, string[]> = {
2121
'dart-sass': ['--verbose', '--no-unicode', '--no-color'],
22-
libsass: ['--style', 'expanded'],
2322
};
2423

2524
const usageText = `

0 commit comments

Comments
 (0)