Skip to content

Commit beab081

Browse files
authored
Merge branch 'main' into renovate/jest-preset-angular-15.x
2 parents 2654822 + d662c05 commit beab081

4 files changed

Lines changed: 32 additions & 35 deletions

File tree

.github/renovate.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/renovate.json5

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3+
extends: ["github>bitwarden/renovate-config"],
4+
enabledManagers: ["github-actions", "npm"],
5+
packageRules: [
6+
{
7+
groupName: "gh minor",
8+
matchManagers: ["github-actions"],
9+
matchUpdateTypes: ["minor", "patch"],
10+
},
11+
{
12+
groupName: "Google Libraries",
13+
matchPackagePatterns: ["google-auth-library", "googleapis"],
14+
matchManagers: ["npm"],
15+
groupSlug: "google-libraries",
16+
},
17+
],
18+
ignoreDeps: [
19+
// yao-pkg is used to create a single executable application bundle for the CLI.
20+
// It is a third party build of node which carries a high supply chain risk.
21+
// This must be manually vetted by our appsec team before upgrading.
22+
// It is excluded from renovate to avoid accidentally upgrading to a non-vetted version.
23+
"@yao-pkg/pkg",
24+
],
25+
}

package-lock.json

Lines changed: 6 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"cross-env": "7.0.3",
100100
"css-loader": "7.1.2",
101101
"dotenv": "17.2.0",
102-
"electron": "37.2.4",
102+
"electron": "37.3.1",
103103
"electron-builder": "24.13.3",
104104
"electron-log": "5.4.1",
105105
"electron-reload": "2.0.0-alpha.1",

0 commit comments

Comments
 (0)