Skip to content

Commit 8347477

Browse files
authored
Merge branch 'develop' into Fix/Redundant_Redirects_between_server_and_client
2 parents c657765 + 8386574 commit 8347477

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

.storybook/main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const config = {
44
addons: [
55
'@storybook/addon-links',
66
'@storybook/addon-essentials',
7-
'@storybook/addon-interactions'
7+
'@storybook/addon-interactions',
8+
'@storybook/addon-mdx-gfm'
89
],
910
framework: {
1011
name: '@storybook/react-webpack5',

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn mo
2222
If you have found a bug in the p5.js Web Editor, you can file it under the ["issues" tab](https://github.com/processing/p5.js-web-editor/issues). You can also request new features here. A set of templates for reporting issues and requesting features are provided to assist you (and us!). The p5.js Editor is maintained mostly by volunteers, so we thank you for your patience as we try to address your issues as soon as we can. Please post bugs and feature requests in the correct repository if you can:
2323

2424
* p5.js library: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues)
25-
* p5.accessibility: [https://github.com/processing/p5.accessibility/issues](https://github.com/processing/p5.accessibility/issues)
26-
* p5.sound: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues)
2725
* p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
2826

2927

client/index.stories.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Meta } from '@storybook/addon-docs/blocks';
1+
import { Meta } from '@storybook/blocks';
22

33
<Meta title=" |Intro" />
44

package.json

+14-13
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,17 @@
9696
"@babel/plugin-transform-react-inline-elements": "^7.14.5",
9797
"@babel/preset-env": "^7.14.7",
9898
"@babel/preset-react": "^7.14.5",
99-
"@storybook/addon-actions": "^7.0.24",
100-
"@storybook/addon-docs": "^7.0.24",
101-
"@storybook/addon-essentials": "^7.0.27",
102-
"@storybook/addon-interactions": "^7.0.27",
103-
"@storybook/addon-links": "^5.3.21",
104-
"@storybook/addons": "^5.3.21",
105-
"@storybook/blocks": "^7.0.27",
106-
"@storybook/react": "^7.0.24",
107-
"@storybook/react-webpack5": "^7.0.27",
108-
"@storybook/testing-library": "^0.0.14-next.2",
99+
"@storybook/addon-actions": "^7.6.8",
100+
"@storybook/addon-docs": "^7.6.8",
101+
"@storybook/addon-essentials": "^7.6.8",
102+
"@storybook/addon-interactions": "^7.6.8",
103+
"@storybook/addon-links": "^7.6.8",
104+
"@storybook/addon-mdx-gfm": "^7.6.8",
105+
"@storybook/addons": "^7.6.8",
106+
"@storybook/blocks": "^7.6.8",
107+
"@storybook/react": "^7.6.8",
108+
"@storybook/react-webpack5": "^7.6.8",
109+
"@storybook/testing-library": "^0.2.2",
109110
"@svgr/webpack": "^6.2.1",
110111
"@testing-library/jest-dom": "^5.15.0",
111112
"@testing-library/react": "^12.1.2",
@@ -121,7 +122,7 @@
121122
"eslint-plugin-jsx-a11y": "^6.4.1",
122123
"eslint-plugin-prettier": "^3.4.0",
123124
"eslint-plugin-react": "^7.24.0",
124-
"eslint-plugin-storybook": "^0.6.12",
125+
"eslint-plugin-storybook": "^0.6.15",
125126
"file-loader": "^6.2.0",
126127
"husky": "^4.3.8",
127128
"jest": "^27.3.1",
@@ -140,8 +141,8 @@
140141
"rimraf": "^2.7.1",
141142
"sass": "^1.66.1",
142143
"sass-loader": "^12.6.0",
143-
"storybook": "^7.0.27",
144-
"storybook-addon-theme-playground": "^2.2.0",
144+
"storybook": "^7.6.8",
145+
"storybook-addon-theme-playground": "^3.1.0",
145146
"style-loader": "^3.3.1",
146147
"terser-webpack-plugin": "^5.3.1",
147148
"webpack-cli": "^4.9.2",

0 commit comments

Comments
 (0)