mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 16:23:44 +00:00
Merge branch 'main' into autofill/pm-8027-inline-menu-appears-within-input-fields-that-do-not-relate-to-user-login
This commit is contained in:
20
.github/workflows/version-bump.yml
vendored
20
.github/workflows/version-bump.yml
vendored
@@ -28,6 +28,10 @@ on:
|
|||||||
description: "Cut RC branch?"
|
description: "Cut RC branch?"
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
|
enable_slack_notification:
|
||||||
|
description: "Enable Slack notifications for upcoming release?"
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
bump_version:
|
bump_version:
|
||||||
@@ -45,6 +49,14 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
version: ${{ inputs.version_number_override }}
|
version: ${{ inputs.version_number_override }}
|
||||||
|
|
||||||
|
- name: Slack Notification Check
|
||||||
|
run: |
|
||||||
|
if [[ "${{ inputs.enable_slack_notification }}" == true ]]; then
|
||||||
|
echo "Slack notifications enabled."
|
||||||
|
else
|
||||||
|
echo "Slack notifications disabled."
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Checkout Branch
|
- name: Checkout Branch
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||||
with:
|
with:
|
||||||
@@ -476,7 +488,7 @@ jobs:
|
|||||||
run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
|
run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
|
||||||
|
|
||||||
- name: Report upcoming browser release version to Slack
|
- name: Report upcoming browser release version to Slack
|
||||||
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_browser != '' }}
|
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_browser != '' && inputs.enable_slack_notification == true }}
|
||||||
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
||||||
with:
|
with:
|
||||||
version: ${{ steps.set-final-version-output.outputs.version_browser }}
|
version: ${{ steps.set-final-version-output.outputs.version_browser }}
|
||||||
@@ -484,7 +496,7 @@ jobs:
|
|||||||
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
||||||
|
|
||||||
- name: Report upcoming cli release version to Slack
|
- name: Report upcoming cli release version to Slack
|
||||||
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_cli != '' }}
|
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_cli != '' && inputs.enable_slack_notification == true }}
|
||||||
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
||||||
with:
|
with:
|
||||||
version: ${{ steps.set-final-version-output.outputs.version_cli }}
|
version: ${{ steps.set-final-version-output.outputs.version_cli }}
|
||||||
@@ -492,7 +504,7 @@ jobs:
|
|||||||
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
||||||
|
|
||||||
- name: Report upcoming desktop release version to Slack
|
- name: Report upcoming desktop release version to Slack
|
||||||
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_desktop != '' }}
|
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_desktop != '' && inputs.enable_slack_notification == true }}
|
||||||
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
||||||
with:
|
with:
|
||||||
version: ${{ steps.set-final-version-output.outputs.version_desktop }}
|
version: ${{ steps.set-final-version-output.outputs.version_desktop }}
|
||||||
@@ -500,7 +512,7 @@ jobs:
|
|||||||
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
|
||||||
|
|
||||||
- name: Report upcoming web release version to Slack
|
- name: Report upcoming web release version to Slack
|
||||||
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_web != '' }}
|
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && steps.set-final-version-output.outputs.version_web != '' && inputs.enable_slack_notification == true }}
|
||||||
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
uses: bitwarden/gh-actions/report-upcoming-release-version@main
|
||||||
with:
|
with:
|
||||||
version: ${{ steps.set-final-version-output.outputs.version_web }}
|
version: ${{ steps.set-final-version-output.outputs.version_web }}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
"papaparse": "5.4.1",
|
"papaparse": "5.4.1",
|
||||||
"proper-lockfile": "4.1.2",
|
"proper-lockfile": "4.1.2",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.1",
|
||||||
"tldts": "6.1.20",
|
"tldts": "6.1.22",
|
||||||
"zxcvbn": "4.4.2"
|
"zxcvbn": "4.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
18
package-lock.json
generated
18
package-lock.json
generated
@@ -67,7 +67,7 @@
|
|||||||
"qrious": "4.0.2",
|
"qrious": "4.0.2",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.1",
|
||||||
"tabbable": "6.2.0",
|
"tabbable": "6.2.0",
|
||||||
"tldts": "6.1.20",
|
"tldts": "6.1.22",
|
||||||
"utf-8-validate": "6.0.3",
|
"utf-8-validate": "6.0.3",
|
||||||
"zone.js": "0.13.3",
|
"zone.js": "0.13.3",
|
||||||
"zxcvbn": "4.4.2"
|
"zxcvbn": "4.4.2"
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
"papaparse": "5.4.1",
|
"papaparse": "5.4.1",
|
||||||
"proper-lockfile": "4.1.2",
|
"proper-lockfile": "4.1.2",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.1",
|
||||||
"tldts": "6.1.20",
|
"tldts": "6.1.22",
|
||||||
"zxcvbn": "4.4.2"
|
"zxcvbn": "4.4.2"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -36035,20 +36035,20 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/tldts": {
|
"node_modules/tldts": {
|
||||||
"version": "6.1.20",
|
"version": "6.1.22",
|
||||||
"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.20.tgz",
|
"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.22.tgz",
|
||||||
"integrity": "sha512-ryfUREMx1yw2AsSMwzflHqe14DaoAoekQLjxV7gk6Uh97ng2MZdDwoxV+jTX3MpNfpwXbJuW7hriCa6/21DFNA==",
|
"integrity": "sha512-WwWAPp+zJn8oJkpjqJcSuuj5foL9cI8SiTjH+gGS1bw5N163YywM0Cmd9OijwtKjdGG7OC6NEYZVl4EG8HfSMg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tldts-core": "^6.1.20"
|
"tldts-core": "^6.1.22"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"tldts": "bin/cli.js"
|
"tldts": "bin/cli.js"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tldts-core": {
|
"node_modules/tldts-core": {
|
||||||
"version": "6.1.20",
|
"version": "6.1.22",
|
||||||
"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.20.tgz",
|
"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.22.tgz",
|
||||||
"integrity": "sha512-VTEzsx7kVbLDgWaACW0atZ7Q0KzbJveYvR6IxvirIhV4Z4GGGqLVCCj9PvF0KW3h0PbJcw0JJnpr0YueHg0ueA=="
|
"integrity": "sha512-TMCyBC7HpvDpBRQCLsODmsclNXGhZLSj76gIlx7QcwvKElMdIzhGN5iYcuTI7yAWJm8zTpsVehWCeOGytDY9fg=="
|
||||||
},
|
},
|
||||||
"node_modules/tmp": {
|
"node_modules/tmp": {
|
||||||
"version": "0.0.33",
|
"version": "0.0.33",
|
||||||
|
|||||||
@@ -200,7 +200,7 @@
|
|||||||
"qrious": "4.0.2",
|
"qrious": "4.0.2",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.1",
|
||||||
"tabbable": "6.2.0",
|
"tabbable": "6.2.0",
|
||||||
"tldts": "6.1.20",
|
"tldts": "6.1.22",
|
||||||
"utf-8-validate": "6.0.3",
|
"utf-8-validate": "6.0.3",
|
||||||
"zone.js": "0.13.3",
|
"zone.js": "0.13.3",
|
||||||
"zxcvbn": "4.4.2"
|
"zxcvbn": "4.4.2"
|
||||||
|
|||||||
Reference in New Issue
Block a user