Skip to content

Commit 60d1210

Browse files
madebynoammadebynoam
committed
Merge branch 'trunk' into report-builder-prototype
2 parents 4f94448 + e11453e commit 60d1210

File tree

365 files changed

+8011
-3181
lines changed

Some content is hidden

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

365 files changed

+8011
-3181
lines changed

‎.github/workflows/design-system-docs.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Publish Design System Docs PR Preview
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
paths:
7+
- 'apps/design-system-docs/**'
8+
- .github/workflows/design-system-docs.yml
9+
10+
# Ensure only one preview build runs per-PR at a time
11+
concurrency:
12+
group: pr-${{ github.event.pull_request.number }}-preview
13+
cancel-in-progress: true
14+
15+
jobs:
16+
preview:
17+
# Avoid running this workflow for pull requests from forks, which would fail due to missing secrets
18+
if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
19+
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
# 1. Checkout the PR code
24+
- uses: actions/checkout@v4
25+
26+
# 2. Set up Node
27+
- uses: actions/setup-node@v4
28+
with:
29+
node-version-file: .nvmrc
30+
cache: yarn
31+
32+
# 3. Install dependencies for just the design-system-docs package
33+
- run: yarn workspaces focus --production @automattic/design-system-docs
34+
35+
# 4. Build the design-system-docs workspace
36+
- name: Build design system docs
37+
run: yarn workspace @automattic/design-system-docs build
38+
39+
# 5. Install Wrangler
40+
- run: npm install -g wrangler
41+
42+
# 6. Upload a new Worker version and capture the preview URL
43+
- name: Upload Worker version
44+
id: upload
45+
env:
46+
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.DESIGN_SYSTEM_PREVIEW_CLOUDFLARE_ACCOUNT }}
47+
CLOUDFLARE_API_TOKEN: ${{ secrets.DESIGN_SYSTEM_PREVIEW_CLOUDFLARE_TOKEN }}
48+
run: |
49+
# Run the upload and tee output so it's visible in the GitHub Actions log
50+
OUT=$(wrangler versions upload --cwd apps/design-system-docs 2>&1 | tee /dev/stderr)
51+
52+
# Extract the preview URL from the output
53+
URL=$(echo "$OUT" | grep -oE 'https://[a-z0-9-]+-preview\.a8cds\.workers\.dev/?')
54+
55+
# Output the URL to the GitHub Actions log for debugging
56+
echo "URL: $URL"
57+
58+
# Expose it to later steps
59+
echo "url=$URL" >> "$GITHUB_OUTPUT"
60+
61+
# 7. Try to find an existing comment with our marker
62+
- name: Find preview comment
63+
id: find_comment
64+
uses: peter-evans/find-comment@v3
65+
with:
66+
issue-number: ${{ github.event.pull_request.number }}
67+
body-includes: '<!-- cf-preview-comment -->'
68+
69+
# 8. Create or update a comment that shows the preview URL
70+
- name: Comment (create or update)
71+
uses: peter-evans/create-or-update-comment@v4
72+
with:
73+
issue-number: ${{ github.event.pull_request.number }}
74+
comment-id: ${{ steps.find_comment.outputs.comment-id }}
75+
edit-mode: replace
76+
body: |
77+
<!-- cf-preview-comment -->
78+
**Design System Reference Site Preview:**
79+
80+
${{ steps.upload.outputs.url }}
81+
82+
(Latest commit: ${{ github.event.pull_request.head.sha }})

‎.storybook/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const storybookConfig = storybookDefaultConfig( {
77
'../client/components/**/*.stories.{js,jsx,tsx}',
88
'../client/blocks/**/*.stories.{js,jsx,tsx}',
99
'../client/dashboard/**/*.stories.{js,jsx,tsx}',
10+
'../client/my-sites/stats/components/**/*.stories.{js,jsx,tsx}',
1011

1112
'../packages/design-picker/src/**/*.stories.{ts,tsx}',
1213
'../packages/domains-table/src/**/*.stories.{js,jsx,ts,tsx}',

‎apps/blaze-dashboard/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@
5959
"@automattic/webpack-extensive-lodash-replacement-plugin": "workspace:^",
6060
"@automattic/webpack-inline-constant-exports-plugin": "workspace:^",
6161
"@automattic/wp-babel-makepot": "workspace:^",
62-
"@wordpress/dependency-extraction-webpack-plugin": "^6.19.0",
62+
"@wordpress/dependency-extraction-webpack-plugin": "^6.24.0",
6363
"autoprefixer": "^10.4.21",
6464
"gettext-parser": "^6.0.0",
6565
"html-webpack-plugin": "^5.6.3",
6666
"lodash": "^4.17.21",
6767
"path-browserify": "^1.0.1",
6868
"postcss": "^8.5.3",
69-
"webpack": "^5.97.1",
69+
"webpack": "^5.99.8",
7070
"webpack-bundle-analyzer": "^4.10.2"
7171
}
7272
}

