Skip to content

Commit 2efe23a

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

File tree

275 files changed

+7767
-964
lines changed

Some content is hidden

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

275 files changed

+7767
-964
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ apps/cli/src/locales/en/messages.json
122122
apps/desktop/src/locales/en/messages.json
123123
apps/web/src/locales/en/messages.json
124124

125+
## Ssh agent temporary co-codeowner
126+
apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-platform-dev @bitwarden/wg-ssh-keys
127+
125128
## BRE team owns these workflows ##
126129
.github/workflows/brew-bump-desktop.yml @bitwarden/dept-bre
127130
.github/workflows/deploy-web.yml @bitwarden/dept-bre

.github/renovate.json

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,12 @@
4141
},
4242
{
4343
"matchPackageNames": [
44-
"@ngtools/webpack",
4544
"base64-loader",
4645
"buffer",
4746
"bufferutil",
48-
"copy-webpack-plugin",
4947
"core-js",
5048
"css-loader",
5149
"html-loader",
52-
"html-webpack-injector",
53-
"html-webpack-plugin",
5450
"mini-css-extract-plugin",
5551
"ngx-infinite-scroll",
5652
"postcss",
@@ -60,20 +56,15 @@
6056
"sass-loader",
6157
"style-loader",
6258
"ts-loader",
63-
"tsconfig-paths-webpack-plugin",
6459
"url",
65-
"util",
66-
"webpack",
67-
"webpack-cli",
68-
"webpack-dev-server",
69-
"webpack-node-externals"
60+
"util"
7061
],
7162
"description": "Admin Console owned dependencies",
7263
"commitMessagePrefix": "[deps] AC:",
7364
"reviewers": ["team:team-admin-console-dev"]
7465
},
7566
{
76-
"matchPackageNames": ["@types/node-ipc", "node-ipc", "qrious"],
67+
"matchPackageNames": ["qrious"],
7768
"description": "Auth owned dependencies",
7869
"commitMessagePrefix": "[deps] Auth:",
7970
"reviewers": ["team:team-auth-dev"]
@@ -110,27 +101,43 @@
110101
},
111102
{
112103
"matchPackageNames": [
104+
"@babel/core",
105+
"@babel/preset-env",
113106
"@electron/notarize",
114107
"@electron/rebuild",
115-
"@types/argon2-browser",
108+
"@ngtools/webpack",
116109
"@types/chrome",
117110
"@types/firefox-webext-browser",
111+
"@types/glob",
118112
"@types/jquery",
113+
"@types/lowdb",
119114
"@types/node",
120115
"@types/node-forge",
121-
"argon2",
122-
"argon2-browser",
123-
"big-integer",
116+
"@types/node-ipc",
117+
"@yao-pkg",
118+
"babel-loader",
119+
"browserslist",
120+
"copy-webpack-plugin",
121+
"electron",
124122
"electron-builder",
125123
"electron-log",
126124
"electron-reload",
127125
"electron-store",
128126
"electron-updater",
129-
"electron",
127+
"html-webpack-injector",
128+
"html-webpack-plugin",
129+
"lowdb",
130130
"node-forge",
131+
"node-ipc",
132+
"pkg",
131133
"rxjs",
134+
"tsconfig-paths-webpack-plugin",
132135
"type-fest",
133-
"typescript"
136+
"typescript",
137+
"webpack",
138+
"webpack-cli",
139+
"webpack-dev-server",
140+
"webpack-node-externals"
134141
],
135142
"description": "Platform owned dependencies",
136143
"commitMessagePrefix": "[deps] Platform:",
@@ -231,7 +238,6 @@
231238
"@types/koa__router",
232239
"@types/koa-bodyparser",
233240
"@types/koa-json",
234-
"@types/lowdb",
235241
"@types/lunr",
236242
"@types/node-fetch",
237243
"@types/proper-lockfile",
@@ -244,18 +250,22 @@
244250
"koa",
245251
"koa-bodyparser",
246252
"koa-json",
247-
"lowdb",
248253
"lunr",
249254
"multer",
250255
"node-fetch",
251256
"open",
252-
"pkg",
253257
"proper-lockfile",
254258
"qrcode-parser"
255259
],
256260
"description": "Vault owned dependencies",
257261
"commitMessagePrefix": "[deps] Vault:",
258262
"reviewers": ["team:team-vault-dev"]
263+
},
264+
{
265+
"matchPackageNames": ["@types/argon2-browser", "argon2", "argon2-browser", "big-integer"],
266+
"description": "Key Management owned dependencies",
267+
"commitMessagePrefix": "[deps] KM:",
268+
"reviewers": ["team:team-key-management-dev"]
259269
}
260270
],
261271
"ignoreDeps": ["@types/koa-bodyparser", "bootstrap", "node-ipc", "node", "npm"]

.github/workflows/build-browser.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Build Browser
22

33
on:
4-
pull_request:
4+
pull_request_target:
5+
types: [opened, synchronize]
56
branches-ignore:
67
- 'l10n_master'
78
- 'cf-pages'
@@ -33,16 +34,24 @@ defaults:
3334
shell: bash
3435

