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.

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

Bump wp-scripts to 22.1.0 and webpack config to v5 #1339

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/src/components/app-button/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
max-height: inherit;

circle {
stroke: currentColor;
stroke: currentcolor;
}
}

Expand Down
2 changes: 1 addition & 1 deletion js/src/components/app-input-link-control/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
display: block;
margin: 6px;
margin-right: 0;
fill: currentColor;
fill: currentcolor;
}
}
2 changes: 1 addition & 1 deletion js/src/components/app-modal/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
gap: calc(var(--main-gap) / 2);
margin-top: calc(var(--main-gap));

@include break-mobile() {
@include break-mobile {
flex-direction: row;
justify-content: flex-end;
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/components/app-radio-content-control/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.app-radio-content-control {
display: grid;
grid-template-columns: [input-start] auto [text-start] 1fr;

// Make browser without `column-gap` (mobile Opera and Samsung) use same gap, for both.
gap: $grid-unit-10;
column-gap: 10px;
Expand All @@ -11,7 +12,6 @@
.components-base-control__field,
.components-radio-control__option {
display: contents;

}
.components-radio-control__input[type="radio"] {
margin: 0;
Expand Down
1 change: 1 addition & 0 deletions js/src/components/app-sub-nav/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// https://github.com/WordPress/wordpress-develop/blob/5.8.1/src/wp-admin/css/common.css#L448-L451
font-weight: 600;
border: none;

// https://github.com/WordPress/wordpress-develop/blob/5.8.1/src/wp-admin/css/common.css#L683-L685
color: #000;
}
Expand Down
5 changes: 2 additions & 3 deletions js/src/components/app-tab-nav/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
padding: 3px $grid-unit-20; // Use padding to offset the is-active border, this benefits Windows High Contrast mode
margin-left: 0;
font-weight: 500;
//transition: box-shadow 0.1s linear;
box-sizing: border-box;

// This pseudo-element "duplicates" the tab label and sets the text to bold.
Expand All @@ -35,7 +34,7 @@

&.is-active {
// The transparent shadow ensures no jumpiness when focus animates on an active tab.
box-shadow: inset 0 0 0 $border-width-focus transparent, inset 0 0 -$border-width-tab 0 0 var(--wp-admin-theme-color);
box-shadow: inset 0 0 0 $border-width-focus transparent, inset 0 0 - $border-width-tab 0 0 var(--wp-admin-theme-color);
position: relative;

// This border appears in Windows High Contrast mode instead of the box-shadow.
Expand All @@ -55,7 +54,7 @@
}

&.is-active:focus {
box-shadow: inset 0 0 0 $border-width-focus var(--wp-admin-theme-color), inset 0 0 -$border-width-tab 0 0 var(--wp-admin-theme-color);
box-shadow: inset 0 0 0 $border-width-focus var(--wp-admin-theme-color), inset 0 0 - $border-width-tab 0 0 var(--wp-admin-theme-color);
}
}
}
2 changes: 1 addition & 1 deletion js/src/components/connected-icon-label/index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gla-connected-icon-label {
fill: currentColor;
fill: currentcolor;
color: #23a713;

svg {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
}

&__placeholder {
@include placeholder();
@include placeholder;

display: inline-block;
width: 18em;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.components-base-control__field {
display: grid;
grid-template-columns: [input-start] auto [text-start] 1fr;

// Make browser without `column-gap` (mobile Opera and Samsung) use same gap, for both.
gap: $grid-unit-10;
column-gap: 10px;
Expand Down
6 changes: 3 additions & 3 deletions js/src/components/help-popover/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ $button-color: #949494;
cursor: pointer;

&:hover {
fill: darken($color: $button-color, $amount: 20%);
fill: color.adjust($button-color, $lightness: -20%);
}
}

.components-popover__content {
width: 300px;

@include break-large() {
@include break-large {
width: 360px;
}

@include break-xlarge() {
@include break-xlarge {
width: 480px;
}

Expand Down
2 changes: 1 addition & 1 deletion js/src/components/loading-label/loading-label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
min-width: 24px;

&__circle {
stroke: currentColor;
stroke: currentcolor;
stroke-width: 8px;
}
}
Expand Down
4 changes: 2 additions & 2 deletions js/src/css/abstracts/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Adds animation to placeholder section
// Copied from WC-admin
// https://github.com/woocommerce/woocommerce-admin/blob/9f68059c7df466ee7a559c555bcb5a7b9e421e6d/packages/style-build/abstracts/_mixins.scss#L22-L35
@mixin placeholder( $lighten-percentage: 30% ) {
@mixin placeholder($lighten-percentage: 30%) {
animation: loading-fade 1.6s ease-in-out infinite;
background-color: $gray-100;
color: transparent;
Expand All @@ -15,7 +15,7 @@
content: "\00a0";
}

@media screen and ( prefers-reduced-motion: reduce ) {
@media screen and (prefers-reduced-motion: reduce) {
animation: none;
}
}
4 changes: 2 additions & 2 deletions js/src/css/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@import "node_modules/@wordpress/base-styles/default-custom-properties";

// Import Gutenberg components that aren't already imported in the lowest WC Admin version we support
@import "./shared/gutenberg-components.scss";
@import "./shared/gutenberg-components";

// Import GLA-wise styling that based on woocommerce-admin styles.
@import "./shared/woocommerce-admin.scss";
@import "./shared/woocommerce-admin";
2 changes: 1 addition & 1 deletion js/src/css/shared/_gutenberg-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}

&__frame {
@include break-small() {
@include break-small {
transform: initial;
position: relative;
top: 0;
Expand Down
1 change: 0 additions & 1 deletion js/src/css/shared/_woocommerce-admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

.woocommerce-layout__main {
padding: 0;

}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gla-edit-program-prompt-modal {
@include break-small() {
@include break-small {
max-width: 360px;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gla-pause-program-modal {
@include break-small() {
@include break-small {
max-width: 360px;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gla-remove-program-modal {
@include break-small() {
@include break-small {
max-width: 360px;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gla-campaign-creation-success-guide {
@include break-small() {
@include break-small {
max-width: 517px;
}

Expand Down
6 changes: 3 additions & 3 deletions js/src/dashboard/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
align-items: flex-end;
margin-bottom: var(--main-gap);

@include break-medium() {
@include break-medium {
flex-direction: row;
justify-content: space-between;
}

.woocommerce-filters-filter {
margin-bottom: calc(var(--main-gap) / 2);

@include break-medium() {
@include break-medium {
margin-bottom: 0;
}
}
Expand All @@ -25,7 +25,7 @@
gap: var(--main-gap);
margin-bottom: var(--main-gap);

@include break-medium() {
@include break-medium {
flex-direction: row;
}

Expand Down
3 changes: 2 additions & 1 deletion js/src/dashboard/summary-section/summary-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
&__body {
// Make card contents within a row have the same height
flex: 1;

// This could be just display: flex, but since Safari 14.0 is still supported,
// and does not support gap for flexbox, we use grid instead.
display: grid;
Expand All @@ -19,10 +20,10 @@
background-color: #f8f9fa;
color: #757575;
text-align: center;

// Make it match the SummaryNumber placeholder's height
// not to make the UI jumpy once preloaders is replaced with an error.
min-height: 117px;

gap: $grid-unit-20;

& > * {
Expand Down
4 changes: 2 additions & 2 deletions js/src/get-started-page/get-started-card/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: column;
align-items: flex-end;

@include break-large() {
@include break-large {
flex-direction: row;
align-items: center;
}
Expand All @@ -24,7 +24,7 @@
text-align: right;
margin-bottom: -4px;

@include break-large() {
@include break-large {
margin-top: calc(var(--main-gap) * 1.5);
}
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/get-started-page/unsupported-notices/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

&__link {
color: currentColor;
color: currentcolor;
}

&__icon {
Expand Down
1 change: 1 addition & 0 deletions js/src/product-attributes/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
overflow: hidden;
clear: both;
border: 1px solid $gray-300;

// using !important to override the WooCommerce style for meta boxes
margin: $grid-unit-20 0 !important;

Expand Down
1 change: 0 additions & 1 deletion js/src/product-feed/product-feed-table-card/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
> div {
width: auto;
}

}
}

Expand Down
2 changes: 1 addition & 1 deletion js/src/product-feed/product-statistics/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
&:nth-child(2) {
display: inline-flex;
align-items: center;
fill: currentColor;
fill: currentcolor;
color: #008a20;
}

Expand Down