‎apps/command-palette-wp-admin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
"@automattic/calypso-eslint-overrides": "workspace:^",
4444
"@automattic/languages": "workspace:^",
4545
"@automattic/wp-babel-makepot": "workspace:^",
46-
"@wordpress/dependency-extraction-webpack-plugin": "^6.19.0",
46+
"@wordpress/dependency-extraction-webpack-plugin": "^6.24.0",
4747
"gettext-parser": "^6.0.0",
4848
"lodash": "^4.17.21",
4949
"npm-run-all": "^4.1.5",
5050
"postcss": "^8.5.3",
51-
"webpack": "^5.97.1",
51+
"webpack": "^5.99.8",
5252
"webpack-bundle-analyzer": "^4.10.2"
5353
}
5454
}

‎apps/design-system-docs/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
"@docusaurus/core": "^3.7.0",
2727
"@docusaurus/preset-classic": "^3.7.0",
2828
"@mdx-js/react": "^3.1.0",
29+
"@wordpress/base-styles": "^5.23.0",
30+
"@wordpress/browserslist-config": "^6.23.0",
2931
"@wordpress/components": "^29.9.0",
30-
"prism-react-renderer": "^2.3.0",
32+
"docusaurus-plugin-sass": "^0.2.6",
33+
"prism-react-renderer": "^2.4.1",
3134
"react": "^18.3.1",
32-
"react-dom": "^18.3.1"
35+
"react-dom": "^18.3.1",
36+
"sass": "^1.54.0"
3337
},
3438
"devDependencies": {
3539
"@docusaurus/module-type-aliases": "^3.7.0",
3640
"@docusaurus/tsconfig": "^3.7.0",
3741
"@docusaurus/types": "^3.7.0",
3842
"@types/react": "^18.3.21",
39-
"@wordpress/base-styles": "^5.23.0",
40-
"@wordpress/browserslist-config": "^6.23.0",
41-
"docusaurus-plugin-sass": "^0.2.6",
42-
"sass": "^1.54.0",
4343
"typescript": "^5.8.3"
4444
},
4545
"optionalDependencies": {

‎apps/design-system-docs/wrangler.jsonc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "preview",
3+
"compatibility_date": "2025-05-28",
4+
"assets": {
5+
"directory": "./dist/",
6+
"not_found_handling": "404-page"
7+
}
8+
}

‎apps/happy-blocks/block-library/search-card/assets/hero-bg.png

28.5 KB
Loading

‎apps/happy-blocks/block-library/search-card/index.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ function get_support_search_link_for_query( $query ) {
1616
$blog_id = get_current_blog_id();
1717

1818
return add_query_arg(
19-
[
19+
array(
2020
'group_id' => "blog_id:{$blog_id}",
2121
's' => $query,
22-
]
22+
)
2323
);
2424
}
2525
}
2626

