Skip to content

Commit

Permalink
Merge branch 'main' into km/pm-16926/fix-km-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Avery committed Jan 15, 2025
2 parents 4f5abc2 + a5dce05 commit e3ddef6
Show file tree
Hide file tree
Showing 466 changed files with 9,351 additions and 2,793 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/no-misused-promises": ["error", { "checksVoidReturn": false }],
"@typescript-eslint/no-this-alias": ["error", { "allowedNames": ["self"] }],
"@typescript-eslint/no-unused-expressions": ["error", { "allowTernary": true }],
"@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
"no-console": "error",
"import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package.
Expand Down
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@
"eslint-plugin-storybook",
"eslint-plugin-tailwindcss",
"husky",
"jest-extended",
"jest-junit",
"jest-mock-extended",
"jest-preset-angular",
"jest-diff",
"lint-staged",
"ts-jest"
],
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/build-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,7 @@ jobs:
- name: "edge"
npm_command: "dist:edge"
archive_name: "dist-edge.zip"
artifact_name: "dist-edge"
- name: "edge-mv3"
npm_command: "dist:edge:mv3"
archive_name: "dist-edge.zip"
artifact_name: "DO-NOT-USE-FOR-PROD-dist-edge-MV3"
artifact_name: "dist-edge-MV3"
- name: "firefox"
npm_command: "dist:firefox"
archive_name: "dist-firefox.zip"
Expand All @@ -212,11 +208,7 @@ jobs:
- name: "opera"
npm_command: "dist:opera"
archive_name: "dist-opera.zip"
artifact_name: "dist-opera"
- name: "opera-mv3"
npm_command: "dist:opera:mv3"
archive_name: "dist-opera.zip"
artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3"
artifact_name: "dist-opera-MV3"
steps:
- name: Check out repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: Scan with SonarCloud
uses: sonarsource/sonarcloud-github-action@02ef91109b2d589e757aefcfb2854c2783fd7b19 # v4.0.0
uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: >
-Dsonar.organization=${{ github.repository_owner }}
Expand Down
9 changes: 5 additions & 4 deletions apps/browser/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@bitwarden/browser",
"version": "2025.1.0",
"version": "2025.1.1",
"scripts": {
"build": "npm run build:chrome",
"build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 webpack",
"build:edge": "cross-env BROWSER=edge webpack",
"build:edge": "cross-env BROWSER=edge MANIFEST_VERSION=3 webpack",
"build:firefox": "cross-env BROWSER=firefox webpack",
"build:opera": "cross-env BROWSER=opera webpack",
"build:opera": "cross-env BROWSER=opera MANIFEST_VERSION=3 webpack",
"build:safari": "cross-env BROWSER=safari webpack",
"build:watch": "npm run build:watch:chrome",
"build:watch:chrome": "npm run build:chrome -- --watch",
Expand All @@ -30,6 +30,7 @@
"dist:safari:mv3": "cross-env MANIFEST_VERSION=3 npm run dist:safari",
"test": "jest",
"test:watch": "jest --watch",
"test:watch:all": "jest --watchAll"
"test:watch:all": "jest --watchAll",
"test:clearCache": "jest --clear-cache"
}
}
2 changes: 1 addition & 1 deletion apps/browser/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable no-undef */
/* eslint-disable no-undef, @typescript-eslint/no-require-imports */
module.exports = {
plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
};
22 changes: 11 additions & 11 deletions apps/browser/src/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@
"description": "A category title describing the concept of web domains"
},
"blockedDomains": {
"message": "Blocked domains"
"message": "Gesperrte Domains"
},
"excludedDomains": {
"message": "Ausgeschlossene Domains"
Expand All @@ -2337,7 +2337,7 @@
"message": "Bitwarden wird für alle angemeldeten Konten nicht danach fragen Zugangsdaten für diese Domains speichern. Du musst die Seite neu laden, damit die Änderungen wirksam werden."
},
"blockedDomainsDesc": {
"message": "Autofill und andere zugehörige Funktionen werden für diese Websites nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
"message": "Automatisches Ausfüllen und andere zugehörige Funktionen werden für diese Webseiten nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
},
"autofillBlockedNotice": {
"message": "Das automatische Ausfüllen ist für diese Website gesperrt. Dieses Verhalten kann in den Einstellungen überprüft oder geändert werden."
Expand All @@ -2364,7 +2364,7 @@
}
},
"blockedDomainsSavedSuccess": {
"message": "Blocked domain changes saved"
"message": "Änderungen gesperrter Domains gespeichert"
},
"excludedDomainsSavedSuccess": {
"message": "Änderungen der ausgeschlossenen Domain gespeichert"
Expand Down Expand Up @@ -2815,7 +2815,7 @@
"description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
},
"contactCSToAvoidDataLossPart2": {
"message": "to avoid additional data loss.",
"message": "um zusätzlichen Datenverlust zu vermeiden.",
"description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
},
"generateUsername": {
Expand Down Expand Up @@ -4671,22 +4671,22 @@
"message": "Du bist nicht berechtigt, diesen Eintrag zu bearbeiten"
},
"biometricsStatusHelptextUnlockNeeded": {
"message": "Biometric unlock is unavailable because PIN or password unlock is required first."
"message": "Biometrisches Entsperren ist nicht verfügbar, da zuerst mit PIN oder Passwort entsperrt werden muss."
},
"biometricsStatusHelptextHardwareUnavailable": {
"message": "Biometric unlock is currently unavailable."
"message": "Biometrisches Entsperren ist derzeit nicht verfügbar."
},
"biometricsStatusHelptextAutoSetupNeeded": {
"message": "Biometric unlock is unavailable due to misconfigured system files."
"message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
},
"biometricsStatusHelptextManualSetupNeeded": {
"message": "Biometric unlock is unavailable due to misconfigured system files."
"message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
},
"biometricsStatusHelptextDesktopDisconnected": {
"message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
"message": "Biometrisches Entsperren ist nicht verfügbar, da die Bitwarden Desktop-App geschlossen ist."
},
"biometricsStatusHelptextNotEnabledInDesktop": {
"message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
"message": "Biometrisches Entsperren ist nicht verfügbar, da es für $EMAIL$ in der Bitwarden Desktop-App nicht aktiviert ist.",
"placeholders": {
"email": {
"content": "$1",
Expand All @@ -4695,7 +4695,7 @@
}
},
"biometricsStatusHelptextUnavailableReasonUnknown": {
"message": "Biometric unlock is currently unavailable for an unknown reason."
"message": "Biometrisches Entsperren ist derzeit aus einem unbekannten Grund nicht verfügbar."
},
"authenticating": {
"message": "Authentifizierung"
Expand Down
11 changes: 7 additions & 4 deletions apps/browser/src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2339,11 +2339,11 @@
"blockedDomainsDesc": {
"message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
},
"autofillBlockedNotice": {
"message": "Autofill is blocked for this website. Review or change this in settings."
"autofillBlockedNoticeV2": {
"message": "Autofill is blocked for this website."
},
"autofillBlockedTooltip": {
"message": "Autofill is blocked on this website. Review in settings."
"autofillBlockedNoticeGuidance": {
"message": "Change this in settings"
},
"websiteItemLabel": {
"message": "Website $number$ (URI)",
Expand Down Expand Up @@ -4010,6 +4010,9 @@
"autofillSuggestions": {
"message": "Autofill suggestions"
},
"itemSuggestions": {
"message": "Suggested items"
},
"autofillSuggestionsTip": {
"message": "Save a login item for this site to autofill"
},
Expand Down
8 changes: 4 additions & 4 deletions apps/browser/src/_locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2337,13 +2337,13 @@
"message": "Bitwarden non chiederà di salvare le credenziali di accesso per questi domini per tutti gli account sul dispositivo. Ricarica la pagina affinché le modifiche abbiano effetto."
},
"blockedDomainsDesc": {
"message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
"message": "Per questi siti, l'auto-completamento e funzionalità simili non saranno disponibili. Ricarica la pagina per applicare le modifiche."
},
"autofillBlockedNotice": {
"message": "Autofill is blocked for this website. Review or change this in settings."
"message": "L'auto-completamento è bloccato per questo sito. Modifica questa scelta nelle impostazioni."
},
"autofillBlockedTooltip": {
"message": "Autofill is blocked on this website. Review in settings."
"message": "L'auto-completamento è bloccato per questo sito. Verifica nelle impostazioni."
},
"websiteItemLabel": {
"message": "Sito $number$ (URI)",
Expand All @@ -2364,7 +2364,7 @@
}
},
"blockedDomainsSavedSuccess": {
"message": "Blocked domain changes saved"
"message": "Modifiche ai domini bloccati salvate"
},
"excludedDomainsSavedSuccess": {
"message": "Modifiche del dominio escluso salvate"
Expand Down
Loading

0 comments on commit e3ddef6

Please sign in to comment.