Skip to content

Commit 1fc8cb6

Browse files
authored
Merge pull request #685 from lightninglabs/update-deps
chore: update NPM dependencies
2 parents 30c2d97 + b61a20b commit 1fc8cb6

File tree

4 files changed

+4152
-5430
lines changed

4 files changed

+4152
-5430
lines changed

app/.storybook/main.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
'../src/__stories__/LoopPage.stories.tsx',
55
'../src/**/*.stories.@(ts|tsx|js|jsx|mdx)',
66
],
7+
78
addons: [
89
'@storybook/preset-create-react-app',
910
'@storybook/addon-actions',
@@ -15,12 +16,19 @@ module.exports = {
1516
},
1617
},
1718
],
18-
core: {
19-
builder: 'webpack5'
20-
},
19+
2120
features: {
2221
// Emotion11 quasi compatibility issue with storybook. Disabling feature flag to support emotion11.
2322
// https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#emotion11-quasi-compatibility
2423
emotionAlias: false,
2524
},
25+
26+
framework: {
27+
name: '@storybook/react-webpack5',
28+
options: {}
29+
},
30+
31+
docs: {
32+
autodocs: true
33+
}
2634
};

app/.storybook/preview.tsx

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { addDecorator } from '@storybook/react';
2+
import { Preview } from '@storybook/react';
33
import '../src/App.scss';
44
import '../src/i18n';
55
import StoryWrapper from '../src/__stories__/StoryWrapper';
@@ -10,8 +10,18 @@ import StoryWrapper from '../src/__stories__/StoryWrapper';
1010
* - include the theme & store providers
1111
* - use Storybook parameters to customize the width of the wrapper
1212
*/
13-
addDecorator((StoryFn, ctx) => (
14-
<StoryWrapper centered={ctx.parameters.centered} contained={ctx.parameters.contained}>
15-
<StoryFn {...ctx} />
16-
</StoryWrapper>
17-
));
13+
14+
const preview: Preview = {
15+
decorators: [
16+
(StoryFn, ctx) => (
17+
<StoryWrapper
18+
centered={ctx.parameters.centered}
19+
contained={ctx.parameters.contained}
20+
>
21+
<StoryFn {...ctx} />
22+
</StoryWrapper>
23+
),
24+
],
25+
};
26+
27+
export default preview;

app/package.json

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"develop": "REACT_APP_USE_SAMPLE_DATA=true yarn start",
1010
"build": "react-scripts build",
1111
"postbuild": "echo '# Keep directory in git.' > build/.gitkeep",
12-
"test": "react-scripts test --env=jest-environment-jsdom",
12+
"test": "react-scripts test --env=jest-environment-jsdom --transformIgnorePatterns \"node_modules/(?!d3)/\"",
1313
"test:ci": "cross-env CI=true yarn test --coverage",
1414
"eject": "react-scripts eject",
1515
"lint": "eslint --ext .ts,.tsx --ignore-path .eslintignore .",
1616
"tsc": "tsc --noEmit",
1717
"protos": "node ./scripts/build-protos.js",
18-
"storybook": "start-storybook -p 9009 -s public",
19-
"build-storybook": "build-storybook -s public"
18+
"storybook": "storybook dev -p 9009 -s public",
19+
"build-storybook": "storybook build -s public"
2020
},
2121
"dependencies": {
2222
"@emotion/react": "11.4.0",
@@ -27,7 +27,7 @@
2727
"bootstrap": "4.6.1",
2828
"buffer": "6.0.3",
2929
"copy-to-clipboard": "3.3.1",
30-
"d3": "6.3.1",
30+
"d3": "7.8.5",
3131
"date-fns": "2.14.0",
3232
"debug": "4.3.1",
3333
"file-saver": "2.0.2",
@@ -47,29 +47,27 @@
4747
"react": "17.0.2",
4848
"react-collapse": "^5.1.1",
4949
"react-dom": "17.0.2",
50-
"react-i18next": "11.7.0",
50+
"react-i18next": "13.5.0",
5151
"react-router-dom": "^6.3.0",
52-
"react-scripts": "^5.0.1",
5352
"react-toastify": "6.0.6",
5453
"react-virtualized": "9.21.2",
5554
"reactour": "1.18.0",
5655
"semver": "^7.5.2",
5756
"styled-components": "5.1.1"
5857
},
5958
"devDependencies": {
60-
"@storybook/addon-actions": "6.5.9",
61-
"@storybook/addon-docs": "6.5.9",
62-
"@storybook/addon-links": "6.5.9",
63-
"@storybook/addons": "6.5.9",
64-
"@storybook/builder-webpack5": "6.5.9",
65-
"@storybook/manager-webpack5": "6.5.9",
66-
"@storybook/preset-create-react-app": "4.1.2",
67-
"@storybook/react": "6.5.9",
59+
"@storybook/addon-actions": "7.5.3",
60+
"@storybook/addon-docs": "7.5.3",
61+
"@storybook/addon-links": "7.5.3",
62+
"@storybook/addons": "7.5.3",
63+
"@storybook/preset-create-react-app": "7.5.3",
64+
"@storybook/react": "7.5.3",
65+
"@storybook/react-webpack5": "7.5.3",
6866
"@testing-library/jest-dom": "5.11.5",
6967
"@testing-library/react": "11.1.1",
7068
"@testing-library/user-event": "12.2.0",
7169
"@types/big.js": "6.1.1",
72-
"@types/d3": "6.2.0",
70+
"@types/d3": "7.4.3",
7371
"@types/debug": "4.1.5",
7472
"@types/file-saver": "2.0.1",
7573
"@types/google-protobuf": "3.7.2",
@@ -93,10 +91,17 @@
9391
"jest-canvas-mock": "2.3.0",
9492
"jest-environment-jsdom": "27.5.1",
9593
"prettier": "2.1.2",
94+
"react-scripts": "^5.0.1",
9695
"sass": "1.43.4",
96+
"storybook": "7.5.3",
9797
"ts-protoc-gen": "0.12.0",
9898
"typescript": "4.1.6",
99-
"webpack": "5"
99+
"webpack": "5.89.0"
100+
},
101+
"resolutions": {
102+
"strip-ansi": "6.0.1",
103+
"jackspeak": "2.1.1",
104+
"wrap-ansi": "7.0.0"
100105
},
101106
"eslintConfig": {
102107
"extends": "react-app",

0 commit comments

Comments
 (0)