Skip to content

Commit

Permalink
Drop support for prettier 2, only support 3 (#634)
Browse files Browse the repository at this point in the history
* Drop support for prettier 2, only support 3

* Format
  • Loading branch information
NullVoxPopuli committed May 14, 2024
1 parent b5ea461 commit dbfdc32
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 241 deletions.
4 changes: 1 addition & 3 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"extends": [
"github>NullVoxPopuli/renovate:npm.json5"
]
extends: ['github>NullVoxPopuli/renovate:npm.json5'],
}
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ jobs:
- uses: volta-cli/action@v4
- uses: ./.github/actions/pnpm


# lint_types:
# name: Lint Types
# runs-on: ubuntu-latest
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
check-plan:
name: "Check Release Plan"
name: 'Check Release Plan'
runs-on: ubuntu-latest
outputs:
command: ${{ steps.check-release.outputs.command }}
Expand Down Expand Up @@ -53,19 +53,19 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18

- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm install --frozen-lockfile
- name: "Generate Explanation and Prep Changelogs"

- name: 'Generate Explanation and Prep Changelogs'
id: explanation
run: |
set +e
pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
if [ $? -ne 0 ]; then
echo 'text<<EOF' >> $GITHUB_OUTPUT
Expand All @@ -83,7 +83,7 @@ jobs:
- uses: peter-evans/create-pull-request@v6
with:
commit-message: "Prepare Release using 'release-plan'"
labels: "internal"
labels: 'internal'
branch: release-preview
title: Prepare Release
body: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
check-plan:
name: "Check Release Plan"
name: 'Check Release Plan'
runs-on: ubuntu-latest
outputs:
command: ${{ steps.check-release.outputs.command }}
Expand All @@ -34,7 +34,7 @@ jobs:
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT

publish:
name: "NPM Publish"
name: 'NPM Publish'
runs-on: ubuntu-latest
needs: check-plan
if: needs.check-plan.outputs.command == 'release'
Expand All @@ -49,14 +49,14 @@ jobs:
node-version: 18
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
registry-url: 'https://registry.npmjs.org'

- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm install --frozen-lockfile
- name: npm publish
run: pnpm release-plan publish

env:
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-n": "^17.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-simple-import-sort": "^12.1.0",
"prettier-plugin-ember-template-tag": "^1.1.0"
"prettier-plugin-ember-template-tag": "^2.0.2"
},
"devDependencies": {
"@babel/core": "^7.24.5",
Expand All @@ -41,7 +41,7 @@
"eslint-plugin-ember": "11.12.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "8.1.1",
"prettier": "2.8.8",
"prettier": "3.2.5",
"release-plan": "^0.9.0",
"typescript": "^5.4.5",
"vitest": "^1.6.0"
Expand Down

0 comments on commit dbfdc32

Please sign in to comment.