Skip to content

Commit 79fd736

Browse files
authored
chore(site): enable React's StrictMode (#13399)
1 parent 973cc2b commit 79fd736

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

site/.storybook/preview.jsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { ThemeProvider as EmotionThemeProvider } from "@emotion/react";
77
import { DecoratorHelpers } from "@storybook/addon-themes";
88
import { withRouter } from "storybook-addon-remix-react-router";
9+
import { StrictMode } from "react";
910
import { QueryClient, QueryClientProvider } from "react-query";
1011
import { HelmetProvider } from "react-helmet-async";
1112
import themes from "theme";
@@ -29,14 +30,16 @@ export const decorators = [
2930
const selected = themeOverride || selectedTheme || "dark";
3031

3132
return (
32-
<StyledEngineProvider injectFirst>
33-
<MuiThemeProvider theme={themes[selected]}>
34-
<EmotionThemeProvider theme={themes[selected]}>
35-
<CssBaseline />
36-
<Story />
37-
</EmotionThemeProvider>
38-
</MuiThemeProvider>
39-
</StyledEngineProvider>
33+
<StrictMode>
34+
<StyledEngineProvider injectFirst>
35+
<MuiThemeProvider theme={themes[selected]}>
36+
<EmotionThemeProvider theme={themes[selected]}>
37+
<CssBaseline />
38+
<Story />
39+
</EmotionThemeProvider>
40+
</MuiThemeProvider>
41+
</StyledEngineProvider>
42+
</StrictMode>
4043
);
4144
},
4245
];

site/src/App.tsx

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import "./theme/globalFonts";
22
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
3-
import { type FC, type ReactNode, useEffect, useState } from "react";
3+
import {
4+
type FC,
5+
type ReactNode,
6+
StrictMode,
7+
useEffect,
8+
useState,
9+
} from "react";
410
import { HelmetProvider } from "react-helmet-async";
511
import { QueryClient, QueryClientProvider } from "react-query";
612
import { RouterProvider } from "react-router-dom";
@@ -74,10 +80,12 @@ export const AppProviders: FC<AppProvidersProps> = ({
7480

7581
export const App: FC = () => {
7682
return (
77-
<ErrorBoundary>
78-
<AppProviders>
79-
<RouterProvider router={router} />
80-
</AppProviders>
81-
</ErrorBoundary>
83+
<StrictMode>
84+
<ErrorBoundary>
85+
<AppProviders>
86+
<RouterProvider router={router} />
87+
</AppProviders>
88+
</ErrorBoundary>
89+
</StrictMode>
8290
);
8391
};

site/src/index.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
import { createRoot } from "react-dom/client";
22
import { App } from "./App";
33

4-
// This is the entry point for the app - where everything start.
5-
// In the future, we'll likely bring in more bootstrapping logic -
6-
// like: https://github.com/coder/m/blob/50898bd4803df7639bd181e484c74ac5d84da474/product/coder/site/pages/_app.tsx#L32
7-
const main = () => {
8-
console.info(` ▄█▀ ▀█▄
4+
console.info(` ▄█▀ ▀█▄
95
▄▄ ▀▀▀ █▌ ██▀▀█▄ ▐█
106
▄▄██▀▀█▄▄▄ ██ ██ █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀
117
█▌ ▄▌ ▐█ █▌ ▀█▄▄▄█▌ █ █ ▐█ ██ ██▀▀ █
128
██████▀▄█ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀▀ ▀▀▀▀ ▀
139
`);
14-
const element = document.getElementById("root");
15-
if (element === null) {
16-
throw new Error("root element is null");
17-
}
18-
const root = createRoot(element);
19-
root.render(<App />);
20-
};
2110

22-
main();
11+
const element = document.getElementById("root");
12+
if (element === null) {
13+
throw new Error("root element is null");
14+
}
15+
const root = createRoot(element);
16+
root.render(<App />);

site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,8 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
206206
<Divider css={{ marginBottom: "0 !important" }} />
207207

208208
<Stack css={styles.info} spacing={0}>
209-
<Tooltip title="Coder Version">
209+
<Tooltip title="Browse the source code">
210210
<a
211-
title="Browse Source Code"
212211
css={[styles.footerText, styles.buildInfo]}
213212
href={buildInfo?.external_url}
214213
target="_blank"

0 commit comments

Comments
 (0)