Skip to content

Commit fa0a9f2

Browse files
thelovekeshthelovekesh
authored
Merge pull request #7816 from ampproject/update/wp-deps
Bump minimum required WP to 6.3
2 parents 22012c5 + f508f83 commit fa0a9f2

File tree

131 files changed

+6072
-7657
lines changed

Some content is hidden

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

131 files changed

+6072
-7657
lines changed

Diff for: ‎.eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ module.exports = {
148148
'jest/prefer-expect-assertions': 'off',
149149
'jest/prefer-inline-snapshots': 'off',
150150
'jest/unbound-method': 'off',
151+
// Disabling because it's not the Jest environment.
152+
'jest/prefer-importing-jest-globals': 'off',
151153
},
152154
},
153155
{

Diff for: ‎.github/workflows/build-test-measure.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ jobs:
328328
external-http: true
329329

330330
- php: '7.4'
331-
wp: '5.3'
331+
wp: '6.3'
332332
phpunit: '7'
333333

334334
- php: '7.4'
335-
wp: '5.3'
335+
wp: '6.3'
336336
phpunit: '7'
337337
external-http: true
338338
steps:
@@ -507,7 +507,7 @@ jobs:
507507
wp: 'latest'
508508

509509
- php: '7.4'
510-
wp: '5.3'
510+
wp: '6.3'
511511
steps:
512512
- name: Shutdown default MySQL service
513513
if: needs.pre-run.outputs.changed-php-count > 0

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules
33

44
/vendor
55
/build
6+
/artifacts
67
/wiki
78
/amp.zip
89
/assets/css/*

Diff for: ‎.phpcs.xml.dist

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
<!-- @TODO(P0): Fix these once WPCS is merged on develop and remove the exclusions. -->
1717
<exclude name="PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose" />
18-
<exclude name="WordPress.Security.EscapeOutput.OutputNotEscaped" />
1918
<exclude name="Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterFunction" />
2019
<exclude name="Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound" />
2120
<exclude name="PSR2.Files.EndFileNewline.TooMany" />

Diff for: ‎.phpstorm.meta.php

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
'admin.amp_themes' => \AmpProject\AmpWP\Admin\AmpThemes::class,
2525
'amp_slug_customization_watcher' => \AmpProject\AmpWP\AmpSlugCustomizationWatcher::class,
2626
'background_task_deactivator' => \AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator::class,
27-
'block_uniqid_transformer' => \AmpProject\AmpWP\BlockUniqidTransformer::class,
2827
'cli.command_namespace' => \AmpProject\AmpWP\Cli\CommandNamespaceRegistration::class,
2928
'cli.optimizer_command' => \AmpProject\AmpWP\Cli\OptimizerCommand::class,
3029
'cli.transformer_command' => \AmpProject\AmpWP\Cli\TransformerCommand::class,

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ An easier path to great Page Experience for everyone. Powered by AMP.
66

77
**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/)
88
**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)
9-
**Requires at least:** 5.3
9+
**Requires at least:** 6.3
1010
**Tested up to:** 6.5
1111
**Stable tag:** 2.5.3
1212
**License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)

Diff for: ‎amp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Author URI: https://github.com/ampproject/amp-wp/graphs/contributors
88
* Version: 2.5.4-alpha
99
* License: GPLv2 or later
10-
* Requires at least: 5.3
10+
* Requires at least: 6.3
1111
* Requires PHP: 7.4
1212
*
1313
* @package AMP

Diff for: ‎assets/src/block-editor/components/amp-preview-button.js

+3-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import { __ } from '@wordpress/i18n';
1616
* Internal dependencies
1717
*/
1818
import { isAMPEnabled } from '../helpers';
19-
import ampFilledIcon from '../../../images/amp-icon.svg';
20-
import ampBlackIcon from '../../../images/amp-black-icon.svg';
19+
import { AMPFilledIcon, AMPBlackIcon } from '../../icons';
2120

2221
/**
2322
* Writes the message and graphic in the new preview window that was opened.
@@ -30,7 +29,7 @@ import ampBlackIcon from '../../../images/amp-black-icon.svg';
3029
function writeInterstitialMessage(targetDocument) {
3130
let markup = renderToString(
3231
<div className="editor-post-preview-button__interstitial-message">
33-
<Icon icon={ampBlackIcon({ viewBox: '0 0 98 98' })} />
32+
<Icon icon={<AMPBlackIcon viewBox="0 0 98 98" />} />
3433
<p>{__('Generating AMP preview…', 'amp')}</p>
3534
</div>
3635
);
@@ -231,11 +230,7 @@ class AmpPreviewButton extends Component {
231230
onClick={this.openPreviewWindow}
232231
ref={this.buttonRef}
233232
>
234-
{ampFilledIcon({
235-
viewBox: '0 0 62 62',
236-
width: 18,
237-
height: 18,
238-
})}
233+
<AMPFilledIcon viewBox="0 0 62 62" height={18} width={18} />
239234
<VisuallyHidden as="span">
240235
{
241236
/* translators: accessibility text */

Diff for: ‎assets/src/block-editor/helpers/test/addAMPAttributes.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* External dependencies
3+
*/
4+
import { describe, expect, it } from '@jest/globals';
5+
16
/**
27
* Internal dependencies
38
*/

Diff for: ‎assets/src/block-editor/store/test/selectors.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* External dependencies
3+
*/
4+
import { describe, expect, it } from '@jest/globals';
5+
16
/**
27
* Internal dependencies
38
*/

Diff for: ‎assets/src/block-validation/components/amp-document-status/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
88
/**
99
* Internal dependencies
1010
*/
11-
import AMPValidationErrorsKeptIcon from '../../../../images/amp-validation-errors-kept.svg';
12-
import BellIcon from '../../../../images/bell-icon.svg';
11+
import { BellIcon, AMPValidationErrorsKeptIcon } from '../../../icons';
1312
import { store as blockValidationStore } from '../../store';
1413
import { StatusIcon } from '../icon';
1514
import { SidebarNotification } from '../sidebar-notification';

Diff for: ‎assets/src/block-validation/components/amp-document-status/test/amp-document-status-notification.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* External dependencies
33
*/
44
import { render, fireEvent } from '@testing-library/react';
5+
import { beforeAll, describe, expect, it, jest } from '@jest/globals';
56

67
/**
78
* WordPress dependencies

Diff for: ‎assets/src/block-validation/components/amp-toggle/test/amp-toggle.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* External dependencies
33
*/
44
import { render, fireEvent } from '@testing-library/react';
5+
import { beforeEach, describe, expect, it, jest } from '@jest/globals';
56

67
/**
78
* Internal dependencies

Diff for: ‎assets/src/block-validation/components/amp-validation-status/revalidate-notification.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
99
* Internal dependencies
1010
*/
1111
import { store as blockValidationStore } from '../../store';
12-
import BellIcon from '../../../../images/bell-icon.svg';
12+
import { BellIcon } from '../../../icons';
1313
import { SidebarNotification } from '../sidebar-notification';
1414
import { useErrorsFetchingStateChanges } from '../../hooks/use-errors-fetching-state-changes';
1515

Diff for: ‎assets/src/block-validation/components/amp-validation-status/status-notification.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
88
/**
99
* Internal dependencies
1010
*/
11-
import AMPValidationErrorsKeptIcon from '../../../../images/amp-validation-errors-kept.svg';
11+
import { AMPValidationErrorsKeptIcon } from '../../../icons';
1212
import { store as blockValidationStore } from '../../store';
1313
import { StatusIcon } from '../icon';
1414
import { SidebarNotification } from '../sidebar-notification';

Diff for: ‎assets/src/block-validation/components/amp-validation-status/test/__snapshots__/revalidate-notification.js.snap

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)