Merge branch 'master' into users/nirice/no-hoist-monaco-editor

microsoft · Feb 2, 2021 · 39aa587 · 39aa587
2 parents 6039d93 + fbbcc7f
commit 39aa587
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/packages/web-components/fast-foundation/package.json b/packages/web-components/fast-foundation/package.json
@@ -71,6 +71,7 @@
     "karma-source-map-support": "^1.4.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
+    "lodash-es": "^4.17.15",
     "mocha": "^7.1.2",
     "prettier": "2.0.2",
     "rollup": "^2.7.6",

diff --git a/sites/fast-website/src/public/footer.ejs b/sites/fast-website/src/public/footer.ejs
@@ -5,7 +5,7 @@
         <site-navigation-item href="https://go.microsoft.com/fwlink/?LinkID=206977">Terms of use</site-navigation-item>
         <site-navigation-item href="https://www.microsoft.com/trademarks">Trademarks</site-navigation-item>
         <site-navigation-item>
-            <p>&copy; Microsoft 2020</p>
+            <p>&copy; Microsoft 2021</p>
         </site-navigation-item>
         <fast-anchor
             href="https://www.fast.design"

diff --git a/sites/website/sidebars.js b/sites/website/sidebars.js
@@ -27,6 +27,7 @@ module.exports = {
                         "components/button",
                         "components/card",
                         "components/checkbox",
+                        "components/data-grid",
                         "components/dialog",
                         "components/divider",
                         "components/flipper",