Skip to content

Commit 19d54c0

Browse files
committed
Merge branch 'main' of github.com:bitwarden/clients into arch/remove-gulp
# Conflicts: # package-lock.json
2 parents 9c174a4 + f5e6fc8 commit 19d54c0

File tree

121 files changed

+4349
-1297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+4349
-1297
lines changed

.github/renovate.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
},
111111
{
112112
"matchPackageNames": [
113+
"@electron/notarize",
114+
"@electron/rebuild",
113115
"@types/argon2-browser",
114116
"@types/chrome",
115117
"@types/firefox-webext-browser",
@@ -119,6 +121,12 @@
119121
"argon2",
120122
"argon2-browser",
121123
"big-integer",
124+
"electron-builder",
125+
"electron-log",
126+
"electron-reload",
127+
"electron-store",
128+
"electron-updater",
129+
"electron",
122130
"node-forge",
123131
"rxjs",
124132
"type-fest",
@@ -197,19 +205,11 @@
197205
},
198206
{
199207
"matchPackageNames": [
200-
"@electron/notarize",
201-
"@electron/rebuild",
202208
"@microsoft/signalr-protocol-msgpack",
203209
"@microsoft/signalr",
204210
"@types/jsdom",
205211
"@types/papaparse",
206212
"@types/zxcvbn",
207-
"electron-builder",
208-
"electron-log",
209-
"electron-reload",
210-
"electron-store",
211-
"electron-updater",
212-
"electron",
213213
"jsdom",
214214
"jszip",
215215
"oidc-client-ts",

0 commit comments

Comments
 (0)