From 62e1e71c6d1bbcf42bc57239d40d4d4e185c32ec Mon Sep 17 00:00:00 2001
From: Victoria <bernard.victoria22@gmail.com>
Date: Wed, 17 Jul 2019 15:04:30 -0700
Subject: [PATCH 1/2] Add prettier and eslint

---
 .eslintrc    | 14 ++++++++++++++
 .prettierrc  |  2 +-
 package.json | 15 +++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 .eslintrc

diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..1eb8d80
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,14 @@
+{
+  "env": {
+    "worker": true,
+    "es6": true
+  },
+  "rules": {
+    "no-unused-vars": ["error", { "argsIgnorePattern": "request" }]
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "extends": ["eslint:recommended"]
+}
diff --git a/.prettierrc b/.prettierrc
index a06a385..c88beb5 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -3,5 +3,5 @@
   "semi": false,
   "trailingComma": "all",
   "tabWidth": 2,
-  "printWidth": 80
+  "printWidth": 100
 }
diff --git a/package.json b/package.json
index 2625b6a..c376a1c 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,23 @@
 {
-  "private": true,
-  "name": "{{ project-name }}",
   "version": "1.0.0",
   "description": "A template for kick starting a Cloudflare Workers project",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "format": "prettier --write '**/*.{js,css,json,md}'"
+    "format": "prettier --write '**/*.{js,css,json,md}'",
+    "eslint": "eslint --fix *.js"
   },
   "author": "{{ authors }}",
   "license": "MIT",
   "devDependencies": {
-    "prettier": "^1.18.2"
+    "eslint": "^6.5.1",
+    "husky": "^2.1.0",
+    "prettier": "^1.17.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run format",
+      "pre-push": "npm run format"
+    }
   }
 }

From f7050f981ccd8192c736490aef9b8fc0daa0dec8 Mon Sep 17 00:00:00 2001
From: Victoria <bernard.victoria22@gmail.com>
Date: Mon, 21 Oct 2019 15:19:46 -0500
Subject: [PATCH 2/2] Averys suggestions to eslint

---
 .eslintrc    | 14 --------------
 .eslintrc.js | 14 ++++++++++++++
 package.json |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 .eslintrc
 create mode 100644 .eslintrc.js

diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 1eb8d80..0000000
--- a/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "env": {
-    "worker": true,
-    "es6": true
-  },
-  "rules": {
-    "no-unused-vars": ["error", { "argsIgnorePattern": "request" }]
-  },
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module"
-  },
-  "extends": ["eslint:recommended"]
-}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..3716cc1
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,14 @@
+module.exports = {
+  env: {
+    worker: true,
+    es6: true,
+  },
+  rules: {
+    'no-unused-vars': ['error', { argsIgnorePattern: 'request' }],
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  extends: ['eslint:recommended', 'plugin:prettier/recommended'],
+}
diff --git a/package.json b/package.json
index c376a1c..5fa4f4d 100644
--- a/package.json
+++ b/package.json
@@ -4,15 +4,15 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "format": "prettier --write '**/*.{js,css,json,md}'",
-    "eslint": "eslint --fix *.js"
+    "format": "eslint --fix *.js"
   },
   "author": "{{ authors }}",
   "license": "MIT",
   "devDependencies": {
     "eslint": "^6.5.1",
-    "husky": "^2.1.0",
-    "prettier": "^1.17.0"
+    "eslint-config-prettier": "^6.4.0",
+    "eslint-plugin-prettier": "^3.1.1",
+    "husky": "^2.1.0"
   },
   "husky": {
     "hooks": {