From 25c5bb147d4fe8f3ababde426eb30edf49b88270 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 08:23:21 -0600 Subject: [PATCH 1/7] [deps] Autofill: Update prettier-plugin-tailwindcss to v0.5.9 (#7175) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 13 +++++-------- package.json | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51a26850301..b4d055709cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -158,7 +158,7 @@ "postcss": "8.4.31", "postcss-loader": "7.3.3", "prettier": "3.1.1", - "prettier-plugin-tailwindcss": "0.5.7", + "prettier-plugin-tailwindcss": "0.5.9", "process": "0.11.10", "react": "18.2.0", "react-dom": "18.2.0", @@ -33537,9 +33537,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.7.tgz", - "integrity": "sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz", + "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==", "dev": true, "engines": { "node": ">=14.21.3" @@ -33548,13 +33548,13 @@ "@ianvs/prettier-plugin-sort-imports": "*", "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", - "@shufo/prettier-plugin-blade": "*", "@trivago/prettier-plugin-sort-imports": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", @@ -33570,9 +33570,6 @@ "@shopify/prettier-plugin-liquid": { "optional": true }, - "@shufo/prettier-plugin-blade": { - "optional": true - }, "@trivago/prettier-plugin-sort-imports": { "optional": true }, diff --git a/package.json b/package.json index 8cbedf05c80..dcd94a4bf84 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "postcss": "8.4.31", "postcss-loader": "7.3.3", "prettier": "3.1.1", - "prettier-plugin-tailwindcss": "0.5.7", + "prettier-plugin-tailwindcss": "0.5.9", "process": "0.11.10", "react": "18.2.0", "react-dom": "18.2.0", From 02ba26e53c04f51e2bf6ed17519f20b28d8fa1ec Mon Sep 17 00:00:00 2001 From: Will Martin Date: Tue, 12 Dec 2023 09:43:47 -0500 Subject: [PATCH 2/7] [AC-1786] deprecate manager role (#6931) * add deprecation message * hide manager option * deprecate manager enum --- .../components/member-dialog/member-dialog.component.html | 5 ++++- .../src/admin-console/enums/organization-user-type.enum.ts | 4 ++++ libs/common/src/admin-console/models/domain/organization.ts | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html index c33781f8411..65d9b766ddd 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html @@ -60,7 +60,10 @@ -
+
Date: Tue, 12 Dec 2023 15:48:44 +0100 Subject: [PATCH 3/7] Renovate: Add devops prefix & remove cargo minor (#7093) --- .github/renovate.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index ae86a4c5c05..220c97f79d2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,26 +6,29 @@ ":dependencyDashboard", ":maintainLockFilesWeekly", ":pinAllExceptPeerDependencies", + ":prConcurrentLimit10", ":rebaseStalePrs", ":separateMajorReleases", "group:monorepos", "schedule:weekends" ], - "prConcurrentLimit": 3, "enabledManagers": ["cargo", "github-actions", "npm"], "commitMessagePrefix": "[deps]:", "commitMessageTopic": "{{depName}}", "packageRules": [ - { - "groupName": "cargo minor", - "matchManagers": ["cargo"], - "matchUpdateTypes": ["minor", "patch"] - }, { "groupName": "gh minor", "matchManagers": ["github-actions"], "matchUpdateTypes": ["minor", "patch"] }, + { + "matchManagers": ["github-actions"], + "commitMessagePrefix": "[deps] DevOps:" + }, + { + "matchManagers": ["cargo"], + "commitMessagePrefix": "[deps] Platform:" + }, { "matchPackageNames": ["typescript", "zone.js"], "matchUpdateTypes": ["major", "minor"], @@ -210,17 +213,17 @@ "matchPackageNames": [ "@electron/notarize", "@electron/rebuild", - "@microsoft/signalr", "@microsoft/signalr-protocol-msgpack", + "@microsoft/signalr", "@types/jsdom", "@types/papaparse", "@types/zxcvbn", - "electron", "electron-builder", "electron-log", "electron-reload", "electron-store", "electron-updater", + "electron", "jsdom", "jszip", "oidc-client-ts", From 007f21fc7f9c23677aefc94f44cd174520d26f55 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:22:02 -0500 Subject: [PATCH 4/7] Update Version Bump workflow (#7180) --- .github/workflows/version-bump.yml | 132 +++++++++++++++++------------ 1 file changed, 78 insertions(+), 54 deletions(-) diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 65e9688c346..5180faaa84c 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -1,51 +1,60 @@ --- name: Version Bump -run-name: Version Bump - ${{ github.ref_name }} +run-name: Version Bump - v${{ inputs.version_number }} on: workflow_dispatch: inputs: bump_browser: - description: "Browser Project Version Bump" + description: "Bump Browser?" type: boolean default: false bump_cli: - description: "CLI Project Version Bump" + description: "Bump CLI?" type: boolean default: false bump_desktop: - description: "Desktop Project Version Bump" + description: "Bump Desktop?" type: boolean default: false bump_web: - description: "Web Project Version Bump" + description: "Bump Web?" type: boolean default: false version_number: - description: "New Version" + description: "New version (example: '2024.1.0')" required: true workflow_call: inputs: - version_number: - required: true - type: string - bump_desktop: - description: "Desktop Project Version Bump" + bump_browser: + description: "Bump Browser?" type: boolean default: false - -defaults: - run: - shell: bash + bump_cli: + description: "Bump CLI?" + type: boolean + 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: bump_version: - name: "Bump Version" + name: "Bump Version to v${{ inputs.version_number }}" runs-on: ubuntu-22.04 steps: - name: Checkout Branch - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Login to Azure - Prod Subscription uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 @@ -57,10 +66,12 @@ jobs: uses: bitwarden/gh-actions/get-keyvault-secrets@main with: 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: Import GPG key - uses: crazy-max/ghaction-import-gpg@72b6676b71ab476b77e676928516f6982eef7a41 # v5.3.0 + uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0 with: gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }} passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }} @@ -68,9 +79,7 @@ jobs: git_commit_gpgsign: true - name: Create Version Branch - id: branch - env: - VERSION: ${{ inputs.version_number }} + id: create-branch run: | CLIENTS=() if [[ ${{ inputs.bump_browser }} == true ]]; then @@ -88,9 +97,9 @@ jobs: printf -v joined '%s,' "${CLIENTS[@]}" echo "client=${joined%,}" >> $GITHUB_OUTPUT - BRANCH=version_bump_${VERSION}_${GITHUB_SHA:0:7} - echo "branch=$BRANCH" >> $GITHUB_OUTPUT - git switch -c ${BRANCH} + NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }} + git switch -c $NAME + echo "name=$NAME" >> $GITHUB_OUTPUT ######################## # VERSION BUMP SECTION # @@ -114,14 +123,15 @@ jobs: printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V if [ $? -eq 0 ]; then echo "Version check successful." + else + echo "Version check failed." + exit 1 fi working-directory: apps/browser - name: Bump Browser Version if: ${{ inputs.bump_browser == true }} - env: - VERSION: ${{ inputs.version_number }} - run: npm version --workspace=@bitwarden/browser ${VERSION} + run: npm version --workspace=@bitwarden/browser ${{ inputs.version_number }} - name: Bump Browser Version - Manifest if: ${{ inputs.bump_browser == true }} @@ -162,14 +172,15 @@ jobs: printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V if [ $? -eq 0 ]; then echo "Version check successful." + else + echo "Version check failed." + exit 1 fi working-directory: apps/cli - name: Bump CLI Version if: ${{ inputs.bump_cli == true }} - env: - VERSION: ${{ inputs.version_number }} - run: npm version --workspace=@bitwarden/cli ${VERSION} + run: npm version --workspace=@bitwarden/cli ${{ inputs.version_number }} ### Desktop - name: Desktop - Verify input version @@ -189,20 +200,19 @@ jobs: printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V if [ $? -eq 0 ]; then echo "Version check successful." + else + echo "Version check failed." + exit 1 fi working-directory: apps/desktop - name: Bump Desktop Version - Root if: ${{ inputs.bump_desktop == true }} - env: - VERSION: ${{ inputs.version_number }} - run: npm version --workspace=@bitwarden/desktop ${VERSION} + run: npm version --workspace=@bitwarden/desktop ${{ inputs.version_number }} - name: Bump Desktop Version - App if: ${{ inputs.bump_desktop == true }} - env: - VERSION: ${{ inputs.version_number }} - run: npm version ${VERSION} + run: npm version ${{ inputs.version_number }} working-directory: "apps/desktop/src" ### Web @@ -223,14 +233,15 @@ jobs: printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V if [ $? -eq 0 ]; then echo "Version check successful." + else + echo "Version check failed." + exit 1 fi working-directory: apps/web - name: Bump Web Version if: ${{ inputs.bump_web == true }} - env: - VERSION: ${{ inputs.version_number }} - run: npm version --workspace=@bitwarden/web-vault ${VERSION} + run: npm version --workspace=@bitwarden/web-vault ${{ inputs.version_number }} ######################## @@ -252,27 +263,27 @@ jobs: - name: Commit files if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} env: - CLIENT: ${{ steps.branch.outputs.client }} + CLIENT: ${{ steps.create-branch.outputs.client }} VERSION: ${{ inputs.version_number }} run: git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a - 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: - BRANCH: ${{ steps.branch.outputs.branch }} - run: git push -u origin ${BRANCH} + PR_BRANCH: ${{ steps.create-branch.outputs.name }} + run: git push -u origin $PR_BRANCH - - name: Create Bump Version PR - if: ${{ (github.ref == 'refs/heads/master') && (steps.version-changed.outputs.changes_to_commit == 'TRUE') }} + - name: Create Version PR + if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} + id: create-pr env: - BASE_BRANCH: master - BRANCH: ${{ steps.branch.outputs.branch }} - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - TITLE: "Bump ${{ steps.branch.outputs.client }} version to ${{ inputs.version_number }}" + PR_BRANCH: ${{ steps.create-branch.outputs.name }} + GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} + TITLE: "Bump ${{ steps.create-branch.outputs.client }} version to ${{ inputs.version_number }}" run: | - gh pr create --title "$TITLE" \ - --base "$BASE_BRANCH" \ - --head "$BRANCH" \ + PR_URL=$(gh pr create --title "$TITLE" \ + --base "$GITHUB_REF" \ + --head "$PR_BRANCH" \ --label "version update" \ --label "automated pr" \ --body " @@ -284,4 +295,17 @@ jobs: - [X] Other ## 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 From 740b5f7a4272e99675fbc65ae2bb603b16499751 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:01:38 -0500 Subject: [PATCH 5/7] [deps] SM: Update typescript-eslint monorepo to v6.14.0 (#7183) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 122 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4d055709cc..ce82ae54db9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,8 +112,8 @@ "@types/react": "16.14.45", "@types/retry": "0.12.2", "@types/zxcvbn": "4.4.4", - "@typescript-eslint/eslint-plugin": "6.13.2", - "@typescript-eslint/parser": "6.13.2", + "@typescript-eslint/eslint-plugin": "6.14.0", + "@typescript-eslint/parser": "6.14.0", "@webcomponents/custom-elements": "1.6.0", "autoprefixer": "10.4.16", "base64-loader": "1.0.0", @@ -14564,16 +14564,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", - "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.14.0.tgz", + "integrity": "sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/type-utils": "6.13.2", - "@typescript-eslint/utils": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/type-utils": "6.14.0", + "@typescript-eslint/utils": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -14599,13 +14599,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", - "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz", + "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -14616,13 +14616,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", - "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.14.0.tgz", + "integrity": "sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/utils": "6.14.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -14643,9 +14643,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", - "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz", + "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -14656,13 +14656,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", - "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz", + "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -14683,17 +14683,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", - "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.14.0.tgz", + "integrity": "sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", "semver": "^7.5.4" }, "engines": { @@ -14708,12 +14708,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", - "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz", + "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -14792,15 +14792,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", - "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz", + "integrity": "sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4" }, "engines": { @@ -14820,13 +14820,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", - "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz", + "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -14837,9 +14837,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", - "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz", + "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -14850,13 +14850,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", - "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz", + "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -14877,12 +14877,12 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", - "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz", + "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { diff --git a/package.json b/package.json index dcd94a4bf84..42a7c06f2d0 100644 --- a/package.json +++ b/package.json @@ -75,8 +75,8 @@ "@types/react": "16.14.45", "@types/retry": "0.12.2", "@types/zxcvbn": "4.4.4", - "@typescript-eslint/eslint-plugin": "6.13.2", - "@typescript-eslint/parser": "6.13.2", + "@typescript-eslint/eslint-plugin": "6.14.0", + "@typescript-eslint/parser": "6.14.0", "@webcomponents/custom-elements": "1.6.0", "autoprefixer": "10.4.16", "base64-loader": "1.0.0", From 6bb03a7b0ed23c46ebad91adf7ec0c932fea28e2 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:53:57 -0500 Subject: [PATCH 6/7] Fix version bump workflow on call (#7193) --- .github/workflows/version-bump.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 5180faaa84c..c3d48299a7e 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -55,6 +55,9 @@ jobs: steps: - name: Checkout Branch uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + with: + repository: bitwarden/clients + ref: master - name: Login to Azure - Prod Subscription uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 @@ -282,7 +285,7 @@ jobs: TITLE: "Bump ${{ steps.create-branch.outputs.client }} version to ${{ inputs.version_number }}" run: | PR_URL=$(gh pr create --title "$TITLE" \ - --base "$GITHUB_REF" \ + --base "master" \ --head "$PR_BRANCH" \ --label "version update" \ --label "automated pr" \ From 3e174fec81c308435324a0b23cce712e844e6746 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 12 Dec 2023 12:37:32 -0500 Subject: [PATCH 7/7] Update version bump workflow token (#7195) --- .github/workflows/version-bump.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index c3d48299a7e..9a78f995e83 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -53,12 +53,6 @@ jobs: name: "Bump Version to v${{ inputs.version_number }}" runs-on: ubuntu-22.04 steps: - - name: Checkout Branch - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - with: - repository: bitwarden/clients - ref: master - - name: Login to Azure - Prod Subscription uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 with: @@ -73,6 +67,13 @@ jobs: 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 uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0 with: @@ -280,8 +281,8 @@ jobs: if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} id: create-pr env: - PR_BRANCH: ${{ steps.create-branch.outputs.name }} GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} + PR_BRANCH: ${{ steps.create-branch.outputs.name }} TITLE: "Bump ${{ steps.create-branch.outputs.client }} version to ${{ inputs.version_number }}" run: | PR_URL=$(gh pr create --title "$TITLE" \