Merge pull request #5554 from ampproject/update-dependencies

Update dependencies

Author: westonruter

.github/workflows/build-test-measure.yml

@@ -38,7 +38,7 @@ jobs:
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -56,7 +56,7 @@ jobs:
           echo "::set-output name=dir::$(npm config get cache)"
 
       - name: Configure npm cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -117,7 +117,7 @@ jobs:
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -135,7 +135,7 @@ jobs:
           echo "::set-output name=dir::$(npm config get cache)"
 
       - name: Configure npm cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.travis.yml

@@ -69,7 +69,8 @@ jobs:
       env: WP_VERSION=latest DEV_LIB_ONLY=phpsyntax
       before_script:
         - phpenv config-rm xdebug.ini || echo "xdebug.ini does not exist."
-        - composer require --dev localheinz/composer-normalize --ignore-platform-reqs
+        # TODO: Exact version of ergebnis/composer-normalize can be removed once Composer v2 is supported.
+        - composer require --dev ergebnis/composer-normalize:2.9.0 --ignore-platform-reqs
       script:
         - source "$DEV_LIB_PATH/travis.script.sh"
         - composer validate --no-check-all

assets/src/components/amp-setting-toggle/test/__snapshots__/index.js.snap

@@ -174,19 +174,21 @@ export function ReaderThemeCarousel() {
 							<p>
 								{ AMP_QUERY_VAR_CUSTOMIZED_LATE
 								/* dangerouslySetInnerHTML reason: Injection of code tags. */
-									? <span
-										dangerouslySetInnerHTML={ {
-											__html: sprintf(
-											/* translators: 1: customized AMP query var, 2: default query var, 3: the AMP_QUERY_VAR constant name, 4: the amp_query_var filter, 5: the plugins_loaded action */
-												__( 'The following themes are not available because your site (probably the active theme) has customized the AMP query var too late (it is set to %1$s as opposed to the default of %2$s). Please make sure that any customizations done by defining the %3$s constant or adding an %4$s filter are done before the %5$s action with priority 8.', 'amp' ),
-												`<code>${ AMP_QUERY_VAR }</code>`,
-												`<code>${ DEFAULT_AMP_QUERY_VAR }</code>`,
-												'<code>AMP_QUERY_VAR</code>',
-												'<code>amp_query_var</code>',
-												'<code>plugins_loaded</code>',
-											),
-										} }
-									/>
+									? (
+										<span
+											dangerouslySetInnerHTML={ {
+												__html: sprintf(
+													/* translators: 1: customized AMP query var, 2: default query var, 3: the AMP_QUERY_VAR constant name, 4: the amp_query_var filter, 5: the plugins_loaded action */
+													__( 'The following themes are not available because your site (probably the active theme) has customized the AMP query var too late (it is set to %1$s as opposed to the default of %2$s). Please make sure that any customizations done by defining the %3$s constant or adding an %4$s filter are done before the %5$s action with priority 8.', 'amp' ),
+													`<code>${ AMP_QUERY_VAR }</code>`,
+													`<code>${ DEFAULT_AMP_QUERY_VAR }</code>`,
+													'<code>AMP_QUERY_VAR</code>',
+													'<code>amp_query_var</code>',
+													'<code>plugins_loaded</code>',
+												),
+											} }
+										/>
+									)
 									: __( 'Some supported themes cannot be installed automatically on this site. To use, please install them manually or contact your hosting provider.', 'amp' )
 								}
 							</p>

assets/src/components/reader-theme-carousel/index.js

@@ -89,19 +89,21 @@ export function ReaderThemeSelection() {
 						<p>
 							{ AMP_QUERY_VAR_CUSTOMIZED_LATE
 								/* dangerouslySetInnerHTML reason: Injection of code tags. */
-								? <span
-									dangerouslySetInnerHTML={ {
-										__html: sprintf(
-											/* translators: 1: customized AMP query var, 2: default query var, 3: the AMP_QUERY_VAR constant name, 4: the amp_query_var filter, 5: the plugins_loaded action */
-											__( 'The following themes are not available because your site (probably the active theme) has customized the AMP query var too late (it is set to %1$s as opposed to the default of %2$s). Please make sure that any customizations done by defining the %3$s constant or adding an %4$s filter are done before the %5$s action with priority 8.', 'amp' ),
-											`<code>${ AMP_QUERY_VAR }</code>`,
-											`<code>${ DEFAULT_AMP_QUERY_VAR }</code>`,
-											'<code>AMP_QUERY_VAR</code>',
-											'<code>amp_query_var</code>',
-											'<code>plugins_loaded</code>',
-										),
-									} }
-								/>
+								? (
+									<span
+										dangerouslySetInnerHTML={ {
+											__html: sprintf(
+												/* translators: 1: customized AMP query var, 2: default query var, 3: the AMP_QUERY_VAR constant name, 4: the amp_query_var filter, 5: the plugins_loaded action */
+												__( 'The following themes are not available because your site (probably the active theme) has customized the AMP query var too late (it is set to %1$s as opposed to the default of %2$s). Please make sure that any customizations done by defining the %3$s constant or adding an %4$s filter are done before the %5$s action with priority 8.', 'amp' ),
+												`<code>${ AMP_QUERY_VAR }</code>`,
+												`<code>${ DEFAULT_AMP_QUERY_VAR }</code>`,
+												'<code>AMP_QUERY_VAR</code>',
+												'<code>amp_query_var</code>',
+												'<code>plugins_loaded</code>',
+											),
+										} }
+									/>
+								)
 								: __( 'The following themes are compatible but cannot be installed automatically. Please install them manually, or contact your host if you are not able to do so.', 'amp' )
 							}
 						</p>

assets/src/components/reader-theme-selection/index.js

@@ -106,7 +106,7 @@ function AnalyticsEntry( { entryIndex, onChange, onDelete, type = '', config = '
 		if ( ! textAreaRef?.current ) {
 			return false;
 		}
-		return textAreaRef.current === document.activeElement;
+		return textAreaRef.current === textAreaRef.current.ownerDocument.activeElement;
 	};
 
 	const defaultValue = vendorConfigs[ type ]?.sample || '{}';

assets/src/components/redirect-toggle/test/__snapshots__/redirect-toggle.js.snap

@@ -15,7 +15,7 @@
     "ext-spl": "*",
     "ampproject/common": "*",
     "ampproject/optimizer": "*",
-    "cweagans/composer-patches": "1.6.7",
+    "cweagans/composer-patches": "1.7.0",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "dev-master#bfdd976"
   },
@@ -34,7 +34,7 @@
     "wp-cli/extension-command": "^2.0",
     "wp-cli/wp-cli": "^2.4",
     "wp-coding-standards/wpcs": "2.3.0",
-    "xwp/wp-dev-lib": "1.6.4"
+    "xwp/wp-dev-lib": "1.6.5"
   },
   "suggest": {
     "ext-intl": "Enables use of idn_to_utf8() to convert punycode domains to UTF-8 for use with an AMP Cache.",