Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into remove/imploding-css…
Browse files Browse the repository at this point in the history
…-code
  • Loading branch information
kraftbj committed Oct 2, 2024
2 parents 5d821cf + 2b8fce1 commit e3c83a9
Show file tree
Hide file tree
Showing 111 changed files with 2,418 additions and 2,178 deletions.
3,548 changes: 1,824 additions & 1,724 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions projects/js-packages/ai-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"@microsoft/fetch-event-source": "2.0.1",
"@types/react": "18.3.3",
"@types/wordpress__block-editor": "11.5.15",
"@wordpress/api-fetch": "7.7.0",
"@wordpress/blob": "4.7.0",
"@wordpress/block-editor": "14.2.0",
"@wordpress/components": "28.7.0",
"@wordpress/compose": "7.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/icons": "10.7.0",
"@wordpress/api-fetch": "7.8.2",
"@wordpress/blob": "4.8.1",
"@wordpress/block-editor": "14.3.4",
"@wordpress/components": "28.8.4",
"@wordpress/compose": "7.8.3",
"@wordpress/data": "10.8.3",
"@wordpress/element": "6.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/icons": "10.8.2",
"clsx": "2.1.1",
"debug": "4.3.4",
"markdown-it": "14.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
2 changes: 1 addition & 1 deletion projects/js-packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"license": "GPL-2.0-or-later",
"dependencies": {
"@automattic/jetpack-config": "workspace:*",
"@wordpress/url": "4.7.0"
"@wordpress/url": "4.8.1"
},
"devDependencies": {
"jest": "29.7.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
2 changes: 1 addition & 1 deletion projects/js-packages/base-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"build-production-js": "echo 'Not implemented.'"
},
"devDependencies": {
"@wordpress/base-styles": "5.7.0"
"@wordpress/base-styles": "5.8.1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
2 changes: 1 addition & 1 deletion projects/js-packages/boost-score-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"test": "jest tests"
},
"dependencies": {
"@wordpress/i18n": "5.7.0",
"@wordpress/i18n": "5.8.2",
"zod": "3.22.3"
},
"devDependencies": {
Expand Down
5 changes: 5 additions & 0 deletions projects/js-packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### This is a list detailing changes for the Jetpack RNA Components package releases.

## [0.56.1] - 2024-10-02
### Changed
- Updated package dependencies. [#39610]

## [0.56.0] - 2024-09-25
### Added
- Added StatCard component export [#35739]
Expand Down Expand Up @@ -1172,6 +1176,7 @@
### Changed
- Update node version requirement to 14.16.1

[0.56.1]: https://github.com/Automattic/jetpack-components/compare/0.56.0...0.56.1
[0.56.0]: https://github.com/Automattic/jetpack-components/compare/0.55.17...0.56.0
[0.55.17]: https://github.com/Automattic/jetpack-components/compare/0.55.16...0.55.17
[0.55.16]: https://github.com/Automattic/jetpack-components/compare/0.55.15...0.55.16
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
20 changes: 10 additions & 10 deletions projects/js-packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-components",
"version": "0.56.0",
"version": "0.56.1",
"description": "Jetpack Components Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand All @@ -17,15 +17,15 @@
"@automattic/format-currency": "1.0.1",
"@automattic/jetpack-boost-score-api": "workspace:*",
"@babel/runtime": "^7",
"@wordpress/browserslist-config": "6.7.0",
"@wordpress/components": "28.7.0",
"@wordpress/compose": "7.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/date": "5.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/icons": "10.7.0",
"@wordpress/notices": "5.7.0",
"@wordpress/browserslist-config": "6.8.1",
"@wordpress/components": "28.8.4",
"@wordpress/compose": "7.8.3",
"@wordpress/data": "10.8.3",
"@wordpress/date": "5.8.2",
"@wordpress/element": "6.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/icons": "10.8.2",
"@wordpress/notices": "5.8.3",
"clsx": "2.1.1",
"prop-types": "^15.7.2",
"qrcode.react": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
14 changes: 7 additions & 7 deletions projects/js-packages/connection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"@automattic/jetpack-components": "workspace:*",
"@automattic/jetpack-config": "workspace:*",
"@automattic/jetpack-script-data": "workspace:*",
"@wordpress/base-styles": "5.7.0",
"@wordpress/browserslist-config": "6.7.0",
"@wordpress/components": "28.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/icons": "10.7.0",
"@wordpress/base-styles": "5.8.1",
"@wordpress/browserslist-config": "6.8.1",
"@wordpress/components": "28.8.4",
"@wordpress/data": "10.8.3",
"@wordpress/element": "6.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/icons": "10.8.2",
"clsx": "2.1.1",
"debug": "4.3.4",
"prop-types": "^15.7.2"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
2 changes: 1 addition & 1 deletion projects/js-packages/eslint-config-target-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"semver": "^7.3.5"
},
"devDependencies": {
"@wordpress/browserslist-config": "6.7.0",
"@wordpress/browserslist-config": "6.8.1",
"eslint": "8.57.0",
"eslint-plugin-es-x": "7.8.0",
"globals": "15.4.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
4 changes: 2 additions & 2 deletions projects/js-packages/i18n-loader-webpack-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"debug": "^4.3.2"
},
"devDependencies": {
"@wordpress/dependency-extraction-webpack-plugin": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/dependency-extraction-webpack-plugin": "6.8.3",
"@wordpress/i18n": "5.8.2",
"jest": "29.7.0",
"webpack": "5.94.0",
"webpack-cli": "4.9.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
14 changes: 7 additions & 7 deletions projects/js-packages/idc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"@automattic/jetpack-api": "workspace:*",
"@automattic/jetpack-base-styles": "workspace:*",
"@automattic/jetpack-components": "workspace:*",
"@wordpress/base-styles": "5.7.0",
"@wordpress/components": "28.7.0",
"@wordpress/compose": "7.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/url": "4.7.0",
"@wordpress/base-styles": "5.8.1",
"@wordpress/components": "28.8.4",
"@wordpress/compose": "7.8.3",
"@wordpress/data": "10.8.3",
"@wordpress/element": "6.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/url": "4.8.1",
"prop-types": "^15.7.2"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
12 changes: 6 additions & 6 deletions projects/js-packages/licensing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"@automattic/jetpack-analytics": "workspace:*",
"@automattic/jetpack-api": "workspace:*",
"@automattic/jetpack-components": "workspace:*",
"@wordpress/api-fetch": "7.7.0",
"@wordpress/components": "28.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/icons": "10.7.0",
"@wordpress/api-fetch": "7.8.2",
"@wordpress/components": "28.8.4",
"@wordpress/element": "6.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/icons": "10.8.2",
"clsx": "2.1.1",
"prop-types": "15.7.2"
},
Expand All @@ -39,7 +39,7 @@
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@wordpress/babel-plugin-import-jsx-pragma": "5.7.0",
"@wordpress/babel-plugin-import-jsx-pragma": "5.8.1",
"babel-jest": "29.7.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
6 changes: 3 additions & 3 deletions projects/js-packages/partner-coupon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@wordpress/base-styles": "5.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/base-styles": "5.8.1",
"@wordpress/data": "10.8.3",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-extended": "4.0.2",
Expand All @@ -41,7 +41,7 @@
"dependencies": {
"@automattic/jetpack-components": "workspace:*",
"@automattic/jetpack-connection": "workspace:*",
"@wordpress/i18n": "5.7.0",
"@wordpress/i18n": "5.8.2",
"clsx": "2.1.1",
"prop-types": "15.7.2"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
41 changes: 20 additions & 21 deletions projects/js-packages/publicize-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
"@automattic/jetpack-shared-extension-utils": "workspace:*",
"@automattic/popup-monitor": "1.0.2",
"@automattic/social-previews": "2.1.0-beta.6",
"@wordpress/annotations": "3.7.0",
"@wordpress/api-fetch": "7.7.0",
"@wordpress/block-editor": "14.2.0",
"@wordpress/blocks": "13.7.0",
"@wordpress/components": "28.7.0",
"@wordpress/compose": "7.7.0",
"@wordpress/data": "10.7.0",
"@wordpress/dataviews": "4.3.0",
"@wordpress/date": "5.7.0",
"@wordpress/edit-post": "8.7.0",
"@wordpress/editor": "14.7.0",
"@wordpress/element": "6.7.0",
"@wordpress/hooks": "4.7.0",
"@wordpress/html-entities": "4.7.0",
"@wordpress/i18n": "5.7.0",
"@wordpress/icons": "10.7.0",
"@wordpress/media-utils": "5.7.0",
"@wordpress/notices": "5.7.0",
"@wordpress/annotations": "3.8.3",
"@wordpress/api-fetch": "7.8.2",
"@wordpress/block-editor": "14.3.4",
"@wordpress/blocks": "13.8.4",
"@wordpress/components": "28.8.4",
"@wordpress/compose": "7.8.3",
"@wordpress/data": "10.8.3",
"@wordpress/dataviews": "4.4.4",
"@wordpress/date": "5.8.2",
"@wordpress/edit-post": "8.8.6",
"@wordpress/editor": "14.8.6",
"@wordpress/element": "6.8.1",
"@wordpress/hooks": "4.8.2",
"@wordpress/html-entities": "4.8.1",
"@wordpress/i18n": "5.8.2",
"@wordpress/icons": "10.8.2",
"@wordpress/media-utils": "5.8.2",
"@wordpress/notices": "5.8.3",
"clsx": "2.1.1",
"prop-types": "15.8.1",
"react-page-visibility": "7.0.0",
Expand All @@ -62,9 +62,8 @@
"@types/jest": "29.5.12",
"@types/react": "18.3.3",
"@types/wordpress__editor": "13.6.8",
"@types/wordpress__media-utils": "4.14.4",
"@wordpress/babel-plugin-import-jsx-pragma": "5.7.0",
"@wordpress/core-data": "7.7.0",
"@wordpress/babel-plugin-import-jsx-pragma": "5.8.1",
"@wordpress/core-data": "7.8.4",
"babel-jest": "29.4.3",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, screen } from '@testing-library/react';
import { render, screen, act } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { ManageConnectionsModal } from '..';
import { setup } from '../../../utils/test-factory';
Expand All @@ -13,6 +13,12 @@ describe( 'ManageConnectionsModal', () => {
beforeEach( () => {
jest.clearAllMocks();
( { stubSetKeyringResult, stubGetKeyringResult } = setup() );
jest.useFakeTimers();
} );

afterEach( () => {
jest.runOnlyPendingTimers();
jest.useRealTimers();
} );

it( 'renders ServicesList when there is no keyringResult', () => {
Expand All @@ -32,12 +38,17 @@ describe( 'ManageConnectionsModal', () => {
} );

it( 'closes the modal and resets keyringResult when closeModal is called', async () => {
const user = userEvent.setup();
const user = userEvent.setup( { advanceTimers: jest.advanceTimersByTime } );

render( <ManageConnectionsModal /> );

await user.click( screen.getByRole( 'button', { name: /close/i } ) );

// Dialog has a close animation. Wait for it to finish.
await act( () => {
jest.runAllTimers();
} );

expect( stubSetKeyringResult ).toHaveBeenCalledWith( null );
} );
} );
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { __ } from '@wordpress/i18n';
import { MediaItem, uploadMedia } from '@wordpress/media-utils';
import { uploadMedia, type Attachment } from '@wordpress/media-utils';
import { useCallback, useMemo, useState } from 'react';

export type SaveImageToLibraryOptions = {
onError?: ( error: Error ) => void;
onSuccess?: ( image: MediaItem ) => void;
onSuccess?: ( image: Partial< Attachment > ) => void;
};

export type SaveImageToLibrary = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
Loading

0 comments on commit e3c83a9

Please sign in to comment.