From 330c62678cc020aacb2af0e6fdf0c2e47b9e5770 Mon Sep 17 00:00:00 2001
From: Stephen Edgar <stephen@netweb.com.au>
Date: Thu, 8 Jun 2017 07:48:06 +1000
Subject: [PATCH 1/3] EditotConfig: Relax 2 space indentation rule to only the
 `package.json` and `*.yml` files.

This is a partial revert of https://github.com/WordPress/gutenberg/commit/7c9cfe4e2c25865c43326a72a31030c9e55671e1, originally it was added so that it was in sync with WordPress' `.editorconfig`, rather WordPress should follow suit of how it's done here.
---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 446a47c3b3982..4ca196b1ed12a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,7 +8,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{*.json,*.yml}]
+[{package.json,*.yml}]
 indent_style = space
 indent_size = 2
 

From 09b849bac97b84694423b94858c75ea3abcef875 Mon Sep 17 00:00:00 2001
From: Stephen Edgar <stephen@netweb.com.au>
Date: Fri, 9 Jun 2017 11:06:51 +1000
Subject: [PATCH 2/3] Use tabs for indentation in `composer.json`

---
 composer.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 6634332cbd38b..4f0477d5981b8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
-  "require-dev": {
-    "squizlabs/php_codesniffer": "2.9.x",
-    "wp-coding-standards/wpcs": "^0.11.0"
-  },
-  "scripts": {
-    "post-install-cmd": [
-      "phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/"
-    ]
-  }
+	"require-dev": {
+		"squizlabs/php_codesniffer": "2.9.x",
+		"wp-coding-standards/wpcs": "^0.11.0"
+	},
+	"scripts": {
+		"post-install-cmd": [
+			"phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/"
+		]
+	}
 }

From a7234bd27af7ac8611188cf339d47695982c6894 Mon Sep 17 00:00:00 2001
From: Stephen Edgar <stephen@netweb.com.au>
Date: Mon, 10 Jul 2017 10:35:59 +1000
Subject: [PATCH 3/3] Merge upstream `composer.json` recent changes

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4f0477d5981b8..25601a5365424 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,10 @@
 {
 	"require-dev": {
 		"squizlabs/php_codesniffer": "2.9.x",
-		"wp-coding-standards/wpcs": "^0.11.0"
+		"wp-coding-standards/wpcs": "dev-develop"
 	},
 	"scripts": {
+		"lint": "phpcs",
 		"post-install-cmd": [
 			"phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/"
 		]