Skip to content

Commit 2b5428e

Browse files
aslilacaslilac
authored
refactor: start using emotion for styling (#9909)
1 parent 4da1223 commit 2b5428e

File tree

29 files changed

+614
-646
lines changed

29 files changed

+614
-646
lines changed

‎.gitignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@ site/e2e/states/*.json
3030
site/e2e/.auth.json
3131
site/playwright-report/*
3232
site/.swc
33-
site/dist/
3433

3534
# Make target for updating golden files (any dir).
3635
.gen-golden
3736

3837
# Build
39-
/build/
40-
/dist/
41-
site/out/
38+
build/
39+
dist/
40+
out/
4241

4342
# Bundle analysis
4443
site/stats/

‎.prettierignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ site/e2e/states/*.json
3333
site/e2e/.auth.json
3434
site/playwright-report/*
3535
site/.swc
36-
site/dist/
3736

3837
# Make target for updating golden files (any dir).
3938
.gen-golden
4039

4140
# Build
42-
/build/
43-
/dist/
44-
site/out/
41+
build/
42+
dist/
43+
out/
4544

4645
# Bundle analysis
4746
site/stats/

‎.vscode/settings.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@
186186
]
187187
},
188188
"eslint.workingDirectories": ["./site"],
189-
"files.exclude": {
190-
"**/node_modules": true
191-
},
192189
"search.exclude": {
193190
"**.pb.go": true,
194191
"**/*.gen.json": true,
@@ -198,7 +195,11 @@
198195
"docs/api/*.md": true,
199196
"docs/templates/*.md": true,
200197
"LICENSE": true,
201-
"scripts/metricsdocgen/metrics": true
198+
"scripts/metricsdocgen/metrics": true,
199+
"site/out/**": true,
200+
"site/storybook-static/**": true,
201+
"**.map": true,
202+
"pnpm-lock.yaml": true
202203
},
203204
// Ensure files always have a newline.
204205
"files.insertFinalNewline": true,

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ endif
107107

108108

109109
clean:
110-
rm -rf build site/out
111-
mkdir -p build site/out/bin
112-
git restore site/out
110+
rm -rf build/ site/build/ site/out/
111+
mkdir -p build/ site/out/bin/
112+
git restore site/out/
113113
.PHONY: clean
114114

115115
build-slim: $(CODER_SLIM_BINARIES)

‎site/.eslintignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ e2e/states/*.json
3333
e2e/.auth.json
3434
playwright-report/*
3535
.swc
36-
dist/
3736

3837
# Make target for updating golden files (any dir).
3938
.gen-golden
4039

4140
# Build
42-
../build/
43-
../dist/
41+
build/
42+
dist/
4443
out/
4544

4645
# Bundle analysis

‎site/.eslintrc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ rules:
156156
# https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html#eslint
157157
react/jsx-key: error
158158
react/jsx-uses-react: "off"
159+
react/no-unknown-property: ["error", { ignore: ["css"] }]
159160
react/react-in-jsx-scope: "off"
160161
"unicorn/explicit-length-check": "error"
161162
# https://github.com/jsx-eslint/eslint-plugin-react/issues/2628#issuecomment-984160944

‎site/.prettierignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ e2e/states/*.json
3333
e2e/.auth.json
3434
playwright-report/*
3535
.swc
36-
dist/
3736

3837
# Make target for updating golden files (any dir).
3938
.gen-golden
4039

4140
# Build
42-
../build/
43-
../dist/
41+
build/
42+
dist/
4443
out/
4544

4645
# Bundle analysis

‎site/.storybook/preview.jsx

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
import CssBaseline from "@mui/material/CssBaseline";
2-
import { StyledEngineProvider, ThemeProvider } from "@mui/material/styles";
2+
import {
3+
StyledEngineProvider,
4+
ThemeProvider as MuiThemeProvider,
5+
} from "@mui/material/styles";
6+
import { ThemeProvider as EmotionThemeProvider } from "@emotion/react";
37
import { withRouter } from "storybook-addon-react-router-v6";
48
import { HelmetProvider } from "react-helmet-async";
5-
import { dark } from "../src/theme";
6-
import "../src/theme/globalFonts";
9+
import { dark } from "theme";
10+
import "theme/globalFonts";
711
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
812

913
export const decorators = [
1014
(Story) => (
1115
<StyledEngineProvider injectFirst>
12-
<ThemeProvider theme={dark}>
13-
<CssBaseline />
14-
<Story />
15-
</ThemeProvider>
16+
<MuiThemeProvider theme={dark}>
17+
<EmotionThemeProvider theme={dark}>
18+
<CssBaseline />
19+
<Story />
20+
</EmotionThemeProvider>
21+
</MuiThemeProvider>
1622
</StyledEngineProvider>
1723
),
1824
withRouter,

‎site/jest.setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import "@testing-library/jest-dom";
22
import { cleanup } from "@testing-library/react";
33
import crypto from "crypto";
4-
import { server } from "./src/testHelpers/server";
4+
import { server } from "testHelpers/server";
55
import "jest-location-mock";
66
import { TextEncoder, TextDecoder } from "util";
77
import { Blob } from "buffer";

‎site/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"dependencies": {
3434
"@emoji-mart/data": "1.1.2",
3535
"@emoji-mart/react": "1.0.1",
36+
"@emotion/css": "11.11.2",
3637
"@emotion/react": "11.11.1",
3738
"@emotion/styled": "11.11.0",
3839
"@fastly/performance-observer-polyfill": "2.0.0",
@@ -45,11 +46,6 @@
4546
"@mui/styles": "5.14.0",
4647
"@mui/system": "5.14.0",
4748
"@tanstack/react-query": "4.35.3",
48-
"@types/color-convert": "2.0.0",
49-
"@types/lodash": "4.14.196",
50-
"@types/react-color": "3.0.6",
51-
"@types/react-date-range": "1.4.4",
52-
"@types/semver": "7.5.0",
5349
"@vitejs/plugin-react": "4.0.1",
5450
"@xstate/inspect": "0.8.0",
5551
"@xstate/react": "3.2.1",
@@ -121,15 +117,20 @@
121117
"@testing-library/react-hooks": "8.0.1",
122118
"@testing-library/user-event": "14.5.1",
123119
"@types/chroma-js": "2.4.0",
120+
"@types/color-convert": "2.0.0",
124121
"@types/express": "4.17.17",
125122
"@types/jest": "29.5.2",
123+
"@types/lodash": "4.14.196",
126124
"@types/node": "18.17.0",
127125
"@types/react": "18.2.6",
126+
"@types/react-color": "3.0.6",
127+
"@types/react-date-range": "1.4.4",
128128
"@types/react-dom": "18.2.4",
129129
"@types/react-helmet": "6.1.5",
130130
"@types/react-syntax-highlighter": "15.5.5",
131131
"@types/react-virtualized-auto-sizer": "1.0.1",
132132
"@types/react-window": "1.8.5",
133+
"@types/semver": "7.5.0",
133134
"@types/ssh2": "1.11.13",
134135
"@types/ua-parser-js": "0.7.36",
135136
"@types/uuid": "9.0.2",

0 commit comments

Comments
 (0)