Skip to content

fix: Use posix paths in import statements in Sass strings #1684

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 13, 2024
Merged

fix: Use posix paths in import statements in Sass strings #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
912196a
fix: Use posix paths in import statements in Sass strings
gadenbuie Sep 12, 2024
9d04e16
docs: Add changelog item
gadenbuie Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Fixed a bug with `Chat()` sometimes silently dropping errors. (#1672)

* `shiny create` now uses the template `id` rather than the directory name as the default directory. (#1666)
* `shiny create` now uses the template `id` rather than the directory name as the default directory.
(#1666)

* `ui.Theme()` now works correctly on Windows when the theme requires Sass compilation. (thanks @yuuuxt, #1684)

## [1.1.0] - 2024-09-03

Expand Down
5 changes: 4 additions & 1 deletion shiny/ui/_theme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,10 @@ def path_pkg_preset(preset: ShinyThemePreset, *args: str) -> str:
#> "{shiny}/www/shared/sass/preset/shiny/bootstrap.min.css"
```
"""
return os.path.realpath(path_pkg_www("sass", "preset", str(preset), *args))
path = os.path.realpath(path_pkg_www("sass", "preset", str(preset), *args))
# these paths end up in strings passed to sass.compile(). Converting to POSIX means
# we use forward slashes to avoid needing to double-escape the Windows backslash
return pathlib.Path(path).as_posix()


def check_is_valid_preset(preset: ShinyThemePreset) -> None:
Expand Down
Loading