diff --git a/gulpfile.js/tasks/build-sass.js b/gulpfile.js/tasks/build-sass.js
index b4d2ec87d..a21d8c02a 100644
--- a/gulpfile.js/tasks/build-sass.js
+++ b/gulpfile.js/tasks/build-sass.js
@@ -7,8 +7,8 @@ const postcss = require('gulp-postcss');
 const cssnano = require('cssnano');
 sass.compiler = require('sass');
 
-const buildSass = () => {
-  return src('./src/index.scss')
+const buildSass = () =>
+  src('./src/index.scss')
     .pipe(
       sass({
         importer: [require('../../glob-sass-importer')],
@@ -20,6 +20,5 @@ const buildSass = () => {
     .pipe(postcss([cssnano()]))
     .pipe(rename({ extname: '.min.css' }))
     .pipe(dest(outDir));
-};
 
 module.exports = buildSass;
diff --git a/gulpfile.js/tasks/build-tokens.js b/gulpfile.js/tasks/build-tokens.js
index eee390891..1c45f1e98 100644
--- a/gulpfile.js/tasks/build-tokens.js
+++ b/gulpfile.js/tasks/build-tokens.js
@@ -1,7 +1,5 @@
 const run = require('gulp-run');
 
-const buildTokens = () => {
-  return run('npm run preprocess:tokens').exec();
-};
+const buildTokens = () => run('npm run preprocess:tokens').exec();
 
 module.exports = buildTokens;
diff --git a/package-lock.json b/package-lock.json
index dae7bc038..a16fc5417 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@babel/preset-env": "7.14.7",
         "@changesets/changelog-github": "0.4.0",
         "@changesets/cli": "2.16.0",
-        "@cloudfour/eslint-plugin": "16.0.0",
+        "@cloudfour/eslint-plugin": "17.1.0",
         "@rollup/plugin-babel": "5.3.0",
         "@rollup/plugin-node-resolve": "13.0.2",
         "@storybook/addon-a11y": "6.3.4",
@@ -138,12 +138,13 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.13.10",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz",
+      "integrity": "sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eslint-scope": "5.1.0",
-        "eslint-visitor-keys": "^1.3.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -154,26 +155,6 @@
         "eslint": ">=7.5.0"
       }
     },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-scope": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/generator": {
       "version": "7.14.5",
       "dev": true,
@@ -2173,19 +2154,20 @@
       }
     },
     "node_modules/@cloudfour/eslint-plugin": {
-      "version": "16.0.0",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/@cloudfour/eslint-plugin/-/eslint-plugin-17.1.0.tgz",
+      "integrity": "sha512-GQRpJlKjoaj9M6VAY5QnU0Zf+sfSTPyA+5klZk5AxHZpDLynu2XMSDY3AsqNpagUE20rv0GpXA972r7QAuqAsQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.2.0",
+        "@babel/core": "^7.13.10",
         "@typescript-eslint/eslint-plugin": "^4.0.0",
         "@typescript-eslint/parser": "^4.0.0",
         "babel-eslint": "^10.0.1",
         "eslint-plugin-import": "^2.14.0",
-        "eslint-plugin-jsdoc": "^32.0.0",
+        "eslint-plugin-jsdoc": "^35.0.0",
         "eslint-plugin-node": "^11.0.0",
-        "eslint-plugin-promise": "^4.0.1",
-        "eslint-plugin-unicorn": "^29.0.0"
+        "eslint-plugin-promise": "^5.0.0",
+        "eslint-plugin-unicorn": "^34.0.0"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -2334,6 +2316,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.9.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz",
+      "integrity": "sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.1.6-beta.0",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "1.0.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.2",
       "dev": true,
@@ -12729,8 +12725,9 @@
     },
     "node_modules/clean-regexp": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -13111,9 +13108,10 @@
       }
     },
     "node_modules/comment-parser": {
-      "version": "1.1.2",
+      "version": "1.1.6-beta.0",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz",
+      "integrity": "sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -15949,29 +15947,50 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "32.3.0",
+      "version": "35.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.1.tgz",
+      "integrity": "sha512-pPYPWtsykwVEue1tYEyoppBj4dgF7XicF67tLLLraY6RQYBq7qMKjUHji19+hfiTtYKKBD0YfeK8hgjPAE5viw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "comment-parser": "1.1.2",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
-        "lodash": "^4.17.20",
-        "regextras": "^0.7.1",
-        "semver": "^7.3.4",
+        "@es-joy/jsdoccomment": "0.9.0-alpha.1",
+        "comment-parser": "1.1.6-beta.0",
+        "debug": "^4.3.2",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "^1.0.4",
+        "lodash": "^4.17.21",
+        "regextras": "^0.8.0",
+        "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-jsdoc/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -15981,8 +16000,9 @@
     },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
       "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -15995,8 +16015,9 @@
     },
     "node_modules/eslint-plugin-jsdoc/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/eslint-plugin-markdown": {
       "version": "2.2.0",
@@ -16129,11 +16150,15 @@
       }
     },
     "node_modules/eslint-plugin-promise": {
-      "version": "4.3.1",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": ">=6"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0"
       }
     },
     "node_modules/eslint-plugin-react": {
@@ -16185,43 +16210,63 @@
       }
     },
     "node_modules/eslint-plugin-unicorn": {
-      "version": "29.0.0",
+      "version": "34.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-34.0.1.tgz",
+      "integrity": "sha512-GUBtRYRhPVOW/GDu6QtOjrneSZxY/MulOT8puJU+47VKCzNmMgS/iHO2gZqoQ7KPMrpNYlebUlvCWy3IR1USVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ci-info": "^3.1.1",
+        "ci-info": "^3.2.0",
         "clean-regexp": "^1.0.0",
         "eslint-template-visitor": "^2.3.2",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "import-modules": "^2.1.0",
-        "lodash": "^4.17.20",
+        "eslint-utils": "^3.0.0",
+        "is-builtin-module": "^3.1.0",
+        "lodash": "^4.17.21",
         "pluralize": "^8.0.0",
         "read-pkg-up": "^7.0.1",
         "regexp-tree": "^0.1.23",
         "reserved-words": "^0.1.2",
         "safe-regex": "^2.1.1",
-        "semver": "^7.3.4"
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
       },
       "peerDependencies": {
-        "eslint": ">=7.20.0"
+        "eslint": ">=7.28.0"
       }
     },
     "node_modules/eslint-plugin-unicorn/node_modules/ci-info": {
-      "version": "3.1.1",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
     },
     "node_modules/eslint-plugin-unicorn/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -16231,8 +16276,9 @@
     },
     "node_modules/eslint-plugin-unicorn/node_modules/semver": {
       "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -16245,8 +16291,9 @@
     },
     "node_modules/eslint-plugin-unicorn/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
