From 83de0127a8d8ecb85b8eddae842476dd0230638c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 16 Jul 2019 10:27:32 +0200
Subject: [PATCH 1/4] Update composer packages

---
 composer.json |   8 +--
 composer.lock | 167 ++++++++++++++++++++++++++++++++++----------------
 2 files changed, 117 insertions(+), 58 deletions(-)

diff --git a/composer.json b/composer.json
index 28c634745..e78086fce 100644
--- a/composer.json
+++ b/composer.json
@@ -8,9 +8,9 @@
     "php": "^5.6.0 || ^7.0"
   },
   "require-dev": {
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-    "phpcompatibility/phpcompatibility-wp": "^1",
-    "wp-coding-standards/wpcs": "^1",
-    "xwp/wp-dev-lib": "1.1.1"
+    "dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
+    "phpcompatibility/phpcompatibility-wp": "2.0.0",
+    "wp-coding-standards/wpcs": "2.1.1",
+    "xwp/wp-dev-lib": "1.2.2"
   }
 }
diff --git a/composer.lock b/composer.lock
index 3edf787ea..094b8988a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,34 +4,32 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f20d3f14c5c3c29001c1cdd09ba33b9e",
+    "content-hash": "6813e4e1d7a435c7f36d018a5fe1b2f9",
     "packages": [],
     "packages-dev": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.4.4",
+            "version": "v0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08"
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/2e41850d5f7797cbb1af7b030d245b3b24e63a08",
-                "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
                 "shasum": ""
             },
             "require": {
                 "composer-plugin-api": "^1.0",
                 "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "*"
+                "squizlabs/php_codesniffer": "^2|^3"
             },
             "require-dev": {
                 "composer/composer": "*",
-                "wimg/php-compatibility": "^8.0"
-            },
-            "suggest": {
-                "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -49,13 +47,13 @@
             "authors": [
                 {
                     "name": "Franck Nijhof",
-                    "email": "f.nijhof@dealerdirect.nl",
-                    "homepage": "http://workingatdealerdirect.eu",
-                    "role": "Developer"
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
                 }
             ],
             "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://workingatdealerdirect.eu",
+            "homepage": "http://www.dealerdirect.com",
             "keywords": [
                 "PHPCodeSniffer",
                 "PHP_CodeSniffer",
@@ -73,20 +71,20 @@
                 "stylecheck",
                 "tests"
             ],
-            "time": "2017-12-06T16:27:17+00:00"
+            "time": "2018-10-26T13:21:45+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
-            "version": "8.2.0",
+            "version": "9.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "eaf613c1a8265bcfd7b0ab690783f2aef519f78a"
+                "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/eaf613c1a8265bcfd7b0ab690783f2aef519f78a",
-                "reference": "eaf613c1a8265bcfd7b0ab690783f2aef519f78a",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/3db1bf1e28123fd574a4ae2e9a84072826d51b5e",
+                "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e",
                 "shasum": ""
             },
             "require": {
@@ -100,15 +98,64 @@
                 "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
             "type": "phpcodesniffer-standard",
-            "autoload": {
-                "psr-4": {
-                    "PHPCompatibility\\": "PHPCompatibility/"
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                },
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
                 }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "time": "2019-06-27T19:58:56+00:00"
+        },
+        {
+            "name": "phpcompatibility/phpcompatibility-paragonie",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
+                "reference": "9160de79fcd683b5c99e9c4133728d91529753ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/9160de79fcd683b5c99e9c4133728d91529753ea",
+                "reference": "9160de79fcd683b5c99e9c4133728d91529753ea",
+                "shasum": ""
             },
+            "require": {
+                "phpcompatibility/php-compatibility": "^9.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0-or-later"
@@ -117,36 +164,46 @@
                 {
                     "name": "Wim Godden",
                     "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "lead"
                 }
             ],
-            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP version compatibility.",
-            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.",
+            "homepage": "http://phpcompatibility.com/",
             "keywords": [
                 "compatibility",
+                "paragonie",
                 "phpcs",
+                "polyfill",
                 "standards"
             ],
-            "time": "2018-07-17T13:42:26+00:00"
+            "time": "2018-12-16T19:10:44+00:00"
         },
         {
             "name": "phpcompatibility/phpcompatibility-wp",
-            "version": "1.0.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
-                "reference": "b26c84df3ec1d4850d0f22264a4a16482a171996"
+                "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b26c84df3ec1d4850d0f22264a4a16482a171996",
-                "reference": "b26c84df3ec1d4850d0f22264a4a16482a171996",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
+                "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
                 "shasum": ""
             },
             "require": {
-                "phpcompatibility/php-compatibility": "^8.1"
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpcompatibility/phpcompatibility-paragonie": "^1.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
             "type": "phpcodesniffer-standard",
@@ -164,7 +221,7 @@
                     "role": "lead"
                 }
             ],
-            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP version compatibility for WordPress projects.",
+            "description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.",
             "homepage": "http://phpcompatibility.com/",
             "keywords": [
                 "compatibility",
@@ -172,20 +229,20 @@
                 "standards",
                 "wordpress"
             ],
-            "time": "2018-07-16T22:10:02+00:00"
+            "time": "2018-10-07T18:31:37+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.4.1",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa"
+                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5b4333b4010625d29580eb4a41f1e53251be6baa",
-                "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
                 "shasum": ""
             },
             "require": {
@@ -223,31 +280,33 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2019-03-19T03:22:27+00:00"
+            "time": "2019-04-10T23:49:02+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
-            "version": "1.2.1",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
-                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c"
+                "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
+                "reference": "bd9c33152115e6741e3510ff7189605b35167908"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
-                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/bd9c33152115e6741e3510ff7189605b35167908",
+                "reference": "bd9c33152115e6741e3510ff7189605b35167908",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^3.3.1"
             },
             "require-dev": {
-                "phpcompatibility/php-compatibility": "^9.0"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
             },
             "type": "phpcodesniffer-standard",
             "notification-url": "https://packagist.org/downloads/",
@@ -266,20 +325,20 @@
                 "standards",
                 "wordpress"
             ],
-            "time": "2018-12-18T09:43:51+00:00"
+            "time": "2019-05-21T02:50:00+00:00"
         },
         {
             "name": "xwp/wp-dev-lib",
-            "version": "1.1.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/xwp/wp-dev-lib.git",
-                "reference": "4caaf0f554778bb59062c8797755999b5fae400d"
+                "reference": "a40a29223deb8f44e6d61db7e6c39bd12eb37919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/xwp/wp-dev-lib/zipball/4caaf0f554778bb59062c8797755999b5fae400d",
-                "reference": "4caaf0f554778bb59062c8797755999b5fae400d",
+                "url": "https://api.github.com/repos/xwp/wp-dev-lib/zipball/a40a29223deb8f44e6d61db7e6c39bd12eb37919",
+                "reference": "a40a29223deb8f44e6d61db7e6c39bd12eb37919",
                 "shasum": ""
             },
             "type": "library",
@@ -304,7 +363,7 @@
             "keywords": [
                 "wordpress"
             ],
-            "time": "2019-04-06T06:37:44+00:00"
+            "time": "2019-07-04T15:04:40+00:00"
         }
     ],
     "aliases": [],

From 15541c762740184f0ecb19f2b0e527d965865a6c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 16 Jul 2019 10:27:46 +0200
Subject: [PATCH 2/4] Update npm packages

---
 .eslintrc         |   8 +-
 package-lock.json | 942 +++++++++++++++++++++++++++++++++++++++-------
 package.json      |  18 +-
 3 files changed, 826 insertions(+), 142 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 6b468741f..72e420c38 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,13 +1,13 @@
 {
 	"root": true,
-	"extends": [
-		"wordpress",
-		"eslint:recommended"
-	],
+  "extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],
 	"env": {
 		"browser": true,
 		"es6": true
 	},
+  "globals": {
+    "wp": true
+  },
 	"parserOptions": {
 		"ecmaVersion": 2018
 	}
diff --git a/package-lock.json b/package-lock.json
index cfc521635..2a5f3d19c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,48 @@
     "@babel/highlight": "^7.0.0"
    }
   },
+  "@babel/generator": {
+   "version": "7.5.0",
+   "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz",
+   "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==",
+   "dev": true,
+   "requires": {
+    "@babel/types": "^7.5.0",
+    "jsesc": "^2.5.1",
+    "lodash": "^4.17.11",
+    "source-map": "^0.5.0",
+    "trim-right": "^1.0.1"
+   }
+  },
+  "@babel/helper-function-name": {
+   "version": "7.1.0",
+   "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+   "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+   "dev": true,
+   "requires": {
+    "@babel/helper-get-function-arity": "^7.0.0",
+    "@babel/template": "^7.1.0",
+    "@babel/types": "^7.0.0"
+   }
+  },
+  "@babel/helper-get-function-arity": {
+   "version": "7.0.0",
+   "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+   "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+   "dev": true,
+   "requires": {
+    "@babel/types": "^7.0.0"
+   }
+  },
+  "@babel/helper-split-export-declaration": {
+   "version": "7.4.4",
+   "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+   "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+   "dev": true,
+   "requires": {
+    "@babel/types": "^7.4.4"
+   }
+  },
   "@babel/highlight": {
    "version": "7.0.0",
    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
@@ -23,6 +65,12 @@
     "js-tokens": "^4.0.0"
    }
   },
