Merge pull request #264 from Fdawgs/chore/tidy

.github/workflows/cd.yml

@@ -34,6 +34,7 @@ jobs:
         needs: release
         if: needs.release.outputs.release_created == 'true'
         runs-on: ubuntu-latest
+        environment: main
         permissions:
             contents: read
             id-token: write
@@ -55,7 +56,7 @@ jobs:
               # Remove dev values from package.json before publishing to reduce package size
               run: |
                   npm pkg delete commitlint devDependencies jest scripts
-                  npm publish --ignore-scripts --provenance
+                  npm publish --access public --ignore-scripts --provenance
 
     publish-ghp:
         name: Publish to GitHub Packages
@@ -64,6 +65,7 @@ jobs:
         runs-on: ubuntu-latest
         permissions:
             contents: read
+            id-token: write
             packages: write
         steps:
             - name: Check out repo
@@ -89,4 +91,4 @@ jobs:
               # Remove dev values from package.json before publishing to reduce package size
               run: |
                   npm pkg delete commitlint devDependencies jest scripts
-                  npm publish --ignore-scripts
+                  npm publish --access public --ignore-scripts --provenance

.vscode/settings.json

@@ -8,5 +8,6 @@
 	},
 	"javascript.updateImportsOnFileMove.enabled": "always",
 	"npm.packageManager": "npm",
+	"prettier.prettierPath": "./node_modules/prettier",
 	"redhat.telemetry.enabled": false
 }

jsconfig.json

@@ -1,11 +1,10 @@
 {
 	"compilerOptions": {
 		"checkJs": true,
-		"lib": ["ES2022"],
 		"module": "NodeNext",
 		"moduleResolution": "NodeNext",
 		"resolveJsonModule": true,
-		"target": "ES2022"
+		"target": "ES2022",
 	},
-	"exclude": ["dist", "node_modules"]
+	"exclude": ["dist", "node_modules"],
 }

package.json

@@ -17,7 +17,10 @@
 	"main": "src/index.js",
 	"type": "commonjs",
 	"types": "types/index.d.ts",
-	"repository": "git+https://github.com/Fdawgs/fastify-disablecache.git",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Fdawgs/fastify-disablecache.git"
+	},
 	"homepage": "https://github.com/Fdawgs/fastify-disablecache",
 	"bugs": {
 		"url": "https://github.com/Fdawgs/fastify-disablecache/issues"
@@ -72,16 +75,16 @@
 		"eslint-config-airbnb-base": "^15.0.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-import": "^2.29.1",
-		"eslint-plugin-jest": "^27.6.1",
+		"eslint-plugin-jest": "^27.6.3",
 		"eslint-plugin-jsdoc": "^48.0.2",
 		"eslint-plugin-promise": "^6.1.1",
-		"eslint-plugin-regexp": "^2.1.2",
+		"eslint-plugin-regexp": "^2.2.0",
 		"eslint-plugin-security": "^2.1.0",
 		"fastify": "^4.25.2",
 		"husky": "^8.0.3",
 		"jest": "^29.7.0",
 		"license-checker": "^25.0.1",
-		"prettier": "^3.1.1",
+		"prettier": "^3.2.3",
 		"spdx-copyleft": "^1.0.0",
 		"upath": "^2.0.1"
 	},

scripts/license-checker.js

@@ -57,10 +57,20 @@ async function checkLicenses() {
 		start: joinSafe(__dirname, ".."),
 	});
 
-	const copyLeftLicensesList = Object.keys(licenses).filter((license) =>
-		// @ts-ignore: includes() returns false if undefined is passed
-		copyLeftLicenses.includes(licenses[license].licenses)
-	);
+	const copyLeftLicensesList = Object.keys(licenses).filter((license) => {
+		let lic = licenses[license].licenses;
+
+		if (!lic) {
+			console.error(
+				`No license found for ${license}. Please check the package.json file.`
+			);
+			process.exit(1);
+		}
+
+		lic = Array.isArray(lic) ? lic : [lic];
+
+		return lic.some((l) => copyLeftLicenses.includes(l));
+	});
 
 	if (copyLeftLicensesList.length > 0) {
 		console.error(