Merge pull request #2001 from reduxjs/feature/docs-umami

.yarnrc.yml

@@ -2,8 +2,8 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
+    spec: "@yarnpkg/plugin-workspace-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-compat.cjs
-    spec: '@yarnpkg/plugin-compat'
+    spec: "@yarnpkg/plugin-compat"
 
-yarnPath: .yarn/releases/yarn-berry.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

docs/tutorials/typescript.md

@@ -25,13 +25,11 @@ hide_title: true
 
 ## Introduction
 
-Welcome to the React Redux TypeScript Quick Start tutorial! **This tutorial will briefly show how to use TypeScript with Redux Toolkit**.
+Welcome to the React Redux TypeScript Quick Start tutorial! **This tutorial will briefly show how to use TypeScript with Redux Toolkit and React-Redux**.
 
 This page focuses on just how to set up the TypeScript aspects . For explanations of what Redux is, how it works, and full examples of how to use Redux, see [the Redux core docs tutorials](https://redux.js.org/tutorials/index).
 
-Both React-Redux and Redux Toolkit are already written in TypeScript, so their TS type definitions are built in.
-
-[React Redux](https://react-redux.js.org) has its type definitions in a separate [`@types/react-redux` typedefs package](https://npm.im/@types/react-redux) on NPM. In addition to typing the library functions, the types also export some helpers to make it easier to write typesafe interfaces between your Redux store and your React components.
+[React Redux](https://react-redux.js.org) is also written in TypeScript as of version 8, and also includes its own type definitions.
 
 The [Redux+TS template for Create-React-App](https://github.com/reduxjs/cra-template-redux-typescript) comes with a working example of these patterns already configured.
 

website/docusaurus.config.js

@@ -31,6 +31,9 @@ const siteConfig = {
             require.resolve('./static/css/codeblock.css'),
           ],
         },
+        googleAnalytics: {
+          trackingID: 'UA-130598673-2',
+        },
       },
     ],
   ],
@@ -52,8 +55,7 @@ const siteConfig = {
     '/scripts/sidebarScroll.js',
     '/scripts/codeblock.js',
     {
-      src:
-        'https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.0/clipboard.min.js',
+      src: 'https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.0/clipboard.min.js',
       async: true,
     },
   ],
@@ -63,7 +65,7 @@ const siteConfig = {
     repoUrl: 'https://github.com/reduxjs/react-redux',
   },
   themeConfig: {
-    metadatas: [{ name: 'twitter:card', content: 'summary' }],
+    metadata: [{ name: 'twitter:card', content: 'summary' }],
     prism: {
       theme: require('./static/scripts/monokaiTheme.js'),
     },
@@ -184,14 +186,26 @@ const siteConfig = {
       ],
     },
     algolia: {
-      apiKey: '2d058d216b7fd5d68d481fd48ee72c06',
+      appId: 'G15KG9HEMQ',
+      apiKey: '3a19f2b0974a8fdde5e8eee758059ba4',
       indexName: 'react-redux',
       algoliaOptions: {},
     },
-    googleAnalytics: {
-      trackingID: 'UA-130598673-2',
-    },
   },
+  plugins: [
+    [
+      '@dipakparmar/docusaurus-plugin-umami',
+      /** @type {import('@dipakparmar/docusaurus-plugin-umami').Options} */
+      ({
+        websiteID: 'e81a2686-96f3-4557-9c03-f584b7e8ab6b',
+        analyticsDomain: 'redux-docs-umami.vercel.app',
+        scriptName: 'script.js',
+        dataAutoTrack: true,
+        dataDoNotTrack: true,
+        dataCache: true,
+      }),
+    ],
+  ],
 }
 
 module.exports = siteConfig

website/package.json

@@ -9,8 +9,9 @@
     "serve": "docusaurus serve"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.7",
-    "@docusaurus/preset-classic": "2.0.0-beta.7",
+    "@dipakparmar/docusaurus-plugin-umami": "^2.0.6",
+    "@docusaurus/core": "2.4.1",
+    "@docusaurus/preset-classic": "2.4.1",
     "classnames": "^2.2.6",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

website/src/pages/index.js

@@ -4,7 +4,6 @@ import Layout from '@theme/Layout'
 import Link from '@docusaurus/Link'
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext'
 import useBaseUrl from '@docusaurus/useBaseUrl'
-import useThemeContext from '@theme/hooks/useThemeContext'
 import styles from './styles.module.css'
 
 const features = [
@@ -20,7 +19,7 @@ const features = [
     ),
     image: <img src="img/noun_Certificate_1945625.svg" />,
     imageAlign: 'top',
-    title: 'Official'
+    title: 'Official',
   },
   {
     content: (
@@ -32,7 +31,7 @@ const features = [
     ),
     image: <img src="img/noun_Check_1870817.svg" />,
     imageAlign: 'top',
-    title: 'Predictable'
+    title: 'Predictable',
   },
   {
     content: (
@@ -44,7 +43,7 @@ const features = [
     ),
     image: <img src="img/noun_Box_1664404.svg" />,
     imageAlign: 'top',
-    title: 'Encapsulated'
+    title: 'Encapsulated',
   },
   {
     content: (
@@ -56,8 +55,8 @@ const features = [
     ),
     image: <img src="img/noun_Rocket_1245262.svg" />,
     imageAlign: 'top',
-    title: 'Optimized'
-  }
+    title: 'Optimized',
+  },
 ]
 
 const otherLibraries = [
@@ -75,7 +74,7 @@ const otherLibraries = [
       >
         <path d="M448 80v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V80c0-26.51 21.49-48 48-48h352c26.51 0 48 21.49 48 48zm-88 16H248.029c-21.313 0-32.08 25.861-16.971 40.971l31.984 31.987L67.515 364.485c-4.686 4.686-4.686 12.284 0 16.971l31.029 31.029c4.687 4.686 12.285 4.686 16.971 0l195.526-195.526 31.988 31.991C358.058 263.977 384 253.425 384 231.979V120c0-13.255-10.745-24-24-24z"></path>
       </svg>
-    )
+    ),
   },
   {
     content:
@@ -92,8 +91,8 @@ const otherLibraries = [
       >
         <path d="M448 80v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V80c0-26.51 21.49-48 48-48h352c26.51 0 48 21.49 48 48zm-88 16H248.029c-21.313 0-32.08 25.861-16.971 40.971l31.984 31.987L67.515 364.485c-4.686 4.686-4.686 12.284 0 16.971l31.029 31.029c4.687 4.686 12.285 4.686 16.971 0l195.526-195.526 31.988 31.991C358.058 263.977 384 253.425 384 231.979V120c0-13.255-10.745-24-24-24z"></path>
       </svg>
-    )
-  }
+    ),
+  },
 ]
 
 function Home() {