Merge pull request #26 from Fdawgs/style/prettier

chore(prettier): create separate files to allow for CI/CD to use prettier config
Fdawgs · Mar 3, 2021 · 641ce30 · 641ce30
2 parents 2f92f5e + 6e7a390
commit 641ce30
Show file tree

Hide file tree

Showing 5 changed files with 209 additions and 86 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,120 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# Auto generated files
+package.json
+CHANGELOG.md
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+	"endOfLine": "lf",
+	"semi": true,
+	"tabWidth": 4,
+	"useTabs": true
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,12 +2,11 @@
 	"editor.defaultFormatter": "esbenp.prettier-vscode",
 	"editor.formatOnSave": true,
 	"files.eol": "\n",
+	"[javascript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
+	},
 	"javascript.updateImportsOnFileMove.enabled": "always",
 	"npm.packageManager": "npm",
-	"prettier.arrowParens": "always",
-	"prettier.endOfLine": "lf",
-	"prettier.tabWidth": 4,
-	"prettier.useTabs": true,
 	"telemetry.enableCrashReporter": false,
 	"telemetry.enableTelemetry": false
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
 ### [1.0.5](https://www.github.com/Fdawgs/fastify-disablecache/compare/v1.0.4...v1.0.5) (2021-03-01)
 
 ### Documentation

diff --git a/package.json b/package.json
@@ -1,84 +1,78 @@
 {
-  "name": "fastify-disablecache",
-  "version": "1.0.5",
-  "description": "Fastify plugin wrapper for nocache to disable client-side caching",
-  "keywords": [
-    "cache",
-    "disable",
-    "disablecache",
-    "expires",
-    "fastify",
-    "headers",
-    "nocache",
-    "plugin",
-    "pragma",
-    "surrogate"
-  ],
-  "main": "src/index.js",
-  "repository": "git+https://github.com/Fdawgs/fastify-disablecache.git",
-  "homepage": "https://github.com/Fdawgs/fastify-disablecache",
-  "bugs": {
-    "url": "https://github.com/Fdawgs/fastify-disablecache/issues"
-  },
-  "license": "MIT",
-  "author": "Frazer Smith <frazer.dev@outlook.com>",
-  "engines": {
-    "node": ">=10.22.0"
-  },
-  "scripts": {
-    "jest": "jest --detectOpenHandles --runInBand",
-    "jest:coverage": "jest --coverage --runInBand",
-    "lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
-    "lint:licenses": "license-checker --direct --onlyAllow=\"0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;Unlicense\" --production --summary",
-    "lint:prettier": "prettier \"**/!(CHANGELOG.md|package.json)\" --write --ignore-path .gitignore --ignore-unknown",
-    "lint:prettier:ci": "prettier \"**/!(CHANGELOG.md|package.json)\"  --check --ignore-path .gitignore --ignore-unknown",
-    "test": "npm run lint && npm run jest"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "npm run lint:prettier:ci && npm test"
-    }
-  },
-  "jest": {
-    "clearMocks": true,
-    "coverageReporters": [
-      "text",
-      "lcovonly"
-    ],
-    "resetMocks": true,
-    "testEnvironment": "node",
-    "testTimeout": 10000
-  },
-  "prettier": {
-    "endOfLine": "lf",
-    "semi": true,
-    "tabWidth": 4,
-    "useTabs": true
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^12.0.1",
-    "@commitlint/config-conventional": "^12.0.1",
-    "eslint": "^7.18.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsdoc": "^32.0.1",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-security": "^1.4.0",
-    "fastify": "^3.10.1",
-    "husky": "~4",
-    "jest": "^26.6.3",
-    "license-checker": "^25.0.1",
-    "prettier": "2.2.1"
-  },
-  "dependencies": {
-    "fastify-plugin": "^3.0.0"
-  }
+	"name": "fastify-disablecache",
+	"version": "1.0.5",
+	"description": "Fastify plugin wrapper for nocache to disable client-side caching",
+	"keywords": [
+		"cache",
+		"disable",
+		"disablecache",
+		"expires",
+		"fastify",
+		"headers",
+		"nocache",
+		"plugin",
+		"pragma",
+		"surrogate"
+	],
+	"main": "src/index.js",
+	"repository": "git+https://github.com/Fdawgs/fastify-disablecache.git",
+	"homepage": "https://github.com/Fdawgs/fastify-disablecache",
+	"bugs": {
+		"url": "https://github.com/Fdawgs/fastify-disablecache/issues"
+	},
+	"license": "MIT",
+	"author": "Frazer Smith <frazer.dev@outlook.com>",
+	"engines": {
+		"node": ">=10.22.0"
+	},
+	"scripts": {
+		"jest": "jest --detectOpenHandles --runInBand",
+		"jest:coverage": "jest --coverage --runInBand",
+		"lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
+		"lint:licenses": "license-checker --direct --onlyAllow=\"0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;Unlicense\" --production --summary",
+		"lint:prettier": "prettier . --write --ignore-unknown",
+		"lint:prettier:ci": "prettier . --check --ignore-unknown",
+		"test": "npm run lint && npm run jest"
+	},
+	"commitlint": {
+		"extends": [
+			"@commitlint/config-conventional"
+		]
+	},
+	"husky": {
+		"hooks": {
+			"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+			"pre-push": "npm run lint:prettier:ci && npm test"
+		}
+	},
+	"jest": {
+		"clearMocks": true,
+		"coverageReporters": [
+			"text",
+			"lcovonly"
+		],
+		"resetMocks": true,
+		"testEnvironment": "node",
+		"testTimeout": 10000
+	},
+	"devDependencies": {
+		"@commitlint/cli": "^12.0.1",
+		"@commitlint/config-conventional": "^12.0.1",
+		"eslint": "^7.18.0",
+		"eslint-config-airbnb-base": "^14.2.1",
+		"eslint-config-prettier": "^8.1.0",
+		"eslint-plugin-import": "^2.22.1",
+		"eslint-plugin-jest": "^24.1.3",
+		"eslint-plugin-jsdoc": "^32.0.1",
+		"eslint-plugin-promise": "^4.2.1",
+		"eslint-plugin-security": "^1.4.0",
+		"fastify": "^3.10.1",
+		"husky": "~4",
+		"jest": "^26.6.3",
+		"license-checker": "^25.0.1",
+		"prettier": "2.2.1"
+	},
+	"dependencies": {
+		"fastify-plugin": "^3.0.0"
+	}
 }