From 664a2822bbf0910a172602555684c9d3c9518596 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Sun, 24 Mar 2024 11:13:20 +0800 Subject: [PATCH 1/3] chore(deps): upgrade puppeteer --- packages/integration-tests/package.json | 4 +- .../tests/console/applications/index.test.ts | 6 +- .../src/tests/console/bootstrap.test.ts | 4 +- .../sign-in-experience/branding.test.ts | 6 +- .../sign-up-and-sign-in/helpers.ts | 9 +- .../src/tests/console/user-management.test.ts | 7 +- pnpm-lock.yaml | 214 ++++++++++++------ 7 files changed, 158 insertions(+), 92 deletions(-) diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index fc3a6a60392..7078a0e7f92 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -41,13 +41,13 @@ "got": "^14.0.0", "jest": "^29.7.0", "jest-matcher-specific-error": "^1.0.0", - "jest-puppeteer": "^10.0.0", + "jest-puppeteer": "^10.0.1", "jose": "^5.0.0", "node-fetch": "^3.3.0", "openapi-schema-validator": "^12.1.3", "openapi-types": "^12.1.3", "prettier": "^3.0.0", - "puppeteer": "^21.0.0", + "puppeteer": "^22.6.0", "text-encoder": "^0.0.4", "typescript": "^5.3.3" }, diff --git a/packages/integration-tests/src/tests/console/applications/index.test.ts b/packages/integration-tests/src/tests/console/applications/index.test.ts index b0a16189f6b..c2166cf6d12 100644 --- a/packages/integration-tests/src/tests/console/applications/index.test.ts +++ b/packages/integration-tests/src/tests/console/applications/index.test.ts @@ -13,7 +13,7 @@ import { goToAdminConsole, waitForToast, } from '#src/ui-helpers/index.js'; -import { expectNavigation, appendPathname, dcls } from '#src/utils.js'; +import { expectNavigation, appendPathname, dcls, waitFor } from '#src/utils.js'; import { type ApplicationMetadata, @@ -145,7 +145,7 @@ describe('applications', () => { await expect(page).toClick('div[class$=header] button span', { text: 'Check guide' }); // Wait for the guide drawer to be ready - await page.waitForTimeout(500); + await waitFor(500); // Close guide await expect(page).toClick( @@ -201,7 +201,7 @@ describe('applications', () => { await waitForToast(page, { text: 'Saved' }); // Wait for the redirect uri field to be updated - await page.waitForTimeout(500); + await waitFor(500); // Remove Redirect Uri await expect(page).toFill(`input[value="${testApp.redirectUri}"]`, ''); diff --git a/packages/integration-tests/src/tests/console/bootstrap.test.ts b/packages/integration-tests/src/tests/console/bootstrap.test.ts index 0af94ca6532..aafb737697a 100644 --- a/packages/integration-tests/src/tests/console/bootstrap.test.ts +++ b/packages/integration-tests/src/tests/console/bootstrap.test.ts @@ -7,7 +7,7 @@ import { consoleUsername, logtoConsoleUrl as logtoConsoleUrlString, } from '#src/constants.js'; -import { appendPathname, cls, dcls, expectNavigation } from '#src/utils.js'; +import { appendPathname, cls, dcls, expectNavigation, waitFor } from '#src/utils.js'; /** * NOTE: This test suite assumes test cases will run sequentially (which is Jest default). @@ -85,7 +85,7 @@ describe('smoke testing for console admin account creation and sign-in', () => { await expect(page).toClick('div[class$=topbar] > div[class$=container]'); // Try awaiting for 500ms before clicking sign-out button - await page.waitForTimeout(500); + await waitFor(500); await expectNavigation( expect(page).toClick( diff --git a/packages/integration-tests/src/tests/console/sign-in-experience/branding.test.ts b/packages/integration-tests/src/tests/console/sign-in-experience/branding.test.ts index 2b24f5b293e..821ef6765e7 100644 --- a/packages/integration-tests/src/tests/console/sign-in-experience/branding.test.ts +++ b/packages/integration-tests/src/tests/console/sign-in-experience/branding.test.ts @@ -1,6 +1,6 @@ import { logtoConsoleUrl as logtoConsoleUrlString } from '#src/constants.js'; import { goToAdminConsole } from '#src/ui-helpers/index.js'; -import { expectNavigation, appendPathname } from '#src/utils.js'; +import { expectNavigation, appendPathname, waitFor } from '#src/utils.js'; import { waitForFormCard, expectToSelectColor, expectToSaveSignInExperience } from './helpers.js'; @@ -64,7 +64,7 @@ describe('sign-in experience: branding', () => { await expect(page).toClick('div[class$=darkModeTip] button span', { text: 'Recalculate' }); // Wait for the recalculate to finish - await page.waitForTimeout(500); + await waitFor(500); // Fill in the custom CSS await expect(page).toFill('div[class$=editor] textarea', 'body { background-color: #5B4D8E; }'); @@ -83,7 +83,7 @@ describe('sign-in experience: branding', () => { await expect(page).toClick('div[class$=darkModeTip] button span', { text: 'Recalculate' }); // Wait for the recalculate to finish - await page.waitForTimeout(500); + await waitFor(500); // Fill in the custom CSS await expect(page).toFill('div[class$=editor] textarea', ''); diff --git a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts index 1e77fe9fe75..5c66f536a90 100644 --- a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts +++ b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts @@ -1,6 +1,7 @@ import { type Page } from 'puppeteer'; import { selectDropdownMenuItem } from '#src/ui-helpers/select-dropdown-menu-item.js'; +import { waitFor } from '#src/utils.js'; import { expectToSaveSignInExperience } from '../helpers.js'; @@ -26,7 +27,7 @@ export const expectToSelectSignUpIdentifier = async (page: Page, identifier: str }); // Wait for the config to update - await page.waitForTimeout(500); + await waitFor(500); }; export const expectToClickSignUpAuthnOption = async (page: Page, option: string) => { @@ -56,7 +57,7 @@ export const expectToAddSignInMethod = async (page: Page, method: string, isAddA }); // Wait for the dropdown to be rendered in the correct position - await page.waitForTimeout(500); + await waitFor(500); await expect(page).toClick('.ReactModalPortal div[class$=dropdownContainer] div[role=menuitem]', { text: method, @@ -88,7 +89,7 @@ export const expectToClickSignInMethodAuthnOption = async ( }); // Wait for the config to update - await page.waitForTimeout(500); + await waitFor(500); }; export const expectToSwapSignInMethodAuthnOption = async (page: Page, method: string) => { @@ -113,7 +114,7 @@ export const expectToRemoveSignInMethod = async (page: Page, method: string) => await expect(methodItem).toClick('div[class$=anchor] button:last-of-type'); // Wait for the config to update - await page.waitForTimeout(500); + await waitFor(500); }; export const expectSignInMethodError = async (page: Page, method: string) => { diff --git a/packages/integration-tests/src/tests/console/user-management.test.ts b/packages/integration-tests/src/tests/console/user-management.test.ts index 6ed12e07c9b..43a7645142e 100644 --- a/packages/integration-tests/src/tests/console/user-management.test.ts +++ b/packages/integration-tests/src/tests/console/user-management.test.ts @@ -15,6 +15,7 @@ import { generateName, generatePhone, generateUsername, + waitFor, } from '#src/utils.js'; await page.setViewport({ width: 1280, height: 720 }); @@ -158,14 +159,14 @@ describe('user management', () => { text: newEmail, }); - await page.waitForTimeout(500); + await waitFor(500); await expect(page).toFillForm('form', { primaryEmail: '' }); await expectToSaveChanges(page); // After removing email, top userinfo card shows the phone number as the title await expect(page).toMatchElement('div[class$=main] div[class$=metadata] div[class$=name]', { text: formatPhoneNumberToInternational(newPhone), }); - await page.waitForTimeout(500); + await waitFor(500); await expect(page).toFillForm('form', { primaryPhone: '' }); await expectToSaveChanges(page); @@ -173,7 +174,7 @@ describe('user management', () => { await expect(page).toMatchElement('div[class$=main] div[class$=metadata] div[class$=name]', { text: newUsername, }); - await page.waitForTimeout(500); + await waitFor(500); await expect(page).toFillForm('form', { username: '' }); await expectToSaveChanges(page); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e741117b0d6..66c09103643 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3881,8 +3881,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 jest-puppeteer: - specifier: ^10.0.0 - version: 10.0.1(puppeteer@21.0.0)(typescript@5.3.3) + specifier: ^10.0.1 + version: 10.0.1(puppeteer@22.6.0)(typescript@5.3.3) jose: specifier: ^5.0.0 version: 5.0.1 @@ -3899,8 +3899,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 puppeteer: - specifier: ^21.0.0 - version: 21.0.0 + specifier: ^22.6.0 + version: 22.6.0(typescript@5.3.3) text-encoder: specifier: ^0.0.4 version: 0.0.4 @@ -9233,18 +9233,19 @@ packages: tslib: 2.6.2 dev: true - /@puppeteer/browsers@1.5.0: - resolution: {integrity: sha512-za318PweGINh5LnHSph7C4xhs0tmRjCD8EPpzcKlw4nzSPhnULj+LTG3+TGefZvW1ti5gjw2JkdQvQsivBeZlg==} - engines: {node: '>=16.3.0'} + /@puppeteer/browsers@2.2.0: + resolution: {integrity: sha512-MC7LxpcBtdfTbzwARXIkqGZ1Osn3nnZJlm+i0+VqHl72t//Xwl9wICrXT8BwtgC6s1xJNHsxOpvzISUqe92+sw==} + engines: {node: '>=18'} hasBin: true dependencies: debug: 4.3.4 extract-zip: 2.0.1 progress: 2.0.3 - proxy-agent: 6.3.0 - tar-fs: 3.0.4 + proxy-agent: 6.4.0 + semver: 7.6.0 + tar-fs: 3.0.5 unbzip2-stream: 1.4.3 - yargs: 17.7.1 + yargs: 17.7.2 transitivePeerDependencies: - supports-color dev: true @@ -11453,6 +11454,37 @@ packages: resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==} dev: true + /bare-events@2.2.2: + resolution: {integrity: sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==} + requiresBuild: true + dev: true + optional: true + + /bare-fs@2.2.2: + resolution: {integrity: sha512-X9IqgvyB0/VA5OZJyb5ZstoN62AzD7YxVGog13kkfYWYqJYcK0kcqLZ6TrmH5qr4/8//ejVcX4x/a0UvaogXmA==} + requiresBuild: true + dependencies: + bare-events: 2.2.2 + bare-os: 2.2.1 + bare-path: 2.1.0 + streamx: 2.15.1 + dev: true + optional: true + + /bare-os@2.2.1: + resolution: {integrity: sha512-OwPyHgBBMkhC29Hl3O4/YfxW9n7mdTr2+SsO29XBWKKJsbgj3mnorDB80r5TiCQgQstgE5ga1qNYrpes6NvX2w==} + requiresBuild: true + dev: true + optional: true + + /bare-path@2.1.0: + resolution: {integrity: sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==} + requiresBuild: true + dependencies: + bare-os: 2.2.1 + dev: true + optional: true + /base-x@3.0.9: resolution: {integrity: sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==} dependencies: @@ -11814,13 +11846,15 @@ packages: engines: {node: '>=6.0'} dev: true - /chromium-bidi@0.4.20(devtools-protocol@0.0.1147663): - resolution: {integrity: sha512-ruHgVZFEv00mAQMz1tQjfjdG63jiPWrQPF6HLlX2ucqLqVTJoWngeBEKHaJ6n1swV/HSvgnBNbtTRIlcVyW3Fw==} + /chromium-bidi@0.5.13(devtools-protocol@0.0.1262051): + resolution: {integrity: sha512-OHbYCetDxdW/xmlrafgOiLsIrw4Sp1BEeolbZ1UGJO5v/nekQOJBj/Kzyw6sqKcAVabUTo0GS3cTYgr6zIf00g==} peerDependencies: devtools-protocol: '*' dependencies: - devtools-protocol: 0.0.1147663 + devtools-protocol: 0.0.1262051 mitt: 3.0.1 + urlpattern-polyfill: 10.0.0 + zod: 3.22.4 dev: true /ci-info@3.8.0: @@ -12155,17 +12189,23 @@ packages: path-type: 4.0.0 dev: true - /cosmiconfig@8.2.0: - resolution: {integrity: sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==} + /cosmiconfig@8.3.6(typescript@5.0.2): + resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} + peerDependencies: + typescript: '>=4.9.5' + peerDependenciesMeta: + typescript: + optional: true dependencies: import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 + typescript: 5.0.2 dev: true - /cosmiconfig@8.3.6(typescript@5.0.2): + /cosmiconfig@8.3.6(typescript@5.3.3): resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} peerDependencies: @@ -12178,11 +12218,11 @@ packages: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 - typescript: 5.0.2 + typescript: 5.3.3 dev: true - /cosmiconfig@8.3.6(typescript@5.3.3): - resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} + /cosmiconfig@9.0.0(typescript@5.3.3): + resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} engines: {node: '>=14'} peerDependencies: typescript: '>=4.9.5' @@ -12190,10 +12230,10 @@ packages: typescript: optional: true dependencies: + env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 - path-type: 4.0.0 typescript: 5.3.3 dev: true @@ -12260,6 +12300,7 @@ packages: node-fetch: 2.7.0 transitivePeerDependencies: - encoding + dev: false /cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} @@ -12673,8 +12714,8 @@ packages: dequal: 2.0.3 dev: true - /devtools-protocol@0.0.1147663: - resolution: {integrity: sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ==} + /devtools-protocol@0.0.1262051: + resolution: {integrity: sha512-YJe4CT5SA8on3Spa+UDtNhEqtuV6Epwz3OZ4HQVLhlRccpZ9/PAYk0/cy/oKxFKRrZPBUPyxympQci4yWNWZ9g==} dev: true /dezalgo@1.0.3: @@ -12921,6 +12962,11 @@ packages: engines: {node: '>=0.12'} dev: true + /env-paths@2.2.1: + resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} + engines: {node: '>=6'} + dev: true + /error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: @@ -14733,8 +14779,8 @@ packages: transitivePeerDependencies: - supports-color - /http-proxy-agent@7.0.0: - resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==} + /http-proxy-agent@7.0.2: + resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 @@ -14778,6 +14824,17 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color + dev: false + + /https-proxy-agent@7.0.4: + resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==} + engines: {node: '>= 14'} + dependencies: + agent-base: 7.1.0 + debug: 4.3.4 + transitivePeerDependencies: + - supports-color + dev: true /human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} @@ -15866,7 +15923,7 @@ packages: jest-resolve: 29.7.0 dev: true - /jest-puppeteer@10.0.1(puppeteer@21.0.0)(typescript@5.3.3): + /jest-puppeteer@10.0.1(puppeteer@22.6.0)(typescript@5.3.3): resolution: {integrity: sha512-FzC35XbqeuQEt1smXh1EOqhJaRkWqJkyWDMfGkcZ8C59QHXeJ7F/iOmiNqYi6l/OsycUuOPCk+IkjfGfS9YbrQ==} engines: {node: '>=16'} peerDependencies: @@ -15874,7 +15931,7 @@ packages: dependencies: expect-puppeteer: 10.0.0 jest-environment-puppeteer: 10.0.1(typescript@5.3.3) - puppeteer: 21.0.0 + puppeteer: 22.6.0(typescript@5.3.3) transitivePeerDependencies: - debug - supports-color @@ -17655,10 +17712,6 @@ packages: engines: {node: '>= 8.0.0'} dev: true - /mkdirp-classic@0.5.3: - resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - dev: true - /mkdirp@1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} @@ -17822,6 +17875,7 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 + dev: false /node-fetch@3.3.0: resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==} @@ -18317,18 +18371,18 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - /pac-proxy-agent@7.0.0: - resolution: {integrity: sha512-t4tRAMx0uphnZrio0S0Jw9zg3oDbz1zVhQ/Vy18FjLfP1XOLNUEjaVxYCYRI6NS+BsMBXKIzV6cTLOkO9AtywA==} + /pac-proxy-agent@7.0.1: + resolution: {integrity: sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==} engines: {node: '>= 14'} dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 agent-base: 7.1.0 debug: 4.3.4 get-uri: 6.0.1 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.1 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.4 pac-resolver: 7.0.0 - socks-proxy-agent: 8.0.1 + socks-proxy-agent: 8.0.2 transitivePeerDependencies: - supports-color dev: true @@ -19018,18 +19072,18 @@ packages: engines: {node: '>=4'} dev: true - /proxy-agent@6.3.0: - resolution: {integrity: sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==} + /proxy-agent@6.4.0: + resolution: {integrity: sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==} engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 debug: 4.3.4 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.1 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.4 lru-cache: 7.18.3 - pac-proxy-agent: 7.0.0 + pac-proxy-agent: 7.0.1 proxy-from-env: 1.1.0 - socks-proxy-agent: 8.0.1 + socks-proxy-agent: 8.0.2 transitivePeerDependencies: - supports-color dev: true @@ -19061,35 +19115,35 @@ packages: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} - /puppeteer-core@21.0.0: - resolution: {integrity: sha512-frnAOQ0pKrwxlYLziy+aB8q7cOm8Ym9Y5VqbdE7alOaOPIK3ynpYLi/1D6XJSKw3WExHmeI2z6TVO85SUxpVAQ==} - engines: {node: '>=16.3.0'} + /puppeteer-core@22.6.0: + resolution: {integrity: sha512-xclyGFhxHfZ9l62uXFm+JpgtJHLIZ1qHc7iR4eaIqBNKA5Dg2sDr8yvylfCx5bMN89QWIaxpV6IHsy0qUynK/g==} + engines: {node: '>=18'} dependencies: - '@puppeteer/browsers': 1.5.0 - chromium-bidi: 0.4.20(devtools-protocol@0.0.1147663) - cross-fetch: 4.0.0 + '@puppeteer/browsers': 2.2.0 + chromium-bidi: 0.5.13(devtools-protocol@0.0.1262051) debug: 4.3.4 - devtools-protocol: 0.0.1147663 - ws: 8.13.0 + devtools-protocol: 0.0.1262051 + ws: 8.16.0 transitivePeerDependencies: - bufferutil - - encoding - supports-color - utf-8-validate dev: true - /puppeteer@21.0.0: - resolution: {integrity: sha512-a3rpCJuKQ7mzlwMJzKX6GhvGeg4CUn4d9+dv+riQDpY4mns32Q9OnmkfTZ3VlbDhGyrdBf1xXF1Z4y0of00WYg==} - engines: {node: '>=16.3.0'} + /puppeteer@22.6.0(typescript@5.3.3): + resolution: {integrity: sha512-TYeza4rl1YXfxqUVw/0hWUWYX5cicnf6qu5kkDV+t7QrESCjMoSNnva4ZA/MRGQ03HnB9BOFw9nxs/SKek5KDA==} + engines: {node: '>=18'} + hasBin: true requiresBuild: true dependencies: - '@puppeteer/browsers': 1.5.0 - cosmiconfig: 8.2.0 - puppeteer-core: 21.0.0 + '@puppeteer/browsers': 2.2.0 + cosmiconfig: 9.0.0(typescript@5.3.3) + devtools-protocol: 0.0.1262051 + puppeteer-core: 22.6.0 transitivePeerDependencies: - bufferutil - - encoding - supports-color + - typescript - utf-8-validate dev: true @@ -19148,6 +19202,7 @@ packages: /queue-tick@1.0.1: resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==} + requiresBuild: true dev: true /quick-lru@4.0.1: @@ -20276,8 +20331,8 @@ packages: type-fest: 3.13.1 dev: false - /socks-proxy-agent@8.0.1: - resolution: {integrity: sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==} + /socks-proxy-agent@8.0.2: + resolution: {integrity: sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==} engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 @@ -20988,12 +21043,14 @@ packages: engines: {node: '>=6'} dev: true - /tar-fs@3.0.4: - resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==} + /tar-fs@3.0.5: + resolution: {integrity: sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==} dependencies: - mkdirp-classic: 0.5.3 pump: 3.0.0 tar-stream: 3.1.6 + optionalDependencies: + bare-fs: 2.2.2 + bare-path: 2.1.0 dev: true /tar-stream@3.1.6: @@ -21163,6 +21220,7 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + dev: false /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -21572,6 +21630,10 @@ packages: requires-port: 1.0.0 dev: true + /urlpattern-polyfill@10.0.0: + resolution: {integrity: sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==} + dev: true + /use-debounced-loader@0.1.1(react@18.2.0): resolution: {integrity: sha512-FbY/ynor7wZV55v1EvvAvu8CvSoEKT1azS2zFb/aLlL0vySbqTM7x9fIcaOJN++E52mVINNDe2VmWWd+Q00S+A==} engines: {node: '>=10'} @@ -21850,6 +21912,7 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + dev: false /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -21884,6 +21947,7 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 + dev: false /whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} @@ -22016,6 +22080,19 @@ packages: optional: true dev: true + /ws@8.16.0: + resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: true + /xml-crypto@3.0.1: resolution: {integrity: sha512-7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw==} engines: {node: '>=0.4.0'} @@ -22132,19 +22209,6 @@ packages: yargs-parser: 21.1.1 dev: false - /yargs@17.7.1: - resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==} - engines: {node: '>=12'} - dependencies: - cliui: 8.0.1 - escalade: 3.1.1 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - dev: true - /yargs@17.7.2: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} From a38a5a74a5c73a53eb3e32e504f7d98d332b92d8 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Sun, 24 Mar 2024 19:10:38 +0800 Subject: [PATCH 2/3] chore: replace plugin --- packages/connectors/templates/package.json | 2 +- .../templates/preset/rollup.config.js | 6 +- pnpm-lock.yaml | 281 +++++++----------- 3 files changed, 117 insertions(+), 172 deletions(-) diff --git a/packages/connectors/templates/package.json b/packages/connectors/templates/package.json index a74f8dcdd08..c0a77d0ce17 100644 --- a/packages/connectors/templates/package.json +++ b/packages/connectors/templates/package.json @@ -46,7 +46,7 @@ "nock": "^13.2.2", "prettier": "^3.0.0", "rollup": "^4.0.0", - "rollup-plugin-summary": "^2.0.0", + "rollup-plugin-output-size": "^1.3.0", "supertest": "^6.2.2", "typescript": "^5.3.3" }, diff --git a/packages/connectors/templates/preset/rollup.config.js b/packages/connectors/templates/preset/rollup.config.js index 29a81ed5d06..df98e6a1c1b 100644 --- a/packages/connectors/templates/preset/rollup.config.js +++ b/packages/connectors/templates/preset/rollup.config.js @@ -2,7 +2,7 @@ import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; import { nodeResolve } from '@rollup/plugin-node-resolve'; import typescript from '@rollup/plugin-typescript'; -import { summary } from 'rollup-plugin-summary'; +import outputSize from 'rollup-plugin-output-size'; /** * @type {import('rollup').RollupOptions} @@ -14,10 +14,10 @@ const configs = [ external: ['zod', 'got', '@logto/connector-kit'], plugins: [ typescript({ tsconfig: 'tsconfig.build.json' }), - nodeResolve({ exportConditions: ['node'] }), + nodeResolve({ exportConditions: ['node'], preferBuiltins: true }), commonjs(), json(), - summary(), + outputSize(), ], }, ]; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66c09103643..d7cdf0b9f38 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -309,9 +309,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -397,9 +397,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -476,9 +476,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -555,9 +555,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -640,9 +640,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -725,9 +725,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -810,9 +810,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -892,9 +892,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -971,9 +971,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1050,9 +1050,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1132,9 +1132,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1211,9 +1211,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1290,9 +1290,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1372,9 +1372,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1451,9 +1451,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1530,9 +1530,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1609,9 +1609,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1688,9 +1688,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1767,9 +1767,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1846,9 +1846,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -1925,9 +1925,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2004,9 +2004,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2086,9 +2086,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2174,9 +2174,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2259,9 +2259,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2338,9 +2338,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2417,9 +2417,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2502,9 +2502,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2581,9 +2581,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2660,9 +2660,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2739,9 +2739,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2818,9 +2818,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -2897,9 +2897,9 @@ importers: rollup: specifier: ^4.0.0 version: 4.12.0 - rollup-plugin-summary: - specifier: ^2.0.0 - version: 2.0.0(rollup@4.12.0) + rollup-plugin-output-size: + specifier: ^1.3.0 + version: 1.3.0(rollup@4.12.0) supertest: specifier: ^6.2.2 version: 6.2.2 @@ -6802,13 +6802,6 @@ packages: prettier: 2.8.4 dev: true - /@colors/colors@1.5.0: - resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} - engines: {node: '>=0.1.90'} - requiresBuild: true - dev: true - optional: true - /@commitlint/cli@19.0.3(@types/node@20.11.20)(typescript@5.0.2): resolution: {integrity: sha512-mGhh/aYPib4Vy4h+AGRloMY+CqkmtdeKPV9poMcZeImF5e3knQ5VYaSeAM0mEzps1dbKsHvABwaDpafLUuM96g==} engines: {node: '>=v18'} @@ -7782,13 +7775,6 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@jridgewell/source-map@0.3.5: - resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} - dependencies: - '@jridgewell/gen-mapping': 0.3.2 - '@jridgewell/trace-mapping': 0.3.18 - dev: true - /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} dev: true @@ -11563,13 +11549,6 @@ packages: wcwidth: 1.0.1 dev: true - /brotli-size@4.0.0: - resolution: {integrity: sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==} - engines: {node: '>= 10.16.0'} - dependencies: - duplexer: 0.1.1 - dev: true - /browserslist@4.21.4: resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -11901,15 +11880,6 @@ packages: engines: {node: '>=6'} dev: false - /cli-table3@0.6.3: - resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==} - engines: {node: 10.* || >= 12.*} - dependencies: - string-width: 4.2.3 - optionalDependencies: - '@colors/colors': 1.5.0 - dev: true - /cli-truncate@3.1.0: resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -12039,10 +12009,6 @@ packages: engines: {node: '>=16'} dev: true - /commander@2.20.3: - resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - dev: true - /commander@5.1.0: resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} engines: {node: '>= 6'} @@ -12862,10 +12828,6 @@ packages: engines: {node: '>=6'} dev: true - /duplexer@0.1.1: - resolution: {integrity: sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q==} - dev: true - /duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} dev: true @@ -13885,11 +13847,6 @@ packages: tslib: 2.5.0 dev: true - /filesize@10.1.0: - resolution: {integrity: sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ==} - engines: {node: '>= 10.4.0'} - dev: true - /fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -18995,6 +18952,11 @@ packages: hasBin: true dev: true + /pretty-bytes@6.1.1: + resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==} + engines: {node: ^14.13.1 || >=16.0.0} + dev: true + /pretty-format@27.5.1: resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -20025,18 +19987,19 @@ packages: safe-stable-stringify: 2.4.3 semver-compare: 1.0.0 - /rollup-plugin-summary@2.0.0(rollup@4.12.0): - resolution: {integrity: sha512-7Av6DQeCmVNpFmCdkkbMya1CneeGWhjSXXQ3B4yDO+BvN/Kbohqi3IEYXAvgHP3iIafSfMyOw+PBLFUlvf1ViA==} - engines: {node: '>=14.0.0'} + /rollup-plugin-output-size@1.3.0(rollup@4.12.0): + resolution: {integrity: sha512-OrTfhj8mxFAO4Yp7OEWwI388uhsiBNDCpfD6tOmcqPfNs5+CWZPDtVmTRZrmXMWfv8skWCOm5ToO4UPy7eRqYg==} + engines: {node: '>=14.16.0'} peerDependencies: - rollup: ^2.68.0||^3.0.0 + rollup: ^2.0.0 || ^3.0.0 || ^4.0.0 + peerDependenciesMeta: + rollup: + optional: true dependencies: - brotli-size: 4.0.0 - cli-table3: 0.6.3 - filesize: 10.1.0 + colorette: 2.0.20 gzip-size: 7.0.0 + pretty-bytes: 6.1.1 rollup: 4.12.0 - terser: 5.28.1 dev: true /rollup@4.12.0: @@ -20362,13 +20325,6 @@ packages: source-map: 0.6.1 dev: true - /source-map-support@0.5.21: - resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} - dependencies: - buffer-from: 1.1.2 - source-map: 0.6.1 - dev: true - /source-map@0.5.7: resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} engines: {node: '>=0.10.0'} @@ -21092,17 +21048,6 @@ packages: engines: {node: '>=8'} dev: true - /terser@5.28.1: - resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==} - engines: {node: '>=10'} - hasBin: true - dependencies: - '@jridgewell/source-map': 0.3.5 - acorn: 8.10.0 - commander: 2.20.3 - source-map-support: 0.5.21 - dev: true - /test-exclude@6.0.0: resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} engines: {node: '>=8'} From b5afc06ebde7ee3c5febdd6dfb5ad5ed6bdf7ca0 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Tue, 26 Mar 2024 12:14:40 +0800 Subject: [PATCH 3/3] refactor: fix tests --- .../sign-up-and-sign-in/happy-path.test.ts | 14 ++++++++------ .../sign-up-and-sign-in/helpers.ts | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/happy-path.test.ts b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/happy-path.test.ts index 5013e0adf25..1633fee8f89 100644 --- a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/happy-path.test.ts +++ b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/happy-path.test.ts @@ -560,16 +560,18 @@ describe('sign-in experience(happy path): sign-up and sign-in', () => { // Should have diffs about social sign-in connector await expectToSaveChanges(page); await expectModalWithTitle(page, 'Reminder'); - // No social content in the before section + const beforeSection = await expect(page).toMatchElement( 'div[class$=section]:has(div[class$=title])', { text: 'Before' } ); - await expect( - expect(beforeSection).toMatchElement('div[class$=title]', { - text: 'Social', - }) - ).rejects.toThrow(); + + // Ensure no social-related content in the "Before" section. The modal is already visible, so + // the timeout can be short. + await expect(beforeSection).not.toMatchElement('div[class$=title]', { + text: 'Social', + timeout: 50, + }); // Have social content in the after section const afterSection = await expect(page).toMatchElement( diff --git a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts index 5c66f536a90..b18de8c067c 100644 --- a/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts +++ b/packages/integration-tests/src/tests/console/sign-in-experience/sign-up-and-sign-in/helpers.ts @@ -27,7 +27,7 @@ export const expectToSelectSignUpIdentifier = async (page: Page, identifier: str }); // Wait for the config to update - await waitFor(500); + await waitFor(100); }; export const expectToClickSignUpAuthnOption = async (page: Page, option: string) => { @@ -57,7 +57,7 @@ export const expectToAddSignInMethod = async (page: Page, method: string, isAddA }); // Wait for the dropdown to be rendered in the correct position - await waitFor(500); + await waitFor(100); await expect(page).toClick('.ReactModalPortal div[class$=dropdownContainer] div[role=menuitem]', { text: method, @@ -89,7 +89,7 @@ export const expectToClickSignInMethodAuthnOption = async ( }); // Wait for the config to update - await waitFor(500); + await waitFor(100); }; export const expectToSwapSignInMethodAuthnOption = async (page: Page, method: string) => { @@ -114,7 +114,7 @@ export const expectToRemoveSignInMethod = async (page: Page, method: string) => await expect(methodItem).toClick('div[class$=anchor] button:last-of-type'); // Wait for the config to update - await waitFor(500); + await waitFor(100); }; export const expectSignInMethodError = async (page: Page, method: string) => {