Merge remote-tracking branch 'origin/develop' into infrastructure/9103-tidy-up-and-remove-redundant-use-of-label-property-in-vrt-scenarios.

Author: juniovitorino

.babelrc

@@ -59,14 +59,16 @@ jobs:
       - name: Setup Node.js (.nvmrc)
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
+          node-version-file: .nvmrc
+          cache: npm
+      # npm@7 is the minimum version required for this repository.
+      # TODO: Remove this step once our node base version comes with npm@7 or greater.
+      - name: Install npm globally
+        run: npm run install-global-npm
       - name: npm install
-        run: |
-          npm ci
+        run: npm ci
       - name: Build Storybook
-        run: |
-          npm run build:storybook
+        run: npm run build:storybook
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -140,11 +142,13 @@ jobs:
       - name: Setup Node.js (.nvmrc)
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
+          node-version-file: .nvmrc
+          cache: npm
+      # npm@7 is the minimum version required for this repository.
+      # TODO: Remove this step once our node base version comes with npm@7 or greater.
+      - name: Install npm globally
+        run: npm run install-global-npm
       - name: npm install
-        run: |
-          npm ci
+        run: npm ci
       - name: Test Storybook
-        run: |
-          npm run test:storybook
+        run: npm run test:storybook

.github/workflows/storybook.yml

@@ -6,14 +6,14 @@
 		"**/composer.lock": true,
 		"**/package-lock.json": true,
 		"third-party/": true,
-		"**/vendor/": true
+		"vendor/": true
 	},
 	"files.exclude": {
 		"**/dist": true,
 		"coverage/": true,
 		"**/node_modules/": true,
 		"third-party/": true,
-		"**/vendor/": true
+		"vendor/": true
 	},
 	"jest.autoEnable": false,
 	"jest.pathToConfig": "./tests/js/jest.config.js",

.vscode/settings.json

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "google-site-kit/rrm-contribute-with-google",
-	"version": "1.150.0",
+	"version": "1.151.0",
 	"title": "Contribute with Google",
 	"category": "widgets",
 	"icon": "google",

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

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "google-site-kit/rrm-subscribe-with-google",
-	"version": "1.150.0",
+	"version": "1.151.0",
 	"title": "Subscribe with Google",
 	"category": "widgets",
 	"icon": "google",

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

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "google-site-kit/sign-in-with-google",
-	"version": "1.150.0",
+	"version": "1.151.0",
 	"title": "Sign in with Google",
 	"category": "widgets",
 	"icon": "google",

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

@@ -0,0 +1,46 @@
+/**
+ * Site Kit by Google, Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * External dependencies
+ */
+import PropTypes from 'prop-types';
+
+/**
+ * Internal dependencies
+ */
+import { SpinnerButton } from 'googlesitekit-components';
+
+export default function CTAButton( { label, disabled, inProgress, onClick } ) {
+	return (
+		<SpinnerButton
+			className="googlesitekit-notice__cta"
+			disabled={ disabled }
+			isSaving={ inProgress }
+			onClick={ onClick }
+		>
+			{ label }
+		</SpinnerButton>
+	);
+}
+
+// eslint-disable-next-line sitekit/acronym-case
+CTAButton.propTypes = {
+	label: PropTypes.string.isRequired,
+	disabled: PropTypes.bool,
+	inProgress: PropTypes.bool,
+	onClick: PropTypes.func.isRequired,
+};

assets/js/components/Notice/CTAButton.js

@@ -0,0 +1,39 @@
+/**
+ * Site Kit by Google, Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+import PropTypes from 'prop-types';
+
+export default function Description( { className, children } ) {
+	return (
+		<p
+			className={ classnames(
+				'googlesitekit-notice__description',
+				className
+			) }
+		>
+			{ children }
+		</p>
+	);
+}
+
+Description.propTypes = {
+	className: PropTypes.string,
+	children: PropTypes.node,
+};

assets/js/components/Notice/Description.js

@@ -1,7 +1,5 @@
 /**
- * Public components entrypoint.
- *
- * Site Kit by Google, Copyright 2022 Google LLC
+ * Site Kit by Google, Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,35 +14,33 @@
  * limitations under the License.
  */
 
