Skip to content

Commit baef49d

Browse files
charIeszhaocharIeszhao
authored
chore: bump dependencies (#6873)
* chore: bump dependencies * fix: ui test * fix: ui test
1 parent 7463e88 commit baef49d

File tree

18 files changed

+806
-512
lines changed

18 files changed

+806
-512
lines changed

‎package.json

+9-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"pg": "^8.8.0",
3535
"tsup": "^8.3.0",
3636
"typescript": "^5.0.0",
37-
"vite": "^5.3.4"
37+
"vite": "^6.0.3"
3838
},
3939
"engines": {
4040
"node": "^20.9.0",
@@ -45,7 +45,14 @@
4545
"formidable@<3.2.4": "^3.2.4",
4646
"[email protected]": "^3.1.0",
4747
"braces@<3.0.3": "^3.0.3",
48-
"@75lb/deep-merge@<1.1.2": "^1.1.2"
48+
"cross-spawn@<6.0.6": "^6.0.6",
49+
"cross-spawn@>=7.0.0 <7.0.5": "^7.0.5",
50+
"@75lb/deep-merge@<1.1.2": "^1.1.2",
51+
"micromatch@<4.0.8": "^4.0.8",
52+
"nanoid@>=4.0.0 <5.0.9": "^5.0.9",
53+
"path-to-regexp@>=0.2.0 <1.9.0": "^1.9.0",
54+
"path-to-regexp@>=4.0.0 <6.3.0": "^6.3.0",
55+
"rollup@>=4.0.0 <4.22.4": "^4.22.4"
4956
},
5057
"peerDependencyRules": {
5158
"allowedVersions": {

‎packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"got": "^14.0.0",
5555
"hpagent": "^1.2.0",
5656
"inquirer": "^9.0.0",
57-
"nanoid": "^5.0.1",
57+
"nanoid": "^5.0.9",
5858
"ora": "^8.0.1",
5959
"p-limit": "^6.0.0",
6060
"p-retry": "^6.0.0",

‎packages/connectors/connector-gitlab/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@silverhand/essentials": "^2.9.1",
1010
"jose": "^5.6.3",
1111
"ky": "^1.2.3",
12-
"nanoid": "^5.0.1",
12+
"nanoid": "^5.0.9",
1313
"snakecase-keys": "^8.0.1",
1414
"zod": "^3.23.8"
1515
},

‎packages/connectors/connector-oidc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@silverhand/essentials": "^2.9.1",
1010
"jose": "^5.6.3",
1111
"ky": "^1.2.3",
12-
"nanoid": "^5.0.1",
12+
"nanoid": "^5.0.9",
1313
"snakecase-keys": "^8.0.1",
1414
"zod": "^3.23.8"
1515
},

‎packages/console/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"libphonenumber-js": "^1.10.51",
8383
"lint-staged": "^15.0.0",
8484
"mermaid": "^10.9.1",
85-
"nanoid": "^5.0.1",
85+
"nanoid": "^5.0.9",
8686
"overlayscrollbars": "^2.0.2",
8787
"overlayscrollbars-react": "^0.5.0",
8888
"postcss": "^8.4.39",
@@ -115,9 +115,9 @@
115115
"stylelint": "^15.0.0",
116116
"swr": "^2.2.0",
117117
"typescript": "^5.5.3",
118-
"vite": "^5.3.4",
118+
"vite": "^6.0.3",
119119
"vite-plugin-compression": "^0.5.1",
120-
"vite-plugin-svgr": "^4.2.0",
120+
"vite-plugin-svgr": "^4.3.0",
121121
"zod": "^3.23.8",
122122
"zod-to-ts": "^1.2.0"
123123
},

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"koa-send": "^5.0.1",
8080
"ky": "^1.2.3",
8181
"lru-cache": "^11.0.0",
82-
"nanoid": "^5.0.1",
82+
"nanoid": "^5.0.9",
8383
"node-forge": "^1.3.1",
8484
"oidc-provider": "github:logto-io/node-oidc-provider#de2d8fd68e91b76d71fb910d44142f9eccd844bc",
8585
"openapi-types": "^12.1.3",

‎packages/demo-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"react-i18next": "^12.3.1",
4646
"stylelint": "^15.0.0",
4747
"typescript": "^5.5.3",
48-
"vite": "^5.3.4",
48+
"vite": "^6.0.3",
4949
"vite-plugin-compression": "^0.5.1",
5050
"zod": "^3.23.8"
5151
},

