From 1315921a547cfa5051f1a7b1eb6ac664501083b7 Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Tue, 1 Sep 2020 10:31:54 +0800
Subject: [PATCH 1/3] Update dependencies

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

diff --git a/package.json b/package.json
index 0c66def885..b52e49466b 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 		"eslint-template-visitor": "^2.2.1",
 		"eslint-utils": "^2.1.0",
 		"import-modules": "^2.0.0",
-		"lodash": "^4.17.15",
+		"lodash": "^4.17.20",
 		"pluralize": "^8.0.0",
 		"read-pkg-up": "^7.0.1",
 		"regexp-tree": "^0.1.21",
@@ -49,26 +49,26 @@
 	},
 	"devDependencies": {
 		"@ava/babel": "^1.0.1",
-		"@babel/code-frame": "7.10.3",
+		"@babel/code-frame": "7.10.4",
 		"@lubien/fixture-beta-package": "^1.0.0-beta.1",
-		"@typescript-eslint/parser": "^3.4.0",
-		"ava": "^3.9.0",
+		"@typescript-eslint/parser": "^4.0.1",
+		"ava": "^3.12.1",
 		"babel-eslint": "^10.1.0",
 		"chalk": "^4.1.0",
-		"eslint": "^7.3.0",
+		"eslint": "^7.8.0",
 		"eslint-ava-rule-tester": "^4.0.0",
 		"eslint-plugin-eslint-plugin": "^2.3.0",
-		"execa": "^4.0.2",
+		"execa": "^4.0.3",
 		"listr": "^0.14.3",
 		"nyc": "^15.1.0",
 		"outdent": "^0.7.1",
 		"pify": "^5.0.0",
-		"typescript": "^3.9.5",
+		"typescript": "^4.0.2",
 		"vue-eslint-parser": "^7.1.0",
-		"xo": "^0.32.0"
+		"xo": "^0.33.1"
 	},
 	"peerDependencies": {
-		"eslint": ">=7.3.0"
+		"eslint": ">=7.8.0"
 	},
 	"ava": {
 		"babel": true,

From 009bb86d4d3bd587f2551189163908d4b4149333 Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Tue, 1 Sep 2020 10:47:23 +0800
Subject: [PATCH 2/3] Fix message

---
 test/expiring-todo-comments.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/expiring-todo-comments.js b/test/expiring-todo-comments.js
index f88a137988..4f788265c8 100644
--- a/test/expiring-todo-comments.js
+++ b/test/expiring-todo-comments.js
@@ -48,8 +48,8 @@ const missingAtSymbolError = (bad, good, message) => ({
 	message: `Missing '@' on TODO argument. On '${bad}' use '${good}'. ${message}`
 });
 
-const noWarningCommentError = () => ({
-	message: 'Unexpected \'todo\' comment.'
+const noWarningCommentError = comment => ({
+	message: `Unexpected 'todo' comment: '${comment}'.`
 });
 
 ruleTester.run('expiring-todo-comments', rule, {
@@ -277,37 +277,37 @@ ruleTester.run('expiring-todo-comments', rule, {
 		},
 		{
 			code: '// TODO',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO []',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO []')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO [no meaning at all]',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO [no meaning at all]')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO [] might have [some] that [try [to trick] me]',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO [] might have [some] that [try [to...')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO [but [it will]] [fallback] [[[ to the default ]]] rule [[[',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO [but [it will]] [fallback] [[[ to...')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO [engine:npm@>=10000]: Unsupported engine',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO [engine:npm@>=10000]: Unsupported...')],
 			options: [{allowWarningComments: false}]
 		},
 		{
 			code: '// TODO [engine:somethingrandom@>=10000]: Unsupported engine',
-			errors: [noWarningCommentError()],
+			errors: [noWarningCommentError('TODO [engine:somethingrandom@>=10000]:...')],
 			options: [{allowWarningComments: false}]
 		},
 		{
@@ -371,7 +371,7 @@ ruleTester.run('expiring-todo-comments', rule, {
 			code: '// TODO [ISSUE-123] fix later',
 			options: [{allowWarningComments: false, ignore: []}],
 			errors: [
-				noWarningCommentError()
+				noWarningCommentError('TODO [ISSUE-123] fix later')
 			]
 		},
 		{
@@ -381,7 +381,7 @@ ruleTester.run('expiring-todo-comments', rule, {
 			`,
 			options: [{allowWarningComments: false, ignore: [/issue-\d+/i]}],
 			errors: [
-				noWarningCommentError()
+				noWarningCommentError('TODO fix later')
 			]
 		},
 		{
@@ -391,7 +391,7 @@ ruleTester.run('expiring-todo-comments', rule, {
 			*/`,
 			options: [{allowWarningComments: false, ignore: [/issue-\d+/i]}],
 			errors: [
-				noWarningCommentError()
+				noWarningCommentError('TODO Invalid')
 			]
 		}
 	]

From 88b3e18348e96f6bd81971ed36849d5df756130b Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Tue, 1 Sep 2020 10:49:27 +0800
Subject: [PATCH 3/3] Enable `microsoft/typescript` test

---
 test/integration/projects.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/integration/projects.js b/test/integration/projects.js
index efc23bcede..27d92a15ce 100644
--- a/test/integration/projects.js
+++ b/test/integration/projects.js
@@ -72,11 +72,10 @@ module.exports = [
 			'aio/content/examples/router/src/app/app-routing.module.9.ts'
 		]
 	},
-	// TODO: enable this when ``@typescript-eslint/parser` support typescript 4.0
-	// {
-	// 	repository: 'https://github.com/microsoft/typescript',
-	// 	extraArguments: typescriptArguments
-	// },
+	{
+		repository: 'https://github.com/microsoft/typescript',
+		extraArguments: typescriptArguments
+	},
 	{
 		repository: 'https://github.com/microsoft/vscode',
 		extraArguments: typescriptArguments