From cd1f0524f469afe1af7b3ea314f9212cc282a8e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:59:59 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump prettier and prettier-plugin-go-template Bumps [prettier](https://github.com/prettier/prettier) and [prettier-plugin-go-template](https://github.com/NiklasPor/prettier-plugin-go-template). These dependencies needed to be updated together. Updates `prettier` from 2.8.8 to 3.0.3 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.3) Updates `prettier-plugin-go-template` from 0.0.13 to 0.0.15 - [Changelog](https://github.com/NiklasPor/prettier-plugin-go-template/blob/master/CHANGELOG.md) - [Commits](https://github.com/NiklasPor/prettier-plugin-go-template/commits) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major - dependency-name: prettier-plugin-go-template dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 005d52edd..f04b527bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1182,15 +1182,15 @@ } }, "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.13.tgz", - "integrity": "sha512-gG/xT5kd+kCzoMaTchXvdfBdsunyRCV6G8cgdPGPd2V5JGGKXUG7SjzBKU7jaGh2RTeblcAdBb/E+S/duOAMsA==", + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.15.tgz", + "integrity": "sha512-WqU92E1NokWYNZ9mLE6ijoRg6LtIGdLMePt2C7UBDjXeDH9okcRI3zRqtnWR4s5AloiqyvZ66jNBAa9tmRY5EQ==", "dev": true, "requires": { "ulid": "^2.3.0" diff --git a/package.json b/package.json index 79300d26f..5ce4071ea 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "hugo-bin": "^0.115.0", "husky": "^8.0.3", "lint-staged": "^15.0.2", - "prettier": "^2.8.8", - "prettier-plugin-go-template": "^0.0.13", + "prettier": "^3.0.3", + "prettier-plugin-go-template": "^0.0.15", "rimraf": "^5.0.5", "shx": "^0.3.4" }, From 866fdc88675c9d4bd2b0de9fcfaabf5fe92d4991 Mon Sep 17 00:00:00 2001 From: george haff Date: Tue, 7 Nov 2023 13:09:40 -0500 Subject: [PATCH 2/3] changes from prettier --- .github/workflows/blog.yaml | 2 +- .github/workflows/create_release.yml | 2 +- .github/workflows/dependabot-assignments.yml | 6 +++--- themes/delphi/layouts/_default/baseof.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 5fed9c2ed..561e4277b 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -55,4 +55,4 @@ jobs: name: blog path: | ./content/blog - ./static/blog \ No newline at end of file + ./static/blog diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index a94368bb6..9f0ae2566 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -32,7 +32,7 @@ jobs: base: main title: Release ${{ steps.version.outputs.next_tag }} labels: chore - # reviewers: + # reviewers: assignees: melange396 body: | Releasing ${{ steps.version.outputs.next_tag }}. diff --git a/.github/workflows/dependabot-assignments.yml b/.github/workflows/dependabot-assignments.yml index 97bbd061e..b511425f2 100644 --- a/.github/workflows/dependabot-assignments.yml +++ b/.github/workflows/dependabot-assignments.yml @@ -7,11 +7,11 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - env: - GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }} + env: + GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }} if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Assign team to PR run: gh pr edit "$PR_URL" --add-reviewer "cmu-delphi/code-reviewers" env: - PR_URL: ${{github.event.pull_request.html_url}} \ No newline at end of file + PR_URL: ${{github.event.pull_request.html_url}} diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index 1d5a9a1eb..5f3ff173b 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -1,4 +1,4 @@ - + From fea3cb8c274bd5f87b160c7c10d2ef273b5b5d2f Mon Sep 17 00:00:00 2001 From: george haff Date: Tue, 7 Nov 2023 12:11:45 -0500 Subject: [PATCH 3/3] adding config for prettier-plugin-go-template --- .prettierrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc.js b/.prettierrc.js index 1b522730e..c96ff17a7 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -2,7 +2,7 @@ module.exports = { printWidth: 120, semi: true, trailingComma: "es5", - + plugins: ["prettier-plugin-go-template"], overrides: [ { files: ["*.html"],