Merge branch 'develop' into fix/pwa-runtime-cache

.github/workflows/codeql-analysis.yml

@@ -39,12 +39,12 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c #v3.25.11
+        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
         with:
           languages: javascript, python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c #v3.25.11
+        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npm run lint:staged

README.md

@@ -7,7 +7,7 @@ An easier path to great Page Experience for everyone. Powered by AMP.
 **Contributors:** [google](https://profiles.wordpress.org/google), [xwp](https://profiles.wordpress.org/xwp), [rtcamp](https://profiles.wordpress.org/rtcamp), [automattic](https://profiles.wordpress.org/automattic), [westonruter](https://profiles.wordpress.org/westonruter), [albertomedina](https://profiles.wordpress.org/albertomedina), [schlessera](https://profiles.wordpress.org/schlessera), [delawski](https://profiles.wordpress.org/delawski/), [swissspidy](https://profiles.wordpress.org/swissspidy), [pierlo](https://profiles.wordpress.org/pierlo), [joshuawold](https://profiles.wordpress.org/joshuawold), [thelovekesh](https://profiles.wordpress.org/thelovekesh/)  
 **Tags:** [page experience](https://wordpress.org/plugins/tags/page-experience), [performance](https://wordpress.org/plugins/tags/performance), [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile), [optimization](https://wordpress.org/plugins/tags/optimization)  
 **Requires at least:** 6.5  
-**Tested up to:** 6.6  
+**Tested up to:** 6.7  
 **Stable tag:** 2.5.4  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 **Requires PHP:** 7.4

assets/src/block-editor/blocks/amp-brid-player/edit.js

@@ -98,6 +98,7 @@ const BlockEdit = (props) => {
 						label={__('Autoplay', 'amp')}
 						checked={autoPlay}
 						onChange={() => setAttributes({ autoPlay: !autoPlay })}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

assets/src/block-editor/blocks/amp-ima-video/edit.js

@@ -66,6 +66,7 @@ const BlockEdit = (props) => {
 								dataDelayAdRequest: !dataDelayAdRequest,
 							})
 						}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

assets/src/block-editor/blocks/amp-mathml/index.js

@@ -17,7 +17,7 @@ export const settings = {
 	icon: 'welcome-learn-more',
 	keywords: [
 		__('Mathematical formula', 'amp'),
-		__('Scientific content ', 'amp'),
+		__('Scientific content', 'amp'),
 	],
 
 	attributes: {

assets/src/block-editor/blocks/amp-o2-player/edit.js

@@ -69,6 +69,7 @@ const BlockEdit = (props) => {
 						label={__('Autoplay', 'amp')}
 						checked={autoPlay}
 						onChange={() => setAttributes({ autoPlay: !autoPlay })}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

assets/src/block-editor/helpers/index.js

@@ -254,6 +254,7 @@ const AmpLightboxToggle = (props) => {
 					setAttributes({ linkTo: 'none' });
 				}
 			}}
+			__nextHasNoMarginBottom={true}
 		/>
 	);
 };
@@ -286,6 +287,7 @@ const AmpCarouselToggle = (props) => {
 			label={__('Display as carousel', 'amp')}
 			checked={ampCarousel}
 			onChange={() => setAttributes({ ampCarousel: !ampCarousel })}
+			__nextHasNoMarginBottom={true}
 		/>
 	);
 };

assets/src/components/amp-setting-toggle/index.js

@@ -51,6 +51,7 @@ export function AMPSettingToggle({
 					</div>
 				}
 				onChange={onChange}
+				__nextHasNoMarginBottom={true}
 			/>
 		</div>
 	);

assets/src/components/amp-support/index.js

@@ -199,7 +199,7 @@ export function AMPSupport(props) {
 						size={NOTICE_SIZE_SMALL}
 						className={'amp-notice--uuid'}
 					>
-						{__('Support UUID: ', 'amp')}
+						{__('Support UUID:', 'amp')}
 						<code>{uuid}</code>
 						<ClipboardButton
 							isSmall={true}

assets/src/settings-page/paired-url-structure.js

@@ -220,7 +220,7 @@ function SlugConflictsNotice({ slug, conflicts }) {
 
 				{conflicts.rewrite && (
 					<li>
-						{__('Rewrite rules: ', 'amp')}
+						{__('Rewrite rules:', 'amp')}
 						{conflicts.rewrite
 							.map((entity) => <code key={entity}>{entity}</code>)
 							.reduce((prev, curr) => [prev, ', ', curr])}

composer.json

@@ -14,7 +14,7 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-spl": "*",
-    "ampproject/amp-toolbox": "0.11.5",
+    "ampproject/amp-toolbox": "0.11.6",
     "cweagans/composer-patches": "^1.0",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "8.5.1"
@@ -23,7 +23,7 @@
     "automattic/vipwpcs": "^3.0",
     "civicrm/composer-downloads-plugin": "^4.0",
     "google/cloud-storage": "^1.0",
-    "mikey179/vfsstream": "1.6.11",
+    "mikey179/vfsstream": "1.6.12",
     "mustache/mustache": "^2",
     "php-stubs/wordpress-stubs": "^6.0",
     "phpcompatibility/phpcompatibility-wp": "2.1.5",