From a653c7557189b173fd7e6b185d90f6e172325a9e Mon Sep 17 00:00:00 2001 From: juhi saxena Date: Mon, 8 Aug 2022 21:24:46 +0530 Subject: [PATCH 01/12] Migrate mention tests --- .../src/editor/click-block-appender.ts | 21 ++++++ .../src/editor/index.ts | 2 + .../src/request-utils/index.ts | 6 +- .../src/request-utils/users.ts | 63 ++++++++++++++++++ .../e2e/specs/editor/various/mentions.spec.js | 66 +++++++++++++++++++ 5 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts create mode 100644 packages/e2e-test-utils-playwright/src/request-utils/users.ts create mode 100644 test/e2e/specs/editor/various/mentions.spec.js diff --git a/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts b/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts new file mode 100644 index 0000000000000..96cc8f88aaf49 --- /dev/null +++ b/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts @@ -0,0 +1,21 @@ +/** + * Internal dependencies + */ +import type { Editor } from './index'; + +/** + * Clicks the default block appender. + * + * @param {Editor} this + */ +export async function clickBlockAppender( this: Editor ) { + // The block appender is only visible when there's no selection. + await this.page.evaluate( () => + // @ts-ignore (Reason: wp isn't typed) + window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock() + ); + const appender = await this.page.waitForSelector( + '.block-editor-default-block-appender__content' + ); + await appender.click(); +} diff --git a/packages/e2e-test-utils-playwright/src/editor/index.ts b/packages/e2e-test-utils-playwright/src/editor/index.ts index 6bae1b0be5f37..9cc4c8fac7e5a 100644 --- a/packages/e2e-test-utils-playwright/src/editor/index.ts +++ b/packages/e2e-test-utils-playwright/src/editor/index.ts @@ -17,6 +17,7 @@ import { selectBlocks } from './select-blocks'; import { showBlockToolbar } from './show-block-toolbar'; import { saveSiteEditorEntities } from './site-editor'; import { transformBlockTo } from './transform-block-to'; +import { clickBlockAppender } from './click-block-appender'; type EditorConstructorProps = { page: Page; @@ -64,4 +65,5 @@ export class Editor { selectBlocks = selectBlocks.bind( this ); showBlockToolbar = showBlockToolbar.bind( this ); transformBlockTo = transformBlockTo.bind( this ); + clickBlockAppender = clickBlockAppender.bind( this ); } diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts index 322aa48e850f8..90c64bb9ae1c8 100644 --- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts +++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts @@ -22,6 +22,7 @@ import { createComment, deleteAllComments } from './comments'; import { createPost, deleteAllPosts } from './posts'; import { resetPreferences } from './preferences'; import { deleteAllWidgets, addWidgetBlock } from './widgets'; +import { createUser, deleteUser } from './users'; interface StorageState { cookies: Cookie[]; @@ -38,7 +39,7 @@ class RequestUtils { baseURL?: string; pluginsMap: Record< string, string > | null = null; - + userID?: number; static async setup( { user, storageStatePath, @@ -133,6 +134,9 @@ class RequestUtils { uploadMedia = uploadMedia.bind( this ); deleteMedia = deleteMedia.bind( this ); deleteAllMedia = deleteAllMedia.bind( this ); + createUser = createUser.bind( this ); + deleteUser = deleteUser.bind( this ); + // getUserID = getUserID.bind( this ); } export type { StorageState }; diff --git a/packages/e2e-test-utils-playwright/src/request-utils/users.ts b/packages/e2e-test-utils-playwright/src/request-utils/users.ts new file mode 100644 index 0000000000000..ff316f81d1e40 --- /dev/null +++ b/packages/e2e-test-utils-playwright/src/request-utils/users.ts @@ -0,0 +1,63 @@ +/** + * Internal dependencies + */ +import type { RequestUtils } from './index'; + +/** + * Create user using REST API. + * + * @param {} this RequestUtils. + * @param {string} username User Name. + * @param {string} firstName First Name. + * @param {string} lastName Last Name. + */ +async function createUser( + this: RequestUtils, + username: string, + firstName: string, + lastName: string +) { + // Create User + // https://developer.wordpress.org/rest-api/reference/users/#create-a-user + await this.rest( { + method: 'POST', + path: '/wp/v2/users', + params: { + username, + first_name: firstName, + last_name: lastName, + email: username + '@example.com', + password: 'secret', + }, + } ); +} + +/** + * Delete user using REST API. + * + * @param {} this RequestUtils. + * @param {string} username User Name. + */ +async function deleteUser( this: RequestUtils, username: string ) { + // List user. + // https://developer.wordpress.org/rest-api/reference/users/#list-users + const user = await this.rest( { + method: 'GET', + path: '/wp/v2/users', + params: { + search: username, + }, + } ); + // Delete User + // https://developer.wordpress.org/rest-api/reference/users/#delete-a-user + await this.rest( { + method: 'DELETE', + path: `/wp/v2/users/${ user[ 0 ].id }`, + params: { + force: true, + reassign: 0, + }, + } ); +} + +export { createUser, deleteUser }; diff --git a/test/e2e/specs/editor/various/mentions.spec.js b/test/e2e/specs/editor/various/mentions.spec.js new file mode 100644 index 0000000000000..6e9ebd42f0c31 --- /dev/null +++ b/test/e2e/specs/editor/various/mentions.spec.js @@ -0,0 +1,66 @@ +/** + * WordPress dependencies + */ +const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' ); + +test.describe( 'autocomplete mentions', () => { + test.beforeAll( async ( { requestUtils } ) => { + await requestUtils.createUser( 'testuser', 'Jane', 'Doe' ); + } ); + + test.beforeEach( async ( { admin } ) => { + await admin.createNewPost(); + } ); + + test.afterAll( async ( { requestUtils } ) => { + await requestUtils.deleteUser( 'testuser' ); + } ); + + test( 'should insert mention', async ( { page, editor } ) => { + await editor.clickBlockAppender(); + await page.keyboard.type( 'I am @a' ); + await page.locator( 'button', { hasText: 'adminadmin' } ).click(); + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +

I am @admin

+` + ); + } ); + + test( 'should insert mention between two other words', async ( { + page, + editor, + pageUtils, + } ) => { + await editor.clickBlockAppender(); + await page.keyboard.type( 'Stuck in the middle with you' ); + await pageUtils.pressKeyTimes( 'ArrowLeft', 'you'.length ); + await page.keyboard.type( '@j' ); + await page.locator( 'button', { hasText: 'Jane Doetestuser' } ).click(); + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +

Stuck in the middle with @testuseryou

+` + ); + } ); + + test( 'should insert two subsequent mentions', async ( { + page, + editor, + } ) => { + await editor.clickBlockAppender(); + await page.keyboard.type( 'I am @j' ); + await page.locator( 'button', { hasText: 'Jane Doetestuser' } ).click(); + await page.keyboard.type( ' ' ); + await page.keyboard.type( '@a' ); + await page.locator( 'button', { hasText: 'adminadmin' } ).click(); + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +

I am @testuser @admin

+` + ); + } ); +} ); From 406ee8982d15ec7acdaaefe1c3876dbc6ae5d77e Mon Sep 17 00:00:00 2001 From: juhi saxena Date: Tue, 9 Aug 2022 11:39:12 +0530 Subject: [PATCH 02/12] Delete old test file --- .../specs/editor/various/mentions.test.js | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 packages/e2e-tests/specs/editor/various/mentions.test.js diff --git a/packages/e2e-tests/specs/editor/various/mentions.test.js b/packages/e2e-tests/specs/editor/various/mentions.test.js deleted file mode 100644 index 458449a1b30d4..0000000000000 --- a/packages/e2e-tests/specs/editor/various/mentions.test.js +++ /dev/null @@ -1,69 +0,0 @@ -/** - * WordPress dependencies - */ -import { - clickBlockAppender, - createNewPost, - createUser, - deleteUser, - getEditedPostContent, - pressKeyTimes, -} from '@wordpress/e2e-test-utils'; - -describe( 'autocomplete mentions', () => { - beforeAll( async () => { - await createUser( 'testuser', { firstName: 'Jane', lastName: 'Doe' } ); - } ); - - beforeEach( async () => { - await createNewPost(); - } ); - - afterAll( async () => { - await deleteUser( 'testuser' ); - } ); - - it( 'should insert mention', async () => { - await clickBlockAppender(); - await page.keyboard.type( 'I am @a' ); - await page.waitForSelector( '.components-autocomplete__result' ); - await page.keyboard.press( 'Enter' ); - await page.keyboard.type( '.' ); - expect( await getEditedPostContent() ).toMatchInlineSnapshot( ` - " -

I am @admin.

- " - ` ); - } ); - - it( 'should insert mention between two other words', async () => { - await clickBlockAppender(); - await page.keyboard.type( 'Stuck in the middle with you.' ); - await pressKeyTimes( 'ArrowLeft', 'you.'.length ); - await page.keyboard.type( '@j' ); - await page.waitForSelector( '.components-autocomplete__result' ); - await page.keyboard.press( 'Enter' ); - await page.keyboard.type( ' ' ); - expect( await getEditedPostContent() ).toMatchInlineSnapshot( ` - " -

Stuck in the middle with @testuser you.

- " - ` ); - } ); - - it( 'should insert two subsequent mentions', async () => { - await clickBlockAppender(); - await page.keyboard.type( 'I am @j' ); - await page.waitForSelector( '.components-autocomplete__result' ); - await page.keyboard.press( 'Enter' ); - await page.keyboard.type( ' @a' ); - await page.waitForSelector( '.components-autocomplete__result' ); - await page.keyboard.press( 'Enter' ); - await page.keyboard.type( '.' ); - expect( await getEditedPostContent() ).toMatchInlineSnapshot( ` - " -

I am @testuser @admin.

- " - ` ); - } ); -} ); From 77775715222b858632456ccdf9374ae7058a6889 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Tue, 16 Aug 2022 10:58:34 +0530 Subject: [PATCH 03/12] Remove Commented code --- packages/e2e-test-utils-playwright/src/request-utils/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts index 90c64bb9ae1c8..bca4479ad91ff 100644 --- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts +++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts @@ -136,7 +136,6 @@ class RequestUtils { deleteAllMedia = deleteAllMedia.bind( this ); createUser = createUser.bind( this ); deleteUser = deleteUser.bind( this ); - // getUserID = getUserID.bind( this ); } export type { StorageState }; From 787f015c39041a7b8da513c59c80cbccf31d0b37 Mon Sep 17 00:00:00 2001 From: juhi saxena Date: Tue, 30 Aug 2022 14:20:20 +0530 Subject: [PATCH 04/12] Address click block appender feedback --- .../src/editor/click-block-appender.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts b/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts index 96cc8f88aaf49..0d916616b25fd 100644 --- a/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts +++ b/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts @@ -14,8 +14,5 @@ export async function clickBlockAppender( this: Editor ) { // @ts-ignore (Reason: wp isn't typed) window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock() ); - const appender = await this.page.waitForSelector( - '.block-editor-default-block-appender__content' - ); - await appender.click(); + await this.page.click( 'role=button[name="Add default block"i]' ); } From 61f328e6ca7982e5b91446aec46610fb22685cb8 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Wed, 2 Nov 2022 11:50:41 +0530 Subject: [PATCH 05/12] Address the feedbacks --- .../src/editor/click-block-appender.ts | 18 ------------ .../src/editor/index.ts | 2 -- .../e2e/specs/editor/various/mentions.spec.js | 29 ++++++++++--------- 3 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts diff --git a/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts b/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts deleted file mode 100644 index 0d916616b25fd..0000000000000 --- a/packages/e2e-test-utils-playwright/src/editor/click-block-appender.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Internal dependencies - */ -import type { Editor } from './index'; - -/** - * Clicks the default block appender. - * - * @param {Editor} this - */ -export async function clickBlockAppender( this: Editor ) { - // The block appender is only visible when there's no selection. - await this.page.evaluate( () => - // @ts-ignore (Reason: wp isn't typed) - window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock() - ); - await this.page.click( 'role=button[name="Add default block"i]' ); -} diff --git a/packages/e2e-test-utils-playwright/src/editor/index.ts b/packages/e2e-test-utils-playwright/src/editor/index.ts index 9cc4c8fac7e5a..6bae1b0be5f37 100644 --- a/packages/e2e-test-utils-playwright/src/editor/index.ts +++ b/packages/e2e-test-utils-playwright/src/editor/index.ts @@ -17,7 +17,6 @@ import { selectBlocks } from './select-blocks'; import { showBlockToolbar } from './show-block-toolbar'; import { saveSiteEditorEntities } from './site-editor'; import { transformBlockTo } from './transform-block-to'; -import { clickBlockAppender } from './click-block-appender'; type EditorConstructorProps = { page: Page; @@ -65,5 +64,4 @@ export class Editor { selectBlocks = selectBlocks.bind( this ); showBlockToolbar = showBlockToolbar.bind( this ); transformBlockTo = transformBlockTo.bind( this ); - clickBlockAppender = clickBlockAppender.bind( this ); } diff --git a/test/e2e/specs/editor/various/mentions.spec.js b/test/e2e/specs/editor/various/mentions.spec.js index 75ea968d326a0..b1163c3b96cf7 100644 --- a/test/e2e/specs/editor/various/mentions.spec.js +++ b/test/e2e/specs/editor/various/mentions.spec.js @@ -19,17 +19,18 @@ test.describe( 'autocomplete mentions', () => { } ); test.afterAll( async ( { requestUtils } ) => { - await requestUtils.deleteAllUsers( 'testuser' ); + await requestUtils.deleteAllUsers(); } ); test( 'should insert mention', async ( { page, editor } ) => { - await editor.clickBlockAppender(); + await page.click( 'role=button[name="Add default block"i]' ); await page.keyboard.type( 'I am @ad' ); - await page.locator( '.components-autocomplete__result' ).waitFor(); + await expect( + page.locator( 'role=listbox >> role=option[name=/admin/i]' ) + ).toBeVisible(); await page.keyboard.press( 'Enter' ); await page.keyboard.type( '.' ); - const content = await editor.getEditedPostContent(); - expect( content ).toBe( + await expect.poll( editor.getEditedPostContent ).toBe( `

I am @admin.

` @@ -41,15 +42,14 @@ test.describe( 'autocomplete mentions', () => { editor, pageUtils, } ) => { - await editor.clickBlockAppender(); + await page.click( 'role=button[name="Add default block"i]' ); await page.keyboard.type( 'Stuck in the middle with you' ); await pageUtils.pressKeyTimes( 'ArrowLeft', 'you'.length ); await page.keyboard.type( '@j' ); await page.locator( '.components-autocomplete__result' ).waitFor(); await page.keyboard.press( 'Enter' ); await page.keyboard.type( ' ' ); - const content = await editor.getEditedPostContent(); - expect( content ).toBe( + await expect.poll( editor.getEditedPostContent ).toBe( `

Stuck in the middle with @testuser you

` @@ -60,16 +60,19 @@ test.describe( 'autocomplete mentions', () => { page, editor, } ) => { - await editor.clickBlockAppender(); + await page.click( 'role=button[name="Add default block"i]' ); await page.keyboard.type( 'I am @j' ); - await page.locator( '.components-autocomplete__result' ).waitFor(); + await expect( + page.locator( 'role=listbox >> role=option[name=/testuser/i]' ) + ).toBeVisible(); await page.keyboard.press( 'Enter' ); await page.keyboard.type( ' @ad' ); - await page.locator( '.components-autocomplete__result' ).waitFor(); + await expect( + page.locator( 'role=listbox >> role=option[name=/admin/i]' ) + ).toBeVisible(); await page.keyboard.press( 'Enter' ); await page.keyboard.type( '.' ); - const content = await editor.getEditedPostContent(); - expect( content ).toBe( + await expect.poll( editor.getEditedPostContent ).toBe( `

I am @testuser @admin.

` From e0ea5a55fa4ab46e7e5af5294d45fe6fd01dfc29 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Thu, 3 Nov 2022 09:20:07 +0530 Subject: [PATCH 06/12] Address remaining feedbacks --- packages/e2e-test-utils-playwright/src/request-utils/index.ts | 1 - test/e2e/specs/editor/various/mentions.spec.js | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts index 82ff5fba62253..f0e243d6f79cd 100644 --- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts +++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts @@ -39,7 +39,6 @@ class RequestUtils { baseURL?: string; pluginsMap: Record< string, string > | null = null; - userID?: number; static async setup( { user, storageStatePath, diff --git a/test/e2e/specs/editor/various/mentions.spec.js b/test/e2e/specs/editor/various/mentions.spec.js index b1163c3b96cf7..878cf148e8abf 100644 --- a/test/e2e/specs/editor/various/mentions.spec.js +++ b/test/e2e/specs/editor/various/mentions.spec.js @@ -46,7 +46,9 @@ test.describe( 'autocomplete mentions', () => { await page.keyboard.type( 'Stuck in the middle with you' ); await pageUtils.pressKeyTimes( 'ArrowLeft', 'you'.length ); await page.keyboard.type( '@j' ); - await page.locator( '.components-autocomplete__result' ).waitFor(); + await expect( + page.locator( 'role=listbox >> role=option[name=/testuser/i]' ) + ).toBeVisible(); await page.keyboard.press( 'Enter' ); await page.keyboard.type( ' ' ); await expect.poll( editor.getEditedPostContent ).toBe( From 712a223e51bfb7da626cc19a29828ffe7449311b Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Thu, 3 Nov 2022 11:03:20 +0530 Subject: [PATCH 07/12] add the line --- packages/e2e-test-utils-playwright/src/request-utils/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts index f0e243d6f79cd..bd6ed7035561e 100644 --- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts +++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts @@ -39,6 +39,7 @@ class RequestUtils { baseURL?: string; pluginsMap: Record< string, string > | null = null; + static async setup( { user, storageStatePath, From 345155fcea5a75cffbaa3593d42ddb4a22c9fdc6 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Fri, 4 Nov 2022 09:56:28 +0530 Subject: [PATCH 08/12] Fix changes --- package-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index e07a27082371c..209b6399f6368 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18668,7 +18668,7 @@ "app-root-dir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz", - "integrity": "sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=", + "integrity": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g=", "dev": true }, "app-root-path": { @@ -26847,7 +26847,7 @@ "babel-plugin-add-react-displayname": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz", - "integrity": "sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=", + "integrity": "sha512-LY3+Y0XVDYcShHHorshrDbt4KFWL4bSeniCtl4SYZbask+Syngk1uMPCeN9+nSiZo6zX5s0RTq/J9Pnaaf/KHw==", "dev": true }, "babel-plugin-apply-mdx-type-prop": { @@ -27270,7 +27270,7 @@ "batch-processor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz", - "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==", "dev": true }, "bcrypt-pbkdf": { @@ -30560,7 +30560,7 @@ "css.escape": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=", + "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==", "dev": true }, "cssesc": { @@ -36681,7 +36681,7 @@ "has-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz", - "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=", + "integrity": "sha512-D+8A457fBShSEI3tFCj65PAbT++5sKiFtdCdOam0gnfBgw9D277OERk+HM9qYJXmdVLZ/znez10SqHN0BBQ50g==", "dev": true, "requires": { "is-glob": "^3.0.0" @@ -36690,7 +36690,7 @@ "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==", "dev": true, "requires": { "is-extglob": "^2.1.0" @@ -38504,7 +38504,7 @@ "is-window": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz", - "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=", + "integrity": "sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==", "dev": true }, "is-windows": { @@ -41881,7 +41881,7 @@ "js-string-escape": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", + "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==", "dev": true }, "js-tokens": { @@ -43409,7 +43409,7 @@ "lz-string": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", - "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=", + "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==", "dev": true }, "macos-release": { @@ -46740,7 +46740,7 @@ "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==", "dev": true }, "number-is-nan": { @@ -47819,7 +47819,7 @@ "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==", "dev": true }, "p-event": { @@ -49158,7 +49158,7 @@ "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", + "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", "dev": true }, "prismjs": { @@ -51390,7 +51390,7 @@ "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", "dev": true }, "remark": { From 39e094e02494510dc4bc2a4234bda65c64b3bb50 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Fri, 4 Nov 2022 09:59:16 +0530 Subject: [PATCH 09/12] Fix remaininging changes --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 209b6399f6368..e35bd0491294f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18668,7 +18668,7 @@ "app-root-dir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz", - "integrity": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g=", + "integrity": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==", "dev": true }, "app-root-path": { From 89f19d4b5894020e28d4be4f6329bc66e4413974 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Fri, 4 Nov 2022 10:01:06 +0530 Subject: [PATCH 10/12] Fix tsconfig Somehow code editor was applying formatting everytime after commit --- packages/data/tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/data/tsconfig.json b/packages/data/tsconfig.json index c604c1785853c..e094031b970b4 100644 --- a/packages/data/tsconfig.json +++ b/packages/data/tsconfig.json @@ -14,5 +14,7 @@ { "path": "../priority-queue" }, { "path": "../redux-routine" } ], - "include": [ "src/**/*" ] + "include": [ + "src/**/*" + ] } From 5dbf4e2a455fda4403e7feadb2d62c583af2aaa4 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Fri, 4 Nov 2022 10:02:29 +0530 Subject: [PATCH 11/12] Fix formatting --- packages/data/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data/tsconfig.json b/packages/data/tsconfig.json index e094031b970b4..7bdd1e67688a8 100644 --- a/packages/data/tsconfig.json +++ b/packages/data/tsconfig.json @@ -15,6 +15,6 @@ { "path": "../redux-routine" } ], "include": [ - "src/**/*" + "src/**/*" ] } From 46553c8d98881e5db17d4b65eccb3e9fda784d51 Mon Sep 17 00:00:00 2001 From: Juhi Saxena Date: Fri, 4 Nov 2022 10:03:21 +0530 Subject: [PATCH 12/12] Fix formatting --- packages/data/tsconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/data/tsconfig.json b/packages/data/tsconfig.json index 7bdd1e67688a8..c333776d38da6 100644 --- a/packages/data/tsconfig.json +++ b/packages/data/tsconfig.json @@ -14,7 +14,7 @@ { "path": "../priority-queue" }, { "path": "../redux-routine" } ], - "include": [ - "src/**/*" + "include": [ + "src/**/*" ] }