+  "@babel/parser": {
+   "version": "7.5.0",
+   "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz",
+   "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==",
+   "dev": true
+  },
   "@babel/runtime": {
    "version": "7.4.4",
    "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz",
@@ -32,6 +80,45 @@
     "regenerator-runtime": "^0.13.2"
    }
   },
+  "@babel/template": {
+   "version": "7.4.4",
+   "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+   "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+   "dev": true,
+   "requires": {
+    "@babel/code-frame": "^7.0.0",
+    "@babel/parser": "^7.4.4",
+    "@babel/types": "^7.4.4"
+   }
+  },
+  "@babel/traverse": {
+   "version": "7.5.0",
+   "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz",
+   "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==",
+   "dev": true,
+   "requires": {
+    "@babel/code-frame": "^7.0.0",
+    "@babel/generator": "^7.5.0",
+    "@babel/helper-function-name": "^7.1.0",
+    "@babel/helper-split-export-declaration": "^7.4.4",
+    "@babel/parser": "^7.5.0",
+    "@babel/types": "^7.5.0",
+    "debug": "^4.1.0",
+    "globals": "^11.1.0",
+    "lodash": "^4.17.11"
+   }
+  },
+  "@babel/types": {
+   "version": "7.5.0",
+   "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz",
+   "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==",
+   "dev": true,
+   "requires": {
+    "esutils": "^2.0.2",
+    "lodash": "^4.17.11",
+    "to-fast-properties": "^2.0.0"
+   }
+  },
   "@hapi/address": {
    "version": "2.0.0",
    "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
@@ -64,6 +151,25 @@
     "@hapi/hoek": "6.x.x"
    }
   },
+  "@types/normalize-package-data": {
+   "version": "2.4.0",
+   "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+   "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+   "dev": true
+  },
+  "@wordpress/eslint-plugin": {
+   "version": "2.3.0",
+   "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-2.3.0.tgz",
+   "integrity": "sha512-1X1uvBfwx96dxz0NmLB22JhSNaJQCYP3bYAnaR5qMV+O9t6gwbdPl+1kpYhe2sSKFm72y6Tfi8CKRWsyKRCHUg==",
+   "dev": true,
+   "requires": {
+    "babel-eslint": "^10.0.1",
+    "eslint-plugin-jsx-a11y": "^6.2.1",
+    "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-react-hooks": "^1.6.0",
+    "requireindex": "^1.2.0"
+   }
+  },
   "abbrev": {
    "version": "1.1.1",
    "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -71,9 +177,9 @@
    "dev": true
   },
   "acorn": {
-   "version": "6.1.1",
-   "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
-   "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+   "version": "6.2.0",
+   "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
+   "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
    "dev": true
   },
   "acorn-jsx": {
@@ -83,9 +189,9 @@
    "dev": true
   },
   "ajv": {
-   "version": "6.10.0",
-   "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
-   "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+   "version": "6.10.2",
+   "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+   "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
    "dev": true,
    "requires": {
     "fast-deep-equal": "^2.0.1",
@@ -159,6 +265,16 @@
     }
    }
   },
+  "aria-query": {
+   "version": "3.0.0",
+   "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+   "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+   "dev": true,
+   "requires": {
+    "ast-types-flow": "0.0.7",
+    "commander": "^2.11.0"
+   }
+  },
   "arr-diff": {
    "version": "4.0.0",
    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -189,6 +305,16 @@
    "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
    "dev": true
   },
+  "array-includes": {
+   "version": "3.0.3",
+   "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+   "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+   "dev": true,
+   "requires": {
+    "define-properties": "^1.1.2",
+    "es-abstract": "^1.7.0"
+   }
+  },
   "array-slice": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
@@ -213,6 +339,12 @@
    "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
    "dev": true
   },
+  "ast-types-flow": {
+   "version": "0.0.7",
+   "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+   "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+   "dev": true
+  },
   "astral-regex": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -249,6 +381,41 @@
    "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
    "dev": true
   },
+  "axobject-query": {
+   "version": "2.0.2",
+   "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+   "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+   "dev": true,
+   "requires": {
+    "ast-types-flow": "0.0.7"
+   }
+  },
+  "babel-eslint": {
+   "version": "10.0.2",
+   "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
+   "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
+   "dev": true,
+   "requires": {
+    "@babel/code-frame": "^7.0.0",
+    "@babel/parser": "^7.0.0",
+    "@babel/traverse": "^7.0.0",
+    "@babel/types": "^7.0.0",
+    "eslint-scope": "3.7.1",
+    "eslint-visitor-keys": "^1.0.0"
+   },
+   "dependencies": {
+    "eslint-scope": {
+     "version": "3.7.1",
+     "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+     "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+     "dev": true,
+     "requires": {
+      "esrecurse": "^4.1.0",
+      "estraverse": "^4.1.1"
+     }
+    }
+   }
+  },
   "babel-extract-comments": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz",
@@ -450,10 +617,36 @@
     "unset-value": "^1.0.0"
    }
   },
+  "caller-callsite": {
+   "version": "2.0.0",
+   "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+   "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+   "dev": true,
+   "requires": {
+    "callsites": "^2.0.0"
+   },
+   "dependencies": {
+    "callsites": {
+     "version": "2.0.0",
+     "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+     "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+     "dev": true
+    }
+   }
+  },
+  "caller-path": {
+   "version": "2.0.0",
+   "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+   "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+   "dev": true,
+   "requires": {
+    "caller-callsite": "^2.0.0"
+   }
+  },
   "callsites": {
-   "version": "3.0.0",
-   "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
-   "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+   "version": "3.1.0",
+   "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+   "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
    "dev": true
   },
   "camelcase": {
@@ -642,6 +835,12 @@
    "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
    "dev": true
   },
+  "commander": {
+   "version": "2.20.0",
+   "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+   "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+   "dev": true
+  },
   "common-tags": {
    "version": "1.8.0",
    "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
@@ -692,6 +891,46 @@
    "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
    "dev": true
   },
+  "cosmiconfig": {
+   "version": "5.2.1",
+   "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+   "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+   "dev": true,
+   "requires": {
+    "import-fresh": "^2.0.0",
+    "is-directory": "^0.3.1",
+    "js-yaml": "^3.13.1",
+    "parse-json": "^4.0.0"
+   },
+   "dependencies": {
+    "import-fresh": {
+     "version": "2.0.0",
+     "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+     "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+     "dev": true,
+     "requires": {
+      "caller-path": "^2.0.0",
+      "resolve-from": "^3.0.0"
+     }
+    },
+    "parse-json": {
+     "version": "4.0.0",
+     "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+     "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+     "dev": true,
+     "requires": {
+      "error-ex": "^1.3.1",
+      "json-parse-better-errors": "^1.0.1"
+     }
+    },
+    "resolve-from": {
+     "version": "3.0.0",
+     "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+     "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+     "dev": true
+    }
+   }
+  },
   "create-error-class": {
    "version": "3.0.2",
    "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
@@ -729,6 +968,12 @@
     "array-find-index": "^1.0.1"
    }
   },
+  "damerau-levenshtein": {
+   "version": "1.0.5",
+   "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
+   "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==",
+   "dev": true
+  },
   "dateformat": {
    "version": "1.0.12",
    "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
@@ -799,6 +1044,15 @@
     "clone": "^1.0.2"
    }
   },
+  "define-properties": {
+   "version": "1.1.3",
+   "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+   "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+   "dev": true,
+   "requires": {
+    "object-keys": "^1.0.12"
+   }
+  },
   "define-property": {
    "version": "2.0.2",
    "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -888,6 +1142,31 @@
     "is-arrayish": "^0.2.1"
    }
   },
