Skip to content

Commit ecf3fcc

Browse files
authored
Minor development-related tweaks & cleanup (#60)
1 parent e51cfac commit ecf3fcc

7 files changed

+26
-29
lines changed

.eslintrc.json

+14-12
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@
22
"root": true,
33
"env": {
44
"node": true,
5-
"es6": true,
6-
"jest/globals": true
5+
"es2021": true
76
},
8-
"plugins": ["jest"],
9-
"extends": [
10-
"eslint:recommended",
11-
"plugin:node/recommended",
12-
"plugin:jest/recommended",
13-
"plugin:jest/style",
14-
"prettier"
15-
],
167
"parserOptions": {
17-
"ecmaVersion": 2018
8+
"ecmaVersion": "latest"
189
},
10+
"extends": ["eslint:recommended", "plugin:node/recommended", "prettier"],
1911
"rules": {
2012
"node/no-unpublished-require": [
2113
"error",
2214
{
2315
"allowModules": ["knex"]
2416
}
2517
]
26-
}
18+
},
19+
"overrides": [
20+
{
21+
"files": ["./src/**/*.test.js"],
22+
"env": {
23+
"jest/globals": true
24+
},
25+
"plugins": ["jest"],
26+
"extends": ["plugin:jest/recommended", "plugin:jest/style"]
27+
}
28+
]
2729
}

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# npm
2-
node_modules/
3-
npm-debug.log*
4-
package-lock.json
2+
/node_modules
3+
/package-lock.json
54

65
# Jest
76
/test/coverage

.prettierignore

-2
This file was deleted.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 Truepic
3+
Copyright (c) 2024 Truepic
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,13 @@ npm run lint
172172

173173
## Releasing
174174

175-
After development is done in the `development` branch and is ready for release,
176-
it should be merged into the `main` branch, where the latest release code lives.
177-
[Release It!](https://github.com/release-it/release-it) is then used to
178-
orchestrate the release process:
175+
When the `development` branch is ready for release,
176+
[Release It!](https://github.com/release-it/release-it) is used to orchestrate
177+
the release process:
179178

180179
```bash
181180
npm run release
182181
```
183182

184-
Once the release process is complete, merge the `main` branch back into the
185-
`development` branch. They should have the same history at this point.
183+
Once the release process is complete, merge the `development` branch into the
184+
`main` branch, which should always reflect the latest release.

jest.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module.exports = {
2-
coverageDirectory: 'test/coverage',
2+
coverageDirectory: './test/coverage',
33
reporters: [
44
'default',
55
[
66
'jest-junit',
77
{
8-
outputDirectory: 'test/reports',
8+
outputDirectory: './test/reports',
99
},
1010
],
1111
],

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"homepage": "https://github.com/TRUEPIC/queryql#readme",
2121
"bugs": "https://github.com/TRUEPIC/queryql/issues",
2222
"license": "MIT",
23-
"main": "src/index.js",
23+
"main": "./src/index.js",
2424
"repository": "TRUEPIC/queryql",
2525
"scripts": {
26-
"lint": "run-p lint:*",
26+
"lint": "npm run lint:format && npm run lint:quality",
2727
"lint:format": "prettier --check .",
2828
"lint:format:fix": "prettier --write .",
2929
"lint:quality": "eslint .",
@@ -43,7 +43,6 @@
4343
"jest": "^29.7.0",
4444
"jest-junit": "^16.0.0",
4545
"knex": "^3.1.0",
46-
"npm-run-all": "^4.1.5",
4746
"prettier": "3.1.1",
4847
"release-it": "^17.0.1"
4948
},

0 commit comments

Comments
 (0)