diff --git a/.github/renovate.json b/.github/renovate.json index f5beabfb..88b2eb8c 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,4 +1,10 @@ { - "extends": ["config:base", ":pinVersions", "group:allNonMajor", "schedule:earlyMondays"], + "extends": [ + "config:base", + ":automergeMinor", + ":pinVersions", + "group:allNonMajor", + "schedule:earlyMondays" + ], "lockFileMaintenance": { "enabled": true } } diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fbb69573..28a0568c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [14.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -34,3 +34,5 @@ jobs: run: yarn install - name: Lint the lint configs run: yarn lint + - name: Prettier + run: yarn prettier diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 134b9b93..2d675a53 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [14.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -42,7 +42,7 @@ jobs: needs: lint strategy: matrix: - node-version: [14.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..c6cf66f4 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +dist/ +.husky/ +.yarn/ diff --git a/.prettierrc.js b/.prettierrc.js index 3a84662c..49b184b9 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,3 +1,3 @@ module.exports = { ...require('@sitaggart/prettier-config'), -} +}; diff --git a/lerna.json b/lerna.json index 3bee3e98..f868955f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,5 @@ { - "packages": [ - "packages/*" - ], + "packages": ["packages/*"], "version": "independent", "npmClient": "yarn", "command": { diff --git a/package.json b/package.json index 5e779c45..fd290134 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,15 @@ "postinstall": "husky install", "lerna": "lerna", "lint": "eslint ./packages/**/*.js", + "prettier": "prettier -c .", "release": "yarn lerna publish -m 'chore(release): publish' --conventional-commits --yes --create-release github" }, "workspaces": [ "packages/**" ], + "engines": { + "node": "20.x" + }, "devDependencies": { "@babel/core": "7.22.9", "@babel/eslint-parser": "7.22.9", @@ -19,7 +23,7 @@ "@sitaggart/eslint-config": "workspace:*", "@sitaggart/prettier-config": "workspace:*", "eslint": "8.46.0", - "husky": "^8.0.0", + "husky": "^8.0.3", "lerna": "7.1.4", "precise-commits": "1.0.2", "prettier": "3.0.1" diff --git a/yarn.lock b/yarn.lock index ed435151..2c42dfea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5785,7 +5785,7 @@ __metadata: languageName: node linkType: hard -"husky@npm:latest": +"husky@npm:^8.0.3": version: 8.0.3 resolution: "husky@npm:8.0.3" bin: @@ -8916,7 +8916,7 @@ __metadata: "@sitaggart/eslint-config": "workspace:*" "@sitaggart/prettier-config": "workspace:*" eslint: 8.46.0 - husky: latest + husky: ^8.0.3 lerna: 7.1.4 precise-commits: 1.0.2 prettier: 3.0.1