+  "es-abstract": {
+   "version": "1.13.0",
+   "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+   "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+   "dev": true,
+   "requires": {
+    "es-to-primitive": "^1.2.0",
+    "function-bind": "^1.1.1",
+    "has": "^1.0.3",
+    "is-callable": "^1.1.4",
+    "is-regex": "^1.0.4",
+    "object-keys": "^1.0.12"
+   }
+  },
+  "es-to-primitive": {
+   "version": "1.2.0",
+   "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+   "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+   "dev": true,
+   "requires": {
+    "is-callable": "^1.1.4",
+    "is-date-object": "^1.0.1",
+    "is-symbol": "^1.0.2"
+   }
+  },
   "escape-string-regexp": {
    "version": "1.0.5",
    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -895,32 +1174,33 @@
    "dev": true
   },
   "eslint": {
-   "version": "5.15.1",
-   "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz",
-   "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==",
+   "version": "6.0.1",
+   "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.0.1.tgz",
+   "integrity": "sha512-DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w==",
    "dev": true,
    "requires": {
     "@babel/code-frame": "^7.0.0",
-    "ajv": "^6.9.1",
+    "ajv": "^6.10.0",
     "chalk": "^2.1.0",
     "cross-spawn": "^6.0.5",
     "debug": "^4.0.1",
     "doctrine": "^3.0.0",
-    "eslint-scope": "^4.0.2",
+    "eslint-scope": "^4.0.3",
     "eslint-utils": "^1.3.1",
     "eslint-visitor-keys": "^1.0.0",
-    "espree": "^5.0.1",
+    "espree": "^6.0.0",
     "esquery": "^1.0.1",
     "esutils": "^2.0.2",
     "file-entry-cache": "^5.0.1",
     "functional-red-black-tree": "^1.0.1",
-    "glob": "^7.1.2",
+    "glob-parent": "^3.1.0",
     "globals": "^11.7.0",
     "ignore": "^4.0.6",
     "import-fresh": "^3.0.0",
     "imurmurhash": "^0.1.4",
     "inquirer": "^6.2.2",
-    "js-yaml": "^3.12.0",
+    "is-glob": "^4.0.0",
+    "js-yaml": "^3.13.1",
     "json-stable-stringify-without-jsonify": "^1.0.1",
     "levn": "^0.3.0",
     "lodash": "^4.17.11",
@@ -928,7 +1208,6 @@
     "mkdirp": "^0.5.1",
     "natural-compare": "^1.4.0",
     "optionator": "^0.8.2",
-    "path-is-inside": "^1.0.2",
     "progress": "^2.0.0",
     "regexpp": "^2.0.1",
     "semver": "^5.5.1",
@@ -938,30 +1217,89 @@
     "text-table": "^0.2.0"
    },
    "dependencies": {
-    "lodash": {
-     "version": "4.17.11",
-     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-     "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-     "dev": true
-    },
     "semver": {
-     "version": "5.6.0",
-     "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-     "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+     "version": "5.7.0",
+     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+     "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
      "dev": true
     }
    }
   },
-  "eslint-config-wordpress": {
-   "version": "2.0.0",
-   "resolved": "https://registry.npmjs.org/eslint-config-wordpress/-/eslint-config-wordpress-2.0.0.tgz",
-   "integrity": "sha1-UgEgbGlk1kgxUjLt9t+9LpJeTNY=",
+  "eslint-plugin-jsx-a11y": {
+   "version": "6.2.3",
+   "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz",
+   "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
+   "dev": true,
+   "requires": {
+    "@babel/runtime": "^7.4.5",
+    "aria-query": "^3.0.0",
+    "array-includes": "^3.0.3",
+    "ast-types-flow": "^0.0.7",
+    "axobject-query": "^2.0.2",
+    "damerau-levenshtein": "^1.0.4",
+    "emoji-regex": "^7.0.2",
+    "has": "^1.0.3",
+    "jsx-ast-utils": "^2.2.1"
+   },
+   "dependencies": {
+    "@babel/runtime": {
+     "version": "7.5.4",
+     "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.4.tgz",
+     "integrity": "sha512-Na84uwyImZZc3FKf4aUF1tysApzwf3p2yuFBIyBfbzT5glzKTdvYI4KVW4kcgjrzoGUjC7w3YyCHcJKaRxsr2Q==",
+     "dev": true,
+     "requires": {
+      "regenerator-runtime": "^0.13.2"
+     }
+    }
+   }
+  },
+  "eslint-plugin-react": {
+   "version": "7.14.2",
+   "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.2.tgz",
+   "integrity": "sha512-jZdnKe3ip7FQOdjxks9XPN0pjUKZYq48OggNMd16Sk+8VXx6JOvXmlElxROCgp7tiUsTsze3jd78s/9AFJP2mA==",
+   "dev": true,
+   "requires": {
+    "array-includes": "^3.0.3",
+    "doctrine": "^2.1.0",
+    "has": "^1.0.3",
+    "jsx-ast-utils": "^2.1.0",
+    "object.entries": "^1.1.0",
+    "object.fromentries": "^2.0.0",
+    "object.values": "^1.1.0",
+    "prop-types": "^15.7.2",
+    "resolve": "^1.10.1"
+   },
+   "dependencies": {
+    "doctrine": {
+     "version": "2.1.0",
+     "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+     "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+     "dev": true,
+     "requires": {
+      "esutils": "^2.0.2"
+     }
+    },
+    "resolve": {
+     "version": "1.11.1",
+     "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+     "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+     "dev": true,
+     "requires": {
+      "path-parse": "^1.0.6"
+     }
+    }
+   }
+  },
+  "eslint-plugin-react-hooks": {
+   "version": "1.6.1",
+   "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.1.tgz",
+   "integrity": "sha512-wHhmGJyVuijnYIJXZJHDUF2WM+rJYTjulUTqF9k61d3BTk8etydz+M4dXUVH7M76ZRS85rqBTCx0Es/lLsrjnA==",
    "dev": true
   },
   "eslint-scope": {
-   "version": "4.0.2",
-   "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
-   "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
+   "version": "4.0.3",
+   "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+   "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
    "dev": true,
    "requires": {
     "esrecurse": "^4.1.0",
@@ -969,10 +1307,13 @@
    }
   },
   "eslint-utils": {
-   "version": "1.3.1",
-   "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-   "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
-   "dev": true
+   "version": "1.4.0",
+   "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
+   "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
+   "dev": true,
+   "requires": {
+    "eslint-visitor-keys": "^1.0.0"
+   }
   },
   "eslint-visitor-keys": {
    "version": "1.0.0",
@@ -981,9 +1322,9 @@
    "dev": true
   },
   "espree": {
-   "version": "5.0.1",
-   "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-   "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+   "version": "6.0.0",
+   "resolved": "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz",
+   "integrity": "sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==",
    "dev": true,
    "requires": {
     "acorn": "^6.0.7",
@@ -1330,9 +1671,9 @@
    },
    "dependencies": {
     "glob": {
-     "version": "7.1.3",
-     "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-     "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+     "version": "7.1.4",
+     "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+     "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
      "dev": true,
      "requires": {
       "fs.realpath": "^1.0.0",
@@ -1355,9 +1696,9 @@
    }
   },
   "flatted": {
-   "version": "2.0.0",
-   "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
-   "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+   "version": "2.0.1",
+   "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+   "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
    "dev": true
   },
   "for-in": {
@@ -1949,6 +2290,12 @@
     }
    }
   },
+  "function-bind": {
+   "version": "1.1.1",
+   "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+   "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+   "dev": true
+  },
   "functional-red-black-tree": {
    "version": "1.0.1",
    "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -2147,9 +2494,9 @@
      }
     },
     "lodash": {
-     "version": "4.17.11",
-     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-     "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+     "version": "4.17.14",
+     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+     "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
      "dev": true
     }
    }
@@ -2268,6 +2615,15 @@
     "inquirer": "^6.0.0"
    }
   },
+  "has": {
+   "version": "1.0.3",
+   "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+   "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+   "dev": true,
+   "requires": {
+    "function-bind": "^1.1.1"
+   }
+  },
   "has-ansi": {
    "version": "2.0.0",
    "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -2283,6 +2639,12 @@
    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
    "dev": true
   },
