Skip to content

Commit 8df8823

Browse files
manzoorwanijkmanzoorwanijk
committed
Merge branch 'trunk' into feature/my-jetpack/onboarding-i3
2 parents 3094e1a + 4749e58 commit 8df8823

204 files changed

Lines changed: 1466 additions & 824 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.phan/stubs/wpcom-stubs.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* `bin/teamcity-builds/jetpack-stubs/stub-defs.php` and regenerate the stubs
55
* by triggering the Jetpack Staging → Update WPCOM Stubs job in TeamCity.
66
*
7-
* Stubs automatically generated from WordPress.com commit 5047104f555af5e656bf630f97a60d018c9e6ab6.
7+
* Stubs automatically generated from WordPress.com commit b61ece1b8b7269dfc07216a8d6e1d8a52f138b3f.
88
*/
99

1010
namespace {
@@ -1660,19 +1660,21 @@ function get_cached_experiment_by_name(string $name): ?\WPCOM\Experiments\Models
16601660
}
16611661
}
16621662
namespace WPCOM\Jetpack_AI {
1663-
class Feature_Control
1663+
class Chrome_AI_Tokens
16641664
{
16651665
/**
16661666
* @return array
16671667
*/
1668-
public static function get_features(): array
1668+
public static function get_tokens()
16691669
{
16701670
}
16711671
}
1672-
1673-
class Chrome_AI_Tokens
1672+
class Feature_Control
16741673
{
1675-
public static function get_tokens(): array
1674+
/**
1675+
* @return array
1676+
*/
1677+
public static function get_features(): array
16761678
{
16771679
}
16781680
}

‎pnpm-lock.yaml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/js-packages/ai-client/changelog/update-sass-wordpress-base-styles-as-modules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: changed
3+
4+
sass: Remove unnecessary `@import` of `@wordpress/base-styles`.

‎projects/js-packages/ai-client/src/components/ai-feedback/style.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import "@wordpress/base-styles/colors";
2-
31
.ai-assistant-feedback {
42

53
&__selection {

‎projects/js-packages/base-styles/changelog/update-sass-wordpress-base-styles-as-modules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: changed
3+
4+
sass: Convert `@automattic/jetpack-base-styles/gutenberg-base-styles` to modules format.

‎projects/js-packages/base-styles/gutenberg-base-styles.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '@wordpress/base-styles/z-index';
2-
@import '@wordpress/base-styles/colors';
3-
@import '@wordpress/base-styles/variables';
4-
@import '@wordpress/base-styles/breakpoints';
5-
@import '@wordpress/base-styles/mixins';
6-
@import '@wordpress/base-styles/animations';
1+
@forward '@wordpress/base-styles/z-index';
2+
@forward '@wordpress/base-styles/colors';
3+
@forward '@wordpress/base-styles/variables';
4+
@forward '@wordpress/base-styles/breakpoints';
5+
@forward '@wordpress/base-styles/mixins';
6+
@forward '@wordpress/base-styles/animations';

‎projects/js-packages/components/changelog/update-sass-wordpress-base-styles-as-modules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: changed
3+
4+
sass: `@use` rather than `@import` for `@automattic/jetpack-base-styles/gutenberg-base-styles`.

‎projects/js-packages/components/components/dot-pager/style.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '@automattic/jetpack-base-styles/gutenberg-base-styles';
1+
@use '@automattic/jetpack-base-styles/gutenberg-base-styles' as gb;
22
@import '@automattic/jetpack-base-styles/root-variables';
33

44
.dot-pager {
@@ -13,7 +13,7 @@
1313
opacity: 1;
1414
visibility: visible;
1515

16-
@include reduce-motion( "transition" );
16+
@include gb.reduce-motion( "transition" );
1717
}
1818

1919
.dot-pager__controls {

‎projects/js-packages/components/components/global-notices/styles.module.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '@automattic/jetpack-base-styles/gutenberg-base-styles';
1+
@use '@automattic/jetpack-base-styles/gutenberg-base-styles' as gb;
22

33
.global-notices {
44

@@ -10,14 +10,14 @@
1010
// Modals have 100000, so this needs to be above them
1111
z-index: 100001;
1212

13-
@include break-small {
13+
@include gb.break-small {
1414
width: auto;
1515
inset-inline: unset; // left and right
1616
inset-block-start: 4rem;
1717
inset-inline-end: 1rem;
1818
}
1919

20-
@include break-medium {
20+
@include gb.break-medium {
2121
inset-block-start: 3rem;
2222
}
2323
}

‎projects/js-packages/components/components/icons/style.module.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '@automattic/jetpack-base-styles/gutenberg-base-styles';
1+
@use '@automattic/jetpack-base-styles/gutenberg-base-styles' as gb;
22

33
.star-icon {
44
fill: #000;
@@ -10,7 +10,7 @@
1010
}
1111

1212
.socialIcon {
13-
fill: $gray-700;
13+
fill: gb.$gray-700;
1414

1515
&.bluesky {
1616
fill: var( --color-bluesky );

0 commit comments

Comments
 (0)