From 94af2caba8c762d32a993bc291b5b0963cac9bab Mon Sep 17 00:00:00 2001 From: Brooooooklyn Date: Thu, 16 May 2024 08:39:59 +0000 Subject: [PATCH] chore: simplify renovate config and upgrade msw (#6961) --- .github/renovate.json | 30 ------------------- package.json | 2 +- .../electron/test/main/updater.spec.ts | 2 +- yarn.lock | 20 ++++++------- 4 files changed, 12 insertions(+), 42 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 091c4eab39..cef310a6e2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -12,36 +12,11 @@ "**/__fixtures__/**" ], "packageRules": [ - { - "matchDepNames": ["napi", "napi-build", "napi-derive"], - "rangeStrategy": "replace", - "groupName": "napi-rs" - }, { "matchPackagePatterns": ["^eslint", "^@typescript-eslint"], "rangeStrategy": "replace", "groupName": "linter" }, - { - "matchPackagePatterns": ["^@nestjs"], - "rangeStrategy": "replace", - "groupName": "nestjs" - }, - { - "matchPackagePatterns": ["^@opentelemetry"], - "rangeStrategy": "replace", - "groupName": "opentelemetry" - }, - { - "matchDepNames": ["@prisma/client", "@prisma/instrumentation", "prisma"], - "rangeStrategy": "replace", - "groupName": "prisma" - }, - { - "matchPackagePatterns": ["^@electron-forge"], - "rangeStrategy": "replace", - "groupName": "electron-forge" - }, { "matchDepNames": ["oxlint"], "rangeStrategy": "replace", @@ -61,11 +36,6 @@ "excludePackagePatterns": ["^@blocksuite/", "oxlint"], "matchUpdateTypes": ["minor", "patch"] }, - { - "matchPackagePatterns": ["*"], - "rangeStrategy": "replace", - "excludePackagePatterns": ["^@blocksuite/"] - }, { "groupName": "rust toolchain", "matchManagers": ["custom.regex"], diff --git a/package.json b/package.json index c669c999c4..a41653765e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "happy-dom": "^14.7.1", "husky": "^9.0.11", "lint-staged": "^15.2.2", - "msw": "^2.2.13", + "msw": "^2.3.0", "nanoid": "^5.0.7", "nx": "^19.0.0", "nyc": "^15.1.0", diff --git a/packages/frontend/electron/test/main/updater.spec.ts b/packages/frontend/electron/test/main/updater.spec.ts index d80e1e14c3..02e24b9d2b 100644 --- a/packages/frontend/electron/test/main/updater.spec.ts +++ b/packages/frontend/electron/test/main/updater.spec.ts @@ -145,7 +145,7 @@ describe('testing for client update', () => { response403 ), http.get( - `https://github.com/toeverything/AFFiNE/releases/download/v0.11.1-canary.2/latest${platformTail}.yml`, + `https://github.com/toeverything/AFFiNE/releases/download/v0.11.1-canary.2/canary${platformTail}.yml`, async () => { const buffer = await fs.readFile( nodePath.join( diff --git a/yarn.lock b/yarn.lock index a731e7747e..9e64347557 100644 --- a/yarn.lock +++ b/yarn.lock @@ -606,7 +606,7 @@ __metadata: happy-dom: "npm:^14.7.1" husky: "npm:^9.0.11" lint-staged: "npm:^15.2.2" - msw: "npm:^2.2.13" + msw: "npm:^2.3.0" nanoid: "npm:^5.0.7" nx: "npm:^19.0.0" nyc: "npm:^15.1.0" @@ -7229,9 +7229,9 @@ __metadata: languageName: node linkType: hard -"@mswjs/interceptors@npm:^0.26.14": - version: 0.26.15 - resolution: "@mswjs/interceptors@npm:0.26.15" +"@mswjs/interceptors@npm:^0.29.0": + version: 0.29.1 + resolution: "@mswjs/interceptors@npm:0.29.1" dependencies: "@open-draft/deferred-promise": "npm:^2.2.0" "@open-draft/logger": "npm:^0.3.0" @@ -7239,7 +7239,7 @@ __metadata: is-node-process: "npm:^1.2.0" outvariant: "npm:^1.2.1" strict-event-emitter: "npm:^0.5.1" - checksum: 10/826ca27bab97d4dd126b9d53806281801bd878c2e66be895db536aead5d9d62acebac7ab2b8e2e2fe8de7023bb1dc59579da78e6de1030da917deb5b11919fdc + checksum: 10/6a6ee6eb3db0fed60bbeb710288f8c1e2cac84f08254756b684dbd553b04449dfe4cce1261fcc83772ee114be2043d9777e2ee6d72bc8d14fd394f961827e528 languageName: node linkType: hard @@ -28831,15 +28831,15 @@ __metadata: languageName: node linkType: hard -"msw@npm:^2.2.13": - version: 2.2.14 - resolution: "msw@npm:2.2.14" +"msw@npm:^2.3.0": + version: 2.3.0 + resolution: "msw@npm:2.3.0" dependencies: "@bundled-es-modules/cookie": "npm:^2.0.0" "@bundled-es-modules/statuses": "npm:^1.0.1" "@inquirer/confirm": "npm:^3.0.0" "@mswjs/cookies": "npm:^1.1.0" - "@mswjs/interceptors": "npm:^0.26.14" + "@mswjs/interceptors": "npm:^0.29.0" "@open-draft/until": "npm:^2.1.0" "@types/cookie": "npm:^0.6.0" "@types/statuses": "npm:^2.0.4" @@ -28859,7 +28859,7 @@ __metadata: optional: true bin: msw: cli/index.js - checksum: 10/47958b28fc254ba6c908c151be695724a938cb7ac8fd8933c48228229780269187f57c6cf101b4662164bd20dcc73b02458081cbc35a36c837e1e2b60b6c1a4a + checksum: 10/85ae48f099bfe2e57ac70dd1749102f9825d78de8ee9cacdd9142c6f6153a601d94119abd1db068b4dcb59063e944563dd22595eb089a5a063ea1f1288acc832 languageName: node linkType: hard