+  "has-symbols": {
+   "version": "1.0.0",
+   "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+   "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+   "dev": true
+  },
   "has-value": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -2328,21 +2690,112 @@
    "dev": true
   },
   "husky": {
-   "version": "0.14.3",
-   "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-   "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-   "dev": true,
-   "requires": {
-    "is-ci": "^1.0.10",
-    "normalize-path": "^1.0.0",
-    "strip-indent": "^2.0.0"
+   "version": "3.0.0",
+   "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.0.tgz",
+   "integrity": "sha512-lKMEn7bRK+7f5eWPNGclDVciYNQt0GIkAQmhKl+uHP1qFzoN0h92kmH9HZ8PCwyVA2EQPD8KHf0FYWqnTxau+Q==",
+   "dev": true,
+   "requires": {
+    "cosmiconfig": "^5.2.1",
+    "execa": "^1.0.0",
+    "get-stdin": "^7.0.0",
+    "is-ci": "^2.0.0",
+    "opencollective-postinstall": "^2.0.2",
+    "pkg-dir": "^4.2.0",
+    "please-upgrade-node": "^3.1.1",
+    "read-pkg": "^5.1.1",
+    "run-node": "^1.0.0",
+    "slash": "^3.0.0"
    },
    "dependencies": {
-    "strip-indent": {
+    "ci-info": {
      "version": "2.0.0",
-     "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-     "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+     "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+     "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
      "dev": true
+    },
+    "execa": {
+     "version": "1.0.0",
+     "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+     "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+     "dev": true,
+     "requires": {
+      "cross-spawn": "^6.0.0",
+      "get-stream": "^4.0.0",
+      "is-stream": "^1.1.0",
+      "npm-run-path": "^2.0.0",
+      "p-finally": "^1.0.0",
+      "signal-exit": "^3.0.0",
+      "strip-eof": "^1.0.0"
+     }
+    },
+    "get-stdin": {
+     "version": "7.0.0",
+     "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
+     "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
+     "dev": true
+    },
+    "get-stream": {
+     "version": "4.1.0",
+     "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+     "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+     "dev": true,
+     "requires": {
+      "pump": "^3.0.0"
+     }
+    },
+    "is-ci": {
+     "version": "2.0.0",
+     "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+     "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+     "dev": true,
+     "requires": {
+      "ci-info": "^2.0.0"
+     }
+    },
+    "normalize-package-data": {
+     "version": "2.5.0",
+     "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+     "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+     "dev": true,
+     "requires": {
+      "hosted-git-info": "^2.1.4",
+      "resolve": "^1.10.0",
+      "semver": "2 || 3 || 4 || 5",
+      "validate-npm-package-license": "^3.0.1"
+     }
+    },
+    "parse-json": {
+     "version": "5.0.0",
+     "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
+     "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+     "dev": true,
+     "requires": {
+      "@babel/code-frame": "^7.0.0",
+      "error-ex": "^1.3.1",
+      "json-parse-better-errors": "^1.0.1",
+      "lines-and-columns": "^1.1.6"
+     }
+    },
+    "read-pkg": {
+     "version": "5.2.0",
+     "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+     "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+     "dev": true,
+     "requires": {
+      "@types/normalize-package-data": "^2.4.0",
+      "normalize-package-data": "^2.5.0",
+      "parse-json": "^5.0.0",
+      "type-fest": "^0.6.0"
+     }
+    },
+    "resolve": {
+     "version": "1.11.1",
+     "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+     "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+     "dev": true,
+     "requires": {
+      "path-parse": "^1.0.6"
+     }
     }
    }
   },
@@ -2362,9 +2815,9 @@
    "dev": true
   },
   "import-fresh": {
-   "version": "3.0.0",
-   "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
-   "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
+   "version": "3.1.0",
+   "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+   "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
    "dev": true,
    "requires": {
     "parent-module": "^1.0.0",
@@ -2462,9 +2915,9 @@
      }
     },
     "lodash": {
-     "version": "4.17.11",
-     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-     "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+     "version": "4.17.14",
+     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+     "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
      "dev": true
     },
     "strip-ansi": {
@@ -2537,6 +2990,12 @@
     "builtin-modules": "^1.0.0"
    }
   },
+  "is-callable": {
+   "version": "1.1.4",
+   "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+   "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+   "dev": true
+  },
   "is-ci": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
@@ -2566,6 +3025,12 @@
     }
    }
   },
+  "is-date-object": {
+   "version": "1.0.1",
+   "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+   "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+   "dev": true
+  },
   "is-descriptor": {
    "version": "0.1.6",
    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -2585,6 +3050,12 @@
     }
    }
   },
+  "is-directory": {
+   "version": "0.3.1",
+   "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+   "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+   "dev": true
+  },
   "is-extendable": {
    "version": "0.1.1",
    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -2705,6 +3176,15 @@
    "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
    "dev": true
   },
+  "is-regex": {
+   "version": "1.0.4",
+   "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+   "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+   "dev": true,
+   "requires": {
+    "has": "^1.0.1"
+   }
+  },
   "is-regexp": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
@@ -2723,6 +3203,15 @@
    "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
    "dev": true
   },
+  "is-symbol": {
+   "version": "1.0.2",
+   "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+   "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+   "dev": true,
+   "requires": {
+    "has-symbols": "^1.0.0"
+   }
+  },
   "is-utf8": {
    "version": "0.2.1",
    "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -2769,6 +3258,12 @@
     "esprima": "^4.0.0"
    }
   },
+  "jsesc": {
+   "version": "2.5.2",
+   "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+   "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+   "dev": true
+  },
   "json-parse-better-errors": {
    "version": "1.0.2",
    "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -2796,6 +3291,16 @@
     "graceful-fs": "^4.1.6"
    }
   },
+  "jsx-ast-utils": {
+   "version": "2.2.1",
+   "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz",
+   "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==",
+   "dev": true,
+   "requires": {
+    "array-includes": "^3.0.3",
+    "object.assign": "^4.1.0"
+   }
+  },
   "just-debounce": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
@@ -2827,6 +3332,12 @@
     "type-check": "~0.3.2"
    }
   },
+  "lines-and-columns": {
+   "version": "1.1.6",
+   "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+   "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+   "dev": true
+  },
   "load-json-file": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -2859,9 +3370,9 @@
    }
   },
   "lodash": {
-   "version": "4.17.11",
-   "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-   "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+   "version": "4.17.14",
+   "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+   "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
    "dev": true
   },
   "lodash._reinterpolate": {
@@ -2898,6 +3409,15 @@
     "chalk": "^2.0.1"
    }
   },
+  "loose-envify": {
+   "version": "1.4.0",
+   "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+   "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+   "dev": true,
+   "requires": {
+    "js-tokens": "^3.0.0 || ^4.0.0"
+   }
+  },
   "loud-rejection": {
    "version": "1.6.0",
    "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -3041,9 +3561,9 @@
    }
   },
   "mixin-deep": {
-   "version": "1.3.1",
-   "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-   "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+   "version": "1.3.2",
+   "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+   "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
    "dev": true,
    "requires": {
     "for-in": "^1.0.2",
@@ -3141,12 +3661,6 @@
     "validate-npm-package-license": "^3.0.1"
    }
   },
-  "normalize-path": {
-   "version": "1.0.0",
-   "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-   "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-   "dev": true
-  },
   "npm-run-path": {
    "version": "2.0.2",
    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -3199,6 +3713,12 @@
     }
    }
   },
+  "object-keys": {
+   "version": "1.1.1",
+   "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+   "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+   "dev": true
+  },
   "object-visit": {
    "version": "1.0.1",
    "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -3208,6 +3728,18 @@
     "isobject": "^3.0.0"
    }
   },
+  "object.assign": {
+   "version": "4.1.0",
+   "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+   "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+   "dev": true,
+   "requires": {
+    "define-properties": "^1.1.2",
+    "function-bind": "^1.1.1",
+    "has-symbols": "^1.0.0",
+    "object-keys": "^1.0.11"
+   }
+  },
   "object.defaults": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -3220,6 +3752,30 @@
     "isobject": "^3.0.0"
    }
   },
+  "object.entries": {
+   "version": "1.1.0",
+   "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+   "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+   "dev": true,
+   "requires": {
+    "define-properties": "^1.1.3",
+    "es-abstract": "^1.12.0",
+    "function-bind": "^1.1.1",
+    "has": "^1.0.3"
+   }
+  },
+  "object.fromentries": {
+   "version": "2.0.0",
+   "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz",
+   "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==",
+   "dev": true,
+   "requires": {
+    "define-properties": "^1.1.2",
+    "es-abstract": "^1.11.0",
+    "function-bind": "^1.1.1",
+    "has": "^1.0.1"
+   }
+  },
   "object.pick": {
    "version": "1.3.0",
    "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -3229,6 +3785,18 @@
     "isobject": "^3.0.1"
    }
   },
+  "object.values": {
+   "version": "1.1.0",
+   "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+   "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+   "dev": true,
+   "requires": {
+    "define-properties": "^1.1.3",
+    "es-abstract": "^1.12.0",
+    "function-bind": "^1.1.1",
+    "has": "^1.0.3"
+   }
+  },
   "once": {
    "version": "1.4.0",
    "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3247,6 +3815,12 @@
     "mimic-fn": "^1.0.0"
    }
   },
+  "opencollective-postinstall": {
+   "version": "2.0.2",
+   "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
+   "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==",
+   "dev": true
+  },
   "optionator": {
    "version": "0.8.2",
    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -3370,9 +3944,9 @@
    }
   },
   "parent-module": {
-   "version": "1.0.0",
-   "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz",
-   "integrity": "sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==",
+   "version": "1.0.1",
+   "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+   "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
    "dev": true,
    "requires": {
     "callsites": "^3.0.0"
@@ -3426,6 +4000,12 @@
    "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
    "dev": true
   },
+  "path-parse": {
+   "version": "1.0.6",
+   "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+   "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+   "dev": true
+  },
   "path-type": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -3458,6 +4038,75 @@
     "pinkie": "^2.0.0"
    }
   },
+  "pkg-dir": {
+   "version": "4.2.0",
+   "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+   "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+   "dev": true,
+   "requires": {
+    "find-up": "^4.0.0"
+   },
+   "dependencies": {
+    "find-up": {
+     "version": "4.1.0",
+     "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+     "dev": true,
+     "requires": {
+      "locate-path": "^5.0.0",
+      "path-exists": "^4.0.0"
+     }
+    },
+    "locate-path": {
+     "version": "5.0.0",
+     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+     "dev": true,
+     "requires": {
+      "p-locate": "^4.1.0"
+     }
+    },
+    "p-limit": {
+     "version": "2.2.0",
+     "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+     "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+     "dev": true,
+     "requires": {
+      "p-try": "^2.0.0"
+     }
+    },
+    "p-locate": {
+     "version": "4.1.0",
+     "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+     "dev": true,
+     "requires": {
+      "p-limit": "^2.2.0"
+     }
+    },
+    "p-try": {
+     "version": "2.2.0",
+     "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+     "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+     "dev": true
+    },
+    "path-exists": {
+     "version": "4.0.0",
+     "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+     "dev": true
+    }
+   }
+  },
+  "please-upgrade-node": {
+   "version": "3.1.1",
+   "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz",
+   "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
+   "dev": true,
+   "requires": {
+    "semver-compare": "^1.0.0"
+   }
+  },
   "posix-character-classes": {
    "version": "0.1.1",
    "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -3494,12 +4143,33 @@
    "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
    "dev": true
   },
