bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into task/DEVOPS-1683

Browse Source
This commit is contained in:
Alex Urbina
2023-12-12 12:43:47 -06:00
committed by GitHub
parent 732f3e87bc 3e174fec81
commit 39c8474467
7 changed files with 175 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/renovate.json vendored
View File

@@ -6,26 +6,29 @@
":dependencyDashboard", ":dependencyDashboard",
":maintainLockFilesWeekly", ":maintainLockFilesWeekly",
":pinAllExceptPeerDependencies", ":pinAllExceptPeerDependencies",
":prConcurrentLimit10",
":rebaseStalePrs", ":rebaseStalePrs",
":separateMajorReleases", ":separateMajorReleases",
"group:monorepos", "group:monorepos",
"schedule:weekends" "schedule:weekends"
], ],
"prConcurrentLimit": 3,
"enabledManagers": ["cargo", "github-actions", "npm"], "enabledManagers": ["cargo", "github-actions", "npm"],
"commitMessagePrefix": "[deps]:", "commitMessagePrefix": "[deps]:",
"commitMessageTopic": "{{depName}}", "commitMessageTopic": "{{depName}}",
"packageRules": [ "packageRules": [
{
"groupName": "cargo minor",
"matchManagers": ["cargo"],
"matchUpdateTypes": ["minor", "patch"]
},
{ {
"groupName": "gh minor", "groupName": "gh minor",
"matchManagers": ["github-actions"], "matchManagers": ["github-actions"],
"matchUpdateTypes": ["minor", "patch"] "matchUpdateTypes": ["minor", "patch"]
}, },
{
"matchManagers": ["github-actions"],
"commitMessagePrefix": "[deps] DevOps:"
},
{
"matchManagers": ["cargo"],
"commitMessagePrefix": "[deps] Platform:"
},
{ {
"matchPackageNames": ["typescript", "zone.js"], "matchPackageNames": ["typescript", "zone.js"],
"matchUpdateTypes": ["major", "minor"], "matchUpdateTypes": ["major", "minor"],
@@ -210,17 +213,17 @@
"matchPackageNames": [ "matchPackageNames": [
"@electron/notarize", "@electron/notarize",
"@electron/rebuild", "@electron/rebuild",
"@microsoft/signalr",
"@microsoft/signalr-protocol-msgpack", "@microsoft/signalr-protocol-msgpack",
"@microsoft/signalr",
"@types/jsdom", "@types/jsdom",
"@types/papaparse", "@types/papaparse",
"@types/zxcvbn", "@types/zxcvbn",
"electron",
"electron-builder", "electron-builder",
"electron-log", "electron-log",
"electron-reload", "electron-reload",
"electron-store", "electron-store",
"electron-updater", "electron-updater",
"electron",
"jsdom", "jsdom",
"jszip", "jszip",
"oidc-client-ts", "oidc-client-ts",

140
.github/workflows/version-bump.yml vendored
View File

@@ -1,52 +1,58 @@
--- ---
name: Version Bump name: Version Bump
run-name: Version Bump - ${{ github.ref_name }} run-name: Version Bump - v${{ inputs.version_number }}
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
bump_browser: bump_browser:
description: "Browser Project Version Bump" description: "Bump Browser?"
type: boolean type: boolean
default: false default: false
bump_cli: bump_cli:
description: "CLI Project Version Bump" description: "Bump CLI?"
type: boolean type: boolean
default: false default: false
bump_desktop: bump_desktop:
description: "Desktop Project Version Bump" description: "Bump Desktop?"
type: boolean type: boolean
default: false default: false
bump_web: bump_web:
description: "Web Project Version Bump" description: "Bump Web?"
type: boolean type: boolean
default: false default: false
version_number: version_number:
description: "New Version" description: "New version (example: '2024.1.0')"
required: true required: true
workflow_call: workflow_call:
inputs: inputs:
version_number: bump_browser:
required: true description: "Bump Browser?"
type: string
bump_desktop:
description: "Desktop Project Version Bump"
type: boolean type: boolean
default: false default: false
bump_cli:
defaults: description: "Bump CLI?"
run: type: boolean
shell: bash default: false
bump_desktop:
description: "Bump Desktop?"
type: boolean
default: false
bump_web:
description: "Bump Web?"
type: boolean
default: false
version_number:
description: "New version (example: '2024.1.0')"
required: true
type: string
jobs: jobs:
bump_version: bump_version:
name: "Bump Version" name: "Bump Version to v${{ inputs.version_number }}"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout Branch
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- name: Login to Azure - Prod Subscription - name: Login to Azure - Prod Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
with: with:
@@ -57,10 +63,19 @@ jobs:
uses: bitwarden/gh-actions/get-keyvault-secrets@main uses: bitwarden/gh-actions/get-keyvault-secrets@main
with: with:
keyvault: "bitwarden-ci" keyvault: "bitwarden-ci"
secrets: "github-gpg-private-key, github-gpg-private-key-passphrase" secrets: "github-gpg-private-key,
github-gpg-private-key-passphrase,
github-pat-bitwarden-devops-bot-repo-scope"
- name: Checkout Branch
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
repository: bitwarden/clients
ref: master
token: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
- name: Import GPG key - name: Import GPG key
uses: crazy-max/ghaction-import-gpg@72b6676b71ab476b77e676928516f6982eef7a41 # v5.3.0 uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0
with: with:
gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }} gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }} passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -68,9 +83,7 @@ jobs:
git_commit_gpgsign: true git_commit_gpgsign: true
- name: Create Version Branch - name: Create Version Branch
id: branch id: create-branch
env:
VERSION: ${{ inputs.version_number }}
run: | run: |
CLIENTS=() CLIENTS=()
if [[ ${{ inputs.bump_browser }} == true ]]; then if [[ ${{ inputs.bump_browser }} == true ]]; then
@@ -88,9 +101,9 @@ jobs:
printf -v joined '%s,' "${CLIENTS[@]}" printf -v joined '%s,' "${CLIENTS[@]}"
echo "client=${joined%,}" >> $GITHUB_OUTPUT echo "client=${joined%,}" >> $GITHUB_OUTPUT
BRANCH=version_bump_${VERSION}_${GITHUB_SHA:0:7} NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }}
echo "branch=$BRANCH" >> $GITHUB_OUTPUT git switch -c $NAME
git switch -c ${BRANCH} echo "name=$NAME" >> $GITHUB_OUTPUT
######################## ########################
# VERSION BUMP SECTION # # VERSION BUMP SECTION #
@@ -114,14 +127,15 @@ jobs:
printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Version check successful." echo "Version check successful."
else
echo "Version check failed."
exit 1
fi fi
working-directory: apps/browser working-directory: apps/browser
- name: Bump Browser Version - name: Bump Browser Version
if: ${{ inputs.bump_browser == true }} if: ${{ inputs.bump_browser == true }}
env: run: npm version --workspace=@bitwarden/browser ${{ inputs.version_number }}
VERSION: ${{ inputs.version_number }}
run: npm version --workspace=@bitwarden/browser ${VERSION}
- name: Bump Browser Version - Manifest - name: Bump Browser Version - Manifest
if: ${{ inputs.bump_browser == true }} if: ${{ inputs.bump_browser == true }}
@@ -162,14 +176,15 @@ jobs:
printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Version check successful." echo "Version check successful."
else
echo "Version check failed."
exit 1
fi fi
working-directory: apps/cli working-directory: apps/cli
- name: Bump CLI Version - name: Bump CLI Version
if: ${{ inputs.bump_cli == true }} if: ${{ inputs.bump_cli == true }}
env: run: npm version --workspace=@bitwarden/cli ${{ inputs.version_number }}
VERSION: ${{ inputs.version_number }}
run: npm version --workspace=@bitwarden/cli ${VERSION}
### Desktop ### Desktop
- name: Desktop - Verify input version - name: Desktop - Verify input version
@@ -189,20 +204,19 @@ jobs:
printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Version check successful." echo "Version check successful."
else
echo "Version check failed."
exit 1
fi fi
working-directory: apps/desktop working-directory: apps/desktop
- name: Bump Desktop Version - Root - name: Bump Desktop Version - Root
if: ${{ inputs.bump_desktop == true }} if: ${{ inputs.bump_desktop == true }}
env: run: npm version --workspace=@bitwarden/desktop ${{ inputs.version_number }}
VERSION: ${{ inputs.version_number }}
run: npm version --workspace=@bitwarden/desktop ${VERSION}
- name: Bump Desktop Version - App - name: Bump Desktop Version - App
if: ${{ inputs.bump_desktop == true }} if: ${{ inputs.bump_desktop == true }}
env: run: npm version ${{ inputs.version_number }}
VERSION: ${{ inputs.version_number }}
run: npm version ${VERSION}
working-directory: "apps/desktop/src" working-directory: "apps/desktop/src"
### Web ### Web
@@ -223,14 +237,15 @@ jobs:
printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Version check successful." echo "Version check successful."
else
echo "Version check failed."
exit 1
fi fi
working-directory: apps/web working-directory: apps/web
- name: Bump Web Version - name: Bump Web Version
if: ${{ inputs.bump_web == true }} if: ${{ inputs.bump_web == true }}
env: run: npm version --workspace=@bitwarden/web-vault ${{ inputs.version_number }}
VERSION: ${{ inputs.version_number }}
run: npm version --workspace=@bitwarden/web-vault ${VERSION}
######################## ########################
@@ -252,27 +267,27 @@ jobs:
- name: Commit files - name: Commit files
if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
env: env:
CLIENT: ${{ steps.branch.outputs.client }} CLIENT: ${{ steps.create-branch.outputs.client }}
VERSION: ${{ inputs.version_number }} VERSION: ${{ inputs.version_number }}
run: git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a run: git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a
- name: Push changes - name: Push changes
if: ${{ (github.ref == 'refs/heads/master') && (steps.version-changed.outputs.changes_to_commit == 'TRUE') }} if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
env: env:
BRANCH: ${{ steps.branch.outputs.branch }} PR_BRANCH: ${{ steps.create-branch.outputs.name }}
run: git push -u origin ${BRANCH} run: git push -u origin $PR_BRANCH
- name: Create Bump Version PR - name: Create Version PR
if: ${{ (github.ref == 'refs/heads/master') && (steps.version-changed.outputs.changes_to_commit == 'TRUE') }} if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
id: create-pr
env: env:
BASE_BRANCH: master GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
BRANCH: ${{ steps.branch.outputs.branch }} PR_BRANCH: ${{ steps.create-branch.outputs.name }}
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" TITLE: "Bump ${{ steps.create-branch.outputs.client }} version to ${{ inputs.version_number }}"
TITLE: "Bump ${{ steps.branch.outputs.client }} version to ${{ inputs.version_number }}"
run: | run: |
gh pr create --title "$TITLE" \ PR_URL=$(gh pr create --title "$TITLE" \
--base "$BASE_BRANCH" \ --base "master" \
--head "$BRANCH" \ --head "$PR_BRANCH" \
--label "version update" \ --label "version update" \
--label "automated pr" \ --label "automated pr" \
--body " --body "
@@ -284,4 +299,17 @@ jobs:
- [X] Other - [X] Other
## Objective ## Objective
Automated ${{ steps.branch.outputs.client }} version bump to ${{ inputs.version_number }}" Automated ${{ steps.create-branch.outputs.client }} version bump to ${{ inputs.version_number }}")
echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
- name: Approve PR
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
run: gh pr review $PR_NUMBER --approve
- name: Merge PR
env:
GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
run: gh pr merge $PR_NUMBER --squash --auto --delete-branch