‎packages/experience-legacy/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
"tiny-cookie": "^2.4.1",
8686
"typescript": "^5.5.3",
8787
"use-debounced-loader": "^0.1.1",
88-
"vite": "^5.3.4",
88+
"vite": "^6.0.3",
8989
"vite-plugin-compression": "^0.5.1",
90-
"vite-plugin-svgr": "^4.2.0"
90+
"vite-plugin-svgr": "^4.3.0"
9191
},
9292
"engines": {
9393
"node": "^20.9.0"

‎packages/experience/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
"tiny-cookie": "^2.4.1",
8686
"typescript": "^5.5.3",
8787
"use-debounced-loader": "^0.1.1",
88-
"vite": "^5.3.4",
88+
"vite": "^6.0.3",
8989
"vite-plugin-compression": "^0.5.1",
90-
"vite-plugin-svgr": "^4.2.0"
90+
"vite-plugin-svgr": "^4.3.0"
9191
},
9292
"engines": {
9393
"node": "^20.9.0"

‎packages/integration-tests/jest.config.ui.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const config = {
33
transform: {},
44
preset: 'jest-puppeteer',
5-
setupFilesAfterEnv: ['jest-matcher-specific-error', './jest.setup.js'],
5+
setupFilesAfterEnv: ['jest-matcher-specific-error', 'expect-puppeteer', './jest.setup.js'],
66
moduleNameMapper: {
77
'^#src/(.*)\\.js(x)?$': '<rootDir>/lib/$1',
88
'^(chalk|inquirer)$': '<rootDir>/../shared/lib/esm/module-proxy.js',

‎packages/integration-tests/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
"@types/node": "^20.9.5",
3939
"dotenv": "^16.4.5",
4040
"eslint": "^8.56.0",
41-
"expect-puppeteer": "^10.0.0",
41+
"expect-puppeteer": "^10.1.4",
4242
"jest": "^29.7.0",
4343
"jest-matcher-specific-error": "^1.0.0",
44-
"jest-puppeteer": "^10.1.2",
44+
"jest-puppeteer": "^10.1.4",
4545
"jose": "^5.6.3",
4646
"ky": "^1.2.3",
4747
"openapi-schema-validator": "^12.1.3",
4848
"openapi-types": "^12.1.3",
4949
"prettier": "^3.0.0",
50-
"puppeteer": "^22.6.5",
50+
"puppeteer": "^23.10.3",
5151
"tsup": "^8.3.0",
5252
"typescript": "^5.5.3",
5353
"zod": "^3.23.8"

‎packages/integration-tests/src/tests/console/user-management.test.ts

+20-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from '#src/ui-helpers/index.js';
1010
import {
1111
appendPathname,
12+
dcls,
1213
expectNavigation,
1314
formatPhoneNumberToInternational,
1415
generateEmail,
@@ -51,6 +52,7 @@ describe('user management', () => {
5152

5253
// Go to user details page
5354
await expectToClickModalAction(page, 'Check user detail');
55+
await page.waitForNavigation({ waitUntil: 'networkidle0' });
5456
await expect(page).toMatchElement('div[class$=main] div[class$=metadata] div[class$=name]', {
5557
text: '[email protected]',
5658
});
@@ -61,15 +63,25 @@ describe('user management', () => {
6163
if (userId) {
6264
expect(page.url()).toBe(new URL(`console/users/${userId}/settings`, logtoConsoleUrl).href);
6365
}
64-
const email = await page.$eval('form input[name=primaryEmail]', (element) =>
65-
element instanceof HTMLInputElement ? element.value : null
66-
);
67-
const phone = await page.$eval('form input[name=primaryPhone]', (element) =>
68-
element instanceof HTMLInputElement ? element.value : null
69-
);
70-
const username = await page.$eval('form input[name=username]', (element) =>
71-
element instanceof HTMLInputElement ? element.value : null
66+
await expect(page).toMatchElement(
67+
[dcls('main'), dcls('introduction'), dcls('title')].join(' '),
68+
{
69+
text: 'Authentication',
70+
}
7271
);
72+
const [email, phone, username] = await Promise.all([
73+
page.$eval('form input[name=primaryEmail]', (element) =>
74+
element instanceof HTMLInputElement ? element.value : null
75+
),
76+
page.$eval('form input[name=primaryPhone]', (element) =>
77+
element instanceof HTMLInputElement ? element.value : null
78+
),
79+
page.$eval('form input[name=username]', (element) =>
80+
element instanceof HTMLInputElement ? element.value : null
81+
),
82+
]);
83+
84+
console.log('################### email, phone, username', email, phone, username);
7385

7486
expect(email).toBe('[email protected]');
7587
expect(phone).toBe('+1 810 555 5555');

‎packages/integration-tests/src/ui-helpers/expect-console.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { consolePassword, consoleUsername, logtoConsoleUrl } from '#src/constant
66
import { cls, dcls, waitFor } from '#src/utils.js';
77

88
import ExpectPage, { ExpectPageError } from './expect-page.js';
9-
import { expectConfirmModalAndAct, expectToSaveChanges } from './index.js';
9+
import { expectConfirmModalAndAct, expectToSaveChanges, type PuppeteerInstance } from './index.js';
1010

1111
type ExpectConsoleOptions = {
1212
/** The URL of the console endpoint. */
@@ -67,7 +67,9 @@ export default class ExpectConsole extends ExpectPage {
6767
*
6868
* @see {@link jest.Matchers.toMatchElement}
6969
*/
70-
async toMatchElement(...args: Parameters<jest.Matchers<unknown>['toMatchElement']>) {
70+
async toMatchElement(
71+
...args: Parameters<jest.Matchers<unknown, PuppeteerInstance>['toMatchElement']>
72+
) {
7173
return expect(this.page).toMatchElement(...args);
7274
}
7375

‎packages/integration-tests/src/ui-helpers/expect-page.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { type ElementHandle, type Page } from 'puppeteer';
22

33
import { expectNavigation } from '#src/utils.js';
44

5+
import { type PuppeteerInstance } from './index.js';
6+
57
/** Error thrown by {@link ExpectPage}. */
68
export class ExpectPageError extends Error {
79
constructor(
@@ -83,7 +85,7 @@ export default class ExpectPage {
8385
/**
8486
* Alias for {@link jest.Matchers['toFill']}.
8587
*/
86-
async toFill(...args: Parameters<jest.Matchers<unknown>['toFill']>) {
88+
async toFill(...args: Parameters<jest.Matchers<unknown, PuppeteerInstance>['toFill']>) {
8789
return expect(this.page).toFill(...args);
8890
}
8991

@@ -142,7 +144,9 @@ export default class ExpectPage {
142144
* @alias `expect(this.page).toMatchElement()`
143145
* @see {@link jest.Matchers.toMatchElement}
144146
*/
145-
async toMatchElement(...args: Parameters<jest.Matchers<unknown>['toMatchElement']>) {
147+
async toMatchElement(
148+
...args: Parameters<jest.Matchers<unknown, PuppeteerInstance>['toMatchElement']>
149+
) {
146150
return expect(this.page).toMatchElement(...args);
147151
}
148152

‎packages/integration-tests/src/ui-helpers/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ConnectorType } from '@logto/connector-kit';
22
import { SignInMode, SignInIdentifier, type PartialPasswordPolicy } from '@logto/schemas';
3-
import { type ElementHandle, type Browser, type Page } from 'puppeteer';
3+
import { type ElementHandle, type Browser, type Page, type Frame } from 'puppeteer';
44

55
import { updateSignInExperience } from '#src/api/sign-in-experience.js';
66
import {
@@ -13,6 +13,8 @@ import { dcls, expectNavigation, waitFor } from '#src/utils.js';
1313

1414
import { selectDropdownMenuItem } from './select-dropdown-menu-item.js';
1515

16+
export type PuppeteerInstance = Page | Frame | ElementHandle;
17+
1618
export const goToAdminConsole = async () => {
1719
const logtoConsoleUrl = new URL(logtoConsoleUrlString);
1820
await expectNavigation(page.goto(logtoConsoleUrl.href));

‎packages/schemas/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@logto/phrases-experience": "workspace:^1.9.0",
8686
"@logto/shared": "workspace:^3.1.2",
8787
"@withtyped/server": "^0.14.0",
88-
"nanoid": "^5.0.1"
88+
"nanoid": "^5.0.9"
8989
},
9090
"peerDependencies": {
9191
"zod": "^3.23.8"

‎packages/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@
6363
"chalk": "^5.3.0",
6464
"find-up": "^7.0.0",
6565
"libphonenumber-js": "^1.9.49",
66-
"nanoid": "^5.0.1"
66+
"nanoid": "^5.0.9"
6767
}
6868
}

0 commit comments

Comments
 (0)