3536
jobs:
37+
check-run:
38+
name: Check PR run
39+
uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
40+
3641
setup:
3742
name: Setup
3843
runs-on: ubuntu-22.04
44+
needs:
45+
- check-run
3946
outputs:
4047
repo_url: ${{ steps.gen_vars.outputs.repo_url }}
4148
adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }}
4249
node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
4350
steps:
44-
- name: Checkout repo
51+
- name: Check out repo
4552
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
53+
with:
54+
ref: ${{ github.event.pull_request.head.sha }}
4655

4756
- name: Get Package Version
4857
id: gen_vars
@@ -71,8 +80,10 @@ jobs:
7180
run:
7281
working-directory: apps/browser
7382
steps:
74-
- name: Checkout repo
83+
- name: Check out repo
7584
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
85+
with:
86+
ref: ${{ github.event.pull_request.head.sha }}
7687

7788
- name: Testing locales - extName length
7889
run: |
@@ -109,8 +120,10 @@ jobs:
109120
_BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
110121
_NODE_VERSION: ${{ needs.setup.outputs.node_version }}
111122
steps:
112-
- name: Checkout repo
123+
- name: Check out repo
113124
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
125+
with:
126+
ref: ${{ github.event.pull_request.head.sha }}
114127

115128
- name: Set up Node
116129
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -249,8 +262,10 @@ jobs:
249262
_BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
250263
_NODE_VERSION: ${{ needs.setup.outputs.node_version }}
251264
steps:
252-
- name: Checkout repo
265+
- name: Check out repo
253266
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
267+
with:
268+
ref: ${{ github.event.pull_request.head.sha }}
254269

255270
- name: Set up Node
256271
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -356,14 +371,16 @@ jobs:
356371

357372
crowdin-push:
358373
name: Crowdin Push
359-
if: github.ref == 'refs/heads/main'
374+
if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'
360375
runs-on: ubuntu-22.04
361376
needs:
362377
- build
363378
- build-safari
364379
steps:
365-
- name: Checkout repo
380+
- name: Check out repo
366381
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
382+
with:
383+
ref: ${{ github.event.pull_request.head.sha }}
367384

368385
- name: Login to Azure
369386
uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -401,7 +418,10 @@ jobs:
401418
- crowdin-push
402419
steps:
403420
- name: Check if any job failed
404-
if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc') && contains(needs.*.result, 'failure')
421+
if: |
422+
github.event_name != 'pull_request_target'
423+
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-browser')
424+
&& contains(needs.*.result, 'failure')
405425
run: exit 1
406426

407427
- name: Login to Azure - Prod Subscription

.github/workflows/build-cli.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Build CLI
22

33
on:
4-
pull_request:
4+
pull_request_target:
5+
types: [opened, synchronize]
56
branches-ignore:
67
- 'l10n_master'
78
- 'cf-pages'
@@ -34,15 +35,23 @@ defaults:
3435
working-directory: apps/cli
3536

3637
jobs:
38+
check-run:
39+
name: Check PR run
40+
uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
41+
3742
setup:
3843
name: Setup
3944
runs-on: ubuntu-22.04
45+
needs:
46+
- check-run
4047
outputs:
4148
package_version: ${{ steps.retrieve-package-version.outputs.package_version }}
4249
node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
4350
steps:
44-
- name: Checkout repo
51+
- name: Check out repo
4552
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
53+
with:
54+
ref: ${{ github.event.pull_request.head.sha }}
4655

4756
- name: Get Package Version
4857
id: retrieve-package-version
@@ -58,7 +67,6 @@ jobs:
5867
NODE_VERSION=${NODE_NVMRC/v/''}
5968
echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
6069
61-
6270
cli:
6371
name: "${{ matrix.os.base }} - ${{ matrix.license_type.readable }}"
6472
strategy:
@@ -82,8 +90,10 @@ jobs:
8290
_WIN_PKG_FETCH_VERSION: 20.11.1
8391
_WIN_PKG_VERSION: 3.5
8492
steps:
85-
- name: Checkout repo
93+
- name: Check out repo
8694
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
95+
with:
96+
ref: ${{ github.event.pull_request.head.sha }}
8797

8898
- name: Setup Unix Vars
8999
run: |
@@ -160,8 +170,10 @@ jobs:
160170
_WIN_PKG_FETCH_VERSION: 20.11.1
161171
_WIN_PKG_VERSION: 3.5
162172
steps:
163-
- name: Checkout repo
173+
- name: Check out repo
164174
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
175+
with:
176+
ref: ${{ github.event.pull_request.head.sha }}
165177

166178
- name: Setup Windows builder
167179
run: |
@@ -310,8 +322,10 @@ jobs:
310322
env:
311323
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
312324
steps:
313-
- name: Checkout repo
325+
- name: Check out repo
314326
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
327+
with:
328+
ref: ${{ github.event.pull_request.head.sha }}
315329

316330
- name: Print environment
317331
run: |
@@ -389,7 +403,10 @@ jobs:
389403
steps:
390404
- name: Check if any job failed
391405
working-directory: ${{ github.workspace }}
392-
if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc') && contains(needs.*.result, 'failure')
406+
if: |
407+
github.event_name != 'pull_request_target'
408+
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-cli')
409+
&& contains(needs.*.result, 'failure')
393410
run: exit 1
394411

395412
- name: Login to Azure - Prod Subscription

0 commit comments

Comments
 (0)