5
apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
View File

@@ -60,7 +60,10 @@
</div> </div>
</label> </label>
</div> </div>
<div class="tw-mb-2 tw-flex tw-items-baseline"> <div
*ngIf="!(flexibleCollectionsEnabled$ | async)"
class="tw-mb-2 tw-flex tw-items-baseline"
>
<input <input
type="radio" type="radio"
id="userTypeManager" id="userTypeManager"

4
libs/common/src/admin-console/enums/organization-user-type.enum.ts
View File

@@ -2,6 +2,10 @@ export enum OrganizationUserType {
Owner = 0, Owner = 0,
Admin = 1, Admin = 1,
User = 2, User = 2,
/**
* @deprecated
* This is deprecated with the introduction of Flexible Collections.
*/
Manager = 3, Manager = 3,
Custom = 4, Custom = 4,
} }

3
libs/common/src/admin-console/models/domain/organization.ts
View File

@@ -131,6 +131,9 @@ export class Organization {
/** /**
* Whether a user has Manager permissions or greater * Whether a user has Manager permissions or greater
*
* @deprecated
* This is deprecated with the introduction of Flexible Collections.
*/ */
get isManager() { get isManager() {
return this.type === OrganizationUserType.Manager || this.isAdmin; return this.type === OrganizationUserType.Manager || this.isAdmin;

135
package-lock.json generated
View File

@@ -112,8 +112,8 @@
"@types/react": "16.14.45", "@types/react": "16.14.45",
"@types/retry": "0.12.2", "@types/retry": "0.12.2",
"@types/zxcvbn": "4.4.4", "@types/zxcvbn": "4.4.4",
"@typescript-eslint/eslint-plugin": "6.13.2", "@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.13.2", "@typescript-eslint/parser": "6.14.0",
"@webcomponents/custom-elements": "1.6.0", "@webcomponents/custom-elements": "1.6.0",
"autoprefixer": "10.4.16", "autoprefixer": "10.4.16",
"base64-loader": "1.0.0", "base64-loader": "1.0.0",
@@ -158,7 +158,7 @@
"postcss": "8.4.31", "postcss": "8.4.31",
"postcss-loader": "7.3.3", "postcss-loader": "7.3.3",
"prettier": "3.1.1", "prettier": "3.1.1",
"prettier-plugin-tailwindcss": "0.5.7", "prettier-plugin-tailwindcss": "0.5.9",
"process": "0.11.10", "process": "0.11.10",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
@@ -14564,16 +14564,16 @@
"dev": true "dev": true
}, },
"node_modules/@typescript-eslint/eslint-plugin": { "node_modules/@typescript-eslint/eslint-plugin": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.14.0.tgz",
"integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", "integrity": "sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/regexpp": "^4.5.1", "@eslint-community/regexpp": "^4.5.1",
"@typescript-eslint/scope-manager": "6.13.2", "@typescript-eslint/scope-manager": "6.14.0",
"@typescript-eslint/type-utils": "6.13.2", "@typescript-eslint/type-utils": "6.14.0",
"@typescript-eslint/utils": "6.13.2", "@typescript-eslint/utils": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2", "@typescript-eslint/visitor-keys": "6.14.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"graphemer": "^1.4.0", "graphemer": "^1.4.0",
"ignore": "^5.2.4", "ignore": "^5.2.4",
@@ -14599,13 +14599,13 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz",
"integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2" "@typescript-eslint/visitor-keys": "6.14.0"
}, },
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@@ -14616,13 +14616,13 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.14.0.tgz",
"integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", "integrity": "sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/typescript-estree": "6.13.2", "@typescript-eslint/typescript-estree": "6.14.0",
"@typescript-eslint/utils": "6.13.2", "@typescript-eslint/utils": "6.14.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"ts-api-utils": "^1.0.1" "ts-api-utils": "^1.0.1"
}, },
@@ -14643,9 +14643,9 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz",
"integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@@ -14656,13 +14656,13 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz",
"integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2", "@typescript-eslint/visitor-keys": "6.14.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@@ -14683,17 +14683,17 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.14.0.tgz",
"integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", "integrity": "sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.4.0", "@eslint-community/eslint-utils": "^4.4.0",
"@types/json-schema": "^7.0.12", "@types/json-schema": "^7.0.12",
"@types/semver": "^7.5.0", "@types/semver": "^7.5.0",
"@typescript-eslint/scope-manager": "6.13.2", "@typescript-eslint/scope-manager": "6.14.0",
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/typescript-estree": "6.13.2", "@typescript-eslint/typescript-estree": "6.14.0",
"semver": "^7.5.4" "semver": "^7.5.4"
}, },
"engines": { "engines": {
@@ -14708,12 +14708,12 @@
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz",
"integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"eslint-visitor-keys": "^3.4.1" "eslint-visitor-keys": "^3.4.1"
}, },
"engines": { "engines": {
@@ -14792,15 +14792,15 @@
} }
}, },
"node_modules/@typescript-eslint/parser": { "node_modules/@typescript-eslint/parser": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz",
"integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", "integrity": "sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "6.13.2", "@typescript-eslint/scope-manager": "6.14.0",
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/typescript-estree": "6.13.2", "@typescript-eslint/typescript-estree": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2", "@typescript-eslint/visitor-keys": "6.14.0",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@@ -14820,13 +14820,13 @@
} }
}, },
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz",
"integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2" "@typescript-eslint/visitor-keys": "6.14.0"
}, },
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@@ -14837,9 +14837,9 @@
} }
}, },
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz",
"integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@@ -14850,13 +14850,13 @@
} }
}, },
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz",
"integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"@typescript-eslint/visitor-keys": "6.13.2", "@typescript-eslint/visitor-keys": "6.14.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@@ -14877,12 +14877,12 @@
} }
}, },
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
"version": "6.13.2", "version": "6.14.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz",
"integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.13.2", "@typescript-eslint/types": "6.14.0",
"eslint-visitor-keys": "^3.4.1" "eslint-visitor-keys": "^3.4.1"
}, },
"engines": { "engines": {
@@ -33537,9 +33537,9 @@
} }
}, },
"node_modules/prettier-plugin-tailwindcss": { "node_modules/prettier-plugin-tailwindcss": {
"version": "0.5.7", "version": "0.5.9",
"resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.7.tgz", "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz",
"integrity": "sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==", "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=14.21.3" "node": ">=14.21.3"
@@ -33548,13 +33548,13 @@
"@ianvs/prettier-plugin-sort-imports": "*", "@ianvs/prettier-plugin-sort-imports": "*",
"@prettier/plugin-pug": "*", "@prettier/plugin-pug": "*",
"@shopify/prettier-plugin-liquid": "*", "@shopify/prettier-plugin-liquid": "*",
"@shufo/prettier-plugin-blade": "*",
"@trivago/prettier-plugin-sort-imports": "*", "@trivago/prettier-plugin-sort-imports": "*",
"prettier": "^3.0", "prettier": "^3.0",
"prettier-plugin-astro": "*", "prettier-plugin-astro": "*",
"prettier-plugin-css-order": "*", "prettier-plugin-css-order": "*",
"prettier-plugin-import-sort": "*", "prettier-plugin-import-sort": "*",
"prettier-plugin-jsdoc": "*", "prettier-plugin-jsdoc": "*",
"prettier-plugin-marko": "*",
"prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-attributes": "*",
"prettier-plugin-organize-imports": "*", "prettier-plugin-organize-imports": "*",
"prettier-plugin-style-order": "*", "prettier-plugin-style-order": "*",
@@ -33570,9 +33570,6 @@
"@shopify/prettier-plugin-liquid": { "@shopify/prettier-plugin-liquid": {
"optional": true "optional": true
}, },
"@shufo/prettier-plugin-blade": {
"optional": true
},
"@trivago/prettier-plugin-sort-imports": { "@trivago/prettier-plugin-sort-imports": {
"optional": true "optional": true
}, },

6
package.json
View File

@@ -75,8 +75,8 @@
"@types/react": "16.14.45", "@types/react": "16.14.45",
"@types/retry": "0.12.2", "@types/retry": "0.12.2",
"@types/zxcvbn": "4.4.4", "@types/zxcvbn": "4.4.4",
"@typescript-eslint/eslint-plugin": "6.13.2", "@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.13.2", "@typescript-eslint/parser": "6.14.0",
"@webcomponents/custom-elements": "1.6.0", "@webcomponents/custom-elements": "1.6.0",
"autoprefixer": "10.4.16", "autoprefixer": "10.4.16",
"base64-loader": "1.0.0", "base64-loader": "1.0.0",
@@ -121,7 +121,7 @@
"postcss": "8.4.31", "postcss": "8.4.31",
"postcss-loader": "7.3.3", "postcss-loader": "7.3.3",
"prettier": "3.1.1", "prettier": "3.1.1",
"prettier-plugin-tailwindcss": "0.5.7", "prettier-plugin-tailwindcss": "0.5.9",
"process": "0.11.10", "process": "0.11.10",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",