From e774fffd9cf2e4ce907047946d236c8ac0d8d9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Fri, 2 Mar 2018 23:47:16 +0000
Subject: [PATCH 1/6] Fix repository.url format

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b22d00e..5f65535 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
   "repository": {
     "type": "git",
-    "url": "git@github.com:Glavin001/atom-beautify.git"
+    "url": "github:Glavin001/atom-beautify"
   },
   "bugs": {
     "url": "https://github.com/Glavin001/atom-beautify/issues"

From b54ce54a5ddb91fda8d22884d604d19f979b07b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Fri, 2 Mar 2018 23:57:35 +0000
Subject: [PATCH 2/6] package.json repository: fix shorthand github

---
 package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5f65535..56d120e 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,7 @@
   "version": "0.32.0",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
-  "repository": {
-    "type": "git",
-    "url": "github:Glavin001/atom-beautify"
-  },
+  "repository": "github:Glavin001/atom-beautify",
   "bugs": {
     "url": "https://github.com/Glavin001/atom-beautify/issues"
   },

From 6aa51fdf78a1e794dd53400ba8b40a49cf1bf14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Sat, 3 Mar 2018 20:09:21 +0000
Subject: [PATCH 3/6] Bump NPM version in Travis

Got issue with npm on pull request #2063
Fix is to use npm >=5.6 (issue npm/npm#17858)
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 58c053f..466d223 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,8 @@ before_install:
   - Rscript --version
   # PHP
   - composer install
+  # NPM Version
+  - npm i -g npm@5.7
   # CoffeeScript
   - npm install coffee-formatter
   # OCaml

From a766cbc34b7a41d2c17071c4c52332b5e1b4adba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Sat, 3 Mar 2018 20:38:58 +0000
Subject: [PATCH 4/6] remove coffee-formatter, added coffeelint on test

---
 .travis.yml  | 2 --
 package.json | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 466d223..18e9450 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,8 +82,6 @@ before_install:
   - composer install
   # NPM Version
   - npm i -g npm@5.7
-  # CoffeeScript
-  - npm install coffee-formatter
   # OCaml
   # - opam init --auto-setup
   # Init environment variables for opam
diff --git a/package.json b/package.json
index d18036b..73ae8f7 100644
--- a/package.json
+++ b/package.json
@@ -456,6 +456,7 @@
     "prepare": "npm run docs",
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html",
+    "pretest": "npm lint",
     "test": "atom --test spec"
   },
   "config": {

From 280d803358ceef129e197a0f1a4c8229a8dbedc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Sun, 4 Mar 2018 00:51:01 +0000
Subject: [PATCH 5/6] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e54272..293918b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Next
 - Update Prettier to 1.11.1. (#2060)
+- Fix package.json repository field (#2062)
 - ...
 
 # v0.32.0 (2018-03-02)

From 22ba792723224da7e284071513fc1bbe9efa5a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <joao@neto.pt>
Date: Sun, 4 Mar 2018 09:25:12 +0000
Subject: [PATCH 6/6] revert explicit npm version, fix pretest script

---
 .travis.yml  | 2 --
 package.json | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 18e9450..e6dd739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,8 +80,6 @@ before_install:
   - Rscript --version
   # PHP
   - composer install
-  # NPM Version
-  - npm i -g npm@5.7
   # OCaml
   # - opam init --auto-setup
   # Init environment variables for opam
diff --git a/package.json b/package.json
index 73ae8f7..58c380c 100644
--- a/package.json
+++ b/package.json
@@ -456,7 +456,7 @@
     "prepare": "npm run docs",
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html",
-    "pretest": "npm lint",
+    "pretest": "npm run lint",
     "test": "atom --test spec"
   },
   "config": {