Skip to content

Commit 6495c0d

Browse files
committed
upgrade storybook@9
1 parent 3fa92f6 commit 6495c0d

File tree

82 files changed

+15012
-18704
lines changed

Some content is hidden

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

82 files changed

+15012
-18704
lines changed

.eslintrc.json

Lines changed: 79 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@
55
},
66
"extends": [
77
"react-app",
8-
"react-app/jest",
9-
"eslint:recommended"
8+
"eslint:recommended",
9+
"plugin:storybook/recommended"
1010
],
11-
"parser": "@babel/eslint-parser",
11+
"parser": "babel-eslint",
1212
"parserOptions": {
1313
"ecmaFeatures": {
1414
"experimentalObjectRestSpread": true,
1515
"jsx": true
1616
},
17-
"sourceType": "module",
18-
"babelOptions": {
19-
"presets": [
20-
[ "babel-preset-react-app", false ],
21-
"babel-preset-react-app/prod"
22-
]
23-
}
17+
"sourceType": "module"
2418
},
2519
"plugins": [
2620
"react",
@@ -36,33 +30,91 @@
3630
"no-var": "off",
3731
"no-case-declarations": "off",
3832
"no-redeclare": "off",
39-
"indent": ["warn", 2, {
40-
"SwitchCase": 1,
41-
"ignoreComments": false
42-
}],
43-
"linebreak-style": ["warn", "unix"],
44-
"quotes": ["warn", "single"],
45-
"semi": ["warn", "always"],
33+
"indent": [
34+
"warn",
35+
2,
36+
{
37+
"SwitchCase": 1,
38+
"ignoreComments": false
39+
}
40+
],
41+
"linebreak-style": [
42+
"warn",
43+
"unix"
44+
],
45+
"quotes": [
46+
"warn",
47+
"single"
48+
],
49+
"semi": [
50+
"warn",
51+
"always"
52+
],
4653
"no-unreachable": "warn",
4754
"no-class-assign": "warn",
4855
"no-unused-vars": "warn",
4956
"no-useless-escape": "off",
5057
"no-irregular-whitespace": "warn",
5158
"no-trailing-spaces": "warn",
52-
"react/jsx-indent": ["warn", 2],
59+
"react/jsx-indent": [
60+
"warn",
61+
2
62+
],
5363
"eol-last": "error",
54-
"space-before-function-paren": ["warn", {"named": "never"}],
55-
"array-bracket-spacing": ["warn", "never"],
56-
"object-curly-spacing": ["warn", "always"],
64+
"space-before-function-paren": [
65+
"warn",
66+
{
67+
"named": "never"
68+
}
69+
],
70+
"array-bracket-spacing": [
71+
"warn",
72+
"never"
73+
],
74+
"object-curly-spacing": [
75+
"warn",
76+
"always"
77+
],
5778
"spaced-comment": "warn",
58-
"keyword-spacing": ["warn", {"before": true}],
79+
"keyword-spacing": [
80+
"warn",
81+
{
82+
"before": true
83+
}
84+
],
5985
"space-infix-ops": "error",
60-
"key-spacing": ["error", { "beforeColon": false }],
61-
"arrow-spacing": ["error", { "before": true, "after": true }],
62-
"comma-spacing": ["error", { "before": false, "after": true }],
86+
"key-spacing": [
87+
"error",
88+
{
89+
"beforeColon": false
90+
}
91+
],
92+
"arrow-spacing": [
93+
"error",
94+
{
95+
"before": true,
96+
"after": true
97+
}
98+
],
99+
"comma-spacing": [
100+
"error",
101+
{
102+
"before": false,
103+
"after": true
104+
}
105+
],
63106
"no-duplicate-imports": "error",
64-
"one-var": ["error", "never"],
65-
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1 }],
107+
"one-var": [
108+
"error",
109+
"never"
110+
],
111+
"no-multiple-empty-lines": [
112+
"error",
113+
{
114+
"max": 2,
115+
"maxEOF": 1
116+
}
117+
],
66118
"no-multi-spaces": "error",
67119
"react/jsx-closing-tag-location": "error"
68120
}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ yarn-error.log*
3535

3636
# Developer scripts for translation
3737
/translate.py
38+
39+
# storybook
40+
*storybook.log
41+
storybook-static

