Skip to content

Commit 9b5ab2b

Browse files
Merge remote-tracking branch 'origin/develop' into infrastructure/11740-playwright-email-reporting.
2 parents 11a84cb + a09113e commit 9b5ab2b

File tree

190 files changed

+2492
-865
lines changed

Some content is hidden

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

190 files changed

+2492
-865
lines changed

.eslintrc.json

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,39 @@
126126
}
127127
],
128128
"react/jsx-no-useless-fragment": "error",
129-
"consistent-return": "error"
129+
"consistent-return": "error",
130+
"unicorn/prevent-abbreviations": [
131+
"warn",
132+
{
133+
"checkProperties": true,
134+
"checkFilenames": false,
135+
"extendDefaultReplacements": false,
136+
"replacements": {
137+
"e": {
138+
"error": true,
139+
"event": true
140+
},
141+
"i": {
142+
"index": true
143+
},
144+
"j": {
145+
"index": true
146+
},
147+
"el": {
148+
"element": true
149+
},
150+
"val": {
151+
"value": true
152+
}
153+
},
154+
"ignore": [
155+
"^_?e2e"
156+
],
157+
"allowList": {
158+
"jQuery": true
159+
}
160+
}
161+
]
130162
},
131163
"settings": {
132164
"import/core-modules": [
@@ -269,6 +301,7 @@
269301
"react",
270302
"react-hooks",
271303
"lodash",
272-
"no-relative-import-paths"
304+
"no-relative-import-paths",
305+
"unicorn"
273306
]
274307
}

.github/workflows/php-lint-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
matrix:
124124
composer_php_version: ['']
125125
composer_dev_require: ['']
126-
php_version: ['7.4', '8.1']
126+
php_version: ['7.4', '8.1', '8.4']
127127
wp_multisite: ['']
128128
wp_version: ['latest']
129129
include:

.github/workflows/publish-docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
uses: ./.github/actions/build-push-docker-image
103103
with:
104104
# Update the version number here when updating the Backstop version within the Dockerfile.
105-
tags: ghcr.io/google/site-kit-wp/vrt:6.3.25-node22
105+
tags: ghcr.io/google/site-kit-wp/vrt:6.3.25-node22-chrome146.0.7680.80
106106
context: ./tests/backstop
107107
labels: org.opencontainers.image.description=Docker image used to run visual regression tests for Site Kit.
108108
registry-username: "github-actions[bot]"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Config files
2-
.*
2+
/.*
33
!.gemini/
44
.gemini/*
55
!.gemini/settings.json

assets/blocks/reader-revenue-manager/contribute-with-google/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "google-site-kit/rrm-contribute-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Contribute with Google",
77
"category": "widgets",
88
"icon": "google",

assets/blocks/reader-revenue-manager/contribute-with-google/v3/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 3,
44
"name": "google-site-kit/rrm-contribute-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Contribute with Google",
77
"category": "widgets",
88
"icon": "google",

assets/blocks/reader-revenue-manager/subscribe-with-google/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "google-site-kit/rrm-subscribe-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Subscribe with Google",
77
"category": "widgets",
88
"icon": "google",

assets/blocks/reader-revenue-manager/subscribe-with-google/v3/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 3,
44
"name": "google-site-kit/rrm-subscribe-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Subscribe with Google",
77
"category": "widgets",
88
"icon": "google",

assets/blocks/sign-in-with-google/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "google-site-kit/sign-in-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Sign in with Google",
77
"category": "widgets",
88
"icon": "google",

assets/blocks/sign-in-with-google/v3/block.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 3,
44
"name": "google-site-kit/sign-in-with-google",
5-
"version": "1.174.0",
5+
"version": "1.175.0",
66
"title": "Sign in with Google",
77
"category": "widgets",
88
"icon": "google",

0 commit comments

Comments
 (0)