Skip to content
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

Deps: Use sass-loader v13 #99412

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+46 −93
Open

Deps: Use sass-loader v13 #99412

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
8400d2f
Deps: Use sass-loader v13
tyxla Feb 6, 2025
35b46bb
Remove `~` from the imports because it's no longer needed
m1r0 Feb 20, 2025
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
2 changes: 1 addition & 1 deletion apps/happy-blocks/block-library/education-header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "@automattic/calypso-color-schemes";
@import "~@automattic/color-studio/dist/color-variables";
@import "@automattic/color-studio/dist/color-variables";
@import "@automattic/onboarding/styles/mixins";

$breakpoint-mobile: 782px; //Mobile size.
Expand Down
10 changes: 5 additions & 5 deletions apps/happy-blocks/block-library/pricing-plans/view.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "~@automattic/typography/styles/variables";
@import "~@automattic/color-studio/dist/color-variables";
@import "~@wordpress/base-styles/colors";
@import "~@wordpress/base-styles/breakpoints";
@import "~@wordpress/base-styles/mixins";
@import "@automattic/typography/styles/variables";
@import "@automattic/color-studio/dist/color-variables";
@import "@wordpress/base-styles/colors";
@import "@wordpress/base-styles/breakpoints";
@import "@wordpress/base-styles/mixins";

$brand-text: "SF Pro Text", $sans;
$brand-display: "SF Pro Display", $sans;
Expand Down
4 changes: 2 additions & 2 deletions client/blocks/importer/wordpress/upgrade-plan/skeleton/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "~@wordpress/base-styles/colors";
@import "@automattic/color-studio/dist/color-variables";
@import "@wordpress/base-styles/colors";

