Removing storybook-addon-remix-react-router and replacing with simple…

… minimal decorator.

.storybook/decorators.js

@@ -4,6 +4,7 @@ import compdemAdminTheme from '../codebases/compdem/client-admin/src/theme'
 import haiDelibTheme from '../codebases/UT-HAI/client-deliberation/src/theme'
 import { Provider as ReduxProvider } from 'react-redux'
 import configureStore from '../codebases/compdem/client-admin/src/store'
+import { MemoryRouter } from 'react-router'
 
 const store = configureStore()
 
@@ -30,3 +31,14 @@ export const svgDecorator = (Story) => (
     <Story />
   </svg>
 )
+
+// If we need more, there's an old addon for React Router v5.
+// See: https://github.com/gvaldambrini/storybook-router
+//
+// If we ever migrate to React Router v6, we can use the new addon.
+// See: https://github.com/JesusTheHun/storybook-addon-remix-react-router
+export const withRouter = (Story) => (
+  <MemoryRouter initialEntries={['/']}>
+    <Story />
+  </MemoryRouter>
+)

.storybook/main.js

@@ -11,7 +11,6 @@ const config = {
     "@storybook/addon-a11y",
     "@chromatic-com/storybook",
     "@storybook/addon-interactions",
-    "storybook-addon-remix-react-router",
     "storybook-branch-switcher",
   ],
   framework: {

package.json

@@ -28,9 +28,9 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-redux": "7.2.2",
+    "react-router-dom": "^5.2.0",
     "redux-thunk": "~2.3.0",
     "storybook": "^8.3.2",
-    "storybook-addon-remix-react-router": "^3.0.0",
     "storybook-branch-switcher": "^0.5.0"
   },
   "dependencies": {

stories/UT-HAI/client-deliberation/InteriorHeader.stories.js

@@ -1,8 +1,6 @@
 import React from 'react'
 import InteriorHeader from '../../../codebases/UT-HAI/client-deliberation/src/components/interior-header'
-import { withDelibThemeUi } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router'
-
+import { withDelibThemeUi, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: InteriorHeader,

stories/compdem/client-admin/CreateUser.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import CreateUser from '../../../codebases/compdem/client-admin/src/components/landers/createuser'
-import { withThemeUi, withRedux } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router'
+import { withThemeUi, withRedux, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: CreateUser,

stories/compdem/client-admin/Header.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import Header from '../../../codebases/compdem/client-admin/src/components/landers/lander-header'
-import { withThemeUi } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router'
+import { withThemeUi, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: Header,

stories/compdem/client-admin/Home.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import Home from '../../../codebases/compdem/client-admin/src/components/landers/home'
-import { withThemeUi } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router'
+import { withThemeUi, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: Home,

stories/compdem/client-admin/Layout.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import Layout from '../../../codebases/compdem/client-admin/src/components/landers/lander-layout'
-import { withThemeUi } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router';
+import { withThemeUi, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: Layout,

stories/compdem/client-admin/Press.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import Press from '../../../codebases/compdem/client-admin/src/components/landers/press'
-import { withThemeUi } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router';
+import { withThemeUi, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: Press,

stories/compdem/client-admin/SignIn.stories.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import SignIn from '../../../codebases/compdem/client-admin/src/components/landers/signin'
-import { withThemeUi, withRedux } from '../../../.storybook/decorators'
-import { withRouter } from 'storybook-addon-remix-react-router'
+import { withThemeUi, withRedux, withRouter } from '../../../.storybook/decorators'
 
 export default {
   component: SignIn,