@@ -16262,8 +16309,9 @@
     },
     "node_modules/eslint-template-visitor": {
       "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+      "integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
       "dev": true,
-      "license": "GPL-3.0-or-later OR MIT",
       "dependencies": {
         "@babel/core": "^7.12.16",
         "@babel/eslint-parser": "^7.12.16",
@@ -16298,9 +16346,10 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
@@ -20642,17 +20691,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/import-modules": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "dev": true,
@@ -20885,6 +20923,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-builtin-module": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+      "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.3",
       "dev": true,
@@ -25694,15 +25744,13 @@
         "signal-exit": "^3.0.2"
       }
     },
-    "node_modules/jsdoctypeparser": {
-      "version": "9.0.0",
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz",
+      "integrity": "sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsdoctypeparser": "bin/jsdoctypeparser"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/jsdom": {
@@ -28146,8 +28194,9 @@
     },
     "node_modules/multimap": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+      "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+      "dev": true
     },
     "node_modules/multipipe": {
       "version": "0.1.2",
@@ -33102,8 +33151,9 @@
     },
     "node_modules/regexp-tree": {
       "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.23.tgz",
+      "integrity": "sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "regexp-tree": "bin/regexp-tree"
       }
@@ -33151,9 +33201,10 @@
       }
     },
     "node_modules/regextras": {
-      "version": "0.7.1",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.1.14"
       }
@@ -33972,8 +34023,9 @@
     },
     "node_modules/reserved-words": {
       "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
+      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
+      "dev": true
     },
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
@@ -37699,8 +37751,9 @@
     },
     "node_modules/safe-regex": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+      "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regexp-tree": "~0.1.1"
       }
