Merge branch 'master' of https://github.com/meshtastic/Meshtastic

website/docusaurus.config.js

@@ -1,4 +1,7 @@
-module.exports = {
+// @ts-check
+
+/** @type {import('@docusaurus/types').Config} */
+const config = {
   title: "Meshtastic",
   tagline: "Open Source hiking, pilot, skiing and secure GPS mesh communicator",
   url: "https://meshtastic.org",
@@ -8,7 +11,7 @@ module.exports = {
   favicon: "img/meshtastic-design/web/favicon.ico",
   organizationName: "meshtastic",
   projectName: "meshtastic",
-  themeConfig: {
+  themeConfig: /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ {
     colorMode: {
       respectPrefersColorScheme: true,
     },
@@ -120,6 +123,7 @@ module.exports = {
   presets: [
     [
       "@docusaurus/preset-classic",
+      /** @type {import('@docusaurus/preset-classic').Options} */
       {
         docs: {
           sidebarPath: require.resolve("./sidebars.js"),
@@ -134,3 +138,5 @@ module.exports = {
     ],
   ],
 };
+
+module.exports = config;

website/package.json

@@ -6,18 +6,15 @@
     "docusaurus": "docusaurus",
     "start": "docusaurus start",
     "build": "docusaurus build",
-    "swizzle": "docusaurus swizzle",
-    "deploy": "docusaurus deploy",
     "serve": "docusaurus serve",
     "clear": "docusaurus clear"
   },
   "dependencies": {
     "@algolia/client-search": "^4.10.3",
-    "@docusaurus/core": "^2.0.0-beta.3",
+    "@docusaurus/core": "^2.0.0-beta.8",
-    "@docusaurus/preset-classic": "^2.0.0-beta.3",
+    "@docusaurus/preset-classic": "^2.0.0-beta.8",
-    "@mdx-js/react": "^1.6.21",
+    "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
-    "docusaurus": "^2.0.0-alpha.378053ac5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
@@ -34,11 +31,8 @@
     ]
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.0.0-beta.3",
+    "@docusaurus/module-type-aliases": "^2.0.0-beta.8",
-    "@tsconfig/docusaurus": "^1.0.2",
+    "@tsconfig/docusaurus": "^1.0.4",
-    "@types/react": "^17.0.14",
+    "typescript": "^4.4.4"
-    "@types/react-helmet": "^6.1.2",
-    "@types/react-router-dom": "^5.1.8",
-    "typescript": "^4.3.5"
   }
 }

website/src/pages/index.tsx

@@ -63,7 +63,7 @@ function Feature({ imageUrl, title, description }) {
 
 function Home() {
   const context = useDocusaurusContext();
-  const { siteConfig = {} } = context;
+  const { siteConfig } = context;
   return (
     <Layout
       title=""