Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update packges #5545

Merged
merged 3 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/connectors/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/connectors/templates/preset/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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(),
],
},
];
Expand Down
4 changes: 2 additions & 2 deletions packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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,
Expand Down Expand Up @@ -145,7 +145,7 @@
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(
Expand Down Expand Up @@ -201,7 +201,7 @@
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}"]`, '');
Expand All @@ -227,7 +227,7 @@
'can create and modify a(n) $type application without framework',
async (app: ApplicationMetadata) => {
if (app.type === ApplicationType.Protected) {
// TODO @wangsijie: Remove this guard once protected app is ready

Check warning on line 230 in packages/integration-tests/src/tests/console/applications/index.test.ts

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

packages/integration-tests/src/tests/console/applications/index.test.ts#L230

[no-warning-comments] Unexpected 'todo' comment: 'TODO @wangsijie: Remove this guard once...'.
expect(true).toBe(true);
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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; }');
Expand All @@ -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', '');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -26,7 +27,7 @@ export const expectToSelectSignUpIdentifier = async (page: Page, identifier: str
});

// Wait for the config to update
await page.waitForTimeout(500);
await waitFor(100);
};

export const expectToClickSignUpAuthnOption = async (page: Page, option: string) => {
Expand Down Expand Up @@ -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(100);

await expect(page).toClick('.ReactModalPortal div[class$=dropdownContainer] div[role=menuitem]', {
text: method,
Expand Down Expand Up @@ -88,7 +89,7 @@ export const expectToClickSignInMethodAuthnOption = async (
});

// Wait for the config to update
await page.waitForTimeout(500);
await waitFor(100);
};

export const expectToSwapSignInMethodAuthnOption = async (page: Page, method: string) => {
Expand All @@ -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(100);
};

export const expectSignInMethodError = async (page: Page, method: string) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
generateName,
generatePhone,
generateUsername,
waitFor,
} from '#src/utils.js';

await page.setViewport({ width: 1280, height: 720 });
Expand Down Expand Up @@ -158,22 +159,22 @@ 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);
// After removing phone number, top userinfo card shows the username as the title
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);
Expand Down
Loading
Loading