Skip to content

Commit 72fb704

Browse files
greyscaledgreyscaled
committed
Merge origin/main
2 parents 5bbcec1 + d8e530e commit 72fb704

File tree

106 files changed

+164
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+164
-178
lines changed

‎README.md

Lines changed: 23 additions & 1 deletion

‎site/.storybook/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path")
22

33
module.exports = {
4-
stories: ["../**/*.stories.mdx", "../**/*.stories.@(js|jsx|ts|tsx)"],
4+
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
55
addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
66
babel: async (options) => ({
77
...options,

‎site/.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ThemeProvider from "@material-ui/styles/ThemeProvider"
22
import { withThemes } from "@react-theming/storybook-addon"
3-
import { light, dark } from "../theme"
3+
import { light, dark } from "../src/theme"
44
import { addDecorator } from "node_modules/@storybook/react"
55
import { createMemoryHistory } from "history"
66
import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom"

‎site/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"@types/react": "17.0.40",
4747
"@types/react-dom": "17.0.13",
4848
"@types/superagent": "4.1.15",
49-
"@typescript-eslint/eslint-plugin": "4.33.0",
50-
"@typescript-eslint/parser": "4.33.0",
49+
"@typescript-eslint/eslint-plugin": "5.15.0",
50+
"@typescript-eslint/parser": "5.15.0",
5151
"copy-webpack-plugin": "10.2.4",
52-
"eslint": "7.32.0",
52+
"eslint": "8.11.0",
5353
"eslint-config-prettier": "8.5.0",
5454
"eslint-import-resolver-alias": "1.1.2",
5555
"eslint-import-resolver-typescript": "2.5.0",

‎site/Main.tsx renamed to ‎site/src/Main.tsx

File renamed without changes.

‎site/api.ts renamed to ‎site/src/api.ts

File renamed without changes.

‎site/app.tsx renamed to ‎site/src/app.tsx

File renamed without changes.

‎site/components/Button/CopyButton.tsx renamed to ‎site/src/components/Button/CopyButton.tsx

File renamed without changes.

‎site/components/Button/LoadingButton.stories.tsx renamed to ‎site/src/components/Button/LoadingButton.stories.tsx

File renamed without changes.

‎site/components/Button/LoadingButton.test.tsx renamed to ‎site/src/components/Button/LoadingButton.test.tsx

File renamed without changes.

0 commit comments

Comments
 (0)