Skip to content

Commit

Permalink
fix(styles): downgrade sass version as there is an issue with @extend (
Browse files Browse the repository at this point in the history
…#9973)

### Related Ticket(s)

{{Provide url(s) to the related ticket(s) that this pull request addresses}}

### Description

There seems to be an issue with `@extend` in the recent upgrade of `sass`. Downgrading `sass` version until there is fix

### Changelog

**Changed**

- downgrade sass back to `~1.40.0`

**Removed**

- band-aid fixes that should be resolved with the `sass` downgrade

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
  • Loading branch information
annawen1 authored Jan 31, 2023
1 parent 95049c9 commit 8cff8a9
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 18 deletions.
Binary file added .yarn/offline-mirror/sass-1.40.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/sass-1.57.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"rollup-plugin-multi-input": "^1.3.1",
"rollup-plugin-terser": "^7.0.2",
"rtlcss": "^3.0.0",
"sass": "~1.57.0",
"sass": "~1.40.0",
"sass-loader": "^10.0.0",
"strip-comments": "^1.0.0",
"style-loader": "^2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ $css--plex: true !default;

:host(#{$prefix}-breadcrumb-item) {
@extend .#{$prefix}--breadcrumb-item;

// TODO: see if we can remove this ::after section after v11 upgrade
&::after {
margin-left: $spacing-03;
color: $text-primary;
content: '/';
}
}

:host(#{$prefix}-breadcrumb-overflow-menu) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@

:host(#{$prefix}-modal[open]) {
@extend .#{$prefix}--modal, .is-visible;

// TODO: look into if following two lines are necessary after v11 upgrade
opacity: 1;
visibility: inherit;
}

:host(#{$prefix}-modal-header) {
Expand Down
10 changes: 4 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22546,14 +22546,12 @@ sass@^1.19.0:
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"

sass@~1.57.0:
version "1.57.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
sass@~1.40.0:
version "1.40.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.40.1.tgz#55d3fc38fe9dc579e7324ce0eb9185bede7992a9"
integrity sha512-M6WskYLzTfdZdb09W9SftIScjudL8jNkhdh9z96U+olQaKIcw2Knb6QLL9bUhnuSm4VD+1yJVaO2/ENDPMTtAQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"

sax@~1.2.1, sax@~1.2.4:
version "1.2.4"
Expand Down

0 comments on commit 8cff8a9

Please sign in to comment.