+  "prop-types": {
+   "version": "15.7.2",
+   "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+   "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+   "dev": true,
+   "requires": {
+    "loose-envify": "^1.4.0",
+    "object-assign": "^4.1.1",
+    "react-is": "^16.8.1"
+   }
+  },
   "pseudomap": {
    "version": "1.0.2",
    "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
    "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
    "dev": true
   },
+  "pump": {
+   "version": "3.0.0",
+   "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+   "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+   "dev": true,
+   "requires": {
+    "end-of-stream": "^1.1.0",
+    "once": "^1.3.1"
+   }
+  },
   "punycode": {
    "version": "2.1.1",
    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -3532,6 +4202,12 @@
     }
    }
   },
+  "react-is": {
+   "version": "16.8.6",
+   "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+   "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==",
+   "dev": true
+  },
   "read-pkg": {
    "version": "1.1.0",
    "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -3665,6 +4341,12 @@
     "is-finite": "^1.0.0"
    }
   },
+  "requireindex": {
+   "version": "1.2.0",
+   "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+   "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+   "dev": true
+  },
   "resolve": {
    "version": "1.1.7",
    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
@@ -3717,6 +4399,12 @@
     "is-promise": "^2.1.0"
    }
   },
+  "run-node": {
+   "version": "1.0.0",
+   "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz",
+   "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
+   "dev": true
+  },
   "rxjs": {
    "version": "6.4.0",
    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -3753,6 +4441,12 @@
    "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
    "dev": true
   },
+  "semver-compare": {
+   "version": "1.0.0",
+   "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+   "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+   "dev": true
+  },
   "semver-diff": {
    "version": "2.1.0",
    "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
@@ -3763,9 +4457,9 @@
    }
   },
   "set-value": {
-   "version": "2.0.0",
-   "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-   "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+   "version": "2.0.1",
+   "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+   "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
    "dev": true,
    "requires": {
     "extend-shallow": "^2.0.1",
@@ -3806,6 +4500,12 @@
    "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
    "dev": true
   },
+  "slash": {
+   "version": "3.0.0",
+   "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+   "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+   "dev": true
+  },
   "slice-ansi": {
    "version": "2.1.0",
    "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
@@ -4137,9 +4837,9 @@
    "dev": true
   },
   "table": {
-   "version": "5.2.3",
-   "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
-   "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==",
+   "version": "5.4.1",
+   "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz",
+   "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==",
    "dev": true,
    "requires": {
     "ajv": "^6.9.1",
@@ -4154,12 +4854,6 @@
      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
      "dev": true
     },
-    "lodash": {
-     "version": "4.17.11",
-     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-     "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-     "dev": true
-    },
     "string-width": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -4172,9 +4866,9 @@
      }
     },
     "strip-ansi": {
-     "version": "5.1.0",
-     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz",
-     "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==",
+     "version": "5.2.0",
+     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
      "dev": true,
      "requires": {
       "ansi-regex": "^4.1.0"
@@ -4218,6 +4912,12 @@
     "os-tmpdir": "~1.0.2"
    }
   },
+  "to-fast-properties": {
+   "version": "2.0.0",
+   "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+   "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+   "dev": true
+  },
   "to-object-path": {
    "version": "0.3.0",
    "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -4266,6 +4966,12 @@
    "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
    "dev": true
   },
+  "trim-right": {
+   "version": "1.0.1",
+   "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+   "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+   "dev": true
+  },
   "tslib": {
    "version": "1.9.3",
    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
@@ -4281,6 +4987,12 @@
     "prelude-ls": "~1.1.2"
    }
   },
+  "type-fest": {
+   "version": "0.6.0",
+   "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+   "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+   "dev": true
+  },
   "underscore.string": {
    "version": "3.3.5",
    "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
@@ -4292,38 +5004,15 @@
    }
   },
   "union-value": {
-   "version": "1.0.0",
-   "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-   "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+   "version": "1.0.1",
+   "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+   "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
    "dev": true,
    "requires": {
     "arr-union": "^3.1.0",
     "get-value": "^2.0.6",
     "is-extendable": "^0.1.1",
-    "set-value": "^0.4.3"
-   },
-   "dependencies": {
-    "extend-shallow": {
-     "version": "2.0.1",
-     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-     "dev": true,
-     "requires": {
-      "is-extendable": "^0.1.0"
-     }
-    },
-    "set-value": {
-     "version": "0.4.3",
-     "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-     "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-     "dev": true,
-     "requires": {
-      "extend-shallow": "^2.0.1",
-      "is-extendable": "^0.1.1",
-      "is-plain-object": "^2.0.1",
-      "to-object-path": "^0.3.0"
-     }
-    }
+    "set-value": "^2.0.1"
    }
   },
   "unique-string": {
@@ -4848,11 +5537,6 @@
     "workbox-core": "^4.3.1"
    }
   },
-  "wp-dev-lib": {
-   "version": "github:xwp/wp-dev-lib#90574b4e61c53a9b0e7f286812fe428d13c9ba7d",
-   "from": "github:xwp/wp-dev-lib#1.0.0",
-   "dev": true
-  },
   "wrappy": {
    "version": "1.0.2",
    "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index af608b9c0..53ccf694e 100644
--- a/package.json
+++ b/package.json
@@ -6,25 +6,25 @@
   "type": "git",
   "url": "https://github.com/xwp/pwa-wp.git"
  },
- "license": "GPL-2.0+",
+ "license": "GPL-2.0-or-later",
  "private": true,
  "devDependencies": {
-  "eslint": "5.15.1",
-  "eslint-config-wordpress": "2.0.0",
-  "grunt": "^1.0.4",
+  "@wordpress/eslint-plugin": "2.3.0",
+  "eslint": "6.0.1",
+  "grunt": "1.0.4",
   "grunt-contrib-clean": "2.0.0",
   "grunt-contrib-copy": "1.0.0",
   "grunt-shell": "3.0.1",
   "grunt-wp-deploy": "2.0.0",
-  "husky": "^0.14.3",
-  "workbox-cli": "4.3.1",
-  "wp-dev-lib": "github:xwp/wp-dev-lib#1.0.0"
+  "husky": "3.0.0",
+  "workbox-cli": "4.3.1"
  },
  "scripts": {
-  "precommit": "if command -v lando >/dev/null 2>&1; then lando ssh -c 'bash ./vendor/xwp/wp-dev-lib/scripts/pre-commit'; else ./vendor/xwp/wp-dev-lib/scripts/pre-commit; fi",
+  "pre-commit": "if command -v lando >/dev/null 2>&1; then lando ssh -c 'bash ./vendor/xwp/wp-dev-lib/scripts/pre-commit'; else ./vendor/xwp/wp-dev-lib/scripts/pre-commit; fi",
   "generate-readme": "./vendor/xwp/wp-dev-lib/scripts/generate-markdown-readme",
   "build": "grunt build; grunt create-build-zip",
-  "deploy": "grunt deploy"
+  "deploy": "grunt deploy",
+   "lint": "eslint ."
  },
  "dependencies": {}
 }

From 55e4b287a39caad03f26c9345633d50cb54190ca Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 16 Jul 2019 10:31:34 +0200
Subject: [PATCH 3/4] Fix eslint errors

---
 Gruntfile.js                                  | 66 +++++++++----------
 .../js/service-worker-navigation-routing.js   | 62 ++++++++---------
 .../js/service-worker-offline-commenting.js   | 17 ++---
 wp-includes/js/service-worker-precaching.js   |  4 +-
 .../js/service-worker-stream-combiner.js      | 12 ++--
 wp-includes/js/service-worker.js              |  2 +-
 6 files changed, 77 insertions(+), 86 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index e3c7b7753..d275d23d5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,31 +12,31 @@ module.exports = function( grunt ) {
 		// Clean up the build.
 		clean: {
 			build: {
-				src: [ 'build' ]
-			}
+				src: [ 'build' ],
+			},
 		},
 
 		// Shell actions.
 		shell: {
 			options: {
 				stdout: true,
-				stderr: true
+				stderr: true,
 			},
 			readme: {
-				command: 'npm run generate-readme' // Generate the readme.md.
+				command: 'npm run generate-readme', // Generate the readme.md.
 			},
 			phpunit: {
-				command: 'phpunit'
+				command: 'phpunit',
 			},
 			verify_matching_versions: {
-				command: 'php bin/verify-version-consistency.php'
+				command: 'php bin/verify-version-consistency.php',
 			},
 			install_workbox: {
-				command: 'if [ -e wp-includes/js/workbox* ]; then rm -r wp-includes/js/workbox*; fi; npx workbox copyLibraries wp-includes/js/ && mv wp-includes/js/workbox-v* wp-includes/js/workbox'
+				command: 'if [ -e wp-includes/js/workbox* ]; then rm -r wp-includes/js/workbox*; fi; npx workbox copyLibraries wp-includes/js/ && mv wp-includes/js/workbox-v* wp-includes/js/workbox',
 			},
 			create_build_zip: {
-				command: 'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi; if [ -e pwa.zip ]; then rm pwa.zip; fi; cd build; zip -r ../pwa.zip .; cd ..; echo; echo "ZIP of build: $(pwd)/pwa.zip"'
-			}
+				command: 'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi; if [ -e pwa.zip ]; then rm pwa.zip; fi; cd build; zip -r ../pwa.zip .; cd ..; echo; echo "ZIP of build: $(pwd)/pwa.zip"',
+			},
 		},
 
 		// Deploys a git Repo to the WordPress SVN repo.