2727
?>
2828
<div class="happy-blocks-search-card">
29+
<!-- TODO: to be added later across the sites
2930
<ul class="navigation">
3031
<li class="active"><?php echo esc_html( __( 'Support Center', 'happy-blocks' ) ); ?></li>
3132
<li class="separator"></li>
@@ -34,15 +35,18 @@ function get_support_search_link_for_query( $query ) {
3435
<li><?php echo esc_html( __( 'Forums', 'happy-blocks' ) ); ?></li>
3536
<li><?php echo esc_html( __( 'Contact', 'happy-blocks' ) ); ?></li>
3637
</ul>
37-
38+
-->
3839
<div class="content">
3940
<h2><?php echo esc_html( __( 'How can we help you?', 'happy-blocks' ) ); ?></h2>
4041
<form class="" role="search" method="get" action="">
4142
<div class="input-wrapper" dir="auto">
42-
<input id="support-search-input" type="search" name="s" placeholder="<?php echo esc_html( __( 'Search questions, guides, courses', 'happy-blocks' ) ); ?>" />
43-
<svg xmlns="http://www.w3.org/2000/svg" class="search-icon" width="24" height="24" viewBox="0 0 24 24" fill="none">
44-
<path d="M13 5C9.7 5 7 7.7 7 11C7 12.4 7.5 13.7 8.3 14.7L4.5 18.5L5.6 19.6L9.4 15.8C10.4 16.6 11.7 17.1 13.1 17.1C16.4 17.1 19.1 14.4 19.1 11.1C19.1 7.8 16.3 5 13 5ZM13 15.5C10.5 15.5 8.5 13.5 8.5 11C8.5 8.5 10.5 6.5 13 6.5C15.5 6.5 17.5 8.5 17.5 11C17.5 13.5 15.5 15.5 13 15.5Z" fill="#2C3338"/>
45-
</svg>
43+
<input id="support-search-input" type="search" name="s" placeholder="<?php echo esc_html( __( 'Search questions, guides, courses', 'happy-blocks' ) ); ?>"/>
44+
45+
<button type="submit" class="search-submit-button" aria-label="<?php echo esc_attr( __( 'Search', 'happy-blocks' ) ); ?>">
46+
<svg xmlns="http://www.w3.org/2000/svg" class="search-icon" width="24" height="24" viewBox="0 0 24 24" fill="none">
47+
<path d="M13 5C9.7 5 7 7.7 7 11C7 12.4 7.5 13.7 8.3 14.7L4.5 18.5L5.6 19.6L9.4 15.8C10.4 16.6 11.7 17.1 13.1 17.1C16.4 17.1 19.1 14.4 19.1 11.1C19.1 7.8 16.3 5 13 5ZM13 15.5C10.5 15.5 8.5 13.5 8.5 11C8.5 8.5 10.5 6.5 13 6.5C15.5 6.5 17.5 8.5 17.5 11C17.5 13.5 15.5 15.5 13 15.5Z"/>
48+
</svg>
49+
</button>
4650
</div>
4751
</form>
4852

‎apps/happy-blocks/block-library/search-card/style.scss

Lines changed: 51 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,16 @@ $breakpoint-tablet: 1224px; //Large tablet size.
33
$breakpoint-desktop: 1440px; //Desktop size.
44

55
.happy-blocks-search-card {
6-
position: relative;
7-
z-index: 1;
8-
9-
&::before {
10-
content: "";
11-
position: absolute;
12-
inset: 0;
13-
z-index: -1;
14-
15-
opacity: 0.6;
16-
17-
background:
18-
linear-gradient(90deg, #F7F8FE 31.63%, rgba(247, 248, 254, 0.00) 100%),
19-
linear-gradient(0deg, #F7F8FE 0%, rgba(247, 248, 254, 0.00) 100%),
20-
url(./assets/pattern.png) #D3D3D3 0 0 / 23px 23px repeat;
21-
pointer-events: none;
22-
}
6+
background:
7+
#F7F8FE url(./assets/hero-bg.png) no-repeat bottom right;
8+
background-size: contain;
239

2410
flex-shrink: 0;
25-
padding: 16px 24px;
11+
padding: 72px 24px;
12+
13+
@media ( max-width: $breakpoint-mobile ) {
14+
padding: 36px 16px;
15+
}
2616

2717
.navigation {
2818
display: flex;
@@ -63,13 +53,18 @@ $breakpoint-desktop: 1440px; //Desktop size.
6353
}
6454

6555
h2 {
66-
margin-top: 54px;
56+
margin-top: 16px;
6757
margin-bottom: 24px;
6858

6959
font-size: 50px;
7060
font-style: normal;
7161
font-weight: 400;
7262
line-height: 1.2;
63+
64+
@media ( max-width: $breakpoint-mobile ) {
65+
font-size: 44px;
66+
}
67+
7368
}
7469

7570
.input-wrapper {
@@ -92,19 +87,38 @@ $breakpoint-desktop: 1440px; //Desktop size.
9287
border: none;
9388
box-shadow: 0 0 4px 0 rgba(56, 88, 233, 0.12);
9489
font-size: 16px;
90+
91+
&::-webkit-search-cancel-button {
92+
-webkit-appearance: none;
93+
appearance: none;
94+
display: none;
95+
}
9596
}
9697

97-
.input-wrapper .search-icon {
98+
.input-wrapper button {
9899
position: absolute;
99100
inset-block-start: 50%;
100101
transform: translateY(-50%);
101102
inset-inline-end: 20px;
102-
pointer-events: none;
103+
background: none;
104+
border: none;
105+
padding: 0;
106+
cursor: pointer;
107+
display: flex;
108+
align-items: center;
109+
justify-content: center;
110+
111+
svg {
112+
fill: #2C3338;
113+
}
114+
115+
&:hover svg {
116+
fill: #3858E9;
117+
}
103118
}
104119

105120
.search-terms {
106121
margin-top: 16px;
107-
margin-bottom: 88px;
108122

109123
display: flex;
110124
align-items: flex-start;
@@ -120,23 +134,36 @@ $breakpoint-desktop: 1440px; //Desktop size.
120134
display: none;
121135
}
122136

137+
@media ( max-width: $breakpoint-mobile ) {
138+
gap: 8px;
139+
}
123140

124141
li {
125142
box-sizing: border-box;
126143
border-radius: 4px;
127144
background: #EDF1FF;
128-
height: 32px;
129-
padding: 14px;
145+
padding: 2px;
130146
flex-direction: column;
131147
justify-content: center;
132148
display: flex;
133149

134150
a {
151+
padding: 6px 14px;
135152
color: #2C3338;
136153
font-size: 12px;
137154
font-style: normal;
138155
font-weight: 400;
139156
line-height: 20px;
157+
text-decoration: none;
158+
}
159+
160+
&:hover {
161+
background: #3858E9;
162+
cursor: pointer;
163+
164+
a {
165+
color: #fff;
166+
}
140167
}
141168
}
142169
}

‎apps/happy-blocks/block-library/support-content-footer/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.83 6.342L17.432 6.642L18.057 6.392L18.5 6.216V18.785L18.057 18.607L17.432 18.357L16.829 18.658L15.385 19.381L12.975 18.577L12.5 18.419L12.026 18.577L9.616 19.38L8.171 18.658L7.568 18.358L6.943 18.608L6.5 18.785V6.215L6.943 6.393L7.568 6.643L8.171 6.342L9.615 5.62L12.025 6.423L12.5 6.581L12.974 6.423L15.384 5.62L16.83 6.342ZM20 4L18.5 4.6L17.5 5L15.5 4L12.5 5L9.5 4L7.5 5L6.5 4.6L5 4V21L6.5 20.4L7.5 20L9.5 21L12.5 20L15.5 21L17.5 20L18.5 20.4L20 21V4ZM16.5 10.25V8.75H8.5V10.25H16.5ZM16.5 13.25V11.75H8.5V13.25H16.5ZM8.5 16.25V14.75H16.5V16.25H8.5Z" fill="white"/>
8989
</svg>
9090
</div>
91-
<h3 class="support-footer__card-title"><?php esc_html_e( 'Lookup a recent charge', 'happy-blocks' ); ?></h3>
92-
<p class="support-footer__card-description"><?php esc_html_e( 'Do you have questions about a recent charge? Lookup the details here.', 'happy-blocks' ); ?></p>
91+
<h3 class="support-footer__card-title"><?php esc_html_e( 'Look up a recent charge', 'happy-blocks' ); ?></h3>
92+
<p class="support-footer__card-description"><?php esc_html_e( 'Do you have questions about a recent charge? Look up the details here.', 'happy-blocks' ); ?></p>
9393
</div>
9494
</a>
9595
</div>

‎apps/happy-blocks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
"@emotion/react": "^11.11.1",
5555
"@testing-library/dom": "^10.4.0",
5656
"@testing-library/react": "^16.3.0",
57-
"@wordpress/readable-js-assets-webpack-plugin": "^3.19.0",
57+
"@wordpress/readable-js-assets-webpack-plugin": "^3.24.0",
5858
"copy-webpack-plugin": "^10.2.4",
5959
"glob": "^7.2.3",
6060
"postcss": "^8.5.3",
61-
"webpack": "^5.97.1"
61+
"webpack": "^5.99.8"
6262
}
6363
}

‎apps/help-center/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"@automattic/calypso-build": "workspace:^",
5050
"@automattic/calypso-typescript-config": "workspace:^",
5151
"@automattic/wp-babel-makepot": "workspace:^",
52-
"@wordpress/dependency-extraction-webpack-plugin": "^6.19.0",
53-
"@wordpress/readable-js-assets-webpack-plugin": "^3.19.0",
52+
"@wordpress/dependency-extraction-webpack-plugin": "^6.24.0",
53+
"@wordpress/readable-js-assets-webpack-plugin": "^3.24.0",
5454
"copy-webpack-plugin": "^10.2.4",
5555
"typescript": "^5.8.3",
56-
"webpack": "^5.97.1"
56+
"webpack": "^5.99.8"
5757
},
5858
"peerDependencies": {
5959
"@automattic/calypso-router": "workspace:^",

‎apps/notifications/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757
"html-webpack-plugin": "^5.6.3",
5858
"postcss": "^8.5.3",
5959
"postcss-custom-properties": "^12.0.0",
60-
"webpack": "^5.97.1"
60+
"webpack": "^5.99.8"
6161
}
6262
}

‎apps/o2-blocks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"devDependencies": {
4848
"@automattic/calypso-apps-builder": "workspace:^",
4949
"@automattic/calypso-eslint-overrides": "workspace:^",
50-
"@wordpress/readable-js-assets-webpack-plugin": "^3.19.0",
50+
"@wordpress/readable-js-assets-webpack-plugin": "^3.24.0",
5151
"postcss": "^8.5.3",
52-
"webpack": "^5.97.1"
52+
"webpack": "^5.99.8"
5353
}
5454
}

0 commit comments

Comments
 (0)