@@ -44921,26 +44974,14 @@
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.13.10",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz",
+      "integrity": "sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==",
       "dev": true,
       "requires": {
-        "eslint-scope": "5.1.0",
-        "eslint-visitor-keys": "^1.3.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.1.0",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "dev": true
-        }
       }
     },
     "@babel/generator": {
@@ -46233,18 +46274,20 @@
       }
     },
     "@cloudfour/eslint-plugin": {
-      "version": "16.0.0",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/@cloudfour/eslint-plugin/-/eslint-plugin-17.1.0.tgz",
+      "integrity": "sha512-GQRpJlKjoaj9M6VAY5QnU0Zf+sfSTPyA+5klZk5AxHZpDLynu2XMSDY3AsqNpagUE20rv0GpXA972r7QAuqAsQ==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.2.0",
+        "@babel/core": "^7.13.10",
         "@typescript-eslint/eslint-plugin": "^4.0.0",
         "@typescript-eslint/parser": "^4.0.0",
         "babel-eslint": "^10.0.1",
         "eslint-plugin-import": "^2.14.0",
-        "eslint-plugin-jsdoc": "^32.0.0",
+        "eslint-plugin-jsdoc": "^35.0.0",
         "eslint-plugin-node": "^11.0.0",
-        "eslint-plugin-promise": "^4.0.1",
-        "eslint-plugin-unicorn": "^29.0.0"
+        "eslint-plugin-promise": "^5.0.0",
+        "eslint-plugin-unicorn": "^34.0.0"
       }
     },
     "@cnakazawa/watch": {
@@ -46356,6 +46399,17 @@
       "version": "0.2.5",
       "dev": true
     },
+    "@es-joy/jsdoccomment": {
+      "version": "0.9.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz",
+      "integrity": "sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "1.1.6-beta.0",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "1.0.4"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.4.2",
       "dev": true,
@@ -53733,6 +53787,8 @@
     },
     "clean-regexp": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
@@ -53993,7 +54049,9 @@
       "dev": true
     },
     "comment-parser": {
-      "version": "1.1.2",
+      "version": "1.1.6-beta.0",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz",
+      "integrity": "sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==",
       "dev": true
     },
     "commondir": {
@@ -56229,20 +56287,35 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "32.3.0",
+      "version": "35.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.1.tgz",
+      "integrity": "sha512-pPYPWtsykwVEue1tYEyoppBj4dgF7XicF67tLLLraY6RQYBq7qMKjUHji19+hfiTtYKKBD0YfeK8hgjPAE5viw==",
       "dev": true,
       "requires": {
-        "comment-parser": "1.1.2",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
-        "lodash": "^4.17.20",
-        "regextras": "^0.7.1",
-        "semver": "^7.3.4",
+        "@es-joy/jsdoccomment": "0.9.0-alpha.1",
+        "comment-parser": "1.1.6-beta.0",
+        "debug": "^4.3.2",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "^1.0.4",
+        "lodash": "^4.17.21",
+        "regextras": "^0.8.0",
+        "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "lru-cache": {
           "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
           "requires": {
             "yallist": "^4.0.0"
@@ -56250,6 +56323,8 @@
         },
         "semver": {
           "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -56257,6 +56332,8 @@
         },
         "yallist": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "dev": true
         }
       }
