Skip to content

Commit af4da3e

Browse files
authored
Merge branch 'main' into PM-22143-Tools-Refactor-TS-Enums-to-be-const-objects
2 parents 95f07c6 + e23b2d0 commit af4da3e

File tree

1,982 files changed

+102074
-27478
lines changed

Some content is hidden

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

1,982 files changed

+102074
-27478
lines changed
File renamed without changes.

.claude/prompts/review-code.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Bitwarden Clients Repo Code Review - Careful Consideration Required
2+
3+
## Think Twice Before Recommending
4+
5+
Angular has multiple valid patterns. Before suggesting changes:
6+
7+
- **Consider the context** - Is this code part of an active modernization effort?
8+
- **Check for established patterns** - Look for similar implementations in the codebase
9+
- **Avoid premature optimization** - Don't suggest refactoring stable, working code without clear benefit
10+
- **Respect incremental progress** - Teams may be modernizing gradually with feature flags
11+
12+
## Angular Modernization - Handle with Care
13+
14+
**Control Flow Syntax (@if, @for, @switch):**
15+
16+
- When you see legacy structural directives (*ngIf, *ngFor), consider whether modernization is in scope
17+
- Do not mandate changes to stable code unless part of the PR's objective
18+
- If suggesting modernization, acknowledge it's optional unless required by PR goals
19+
20+
**Standalone Components:**
21+
22+
- New components should be standalone whenever feasible, but do not flag existing NgModule components as issues
23+
- Legacy patterns exist for valid reasons - consider modernization effort vs benefit
24+
25+
**Typed Forms:**
26+
27+
- Recommend typed forms for NEW form code
28+
- Don't suggest rewriting working untyped forms unless they're being modified
29+
30+
## Tailwind CSS - Critical Pattern
31+
32+
**tw- prefix is mandatory** - This is non-negotiable and should be flagged as ❌ major finding:
33+
34+
- Missing tw- prefix breaks styling completely
35+
- Check ALL Tailwind classes in modified files
36+
37+
## Rust SDK Adoption - Tread Carefully
38+
39+
When reviewing cipher operations:
40+
41+
- Look for breaking changes in the TypeScript → Rust boundary
42+
- Verify error handling matches established patterns
43+
- Don't suggest alternative SDK patterns without strong justification
44+
45+
## Component Library First
46+
47+
Before suggesting custom implementations:
48+
49+
- Check if Bitwarden's component library already provides the functionality
50+
- Prefer existing components over custom Tailwind styling
51+
- Don't add UI complexity that the component library already solves
52+
53+
## When in Doubt
54+
55+
- **Ask questions** (💭) rather than making definitive recommendations
56+
- **Flag for human review** (⚠️) if you're uncertain
57+
- **Acknowledge alternatives** exist when suggesting improvements

.github/CODEOWNERS

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
apps/desktop/desktop_native @bitwarden/team-platform-dev
99
apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-desktop-dev
1010
apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-desktop-dev
11+
apps/desktop/desktop_native/core/src/secure_memory @bitwarden/team-key-management-dev
1112
## No ownership for Cargo.lock and Cargo.toml to allow dependency updates
1213
apps/desktop/desktop_native/Cargo.lock
1314
apps/desktop/desktop_native/Cargo.toml
@@ -28,8 +29,9 @@ libs/common/src/auth @bitwarden/team-auth-dev
2829
## Tools team files ##
2930
apps/browser/src/tools @bitwarden/team-tools-dev
3031
apps/cli/src/tools @bitwarden/team-tools-dev
32+
apps/desktop/desktop_native/bitwarden_chromium_import_helper @bitwarden/team-tools-dev
33+
apps/desktop/desktop_native/chromium_importer @bitwarden/team-tools-dev
3134
apps/desktop/src/app/tools @bitwarden/team-tools-dev
32-
apps/desktop/desktop_native/bitwarden_chromium_importer @bitwarden/team-tools-dev
3335
apps/web/src/app/tools @bitwarden/team-tools-dev
3436
libs/angular/src/tools @bitwarden/team-tools-dev
3537
libs/common/src/models/export @bitwarden/team-tools-dev
@@ -45,12 +47,12 @@ bitwarden_license/bit-web/src/app/dirt @bitwarden/team-data-insights-and-reporti
4547
libs/dirt @bitwarden/team-data-insights-and-reporting-dev
4648
libs/common/src/dirt @bitwarden/team-data-insights-and-reporting-dev
4749

48-
## Localization/Crowdin (Platform and Tools team)
49-
apps/browser/src/_locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
50-
apps/browser/store/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
51-
apps/cli/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
52-
apps/desktop/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
53-
apps/web/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
50+
## Localization/Crowdin (Platform team)
51+
apps/browser/src/_locales @bitwarden/team-platform-dev
52+
apps/browser/store/locales @bitwarden/team-platform-dev
53+
apps/cli/src/locales @bitwarden/team-platform-dev
54+
apps/desktop/src/locales @bitwarden/team-platform-dev
55+
apps/web/src/locales @bitwarden/team-platform-dev
5456

5557
## Vault team files ##
5658
apps/browser/src/vault @bitwarden/team-vault-dev
@@ -173,13 +175,16 @@ apps/desktop/src/key-management @bitwarden/team-key-management-dev
173175
apps/web/src/app/key-management @bitwarden/team-key-management-dev
174176
apps/browser/src/key-management @bitwarden/team-key-management-dev
175177
apps/cli/src/key-management @bitwarden/team-key-management-dev
178+
bitwarden_license/bit-web/src/app/key-management @bitwarden/team-key-management-dev
176179
libs/key-management @bitwarden/team-key-management-dev
177180
libs/key-management-ui @bitwarden/team-key-management-dev
178181
libs/common/src/key-management @bitwarden/team-key-management-dev
179182
# Node-cryptofunction service
180183
libs/node @bitwarden/team-key-management-dev
181184

