Skip to content

Commit 30a2ba6

Browse files
github-actions[bot]github-actions[bot]
authored
Merge release/2.7.2 into main branch (#1187)
1 parent cd5f005 commit 30a2ba6

Some content is hidden

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

41 files changed

+2603
-34241
lines changed

‎.babelrc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"presets": [
33
"@babel/preset-env",
4-
"@babel/preset-react",
4+
[
5+
"@babel/preset-react",
6+
{ "runtime": "automatic" }
7+
],
58
"@babel/preset-typescript"
69
],
710
"plugins": [

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.20.0
1+
18.18.2

‎.storybook/main.js‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,45 @@
11
const config = {
2-
addons: [
3-
{
4-
name: '@storybook/addon-docs',
5-
options: {
6-
jsxOptions: {
7-
babelrc: true,
8-
configFile: true
9-
}
2+
addons: [{
3+
name: '@storybook/addon-docs',
4+
options: {
5+
jsxOptions: {
6+
babelrc: true,
7+
configFile: true
108
}
11-
},
12-
'@storybook/addon-a11y',
13-
'@storybook/addon-actions',
14-
'@storybook/addon-backgrounds',
15-
'@storybook/addon-controls',
16-
'@storybook/addon-links',
17-
'@storybook/addon-knobs',
18-
'@storybook/addon-storysource',
19-
'@storybook/addon-mdx-gfm'
20-
],
9+
}
10+
}, '@storybook/addon-a11y', '@storybook/addon-actions', '@storybook/addon-backgrounds', '@storybook/addon-controls', '@storybook/addon-links', '@storybook/addon-storysource', '@storybook/addon-mdx-gfm', '@storybook/addon-webpack5-compiler-babel', ({
11+
name: "@storybook/addon-styling-webpack",
12+
13+
options: {
14+
rules: [{
15+
test: /\.css$/,
16+
sideEffects: true,
17+
use: [
18+
require.resolve("style-loader"),
19+
{
20+
loader: require.resolve("css-loader"),
21+
options: {
22+
23+
24+
},
25+
},
26+
],
27+
},],
28+
}
29+
})],
2130
docs: {
2231
autodocs: true,
2332
defaultName: 'Docs',
2433
},
2534
stories: [
26-
'../stories/Intro.stories.mdx',
35+
'../stories/Intro.stories.jsx',
2736
'../src/**/*.stories.@(js|mdx)',
2837
'../src/**/*.stories.@(ts|mdx)',
2938
'../src/**/*.stories.js[x]',
3039
'../src/**/*.stories.ts[x]',
31-
'../stories/**/*.stories.mdx',
3240
'../stories/**/*.stories.js[x]',
3341
'../stories/**/*.stories.ts[x]'
3442
],
35-
features: {
36-
storyStoreV7: false,
37-
},
3843
framework: {
3944
name: '@storybook/react-webpack5',
4045
options: { fastRefresh: true },

‎.storybook/preview.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
import colors from '../src/Styles/colors/palette';
2+
import '../scss/global.scss';
3+
import 'bootstrap/dist/css/bootstrap.min.css';
24

35
const preview = {
6+
decorators: [
7+
(Story) => (
8+
<div className="Synthesized">
9+
{/* 👇 Decorators in Storybook also accept a function. Replace <Story/> with Story() to enable it */}
10+
<Story />
11+
</div>
12+
),
13+
],
414
parameters: {
515
backgrounds: {
616
default: '$ux-white',

‎package.json‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "2.7.1",
3+
"version": "2.7.2",
44
"dependencies": {
55
"@tiptap/core": "^2.0.3",
66
"@tiptap/extension-bold": "^2.0.3",
@@ -34,16 +34,16 @@
3434
},
3535
"scripts": {
3636
"build": "NODE_ENV=production babel src --out-dir lib --copy-files --extensions '.js,.jsx,.ts,.tsx' && tsc",
37-
"build-storybook": "storybook build -s public",
38-
"build-storybook-docs": "storybook build -s public --docs",
37+
"build-storybook": "storybook build public",
38+
"build-storybook-docs": "storybook build public --docs",
3939
"build-ts": "tsc",
4040
"chromatic": "npx chromatic",
4141
"lint": "tsc --noEmit && eslint . --ext .js,.jsx,.ts,.tsx",
4242
"prepublishOnly": "yarn build",
4343
"rs:link": "bin/link-rs",
4444
"rs:link:watch": "nodemon",
4545
"rs:unlink": "bin/unlink-rs",
46-
"storybook": "storybook dev -p 9009 -s public",
46+
"storybook": "storybook dev -p 9009 public",
4747
"test": "jest"
4848
},
4949
"eslintConfig": {
@@ -80,11 +80,13 @@
8080
"devDependencies": {
8181
"@babel/cli": "^7.8.4",
8282
"@babel/core": "^7.8.4",
83+
"@babel/plugin-proposal-class-properties": "^7.18.6",
8384
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
8485
"@babel/plugin-proposal-private-methods": "^7.18.6",
8586
"@babel/plugin-proposal-private-property-in-object": "^7.21.0",
8687
"@babel/plugin-transform-runtime": "^7.12.1",
8788
"@babel/preset-env": "^7.8.4",
89+
"@babel/preset-react": "^7.24.1",
8890
"@babel/preset-typescript": "^7.22.5",
8991
"@babel/runtime": "^7.12.5",
9092
"@fortawesome/fontawesome-svg-core": "^1.2.28",
@@ -93,20 +95,20 @@
9395
"@fortawesome/pro-solid-svg-icons": "^6.4.0",
9496
"@fortawesome/react-fontawesome": "^0.2.0",
9597
"@popperjs/core": "^2.5.3",
96-
"@storybook/addon-a11y": "7.4.1",
97-
"@storybook/addon-actions": "7.4.1",
98-
"@storybook/addon-backgrounds": "7.4.1",
99-
"@storybook/addon-controls": "^7.4.1",
100-
"@storybook/addon-docs": "7.4.1",
101-
"@storybook/addon-jest": "7.4.1",
102-
"@storybook/addon-knobs": "7.0.2",
103-
"@storybook/addon-links": "7.4.1",
104-
"@storybook/addon-mdx-gfm": "7.4.1",
105-
"@storybook/addon-storyshots": "7.4.1",
106-
"@storybook/addon-storysource": "7.4.1",
107-
"@storybook/addons": "7.4.1",
108-
"@storybook/react": "7.4.1",
109-
"@storybook/react-webpack5": "7.4.1",
98+
"@storybook/addon-a11y": "^8.0.5",
99+
"@storybook/addon-actions": "^8.0.5",
100+
"@storybook/addon-backgrounds": "^8.0.5",
101+
"@storybook/addon-controls": "^8.0.5",
102+
"@storybook/addon-docs": "^8.0.5",
103+
"@storybook/addon-jest": "^8.0.5",
104+
"@storybook/addon-links": "^8.0.5",
105+
"@storybook/addon-mdx-gfm": "^8.0.5",
106+
"@storybook/addon-storysource": "^8.0.5",
107+
"@storybook/addon-styling-webpack": "^1.0.0",
108+
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
109+
"@storybook/addons": "^7.6.17",
110+
"@storybook/react": "^8.0.5",
111+
"@storybook/react-webpack5": "^8.0.5",
110112
"@testing-library/jest-dom": "^6.1.3",
111113
"@testing-library/react": "^12.1.2",
112114
"@testing-library/react-hooks": "^3.2.1",
@@ -148,7 +150,7 @@
148150
"react-test-renderer": "^18.0.2",
149151
"react-tracking": "8.1.0",
150152
"sass-loader": "^10.4.1",
151-
"storybook": "7.4.1",
153+
"storybook": "^8.0.5",
152154
"storybook-addon-designs": "6.3.1",
153155
"style-loader": "^1.1.3",
154156
"typescript": "^4.9.5",
@@ -191,5 +193,9 @@
191193
},
192194
"readme": "https://github.com/user-interviews/ui-design-system#readme",
193195
"homepage": "https://github.com/user-interviews/ui-design-system",
194-
"_id": "@user-interviews/[email protected]"
196+
"_id": "@user-interviews/[email protected]",
197+
"volta": {
198+
"node": "18.18.2",
199+
"yarn": "1.22.21"
200+
}
195201
}

0 commit comments

Comments
 (0)