@keyframes import-upgrade-plan-skeleton__animation {
0% {
Expand Down
2 changes: 1 addition & 1 deletion client/blocks/login/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import "@wordpress/base-styles/mixins";
@import "calypso/assets/stylesheets/p2-extends";

@import "~@automattic/color-studio/dist/color-variables";
@import "@automattic/color-studio/dist/color-variables";

$breakpoint-mobile: 782px; //Mobile size.

Expand Down
2 changes: 1 addition & 1 deletion client/blocks/plugin-scheduled-updates-common/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "@automattic/color-studio/dist/color-variables";
@import "@automattic/global-styles/src/components/search-control-styles";
@import "@wordpress/base-styles/breakpoints";

Expand Down
4 changes: 2 additions & 2 deletions client/components/bloganuary-header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@wordpress/base-styles/breakpoints";
@import "~@wordpress/base-styles/mixins";
@import "@wordpress/base-styles/breakpoints";
@import "@wordpress/base-styles/mixins";

.bloganuary-header {
background-color: var(--color-sidebar-background);
Expand Down
2 changes: 1 addition & 1 deletion client/components/reviews-rating-stars/reviews-ratings-stars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "@automattic/color-studio/dist/color-variables";
@import "@wordpress/base-styles/variables";

.reviews-ratings-stars__star-bar {
Expand Down
2 changes: 1 addition & 1 deletion client/jetpack-connect/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "@automattic/color-studio/dist/color-variables";

@mixin jetpack-connect-colors() {
// Override accent variables with Jetpack colors
Expand Down
2 changes: 1 addition & 1 deletion client/landing/stepper/declarative-flow/internals/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Importers styles
*/
@import "~calypso/blocks/import/style/base";
@import "calypso/blocks/import/style/base";

/**
* General onboarding styling
Expand Down
4 changes: 2 additions & 2 deletions .../declarative-flow/internals/steps-repository/site-migration-instructions/steps/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "~@wordpress/base-styles/colors";
@import "@automattic/color-studio/dist/color-variables";
@import "@wordpress/base-styles/colors";

@keyframes migration-key-skeleton__animation {
0% {
Expand Down
4 changes: 2 additions & 2 deletions client/me/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@wordpress/base-styles/breakpoints";
@import "~@wordpress/base-styles/mixins";
@import "@wordpress/base-styles/breakpoints";
@import "@wordpress/base-styles/mixins";

body.is-group-me.is-section-help,
body.is-section-me {
Expand Down
32 changes: 16 additions & 16 deletions client/my-sites/subscribers/components/subscriber-data-views/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/breakpoints';
@import "~@wordpress/base-styles/mixins";
@import "@wordpress/base-styles/mixins";
@import '@wordpress/dataviews/build-style/style.css';

$padding-standard: 16px;
Expand All @@ -9,7 +9,7 @@ body.is-section-subscribers.is-subscribers-dataviews,
.theme-jetpack-cloud.is-subscribers-dataviews.is-group-jetpack-cloud.is-section-jetpack-subscribers
{
overflow: hidden;

.layout:not(.has-no-sidebar),
.has-no-masterbar {
.layout__content {
Expand Down Expand Up @@ -46,11 +46,11 @@ body.is-section-subscribers.is-subscribers-dataviews,
100vh - var(--masterbar-height) - #{$padding-standard * 2}
);
overflow: hidden;

@media ( max-width: $break-small ) {
padding: 0;
}

button {
cursor: pointer;
max-width: 100%;
Expand All @@ -60,7 +60,7 @@ body.is-section-subscribers.is-subscribers-dataviews,
background: none;
}
}

.subscriber-data-views__square-avatar {
border-radius: 0;
cursor: pointer;
Expand All @@ -70,7 +70,7 @@ body.is-section-subscribers.is-subscribers-dataviews,
border-bottom: 1px dotted var(--studio-gray-60);
cursor: pointer;
}

&__list {
flex: 1 1 auto;
transition: width 0.15s ease-in-out;
Expand All @@ -81,10 +81,10 @@ body.is-section-subscribers.is-subscribers-dataviews,
overflow: hidden;
display: flex;
flex-direction: column;

.navigation-header {
padding: $padding-standard 48px;

// 430px is the DataViews padding breakpoint.
@media ( max-width: 430px ) {
padding: $padding-standard 24px;
Expand Down Expand Up @@ -135,19 +135,19 @@ body.is-section-subscribers.is-subscribers-dataviews,
}
}
}

&.has-selected-subscriber {
.subscriber-data-views__list {
flex: 0 0 25%;
width: 25%;
min-width: 300px;

.navigation-header {
padding: $padding-standard 24px;

.add-subscribers-button {
min-height: 37px;

.add-subscribers-button-text {
display: none;
}
Expand All @@ -167,7 +167,7 @@ body.is-section-subscribers.is-subscribers-dataviews,
display: none;
}
}

.subscriber-data-views__details {
display: block;
flex: 1 1 auto;
Expand All @@ -184,7 +184,7 @@ body.is-section-subscribers.is-subscribers-dataviews,
margin-bottom: 24px;
margin-top: 0;
}

&__close-button {
margin-left: auto;
border-radius: 4px;
Expand All @@ -208,17 +208,17 @@ body.is-section-subscribers.is-subscribers-dataviews,
}
}
}

&__details {
background: var( --color-surface );
display: none;
}

.subscriber-profile.subscriber-profile--compact {
@media ( max-width: $break-wide ) {
max-width: 195px;
}

.subscriber-profile__user-details {
.subscriber-profile__name,
.subscriber-profile__email {
Expand Down
4 changes: 2 additions & 2 deletions client/site-profiler/components/skeleton-screen/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@automattic/color-studio/dist/color-variables";
@import "~@wordpress/base-styles/colors";
@import "@automattic/color-studio/dist/color-variables";
@import "@wordpress/base-styles/colors";

@keyframes site-profiler-skeleton__animation {
0% {
Expand Down
4 changes: 2 additions & 2 deletions client/sites/components/panel-sidebar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

@import "@wordpress/base-styles/breakpoints";
@import "@wordpress/base-styles/mixins";
@import "~@automattic/color-studio/dist/color-variables";
@import "~@automattic/typography/styles/variables";
@import "@automattic/color-studio/dist/color-variables";
@import "@automattic/typography/styles/variables";

.panel-with-sidebar {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"postcss-loader": "^6.2.1",
"recursive-copy": "^2.0.14",
"sass": "1.54.0",
"sass-loader": "^12.1.0",
"sass-loader": "^13.1.0",
"semver": "^7.3.2",
"stream-browserify": "^3.0.0",
"terser-webpack-plugin": "^5.3.11",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"css-loader": "^6.11.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass-loader": "^12.1.0",
"sass-loader": "^13.1.0",
"style-loader": "^1.3.0",
"webpack": "^5.97.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/onboarding/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^5.0.1",
"sass-loader": "^10.1.1",
"sass-loader": "^13.1.0",
"style-loader": "^1.3.0",
"typescript": "^5.3.3",
"webpack": "^5.97.1"
Expand Down
55 changes: 4 additions & 51 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ __metadata:
postcss-loader: "npm:^6.2.1"
recursive-copy: "npm:^2.0.14"
sass: "npm:1.54.0"
sass-loader: "npm:^12.1.0"
sass-loader: "npm:^13.1.0"
semver: "npm:^7.3.2"
stream-browserify: "npm:^3.0.0"
terser-webpack-plugin: "npm:^5.3.11"
Expand Down Expand Up @@ -527,7 +527,7 @@ __metadata:
css-loader: "npm:^6.11.0"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
sass-loader: "npm:^12.1.0"
sass-loader: "npm:^13.1.0"
style-loader: "npm:^1.3.0"
webpack: "npm:^5.97.1"
peerDependencies:
Expand Down Expand Up @@ -1631,7 +1631,7 @@ __metadata:
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.23.1"
redux: "npm:^5.0.1"
sass-loader: "npm:^10.1.1"
sass-loader: "npm:^13.1.0"
style-loader: "npm:^1.3.0"
tslib: "npm:^2.5.0"
typescript: "npm:^5.3.3"
Expand Down Expand Up @@ -24163,7 +24163,7 @@ __metadata:
languageName: node
linkType: hard

"klona@npm:^2.0.4, klona@npm:^2.0.5":
"klona@npm:^2.0.5":
version: 2.0.5
resolution: "klona@npm:2.0.5"
checksum: 5b752c11ca8e2996612386699f52cc5aed802aa4116663d26239ac0b054fae25191dacb95587ecf1a167b039daa9fc3fa2da17dfd5d0821f3037de3821d9a9e5
Expand Down Expand Up @@ -31640,53 +31640,6 @@ __metadata:
languageName: node
linkType: hard

"sass-loader@npm:^10.1.1":
version: 10.2.1
resolution: "sass-loader@npm:10.2.1"
dependencies:
klona: "npm:^2.0.4"
loader-utils: "npm:^2.0.0"
neo-async: "npm:^2.6.2"
schema-utils: "npm:^3.0.0"
semver: "npm:^7.3.2"
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0
sass: ^1.3.0
webpack: ^4.36.0 || ^5.0.0
peerDependenciesMeta:
fibers:
optional: true
node-sass:
optional: true
sass:
optional: true
checksum: 03286a3b46c6d1c606c7e382cf9fefc569e45758d7d6e813a20a5b00926336baa8a45e833a7a4e461b4092aac22f6859052437e7d7c0d6f726c71328f8c25173
languageName: node
linkType: hard

"sass-loader@npm:^12.1.0":
version: 12.1.0
resolution: "sass-loader@npm:12.1.0"
dependencies:
klona: "npm:^2.0.4"
neo-async: "npm:^2.6.2"
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0
sass: ^1.3.0
webpack: ^5.0.0
peerDependenciesMeta:
fibers:
optional: true
node-sass:
optional: true
sass:
optional: true
checksum: 4fe94e330239ecf4eb35bf2fcb0abe7981380d3e308761d3ab774b6e8741ef11d5f513734aa0bb43c06b91a26d24f365c2d71bdbf4027f897b6abc98648247cb
languageName: node
linkType: hard

"sass-loader@npm:^13.1.0":
version: 13.3.3
resolution: "sass-loader@npm:13.3.3"
Expand Down