182185
apps/desktop/desktop_native/core/src/biometric/ @bitwarden/team-key-management-dev
186+
apps/desktop/desktop_native/core/src/biometric_v2/ @bitwarden/team-key-management-dev
187+
apps/desktop/desktop_native/core/src/secure_memory/ @bitwarden/team-key-management-dev
183188
apps/desktop/src/services/native-messaging.service.ts @bitwarden/team-key-management-dev
184189
apps/browser/src/background/nativeMessaging.background.ts @bitwarden/team-key-management-dev
185190
apps/desktop/src/services/biometric-message-handler.service.ts @bitwarden/team-key-management-dev
@@ -220,3 +225,8 @@ apps/web/src/locales/en/messages.json
220225
**/jest.config.js @bitwarden/team-platform-dev
221226
**/project.jsons @bitwarden/team-platform-dev
222227
libs/pricing @bitwarden/team-billing-dev
228+
229+
# Claude related files
230+
.claude/ @bitwarden/team-ai-sme
231+
.github/workflows/respond.yml @bitwarden/team-ai-sme
232+
.github/workflows/review-code.yml @bitwarden/team-ai-sme

.github/renovate.json5

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
"@babel/core",
140140
"@babel/preset-env",
141141
"@bitwarden/sdk-internal",
142+
"@bitwarden/commercial-sdk-internal",
142143
"@electron/fuses",
143144
"@electron/notarize",
144145
"@electron/rebuild",
@@ -186,7 +187,6 @@
186187
"json5",
187188
"keytar",
188189
"libc",
189-
"log",
190190
"lowdb",
191191
"mini-css-extract-plugin",
192192
"napi",
@@ -215,6 +215,8 @@
215215
"simplelog",
216216
"style-loader",
217217
"sysinfo",
218+
"tracing",
219+
"tracing-subscriber",
218220
"ts-node",
219221
"ts-loader",
220222
"tsconfig-paths-webpack-plugin",
@@ -229,6 +231,7 @@
229231
"webpack-node-externals",
230232
"widestring",
231233
"windows",
234+
"windows-core",
232235
"windows-future",
233236
"windows-registry",
234237
"zbus",
@@ -253,6 +256,11 @@
253256
groupName: "zbus",
254257
matchPackageNames: ["zbus", "zbus_polkit"],
255258
},
259+
{
260+
// We need to group all windows-related packages together to avoid build errors caused by version incompatibilities.
261+
groupName: "windows",
262+
matchPackageNames: ["windows", "windows-core", "windows-future", "windows-registry"],
263+
},
256264
{
257265
// We group all webpack build-related minor and patch updates together to reduce PR noise.
258266
// We include patch updates here because we want PRs for webpack patch updates and it's in this group.
@@ -400,7 +408,16 @@
400408
reviewers: ["team:team-vault-dev"],
401409
},
402410
{
403-
matchPackageNames: ["aes", "big-integer", "cbc", "rsa", "russh-cryptovec", "sha2"],
411+
matchPackageNames: [
412+
"aes",
413+
"big-integer",
414+
"cbc",
415+
"rsa",
416+
"russh-cryptovec",
417+
"sha2",
418+
"memsec",
419+
"linux-keyutils",
420+
],
404421
description: "Key Management owned dependencies",
405422
commitMessagePrefix: "[deps] KM:",
406423
reviewers: ["team:team-key-management-dev"],

.github/workflows/alert-ddg-files-modified.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ jobs:
1414
pull-requests: write
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
1919
fetch-depth: 0
20+
persist-credentials: false
2021

2122
- name: Get changed files
2223
id: changed-files
@@ -68,9 +69,11 @@ jobs:
6869
- name: Comment on PR if monitored files changed
6970
if: steps.changed-files.outputs.monitored == 'true'
7071
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
72+
env:
73+
_MONITORED_FILES: ${{ steps.changed-files.outputs.monitored_files }}
7174
with:
7275
script: |
73-
const changedFiles = `${{ steps.changed-files.outputs.monitored_files }}`.split(' ').filter(file => file.trim() !== '');
76+
const changedFiles = `$_MONITORED_FILES`.split(' ').filter(file => file.trim() !== '');
7477
7578
const message = `<!-- comment_tag: ddg-test-warning -->
7679
⚠️🦆 **DuckDuckGo Integration files have been modified in this PR:**

.github/workflows/auto-branch-updater.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,20 @@ jobs:
2727
steps:
2828
- name: Setup
2929
id: setup
30-
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
30+
run: echo "branch=${GITHUB_REF#refs/heads/}" >> "$GITHUB_OUTPUT"
3131

3232
- name: Checkout repo
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
ref: 'eu-web-${{ steps.setup.outputs.branch }}'
3636
fetch-depth: 0
37+
persist-credentials: true
3738

3839
- name: Merge ${{ steps.setup.outputs.branch }}
40+
env:
41+
_BRANCH: ${{ steps.setup.outputs.branch }}
3942
run: |
40-
git config --local user.email "${{ env._BOT_EMAIL }}"
41-
git config --local user.name "${{ env._BOT_NAME }}"
42-
git merge origin/${{ steps.setup.outputs.branch }}
43+
git config --local user.email "$_BOT_EMAIL"
44+
git config --local user.name "$_BOT_NAME"
45+
git merge "origin/$_BRANCH"
4346
git push

0 commit comments

Comments
 (0)