@@ -56340,8 +56417,11 @@
       }
     },
     "eslint-plugin-promise": {
-      "version": "4.3.1",
-      "dev": true
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-react": {
       "version": "7.24.0",
@@ -56379,30 +56459,44 @@
       }
     },
     "eslint-plugin-unicorn": {
-      "version": "29.0.0",
+      "version": "34.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-34.0.1.tgz",
+      "integrity": "sha512-GUBtRYRhPVOW/GDu6QtOjrneSZxY/MulOT8puJU+47VKCzNmMgS/iHO2gZqoQ7KPMrpNYlebUlvCWy3IR1USVQ==",
       "dev": true,
       "requires": {
-        "ci-info": "^3.1.1",
+        "ci-info": "^3.2.0",
         "clean-regexp": "^1.0.0",
         "eslint-template-visitor": "^2.3.2",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "import-modules": "^2.1.0",
-        "lodash": "^4.17.20",
+        "eslint-utils": "^3.0.0",
+        "is-builtin-module": "^3.1.0",
+        "lodash": "^4.17.21",
         "pluralize": "^8.0.0",
         "read-pkg-up": "^7.0.1",
         "regexp-tree": "^0.1.23",
         "reserved-words": "^0.1.2",
         "safe-regex": "^2.1.1",
-        "semver": "^7.3.4"
+        "semver": "^7.3.5"
       },
       "dependencies": {
         "ci-info": {
-          "version": "3.1.1",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
           "dev": true
         },
+        "eslint-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
         "lru-cache": {
           "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
           "requires": {
             "yallist": "^4.0.0"
@@ -56410,6 +56504,8 @@
         },
         "semver": {
           "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -56417,6 +56513,8 @@
         },
         "yallist": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "dev": true
         }
       }
@@ -56431,6 +56529,8 @@
     },
     "eslint-template-visitor": {
       "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+      "integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.12.16",
@@ -56454,7 +56554,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
@@ -59322,10 +59424,6 @@
         "resolve-cwd": "^3.0.0"
       }
     },
-    "import-modules": {
-      "version": "2.1.0",
-      "dev": true
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "dev": true
@@ -59477,6 +59575,15 @@
       "version": "1.1.6",
       "dev": true
     },
+    "is-builtin-module": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+      "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^3.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.2.3",
       "dev": true
@@ -62660,8 +62767,10 @@
         }
       }
     },