.storybook/main.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
module.exports = {
2-
stories: ['../stories/**/*.stories.js'],
3-
staticDirs: ['../public'],
4-
addons: [
5-
'@storybook/addon-actions',
6-
'@storybook/addon-links',
7-
'@storybook/addon-controls',
8-
'@storybook/preset-create-react-app',
9-
{
10-
name: '@storybook/addon-docs',
11-
options: {
12-
configureJSX: true,
13-
}
14-
}
1+
2+
3+
/** @type { import('@storybook/react-webpack5').StorybookConfig } */
4+
const config = {
5+
"stories": [
6+
"../stories/**/*.mdx",
7+
"../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)"
8+
],
9+
"addons": [
10+
"@storybook/addon-webpack5-compiler-swc",
11+
"@storybook/addon-docs",
12+
"@storybook/addon-onboarding",
1513
],
16-
framework: {
17-
name: "@storybook/react-webpack5",
18-
options: {
19-
builder: {
20-
useSWC: true,
21-
},
22-
},
14+
"framework": {
15+
"name": "@storybook/react-webpack5",
16+
"options": {}
2317
},
2418
webpackFinal: async (config) => {
25-
config.module.rules.push({
26-
test: /\.(js|jsx)$/,
27-
exclude: /node_modules/,
28-
use: {
29-
loader: 'babel-loader',
30-
options: {
31-
presets: ['@babel/preset-react']
32-
}
19+
config.module.rules = config.module.rules.map(rule => {
20+
if (rule.test && rule.test.toString().includes('svg')) {
21+
return {
22+
...rule,
23+
test: new RegExp(rule.test.toString().replace('svg|', '').slice(1, -1))
24+
};
3325
}
26+
return rule;
27+
});
28+
config.module.rules.push({
29+
test: /\.svg$/,
30+
use: ['@svgr/webpack']
3431
});
32+
3533
return config;
3634
}
3735
};
36+
37+
export default config;

.storybook/manager.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { addons } from 'storybook/manager-api';
2+
import { create } from 'storybook/theming';
3+
4+
addons.setConfig({
5+
theme: create({
6+
base: 'light',
7+
brandTitle: 'dtable-ui-component',
8+
brandUrl: 'https://github.com/seatable/dtable-ui-component',
9+
}),
10+
});

.storybook/preview.js

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import React from 'react';
2-
import { Title, Subtitle, Description, Primary, Controls, Stories } from '@storybook/blocks';
1+
/** @type { import('@storybook/react-webpack5').Preview } */
2+
3+
import '../public/media/dtable-font.css';
4+
import '../public/media/seatable-ui.css';
5+
import '../stories/css/story-cover.css';
36

4-
/** @type { import('@storybook/react').Preview } */
57
const preview = {
68
parameters: {
7-
actions: { argTypesRegex: "^on[A-Z].*" },
89
controls: {
910
matchers: {
1011
color: /(background|color)$/i,
@@ -13,22 +14,14 @@ const preview = {
1314
},
1415
options: {
1516
storySort: {
16-
method: '',
17-
order: [],
18-
locales: '',
19-
}
17+
order: [
18+
'General',
19+
'Formatter',
20+
'Editor',
21+
'Mobile',
22+
],
23+
},
2024
},
21-
docs: {
22-
page: () => (
23-
<>
24-
<Title />
25-
<Subtitle />
26-
<Description />
27-
<Primary />
28-
<Controls />
29-
</>
30-
),
31-
}
3225
},
3326
};
3427

config/webpack.config.js

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -393,29 +393,7 @@ module.exports = function (webpackEnv) {
393393
},
394394
{
395395
test: /\.svg$/,
396-
use: [
397-
{
398-
loader: require.resolve('@svgr/webpack'),
399-
options: {
400-
prettier: false,
401-
svgo: false,
402-
svgoConfig: {
403-
plugins: [{ removeViewBox: false }],
404-
},
405-
titleProp: true,
406-
ref: true,
407-
},
408-
},
409-
{
410-
loader: require.resolve('file-loader'),
411-
options: {
412-
name: 'static/media/[name].[hash].[ext]',
413-
},
414-
},
415-
],
416-
issuer: {
417-
and: [/\.(ts|tsx|js|jsx|md|mdx)$/],
418-
},
396+
use: ['@svgr/webpack'],
419397
},
420398
{
421399
test: /\.worker\.js$/,

jest.config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ const path = require('path');
22

33
module.exports = {
44
rootDir: path.resolve(__dirname, './'),
5-
roots: ["<rootDir>/tests/"],
6-
setupFiles: ["<rootDir>/tests/setup.js"],
7-
testMatch: [ "<rootDir>/tests/**/(*.)+(spec|test).[jt]s?(x)"],
5+
roots: ['<rootDir>/tests/'],
6+
testMatch: ['<rootDir>/tests/**/(*.)+(spec|test).[jt]s?(x)'],
7+
testEnvironment: 'jsdom',
8+
setupFilesAfterEnv: ['<rootDir>/tests/setupTests.js'],
89
transform: {
910
'^.+\\.(js|jsx|mjs)$': '<rootDir>/node_modules/babel-jest',
1011
'^.+\\.(css|less)$': '<rootDir>/config/jest/cssTransform.js',
@@ -13,4 +14,4 @@ module.exports = {
1314
transformIgnorePatterns: [
1415
'[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$',
1516
],
16-
}
17+
};

0 commit comments

Comments
 (0)