+/**
+ * External dependencies
+ */
+import PropTypes from 'prop-types';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies
  */
-import Components from './googlesitekit/components-gm3';
+import { Button } from 'googlesitekit-components';
 
-if ( typeof global.googlesitekit === 'undefined' ) {
-	global.googlesitekit = {};
+export default function DismissButton( {
+	label = __( 'Got it!', 'google-site-kit' ),
+	onClick,
+} ) {
+	return (
+		<Button onClick={ onClick } tertiary>
+			{ label }
+		</Button>
+	);
 }
 
-global.googlesitekit.components = Components;
-
-export const {
-	Button,
-	Checkbox,
-	Chip,
-	CircularProgress,
-	Dialog,
-	DialogTitle,
-	DialogContent,
-	DialogFooter,
-	Menu,
-	Option,
-	ProgressBar,
-	Radio,
-	Select,
-	SpinnerButton,
-	Switch,
-	Tab,
-	TabBar,
-	TextField,
-	Tooltip,
-} = Components;
+DismissButton.propTypes = {
+	label: PropTypes.string,
+	onClick: PropTypes.func.isRequired,
+};

assets/js/googlesitekit-components-gm3.js renamed to assets/js/components/Notice/DismissButton.js

@@ -0,0 +1,46 @@
+/**
+ * Site Kit by Google, Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * External dependencies
+ */
+import PropTypes from 'prop-types';
+
+/**
+ * Internal dependencies
+ */
+import CheckFill from '../../../svg/icons/check-fill.svg';
+import WarningSVG from '../../../svg/icons/warning.svg';
+import StarFill from '../../../svg/icons/star-fill.svg';
+import { TYPES } from './constants';
+
+const typeIconMap = {
+	[ TYPES.NEW ]: StarFill,
+	[ TYPES.SUCCESS ]: CheckFill,
+	[ TYPES.INFO ]: WarningSVG,
+	[ TYPES.WARNING ]: WarningSVG,
+	[ TYPES.ERROR ]: WarningSVG,
+};
+
+export default function Icon( { type } ) {
+	const IconComponent = typeIconMap[ type ] || WarningSVG;
+
+	return <IconComponent width={ 26 } height={ 26 } />;
+}
+
+Icon.propTypes = {
+	type: PropTypes.oneOf( Object.values( TYPES ) ),
+};

assets/js/components/Notice/Icon.js

@@ -1,7 +1,5 @@
 /**
- * CircularProgress component.
- *
- * Site Kit by Google, Copyright 2023 Google LLC
+ * Site Kit by Google, Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +14,21 @@
  * limitations under the License.
  */
 
-export default function CircularProgress() {
-	return null;
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+import PropTypes from 'prop-types';
+
+export default function Title( { className, children } ) {
+	return (
+		<p className={ classnames( 'googlesitekit-notice__title', className ) }>
+			{ children }
+		</p>
+	);
 }
+
+Title.propTypes = {
+	className: PropTypes.string,
+	children: PropTypes.node,
+};

assets/js/googlesitekit/components-gm3/CircularProgress.js renamed to assets/js/components/Notice/Title.js

@@ -1,7 +1,5 @@
 /**
- * Chip component.
- *
- * Site Kit by Google, Copyright 2022 Google LLC
+ * Site Kit by Google, Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +14,10 @@
  * limitations under the License.
  */
 
-export default function Chip() {
-	return null;
-}
+export const TYPES = {
+	NEW: 'new',
+	SUCCESS: 'success',
+	WARNING: 'warning',
+	INFO: 'info',
+	ERROR: 'error',
+};