@@ -45,10 +45,10 @@ module.exports = function( grunt ) {
 				options: {
 					plugin_slug: 'pwa',
 					build_dir: 'build',
-					assets_dir: 'wp-assets'
-				}
-			}
-		}
+					assets_dir: 'wp-assets',
+				},
+			},
+		},
 
 	} );
 
@@ -60,39 +60,37 @@ module.exports = function( grunt ) {
 
 	// Register tasks.
 	grunt.registerTask( 'default', [
-		'build'
+		'build',
 	] );
 
 	grunt.registerTask( 'readme', [
-		'shell:readme'
+		'shell:readme',
 	] );
 
 	grunt.registerTask( 'build', function() {
-		var done, spawnQueue, stdout;
-		done = this.async();
-		spawnQueue = [];
-		stdout = [];
+		const done = this.async();
+		const spawnQueue = [];
+		const stdout = [];
 
 		grunt.task.run( 'shell:install_workbox' );
 
 		spawnQueue.push(
 			{
 				cmd: 'git',
-				args: [ '--no-pager', 'log', '-1', '--format=%h', '--date=short' ]
+				args: [ '--no-pager', 'log', '-1', '--format=%h', '--date=short' ],
 			},
 			{
 				cmd: 'git',
-				args: [ 'ls-files' ]
+				args: [ 'ls-files' ],
 			}
 		);
 
 		function finalize() {
-			var commitHash, lsOutput, versionAppend, paths;
-			commitHash = stdout.shift();
-			lsOutput = stdout.shift();
-			versionAppend = commitHash + '-' + new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' );
+			const commitHash = stdout.shift();
+			const lsOutput = stdout.shift();
+			const versionAppend = commitHash + '-' + new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' );
 
-			paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
+			const paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
 				return ! /^(\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|readme\.md|composer\..*|webpack.*)/.test( file );
 			} );
 			paths.push( 'wp-includes/js/workbox/*' );
@@ -105,8 +103,8 @@ module.exports = function( grunt ) {
 					expand: true,
 					options: {
 						noProcess: [ '*/**', 'LICENSE' ], // That is, only process pwa.php and readme.txt.
-						process: function( content, srcpath ) {
-							var matches, version, versionRegex;
+						process( content, srcpath ) {
+							let matches, version, versionRegex;
 							if ( /pwa\.php$/.test( srcpath ) ) {
 								versionRegex = /(\*\s+Version:\s+)(\d+(\.\d+)+-\w+)/;
 
@@ -120,9 +118,9 @@ module.exports = function( grunt ) {
 								}
 							}
 							return content;
-						}
-					}
-				}
+						},
+					},
+				},
 			} );
 			grunt.task.run( 'readme' );
 			grunt.task.run( 'copy' );
@@ -131,7 +129,7 @@ module.exports = function( grunt ) {
 		}
 
 		function doNext() {
-			var nextSpawnArgs = spawnQueue.shift();
+			const nextSpawnArgs = spawnQueue.shift();
 			if ( ! nextSpawnArgs ) {
 				finalize();
 			} else {
@@ -152,13 +150,13 @@ module.exports = function( grunt ) {
 	} );
 
 	grunt.registerTask( 'create-build-zip', [
-		'shell:create_build_zip'
+		'shell:create_build_zip',
 	] );
 
 	grunt.registerTask( 'deploy', [
 		'shell:verify_matching_versions',
 		'shell:phpunit',
 		'build',
-		'wp_deploy'
+		'wp_deploy',
 	] );
 };
diff --git a/wp-includes/js/service-worker-navigation-routing.js b/wp-includes/js/service-worker-navigation-routing.js
index de7724a6d..cf59da3b9 100644
--- a/wp-includes/js/service-worker-navigation-routing.js
+++ b/wp-includes/js/service-worker-navigation-routing.js
@@ -20,7 +20,7 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 	/**
 	 * Handle navigation request.
 	 *
-	 * @param event Event.
+	 * @param {Object} event Event.
 	 * @return {Promise<Response>} Response.
 	 */
 	async function handleNavigationRequest( { event } ) {
@@ -44,9 +44,8 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 					return response.text().then( ( body ) => {
 						return new Response( script + body );
 					} );
-				} else {
-					return response;
 				}
