Skip to content

Commit 09fc49f

Browse files
authored
Merge pull request #12416 from quarto-dev/bugfix/12338
Add new scss-parser workaround for module access
2 parents 29091da + 5f39deb commit 09fc49f

File tree

10 files changed

+12921
-1
lines changed

10 files changed

+12921
-1
lines changed

news/changelog-1.7.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ All changes included in 1.7:
141141
- ([#12117](https://github.com/quarto-dev/quarto-cli/issues/12117)): Color output to stdout and stderr is now correctly rendered for `html` format in the Jupyter and Julia engines.
142142
- ([#12264](https://github.com/quarto-dev/quarto-cli/issues/12264)): Upgrade `dart-sass` to 1.85.1.
143143
- ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added a new CLI command `quarto call`. First users of this interface are the new `quarto call engine julia ...` subcommands.
144+
- ([#12338](https://github.com/quarto-dev/quarto-cli/issues/12338)): Add an additional workaround for the SCSS parser used in color variable extraction.
144145
- ([#12369](https://github.com/quarto-dev/quarto-cli/pull/12369)): `quarto preview` correctly throws a YAML validation error when a `format` key does not conform.
145146

146147
## Languages
147148

148-
- ([#12366](https://github.com/quarto-dev/quarto-cli/pull/12366)): Added Bulgarian translation for Quarto UI text (credit: @sakelariev)
149+
- ([#12366](https://github.com/quarto-dev/quarto-cli/pull/12366)): Added Bulgarian translation for Quarto UI text (credit: @sakelariev)

src/core/sass/analyzer/parse.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export const makeParserModule = (
88
) => {
99
return {
1010
getSassAst: (contents: string) => {
11+
// scss-parser doesn't support the `$.` operator for module access and it breaks their parser oO, so we remove it.
12+
contents = contents.replaceAll(".$", "_dot_dollar");
13+
1114
// scss-parser doesn't support the `...` operator and it breaks their parser oO, so we remove it.
1215
// our analysis doesn't need to know about it.
1316
contents = contents.replaceAll("...", "_dot_dot_dot");
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/.quarto/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$pinkish: #e83e8c;
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
project:
2+
type: website
3+
4+
website:
5+
title: "website"
6+
navbar:
7+
left:
8+
- href: index.qmd
9+
text: Home
10+
- about.qmd
11+
12+
format:
13+
html:
14+
theme:
15+
- cosmo
16+
- styles.scss

0 commit comments

Comments
 (0)