Skip to content

Commit 060657b

Browse files
authored
Merge pull request #32 from atom-community/update
feat: convert the config to ESM TypeScript
2 parents ab02e85 + ab80bb5 commit 060657b

File tree

10 files changed

+1958
-1352
lines changed

10 files changed

+1958
-1352
lines changed

.github/workflows/CI.yml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
name: CI
22
on:
3-
- push
4-
- pull_request
3+
push:
4+
branches:
5+
- master
6+
pull_request:
57

68
defaults:
79
run:
810
shell: bash
911

1012
jobs:
1113
Lint:
12-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
14+
if: "${{ !contains(github.event.head_commit.message, '[skip ci]') }}"
1315
runs-on: ubuntu-latest
1416
env:
1517
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -20,19 +22,24 @@ jobs:
2022

2123
- uses: actions/setup-node@v4
2224
with:
23-
node-version: "16.x"
25+
node-version: 20
2426

25-
- name: Commit lint ✨
26-
uses: wagoid/commitlint-github-action@v5
27+
- name: Setup PNPM
28+
uses: pnpm/action-setup@v2
29+
with:
30+
version: 8
2731

28-
- name: Install dependencies
29-
run: npm install
32+
- name: Install
33+
run: pnpm install
3034

3135
- name: Format ✨
32-
run: npm run test.format
36+
run: pnpm run test.format
3337

3438
- name: Lint ✨
35-
run: npm run test.lint
39+
run: pnpm run test.lint
40+
41+
- name: Commit lint ✨
42+
uses: wagoid/commitlint-github-action@v5
3643

3744
Release:
3845
needs: [Lint]
@@ -43,9 +50,15 @@ jobs:
4350
- uses: actions/checkout@v4
4451
- uses: actions/setup-node@v4
4552
with:
46-
node-version: "16.x"
47-
- name: NPM install
48-
run: npm install
53+
node-version: 20
54+
55+
- name: Setup PNPM
56+
uses: pnpm/action-setup@v2
57+
with:
58+
version: 8
59+
60+
- name: Install ✨
61+
run: pnpm install
4962

5063
- name: Release 🎉
5164
uses: cycjimmy/semantic-release-action@v2

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Add the following to your `package.json`
3232
```json
3333
"prettier": "prettier-config-atomic",
3434
"scripts": {
35-
"format": "prettier --plugin-search-dir=./ --write .",
36-
"test.format": "prettier --plugin-search-dir=./ . --check"
35+
"format": "prettier --write .",
36+
"test.format": "prettier . --check"
3737
}
3838
```
3939

package.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,30 @@
55
"repository": "https://github.com/atom-community/prettier-config-atomic",
66
"license": "MIT",
77
"author": "Amin Yahyaabadi",
8-
"main": "./prettier.config.js",
8+
"type": "module",
9+
"main": "dist/prettier.config.js",
910
"files": [
10-
"prettier.config.js"
11+
"dist",
12+
"src"
1113
],
1214
"scripts": {
15+
"build": "tsc -p tsconfig.json --pretty",
1316
"bump": "ncu -u",
14-
"format": "prettier --plugin-search-dir=./ --write ./",
17+
"format": "prettier --write ./",
1518
"lint": "eslint . --fix",
16-
"test.format": "prettier --plugin-search-dir=./ ./ --check",
19+
"prepare": "pnpm run build",
20+
"test.format": "prettier ./ --check",
1721
"test.lint": "eslint ."
1822
},
1923
"dependencies": {
20-
"prettier": "2.7.1",
21-
"prettier-plugin-jsdoc": "^0.4.2",
22-
"prettier-plugin-packagejson": "^2.2.18",
24+
"prettier": "3.1.1",
25+
"prettier-plugin-jsdoc": "^1.3.0",
26+
"prettier-plugin-packagejson": "^2.4.9",
2327
"sort-package-json": "github:aminya/sort-package-json"
2428
},
2529
"devDependencies": {
26-
"eslint-config-atomic": "^1.18.1"
30+
"eslint": "^8.56.0",
31+
"eslint-config-atomic": "^1.20.6"
2732
},
2833
"keywords": [
2934
"prettier",

0 commit comments

Comments
 (0)