From d3a9e6b2a61f049d29b6c261e5a1d260feb1cf6c Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Mon, 4 Oct 2021 12:01:11 +0900
Subject: [PATCH 1/3] Make eslint work again

---
 .eslintrc.js |  1 +
 package.json |  2 ++
 yarn.lock    | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 030fd7341..3f109a34f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,6 +28,7 @@ module.exports = {
 	globals: {
 		wp: 'off',
 	},
+	ignorePatterns: [ 'build/', 'build-*/', 'node_modules/', '*.d.ts' ],
 	rules: {
 		'@wordpress/dependency-group': 'error',
 		'@wordpress/react-no-unsafe-timeout': 'error',
diff --git a/package.json b/package.json
index d2156451c..2dd6a9eb2 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
 		"build": "yarn build:es6 && yarn build:cjs && yarn build:browser && yarn build:types",
 		"clean": "rm -rf build build-module build-browser build-types dist tsconfig.tsbuildinfo",
 		"dist": "yarn build && rm -rf dist && mkdir dist && zip build-browser.zip -r build-browser && mv build-browser.zip dist/isolated-block-editor.zip && release-it",
+		"lint:js": "wp-scripts lint-js",
 		"storybook": "start-storybook -p 6006"
 	},
 	"sideEffects": [
@@ -85,6 +86,7 @@
 		"@wordpress/wordcount": "^3.2.1",
 		"classnames": "^2.3.1",
 		"debug": "^4.3.2",
+		"eslint-plugin-eslint-comments": "^3.2.0",
 		"react": "17.0.2",
 		"react-autosize-textarea": "^7.1.0",
 		"react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 853044291..d14f08d05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7645,6 +7645,14 @@ eslint-module-utils@^2.6.2:
     debug "^3.2.7"
     pkg-dir "^2.0.0"
 
+eslint-plugin-eslint-comments@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
+  integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    ignore "^5.0.5"
+
 eslint-plugin-import@^2.23.4, eslint-plugin-import@^2.24.2:
   version "2.24.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
@@ -9557,7 +9565,7 @@ ignore@^4.0.3, ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4, ignore@^5.1.8, ignore@~5.1.8:
+ignore@^5.0.5, ignore@^5.1.4, ignore@^5.1.8, ignore@~5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==

From 0343e69b3ba9610b8c062c42b11f55ea013eeb57 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Mon, 4 Oct 2021 12:05:56 +0900
Subject: [PATCH 2/3] Make prettier work

---
 .prettierignore | 3 +++
 package.json    | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..16a24803d
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+build/
+build-*/
+*.d.ts
\ No newline at end of file
diff --git a/package.json b/package.json
index 2dd6a9eb2..05dd716c7 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
 		"build": "yarn build:es6 && yarn build:cjs && yarn build:browser && yarn build:types",
 		"clean": "rm -rf build build-module build-browser build-types dist tsconfig.tsbuildinfo",
 		"dist": "yarn build && rm -rf dist && mkdir dist && zip build-browser.zip -r build-browser && mv build-browser.zip dist/isolated-block-editor.zip && release-it",
+		"format": "wp-scripts format",
 		"lint:js": "wp-scripts lint-js",
 		"storybook": "start-storybook -p 6006"
 	},

From 2ac686f29dc8d66d43ed3d5a25bc4cc18e099d43 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Mon, 4 Oct 2021 15:33:29 +0900
Subject: [PATCH 3/3] Tweak eslintrc for better typescript support

---
 .eslintrc.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index 3f109a34f..9b7040381 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -30,6 +30,8 @@ module.exports = {
 	},
 	ignorePatterns: [ 'build/', 'build-*/', 'node_modules/', '*.d.ts' ],
 	rules: {
+		'jsdoc/check-line-alignment': 'off',
+		'jsdoc/require-property-description': 'off',
 		'@wordpress/dependency-group': 'error',
 		'@wordpress/react-no-unsafe-timeout': 'error',
 		'no-restricted-syntax': [
@@ -140,4 +142,9 @@ module.exports = {
 			],
 		},
 	],
+	settings: {
+		jsdoc: {
+			mode: 'typescript',
+		},
+	},
 };