+				return response;
 			}
 
 			if ( canStreamResponse() ) {
@@ -55,23 +54,21 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 
 			const originalResponse = response.clone();
 			return response.text().then( function( responseBody ) {
-
 				// Prevent serving custom error template if WordPress is already responding with a valid error page (e.g. via wp_die()).
 				if ( -1 !== responseBody.indexOf( '</html>' ) ) {
 					return originalResponse;
 				}
 
 				return caches.match( wp.serviceWorker.precaching.getCacheKeyForURL( ERROR_500_URL ) ).then( function( errorResponse ) {
-
 					if ( ! errorResponse ) {
 						return response;
 					}
 
 					return errorResponse.text().then( function( text ) {
-						let init = {
+						const init = {
 							status: errorResponse.status,
 							statusText: errorResponse.statusText,
-							headers: errorResponse.headers
+							headers: errorResponse.headers,
 						};
 
 						let body = text.replace( /[<]!--WP_SERVICE_WORKER_ERROR_MESSAGE-->/, errorMessages.error );
@@ -88,7 +85,7 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 									.replace( /"/g, '&quot;' )
 									.replace( /</g, '&lt;' )
 									.replace( />/g, '&gt;' );
-								const iframe = `<iframe style="width:100%" src="${src}" data-srcdoc="${srcdoc}"></iframe>`;
+								const iframe = `<iframe style="width:100%" src="${ src }" data-srcdoc="${ srcdoc }"></iframe>`;
 								details = details.replace( '{{{error_details_iframe}}}', iframe );
 								// The following are in case the user wants to include the <iframe> in the template.
 								details = details.replace( '{{{iframe_src}}}', src );
@@ -113,10 +110,10 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 
 			return caches.match( wp.serviceWorker.precaching.getCacheKeyForURL( ERROR_OFFLINE_URL ) ).then( function( response ) {
 				return response.text().then( function( text ) {
-					let init = {
+					const init = {
 						status: response.status,
 						statusText: response.statusText,
-						headers: response.headers
+						headers: response.headers,
 					};
 
 					const body = text.replace( /[<]!--WP_SERVICE_WORKER_ERROR_MESSAGE-->/, navigator.onLine ? errorMessages.serverOffline : errorMessages.clientOffline );
@@ -145,14 +142,14 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 
 		if ( canStreamResponse() ) {
 			const streamHeaderFragmentURL = STREAM_HEADER_FRAGMENT_URL;
-			const precacheStrategy = new wp.serviceWorker.strategies.cacheFirst({
+			const precacheStrategy = new wp.serviceWorker.strategies.cacheFirst( {
 				cacheName: wp.serviceWorker.core.cacheNames.precache,
-			});
+			} );
 
 			const url = new URL( event.request.url );
 			url.searchParams.append( STREAM_HEADER_FRAGMENT_QUERY_VAR, 'body' );
 			const init = {
-				mode: 'same-origin'
+				mode: 'same-origin',
 			};
 			const copiedProps = [
 				'method',
@@ -167,19 +164,18 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 				init[ initProp ] = event.request[ initProp ];
 			}
 			const request = new Request( url.toString(), init );
-			const stream = wp.serviceWorker.streams.concatenateToResponse([
-				precacheStrategy.makeRequest({ request: streamHeaderFragmentURL }),
+			const stream = wp.serviceWorker.streams.concatenateToResponse( [
+				precacheStrategy.makeRequest( { request: streamHeaderFragmentURL } ),
 				navigationCacheStrategy.makeRequest( { request } )
 					.then( handleResponse )
 					.catch( sendOfflineResponse ),
-			]);
+			] );
 
 			return stream.response;
-		} else {
-			return navigationCacheStrategy.makeRequest( { request: event.request } )
-				.then( handleResponse )
-				.catch( sendOfflineResponse );
 		}
+		return navigationCacheStrategy.makeRequest( { request: event.request } )
+			.then( handleResponse )
+			.catch( sendOfflineResponse );
 	}
 
 	const blacklist = NAVIGATION_BLACKLIST_PATTERNS.map( ( pattern ) => new RegExp( pattern ) );
@@ -196,13 +192,13 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 			 *
 			 * @inheritDoc
 			 */
-			constructor(handler, {
-				whitelist = [/./],
-				blacklist = []
-			} = {}) {
-				super(options => this._match(options), handler);
-				this._whitelist = whitelist;
-				this._blacklist = blacklist;
+			constructor( handler, {
+				whitelist: _whitelist = [ /./ ],
+				blacklist: _blacklist = [],
+			} = {} ) {
+				super( ( options ) => this._match( options ), handler );
+				this._whitelist = _whitelist;
+				this._blacklist = _blacklist;
 			}
 
 			/**
@@ -211,24 +207,24 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 			 * @param {Object} options
 			 * @param {URL} options.url
 			 * @param {Request} options.request
-			 * @return {boolean}
+			 * @return {boolean} Whether there is a match or not.
 			 *
 			 * @private
 			 */
-			_match({ url, request }) {
+			_match( { url, request } ) {
 				// This replaces checking for navigate in NavigationRoute, which looks for 'navigate' instead.
 				if ( request.mode !== 'same-origin' ) {
 					return false;
 				}
 
 				const pathnameAndSearch = url.pathname + url.search;
-				for (const regExp of this._blacklist) {
-					if (regExp.test(pathnameAndSearch)) {
+				for ( const regExp of this._blacklist ) {
+					if ( regExp.test( pathnameAndSearch ) ) {
 						return false;
 					}
 				}
 
-				return this._whitelist.some(regExp => regExp.test(pathnameAndSearch));
+				return this._whitelist.some( ( regExp ) => regExp.test( pathnameAndSearch ) );
 			}
 		}
 
@@ -250,6 +246,6 @@ ERROR_OFFLINE_BODY_FRAGMENT_URL, STREAM_HEADER_FRAGMENT_QUERY_VAR, NAVIGATION_BL
 wp.serviceWorker.routing.registerRoute( new wp.serviceWorker.routing.NavigationRoute(
 	new wp.serviceWorker.strategies.NetworkOnly(),
 	{
-		whitelist: NAVIGATION_BLACKLIST_PATTERNS.map( ( pattern ) => new RegExp( pattern ) )
+		whitelist: NAVIGATION_BLACKLIST_PATTERNS.map( ( pattern ) => new RegExp( pattern ) ),
 	}
 ) );
diff --git a/wp-includes/js/service-worker-offline-commenting.js b/wp-includes/js/service-worker-offline-commenting.js
index 20575b293..d3ff793a3 100644
--- a/wp-includes/js/service-worker-offline-commenting.js
+++ b/wp-includes/js/service-worker-offline-commenting.js
@@ -6,7 +6,6 @@
 	const errorMessages = ERROR_MESSAGES;
 
 	const commentHandler = ( { event } ) => {
-
 		const clone = event.request.clone();
 		return fetch( event.request )
 			.then( ( response ) => {
@@ -17,16 +16,15 @@
 				// @todo This is duplicated with code in service-worker-navigation-routing.js.
 				return response.text().then( function( errorText ) {
 					return caches.match( wp.serviceWorker.precaching.getCacheKeyForURL( ERROR_500_URL ) ).then( function( errorResponse ) {
-
 						if ( ! errorResponse ) {
 							return response;
 						}
 
 						return errorResponse.text().then( function( text ) {
-							let init = {
+							const init = {
 								status: errorResponse.status,
 								statusText: errorResponse.statusText,
-								headers: errorResponse.headers
+								headers: errorResponse.headers,
 							};
 
 							let body = text.replace( /[<]!--WP_SERVICE_WORKER_ERROR_MESSAGE-->/, errorMessages.error );
@@ -43,7 +41,7 @@
 										.replace( /"/g, '&quot;' )
 										.replace( /</g, '&lt;' )
 										.replace( />/g, '&gt;' );
-									const iframe = `<iframe style="width:100%" src="${src}"  srcdoc="${srcdoc}"></iframe>`;
+									const iframe = `<iframe style="width:100%" src="${ src }"  srcdoc="${ srcdoc }"></iframe>`;
 									details = details.replace( '{{{error_details_iframe}}}', iframe );
 									// The following are in case the user wants to include the <iframe> in the template.
 									details = details.replace( '{{{iframe_src}}}', src );
@@ -73,24 +71,23 @@
 							credentials: request.credentials,
 							referrer: request.referrer,
 							redirect: 'manual',
-							body: body
+							body,
 						} );
 
 						// Add request to queue.
 						queue.pushRequest( {
-							request: req 
+							request: req,
 						} );
 					}
 				);
 
 				// @todo This is duplicated with code in service-worker-navigation-routing.js.
 				return caches.match( wp.serviceWorker.precaching.getCacheKeyForURL( ERROR_OFFLINE_URL ) ).then( function( response ) {
-
 					return response.text().then( function( text ) {
-						let init = {
+						const init = {
 							status: response.status,
 							statusText: response.statusText,
-							headers: response.headers
+							headers: response.headers,
 						};
 
 						const body = text.replace( /[<]!--WP_SERVICE_WORKER_ERROR_MESSAGE-->/, errorMessages.comment );
diff --git a/wp-includes/js/service-worker-precaching.js b/wp-includes/js/service-worker-precaching.js
index d0931a7a7..6578839c2 100644
--- a/wp-includes/js/service-worker-precaching.js
+++ b/wp-includes/js/service-worker-precaching.js
@@ -11,8 +11,8 @@
 		ignoreUrlParametersMatching: [
 			/^utm_/,
 			/^wp-mce-/,
-			/^ver$/
-		]
+			/^ver$/,
+		],
 		// @todo Add urlManipulation which allows for the list of ignoreUrlParametersMatching to be supplied with each entry.
 	} );
 } )();
diff --git a/wp-includes/js/service-worker-stream-combiner.js b/wp-includes/js/service-worker-stream-combiner.js
index ffac49205..b30261981 100644
--- a/wp-includes/js/service-worker-stream-combiner.js
+++ b/wp-includes/js/service-worker-stream-combiner.js
@@ -1,6 +1,6 @@
 /*global STREAM_COMBINE_INVOKE_SCRIPT_ID, STREAM_COMBINE_DEFINE_SCRIPT_ID, STREAM_FRAGMENT_BOUNDARY_ELEMENT_ID */
 
-"use strict";
+'use strict';
 /* This JS file will be added as an inline script in a stream header fragment response. */
 /* This file currently uses JS features which are compatible with Chrome 40 (Googlebot). */
 
@@ -22,10 +22,10 @@ function wpStreamCombine( data ) { /* eslint-disable-line no-unused-vars */
 	 *
 	 * @param {Element} element        - Element in head to compare.
 	 * @param {Object}  newElementData - Head node data to compare with.
-	 * @returns {boolean} Matching.
+	 * @return {boolean} Matching.
 	 */
 	const isElementMatchingData = ( element, newElementData ) => {
-		if ( element.nodeName.toLowerCase() !== newElementData[0] ) {
+		if ( element.nodeName.toLowerCase() !== newElementData[ 0 ] ) {
 			return false;
 		}
 
@@ -49,7 +49,7 @@ function wpStreamCombine( data ) { /* eslint-disable-line no-unused-vars */
 		.filter( ( headNodeData ) => '#comment' !== headNodeData[ 0 ] )
 		.forEach( ( headNodeData ) => {
 			const headChildElement = Array.from( document.head.getElementsByTagName( headNodeData[ 0 ] ) ).find( ( element ) => {
-				return ! processedHeadElements.has( element ) && isElementMatchingData( element, headNodeData )
+				return ! processedHeadElements.has( element ) && isElementMatchingData( element, headNodeData );
 			} );
 			if ( ! headChildElement ) {
 				return;
@@ -88,7 +88,7 @@ function wpStreamCombine( data ) { /* eslint-disable-line no-unused-vars */
 		'preload',
 		'profile',
 		'stylesheet',
-		'wlwmanifest'
+		'wlwmanifest',
 	] );
 	Array.from( document.head.querySelectorAll( 'link[rel]' ) ).forEach( ( link ) => {
 		if ( ! processedHeadElements.has( link ) && ! preservedLinkRels.has( link.rel ) ) {
@@ -130,7 +130,7 @@ function wpStreamCombine( data ) { /* eslint-disable-line no-unused-vars */
 	const removedElements = [
 		STREAM_COMBINE_INVOKE_SCRIPT_ID,
 		STREAM_COMBINE_DEFINE_SCRIPT_ID,
-		STREAM_FRAGMENT_BOUNDARY_ELEMENT_ID
+		STREAM_FRAGMENT_BOUNDARY_ELEMENT_ID,
 	];
 	for ( const elementId of removedElements ) {
 		const element = document.getElementById( elementId );
diff --git a/wp-includes/js/service-worker.js b/wp-includes/js/service-worker.js
index dfaff33b7..4df1b985a 100644
--- a/wp-includes/js/service-worker.js
+++ b/wp-includes/js/service-worker.js
@@ -11,7 +11,7 @@ if ( ! self.wp ) {
 wp.serviceWorker = workbox;
 
 // Skip the waiting phase for the Service Worker.
-self.addEventListener( 'message', function ( event ) {
+self.addEventListener( 'message', function( event ) {
 	if ( 'skipWaiting' === event.data.action ) {
 		self.skipWaiting();
 	}

From 17f5c4a94ad376ec0be13ba12e2431e9fe05525e Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 16 Jul 2019 11:45:11 +0200
Subject: [PATCH 4/4] Fix phpcs errors

---
 package.json                                  |  3 +-
 wp-includes/class-wp-https-ui.php             |  2 +-
 ...ce-worker-navigation-routing-component.php | 28 +++++++++----------
 wp-includes/service-workers.php               |  8 ++++--
 wp-includes/template.php                      |  8 +++---
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 53ccf694e..74d9471fd 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,8 @@
   "generate-readme": "./vendor/xwp/wp-dev-lib/scripts/generate-markdown-readme",
   "build": "grunt build; grunt create-build-zip",
   "deploy": "grunt deploy",
-   "lint": "eslint ."
+   "lint:js": "eslint .",
+   "lint:php": "vendor/bin/phpcs"
  },
  "dependencies": {}
 }
diff --git a/wp-includes/class-wp-https-ui.php b/wp-includes/class-wp-https-ui.php
index b2df775e8..d4130d045 100644
--- a/wp-includes/class-wp-https-ui.php
+++ b/wp-includes/class-wp-https-ui.php
@@ -171,7 +171,7 @@ public function render_https_settings() {
 		<script>
 			( function ( $ ) {
 				// Move this UI under the Site Address (URL) <tr> on the General Settings page.
-				$( 'input[name=<?php echo self::UPGRADE_HTTPS_OPTION; // WPCS: XSS OK. ?>]' ).parents( 'tr' ).insertAfter( $( 'label[for=home]' ).parents( 'tr') );
+				$( 'input[name=<?php echo self::UPGRADE_HTTPS_OPTION; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>]' ).parents( 'tr' ).insertAfter( $( 'label[for=home]' ).parents( 'tr') );
 			} )( jQuery );
 		</script>
 		<?php
diff --git a/wp-includes/components/class-wp-service-worker-navigation-routing-component.php b/wp-includes/components/class-wp-service-worker-navigation-routing-component.php
index c8a94855d..ffd3a1b5b 100644
--- a/wp-includes/components/class-wp-service-worker-navigation-routing-component.php
+++ b/wp-includes/components/class-wp-service-worker-navigation-routing-component.php
@@ -69,10 +69,10 @@ class WP_Service_Worker_Navigation_Routing_Component implements WP_Service_Worke
 	 * @return string|null Stream fragment name or null if not requested.
 	 */
 	public static function get_stream_fragment_query_var() {
-		if ( ! isset( $_GET[ self::STREAM_FRAGMENT_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+		if ( ! isset( $_GET[ self::STREAM_FRAGMENT_QUERY_VAR ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return null;
 		}
-		$stream_fragment = wp_unslash( $_GET[ self::STREAM_FRAGMENT_QUERY_VAR ] ); // WPCS: CSRF OK.
+		$stream_fragment = wp_unslash( $_GET[ self::STREAM_FRAGMENT_QUERY_VAR ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		if ( in_array( $stream_fragment, array( 'header', 'body' ), true ) ) {
 			return $stream_fragment;
 		}
@@ -150,7 +150,7 @@ public static function do_stream_boundary( $loading_content = '' ) {
 			if ( ! $loading_content ) {
 				$loading_content = esc_html__( 'Loading&hellip;', 'pwa' );
 			}
-			echo $loading_content; // WPCS: XSS OK.
+			echo $loading_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 		echo '</div>';
 
@@ -170,8 +170,8 @@ public static function do_stream_boundary( $loading_content = '' ) {
 			printf(
 				'<script id="%s">%s</script>',
 				esc_attr( self::STREAM_COMBINE_DEFINE_SCRIPT_ID ),
-				$script
-			); // WPCS: XSS OK.
+				$script // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			);
 		}
 
 		// Short-circuit the response when requesting the header since there is nothing left to stream.
@@ -197,7 +197,7 @@ public static function do_stream_boundary( $loading_content = '' ) {
 				wp_die( esc_html__( 'Failed to turn header into document.', 'pwa' ) );
 			}
 			$response = self::get_header_combine_invoke_script( $dom, true );
-			echo $response; // WPCS: XSS OK.
+			echo $response; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 	}
 
@@ -218,29 +218,29 @@ public static function get_header_combine_invoke_script( $dom, $serialized = tru
 		);
 		$head = $dom->getElementsByTagName( 'head' )->item( 0 );
 		if ( $head ) {
-			foreach ( $head->childNodes as $node ) {
+			foreach ( $head->childNodes as $node ) { // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 				if ( $node instanceof DOMElement ) {
-					if ( 'noscript' === $node->nodeName ) {
+					if ( 'noscript' === $node->nodeName ) { // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 						continue; // Obviously noscript will never be relevant to synchronize since it will never be evaluated.
 					}
 					$element = array(
-						$node->nodeName,
+						$node->nodeName, // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 						null,
 					);
 					if ( $node->hasAttributes() ) {
 						$element[1] = array();
 						foreach ( $node->attributes as $attribute ) {
-							$element[1][ $attribute->nodeName ] = $attribute->nodeValue;
+							$element[1][ $attribute->nodeName ] = $attribute->nodeValue; // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 						}
 					}
-					if ( $node->firstChild instanceof DOMText ) {
-						$element[] = $node->firstChild->nodeValue;
+					if ( $node->firstChild instanceof DOMText ) { // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+						$element[] = $node->firstChild->nodeValue; // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 					}
 					$data['head_nodes'][] = $element;
 				} elseif ( $node instanceof DOMComment ) {
 					$data['head_nodes'][] = array(
 						'#comment',
-						$node->nodeValue,
+						$node->nodeValue, // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 					);
 				}
 			}
@@ -249,7 +249,7 @@ public static function get_header_combine_invoke_script( $dom, $serialized = tru
 		$body = $dom->getElementsByTagName( 'body' )->item( 0 );
 		if ( $body ) {
 			foreach ( $body->attributes as $attribute ) {
-				$data['body_attributes'][ $attribute->nodeName ] = $attribute->nodeValue;
+				$data['body_attributes'][ $attribute->nodeName ] = $attribute->nodeValue; // phpcs:ignore  WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			}
 		}
 
diff --git a/wp-includes/service-workers.php b/wp-includes/service-workers.php
index 47fe48a11..450b7ca41 100644
--- a/wp-includes/service-workers.php
+++ b/wp-includes/service-workers.php
@@ -266,13 +266,15 @@ function wp_disable_script_concatenation() {
 	 * for authenticated users without full-page caching.
 	*/
 	if ( isset( $_COOKIE['wordpress_sw_installed'] ) ) {
-		$concatenate_scripts = false; // WPCS: Override OK.
+		$concatenate_scripts = false; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 	}
 
+	// phpcs:disable
 	// @todo This is just here for debugging purposes.
-	if ( isset( $_GET['wp_concatenate_scripts'] ) ) { // WPCS: csrf ok.
-		$concatenate_scripts = rest_sanitize_boolean( $_GET['wp_concatenate_scripts'] ); // WPCS: csrf ok, override ok.
+	if ( isset( $_GET['wp_concatenate_scripts'] ) ) {
+		$concatenate_scripts = rest_sanitize_boolean( $_GET['wp_concatenate_scripts'] );
 	}
+	// phpcs:enable
 }
 
 /**
diff --git a/wp-includes/template.php b/wp-includes/template.php
index ff00a49cc..d6d2218ec 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -12,7 +12,7 @@
  * @since 0.2.0
  */
 
-// phpcs:disable WordPress.WP.DiscouragedConstants.UsageFound
+// phpcs:disable WordPress.WP.DiscouragedConstants
 
 /**
  * Retrieve the name of the highest priority template file that exists.
@@ -155,14 +155,14 @@ function wp_service_worker_error_details_template( $output = '' ) {
 	if ( empty( $output ) ) {
 		$output = '<details id="error-details"><summary>' . esc_html__( 'More Details', 'pwa' ) . '</summary>{{{error_details_iframe}}}</details>';
 	}
-	echo '<!--WP_SERVICE_WORKER_ERROR_TEMPLATE_BEGIN-->'; // WPCS: XSS OK.
+	echo '<!--WP_SERVICE_WORKER_ERROR_TEMPLATE_BEGIN-->';
 	echo wp_kses_post( $output );
-	echo '<!--WP_SERVICE_WORKER_ERROR_TEMPLATE_END-->'; // WPCS: XSS OK.
+	echo '<!--WP_SERVICE_WORKER_ERROR_TEMPLATE_END-->';
 }
 
 /**
  * Display service worker error message template tag.
  */
 function wp_service_worker_error_message_placeholder() {
-	echo '<p><!--WP_SERVICE_WORKER_ERROR_MESSAGE--></p>'; // WPCS: XSS OK.
+	echo '<p><!--WP_SERVICE_WORKER_ERROR_MESSAGE--></p>';
 }