From 53fd12c618f16ef166a16432dcfeeceace8e0fe7 Mon Sep 17 00:00:00 2001
From: Stephen Edgar <stephen@netweb.com.au>
Date: Fri, 16 Aug 2019 15:09:35 +1000
Subject: [PATCH 1/2] fix(scripts): use the SCSS shared
 stylelint-config-wordpress config

---
 packages/scripts/CHANGELOG.md             | 4 ++++
 packages/scripts/config/.stylelintrc.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index 7ccc3d4d75efa..c9b35dd6d41fe 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -6,6 +6,10 @@
 - The bundled `jest-puppeteer` dependency has been updated from requiring `^4.0.0` to requiring `^4.3.0` ([#16875](https://github.com/WordPress/gutenberg/pull/16875)).
 - The bundled `eslint` dependency has been updated from requiring `^5.16.0` to requiring `^6.1.0`.
 
+### Bug Fix
+
+- Use the SCSS shared stylelint configuration so that both CSS and SCSS stylelint rules are used ([#](https://github.com/WordPress/gutenberg/pull/))
+
 ## 3.4.0 (2019-08-05)
 
 ### New Features
diff --git a/packages/scripts/config/.stylelintrc.json b/packages/scripts/config/.stylelintrc.json
index e3113e5fb0b6a..42bc0988349e5 100644
--- a/packages/scripts/config/.stylelintrc.json
+++ b/packages/scripts/config/.stylelintrc.json
@@ -1,3 +1,3 @@
 {
-	"extends": "stylelint-config-wordpress"
+	"extends": "stylelint-config-wordpress/scss"
 }

From bb624b7134212648713fb47b9d54be0f8536af2b Mon Sep 17 00:00:00 2001
From: Stephen Edgar <stephen@netweb.com.au>
Date: Fri, 16 Aug 2019 15:21:58 +1000
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 packages/scripts/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index c9b35dd6d41fe..720706ed0a7ff 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 ### Bug Fix
 
-- Use the SCSS shared stylelint configuration so that both CSS and SCSS stylelint rules are used ([#](https://github.com/WordPress/gutenberg/pull/))
+- Use the SCSS shared `stylelint-config-wordpress` config so that both CSS and SCSS rules are used ([#17060](https://github.com/WordPress/gutenberg/pull/17060))
 
 ## 3.4.0 (2019-08-05)