Merge pull request #1761 from Fdawgs/chore/2024-01

Fdawgs · Jan 25, 2024 · 307089c · 307089c
2 parents 6f53979 + ca773e0
commit 307089c
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 286 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run lint:prettier && npm run lint:licenses && npm test
+npm run lint:licenses && npm test
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,6 +8,7 @@
 	},
 	"javascript.updateImportsOnFileMove.enabled": "always",
 	"npm.packageManager": "npm",
+	"prettier.prettierPath": "./node_modules/prettier",
 	"redhat.telemetry.enabled": false,
 	"[xml]": {
 		"editor.defaultFormatter": "redhat.vscode-xml"

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ The underlying OpenAPI definitions are found at `/docs/openapi`.
 Contributions are welcome, and any help is greatly appreciated!
 
 See [the contributing guide](./CONTRIBUTING.md) for details on how to get started.
-Please adhere to this project's [Code of Conduct](./CODE_OF_CONDUCT.md) when contributing.
+Please adhere to this project's [Code of Conduct](https://github.com/Fdawgs/.github/blob/main/CODE_OF_CONDUCT.md) when contributing.
 
 ## License
 

diff --git a/SECURITY.md b/SECURITY.md
diff --git a/jsconfig.json b/jsconfig.json
@@ -3,11 +3,10 @@
 		// Uncomment as and when needed
 		// "checkJs": true,
 		// "strict": true,
-		"lib": ["ES2022"],
 		"module": "NodeNext",
 		"moduleResolution": "NodeNext",
 		"resolveJsonModule": true,
-		"target": "ES2022"
+		"target": "ES2022",
 	},
-	"exclude": ["dist", "node_modules"]
+	"exclude": ["dist", "node_modules"],
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,10 @@
 	"description": "RESTful API for converting clinical documents and files",
 	"main": "dist/app.js",
 	"type": "commonjs",
-	"repository": "git+https://github.com/Fdawgs/docsmith.git",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Fdawgs/docsmith.git"
+	},
 	"homepage": "https://github.com/Fdawgs/docsmith",
 	"bugs": {
 		"url": "https://github.com/Fdawgs/docsmith/issues"
@@ -22,14 +25,15 @@
 		"jest": "jest",
 		"jest:coverage": "jest --coverage",
 		"lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
+		"lint:fix": "npm run lint -- --fix",
 		"lint:licenses": "node scripts/license-checker.js",
 		"lint:lockfile": "lockfile-lint -p package-lock.json -t npm -a npm -s -i",
 		"lint:prettier": "prettier . -c -u",
 		"lint:prettier:fix": "prettier . -w -u",
 		"prepare": "husky install && npx playwright install firefox --with-deps",
 		"start": "node .",
 		"start:dev": "nodemon src/app.js | pino-pretty",
-		"test": "npm run lint && npm run jest"
+		"test": "npm run lint && npm run lint:prettier && npm run jest"
 	},
 	"commitlint": {
 		"extends": [
@@ -94,7 +98,7 @@
 		"nodemon": "^3.0.2",
 		"pino-pretty": "^10.3.1",
 		"playwright": "^1.40.1",
-		"prettier": "^3.1.1",
+		"prettier": "^3.2.4",
 		"spdx-copyleft": "^1.0.0"
 	},
 	"dependencies": {
@@ -113,7 +117,6 @@
 		"clean-css": "^5.3.3",
 		"cssesc": "^3.0.0",
 		"cssom": "^0.5.0",
-		"dotenv": "^16.3.1",
 		"env-schema": "^5.2.1",
 		"fastify": "^4.25.2",
 		"fastify-disablecache": "^3.1.8",