-    "jsdoctypeparser": {
-      "version": "9.0.0",
+    "jsdoc-type-pratt-parser": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz",
+      "integrity": "sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ==",
       "dev": true
     },
     "jsdom": {
@@ -64438,6 +64547,8 @@
     },
     "multimap": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+      "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
       "dev": true
     },
     "multipipe": {
@@ -67768,6 +67879,8 @@
     },
     "regexp-tree": {
       "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.23.tgz",
+      "integrity": "sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw==",
       "dev": true
     },
     "regexp.prototype.flags": {
@@ -67795,7 +67908,9 @@
       }
     },
     "regextras": {
-      "version": "0.7.1",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
       "dev": true
     },
     "regjsgen": {
@@ -68365,6 +68480,8 @@
     },
     "reserved-words": {
       "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
+      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
       "dev": true
     },
     "resize-observer-polyfill": {
@@ -70924,6 +71041,8 @@
     },
     "safe-regex": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+      "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
       "dev": true,
       "requires": {
         "regexp-tree": "~0.1.1"
diff --git a/package.json b/package.json
index bf0bd5040..ecd27448c 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@babel/preset-env": "7.14.7",
     "@changesets/changelog-github": "0.4.0",
     "@changesets/cli": "2.16.0",
-    "@cloudfour/eslint-plugin": "16.0.0",
+    "@cloudfour/eslint-plugin": "17.1.0",
     "@rollup/plugin-babel": "5.3.0",
     "@rollup/plugin-node-resolve": "13.0.2",
     "@storybook/addon-a11y": "6.3.4",
diff --git a/src/scripts/modular-scale.js b/src/scripts/modular-scale.js
index 5c549c30c..e3b450a6c 100644
--- a/src/scripts/modular-scale.js
+++ b/src/scripts/modular-scale.js
@@ -9,31 +9,23 @@ const ratio = Number(tokens.number.scale.modular.ratio.value);
  * Simple function for calculating ratio steps
  * @param {string} step
  */
-const modularScale = (step) => {
-  return ratio ** Number(step);
-};
+const modularScale = (step) => ratio ** Number(step);
 exports.modularScale = modularScale;
 
 /**
  * Modular Scale in Ems
  * @param {string} step
  */
-exports.modularEm = (step) => {
-  return `${modularScale(step)}em`;
-};
+exports.modularEm = (step) => `${modularScale(step)}em`;
 
 /**
  * Modular Scale in Rems
  * @param {string} step
  */
-exports.modularRem = (step) => {
-  return `${modularScale(step)}rem`;
-};
+exports.modularRem = (step) => `${modularScale(step)}rem`;
 
 /**
  * Modular Scale in Pixels
  * @param {string} step
  */
-exports.modularPx = (step) => {
-  return `${modularScale(step) * 16}px`;
-};
+exports.modularPx = (step) => `${modularScale(step) * 16}px`;
diff --git a/src/tokens/font.stories.mdx b/src/tokens/font.stories.mdx
index de9cb4951..c82885f81 100644
--- a/src/tokens/font.stories.mdx
+++ b/src/tokens/font.stories.mdx
@@ -3,7 +3,7 @@ import tokens from '../compiled/tokens/js/tokens';
 const _ = require('lodash');
 const generateTokenTable = (props) => {
   const propsArray = Object.values(props);
-  const hasComments = propsArray.filter((p) => Boolean(p.comment)).length > 0;
+  const hasComments = propsArray.some((p) => Boolean(p.comment));
   return (
     <table>
       <thead>
diff --git a/src/tokens/motion.stories.mdx b/src/tokens/motion.stories.mdx
index 8a7d78a7c..0b70b1dbd 100644
--- a/src/tokens/motion.stories.mdx
+++ b/src/tokens/motion.stories.mdx
@@ -3,7 +3,7 @@ import tokens from '../compiled/tokens/js/tokens';
 const _ = require('lodash');
 const generateTokenTable = (props, filterLevel) => {
   const propsArray = Object.values(props);
-  const hasComments = propsArray.filter((p) => Boolean(p.comment)).length > 0;
+  const hasComments = propsArray.some((p) => Boolean(p.comment));
   return (
     <table>
       <thead>
diff --git a/src/tokens/sizes.stories.mdx b/src/tokens/sizes.stories.mdx
index 1709d4893..9a1debe8d 100644
--- a/src/tokens/sizes.stories.mdx
+++ b/src/tokens/sizes.stories.mdx
@@ -2,7 +2,7 @@ import { Meta } from '@storybook/addon-docs/blocks';
 import sizeTokens from '../compiled/tokens/js/size-tokens'; // Flattened tokens object
 const generateTokenTable = (props) => {
   const propsArray = Object.values(props);
-  const hasComments = propsArray.filter((p) => Boolean(p.comment)).length > 0;
+  const hasComments = propsArray.some((p) => Boolean(p.comment));
   return (
     <table>
       <thead>
@@ -13,30 +13,27 @@ const generateTokenTable = (props) => {
         </tr>
       </thead>
       <tbody>
-        {propsArray.map((prop) => {
-          return (
-            <tr key={prop.name}>
-              <td>
-                <code>
-                  size.${prop.name.slice(prop.attributes.category.length + 1)}
-                </code>
-              </td>
-              <td>
-                <code>{prop.value}</code>
-              </td>
-              {hasComments && <td>{prop.comment}</td>}
-            </tr>
-          );
-        })}
+        {propsArray.map((prop) => (
+          <tr key={prop.name}>
+            <td>
+              <code>
+                size.${prop.name.slice(prop.attributes.category.length + 1)}
+              </code>
+            </td>
+            <td>
+              <code>{prop.value}</code>
+            </td>
+            {hasComments && <td>{prop.comment}</td>}
+          </tr>
+        ))}
       </tbody>
     </table>
   );
 };
-const filterTokensByType = (type) => {
-  return Object.keys(sizeTokens)
+const filterTokensByType = (type) =>
+  Object.keys(sizeTokens)
     .filter((key) => sizeTokens[key].attributes.type === type)
     .map((key) => sizeTokens[key]);
-};
 /**
  * We want a list of all size tokens that haven't already been documented.
  * We grab a flattened list of tokens so we don't have to worry about tokens
diff --git a/twing/virtual-bundled-environment.js b/twing/virtual-bundled-environment.js
index 0f9aa1899..82677ffb6 100644
--- a/twing/virtual-bundled-environment.js
+++ b/twing/virtual-bundled-environment.js
@@ -25,10 +25,8 @@ const getVirtualFile = async () => {
 };
 
 /** Webpack will call this file in node, the `code` property is the code that gets added to the bundle */
-module.exports = async () => {
-  return {
-    // This is not cached
-    // But that is ok, because tiny-glob has its own cache and string concatanation is fast
-    code: await getVirtualFile(),
-  };
-};
+module.exports = async () => ({
+  // This is not cached
+  // But that is ok, because tiny-glob has its own cache and string concatanation is fast
+  code: await getVirtualFile(),
+});