Skip to content

Commit d55790e

Browse files
dylanvorsterdylanvorster
authored
Merge pull request #947 from projectstorm/upgrade
Upgrade all the things
2 parents 2d9fca1 + a1b2f6a commit d55790e

File tree

37 files changed

+4183
-2919
lines changed

37 files changed

+4183
-2919
lines changed

‎diagrams-demo-gallery/.storybook/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ module.exports = {
22
stories: ['../demos/*.stories.tsx'],
33
core: {
44
builder: 'webpack5'
5-
}
5+
},
6+
addons: ['@storybook/addon-actions']
67
};

‎diagrams-demo-gallery/.storybook/manager.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { addons } from '@storybook/addons';
2-
import '@storybook/addon-actions/register';
32

43
import diagramsTheme from './theme';
54

‎diagrams-demo-gallery/demos/demo-canvas-drag/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ class CanvasDragToggle extends React.Component<any, any> {
3131
<DemoButton key={2} onClick={this.disableDrag}>
3232
Disable canvas drag
3333
</DemoButton>
34-
]}>
34+
]}
35+
>
3536
<DemoCanvasWidget>
3637
<CanvasWidget engine={engine} />
3738
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-custom-node1/DiamondNodeWidget.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export class DiamondNodeWidget extends React.Component<DiamondNodeWidgetProps> {
3636
position: 'relative',
3737
width: this.props.size,
3838
height: this.props.size
39-
}}>
39+
}}
40+
>
4041
<svg
4142
width={this.props.size}
4243
height={this.props.size}
@@ -72,7 +73,8 @@ export class DiamondNodeWidget extends React.Component<DiamondNodeWidgetProps> {
7273
position: 'absolute'
7374
}}
7475
port={this.props.node.getPort(PortModelAlignment.LEFT)}
75-
engine={this.props.engine}>
76+
engine={this.props.engine}
77+
>
7678
<S.Port />
7779
</PortWidget>
7880
<PortWidget
@@ -82,7 +84,8 @@ export class DiamondNodeWidget extends React.Component<DiamondNodeWidgetProps> {
8284
position: 'absolute'
8385
}}
8486
port={this.props.node.getPort(PortModelAlignment.TOP)}
85-
engine={this.props.engine}>
87+
engine={this.props.engine}
88+
>
8689
<S.Port />
8790
</PortWidget>
8891
<PortWidget
@@ -92,7 +95,8 @@ export class DiamondNodeWidget extends React.Component<DiamondNodeWidgetProps> {
9295
position: 'absolute'
9396
}}
9497
port={this.props.node.getPort(PortModelAlignment.RIGHT)}
95-
engine={this.props.engine}>
98+
engine={this.props.engine}
99+
>
96100
<S.Port />
97101
</PortWidget>
98102
<PortWidget
@@ -102,7 +106,8 @@ export class DiamondNodeWidget extends React.Component<DiamondNodeWidgetProps> {
102106
position: 'absolute'
103107
}}
104108
port={this.props.node.getPort(PortModelAlignment.BOTTOM)}
105-
engine={this.props.engine}>
109+
engine={this.props.engine}
110+
>
106111
<S.Port />
107112
</PortWidget>
108113
</div>

‎diagrams-demo-gallery/demos/demo-drag-and-drop/components/BodyWidget.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ export class BodyWidget extends React.Component<BodyWidgetProps> {
7474
}}
7575
onDragOver={(event) => {
7676
event.preventDefault();
77-
}}>
77+
}}
78+
>
7879
<DemoCanvasWidget>
7980
<CanvasWidget engine={this.props.app.getDiagramEngine()} />
8081
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-drag-and-drop/components/TrayItemWidget.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export class TrayItemWidget extends React.Component<TrayItemWidgetProps> {
2929
onDragStart={(event) => {
3030
event.dataTransfer.setData('storm-diagram-node', JSON.stringify(this.props.model));
3131
}}
32-
className="tray-item">
32+
className="tray-item"
33+
>
3334
{this.props.name}
3435
</S.Tray>
3536
);

‎diagrams-demo-gallery/demos/demo-labelled-links/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@ export default () => {
5353
<DemoButton
5454
onClick={() => {
5555
action('Serialized Graph')(JSON.stringify(model.serializeDiagram(), null, 2));
56-
}}>
56+
}}
57+
>
5758
Serialize Graph
5859
</DemoButton>
59-
}>
60+
}
61+
>
6062
<DemoCanvasWidget>
6163
<CanvasWidget engine={engine} />
6264
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-mutate-graph/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class NodeDelayedPosition extends React.Component<any, any> {
4949
<DemoButton key={2} onClick={this.updatePositionViaSerialize}>
5050
Update position via serialize
5151
</DemoButton>
52-
]}>
52+
]}
53+
>
5354
<DemoCanvasWidget>
5455
<CanvasWidget engine={engine} />
5556
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-right-angles-routing/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ export default () => {
5858
<DemoButton
5959
onClick={() => {
6060
action('Serialized Graph')(JSON.stringify(model.serialize(), null, 2));
61-
}}>
61+
}}
62+
>
6263
Serialize Graph
6364
</DemoButton>
64-
}>
65+
}
66+
>
6567
<DemoCanvasWidget>
6668
<CanvasWidget engine={engine} />
6769
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-serializing/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ export default () => {
4949
<DemoButton
5050
onClick={() => {
5151
action('Serialized Graph')(beautify(model2.serialize(), null, 2, 80));
52-
}}>
52+
}}
53+
>
5354
Serialize Graph
5455
</DemoButton>
55-
}>
56+
}
57+
>
5658
<DemoCanvasWidget>
5759
<CanvasWidget engine={engine} />
5860
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-smart-routing/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@ export default () => {
6060
<DemoButton
6161
onClick={() => {
6262
action('Serialized Graph')(JSON.stringify(model.serialize(), null, 2));
63-
}}>
63+
}}
64+
>
6465
Serialize Graph
6566
</DemoButton>
66-
}>
67+
}
68+
>
6769
<DemoCanvasWidget>
6870
<CanvasWidget engine={engine} />
6971
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/demo-zoom-to-fit-nodes/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default () => {
2929
//6) render the diagram!
3030
return (
3131
<DemoWorkspaceWidget
32-
buttons={<DemoButton onClick={() => engine.zoomToFitSelectedNodes(50)}>Zoom to fit</DemoButton>}>
32+
buttons={<DemoButton onClick={() => engine.zoomToFitSelectedNodes(50)}>Zoom to fit</DemoButton>}
33+
>
3334
<DemoCanvasWidget>
3435
<CanvasWidget engine={engine} />
3536
</DemoCanvasWidget>

‎diagrams-demo-gallery/demos/helpers/DemoCanvasWidget.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@ namespace S {
5555
`;
5656
}
5757

58-
export class DemoCanvasWidget extends React.Component<DemoCanvasWidgetProps> {
58+
export class DemoCanvasWidget extends React.Component<React.PropsWithChildren<DemoCanvasWidgetProps>> {
5959
render() {
6060
return (
6161
<>
6262
<Global styles={S.Expand} />
6363
<S.Container
6464
background={this.props.background || 'rgb(60, 60, 60)'}
65-
color={this.props.color || 'rgba(255,255,255, 0.05)'}>
65+
color={this.props.color || 'rgba(255,255,255, 0.05)'}
66+
>
6667
{this.props.children}
6768
</S.Container>
6869
</>

‎diagrams-demo-gallery/demos/helpers/DemoWorkspaceWidget.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const DemoButton = styled.button`
4343
}
4444
`;
4545

46-
export class DemoWorkspaceWidget extends React.Component<DemoWorkspaceWidgetProps> {
46+
export class DemoWorkspaceWidget extends React.Component<React.PropsWithChildren<DemoWorkspaceWidgetProps>> {
4747
render() {
4848
return (
4949
<S.Container>

‎diagrams-demo-gallery/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎diagrams-demo-gallery/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@projectstorm/react-diagrams-gallery",
3-
"version": "6.7.0",
3+
"version": "6.7.2-alpha.0",
44
"author": "dylanvorster",
55
"license": "MIT",
66
"private": true,
@@ -27,14 +27,14 @@
2727
"nodes"
2828
],
2929
"dependencies": {
30-
"@storybook/addon-actions": "^6.2.8",
30+
"@storybook/addon-actions": "^6.5.6",
3131
"@storybook/addon-options": "^5.3.21",
32-
"@storybook/addons": "^6.2.8",
33-
"@storybook/builder-webpack5": "^6.2.8",
34-
"@storybook/manager-webpack5": "^6.3.2",
35-
"@storybook/react": "^6.3.2",
36-
"@storybook/storybook-deployer": "^2.8.7",
37-
"@storybook/theming": "^6.2.8",
38-
"gsap": "^3.7.1"
32+
"@storybook/addons": "^6.5.6",
33+
"@storybook/builder-webpack5": "^6.5.6",
34+
"@storybook/manager-webpack5": "^6.5.6",
35+
"@storybook/react": "^6.5.6",
36+
"@storybook/storybook-deployer": "^2.8.11",
37+
"@storybook/theming": "^6.5.6",
38+
"gsap": "^3.10.4"
3939
}
4040
}

‎diagrams-demo-project/package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@projectstorm/react-diagrams-demo",
3-
"version": "6.7.0",
3+
"version": "6.7.2-alpha.0",
44
"author": "dylanvorster",
55
"license": "MIT",
66
"private": true,
@@ -25,7 +25,13 @@
2525
"main": "./dist/index.js",
2626
"typings": "./dist/@types/index",
2727
"dependencies": {
28-
"@projectstorm/react-diagrams": "^6.7.0",
28+
"@projectstorm/react-diagrams": "^6.7.2-alpha.0",
29+
"react": "^18.1.0",
30+
"react-dom": "^18.1.0"
31+
},
32+
"devDependencies": {
33+
"@types/react": "^18.0.10",
34+
"@types/react-dom": "^18.0.5",
2935
"webpack": "^5.46.0",
3036
"webpack-cli": "^4.7.2",
3137
"webpack-dev-server": "^3.11.2"

‎diagrams-demo-project/src/main.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import * as ReactDOM from 'react-dom';
2+
import { createRoot } from 'react-dom/client';
33
import './main.css';
44
import createEngine, { DefaultLinkModel, DiagramModel } from '@projectstorm/react-diagrams';
55
import { JSCustomNodeFactory } from './custom-node-js/JSCustomNodeFactory';
@@ -39,5 +39,6 @@ model.addAll(node1, node2, link1);
3939
engine.setModel(model);
4040

4141
document.addEventListener('DOMContentLoaded', () => {
42-
ReactDOM.render(<BodyWidget engine={engine} />, document.querySelector('#application'));
42+
const root = createRoot(document.querySelector('#application'));
43+
root.render(<BodyWidget engine={engine} />);
4344
});

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "6.7.0"
4+
"version": "6.7.2-alpha.0"
55
}

‎package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,52 +41,52 @@
4141
"react": "16.* || 17.*"
4242
},
4343
"devDependencies": {
44-
"@babel/core": "^7.14.8",
45-
"@babel/preset-react": "^7.14.5",
46-
"@emotion/react": "^11.4.0",
47-
"@emotion/styled": "^11.3.0",
48-
"@types/dagre": "^0.7.45",
49-
"@types/jest": "^26.0.24",
50-
"@types/jest-environment-puppeteer": "^4.4.1",
51-
"@types/lodash": "^4.14.171",
52-
"@types/node": "^16.4.1",
53-
"@types/puppeteer": "^5.4.4",
54-
"@types/react": "^17.0.14",
55-
"babel-loader": "^8.2.2",
44+
"@babel/core": "^7.18.2",
45+
"@babel/preset-react": "^7.17.12",
46+
"@emotion/react": "^11.9.0",
47+
"@emotion/styled": "^11.8.1",
48+
"@types/dagre": "^0.7.47",
49+
"@types/jest": "^28.1.0",
50+
"@types/jest-environment-puppeteer": "^5.0.2",
51+
"@types/lodash": "^4.14.182",
52+
"@types/node": "^17.0.39",
53+
"@types/puppeteer": "^5.4.6",
54+
"@types/react": "^18.0.10",
55+
"babel-loader": "^8.2.5",
5656
"cross-env": "^7.0.3",
57-
"css-loader": "^6.2.0",
57+
"css-loader": "^6.7.1",
5858
"dagre": "^0.8.5",
5959
"emotion": "^11.0.0",
6060
"enzyme": "^3.11.0",
6161
"file-loader": "^6.2.0",
62-
"glob": "^7.1.7",
63-
"jest": "^27.0.6",
64-
"jest-cli": "^27.0.6",
65-
"jest-puppeteer": "^5.0",
62+
"glob": "^8.0.3",
63+
"jest": "^28.1.0",
64+
"jest-cli": "^28.1.0",
65+
"jest-puppeteer": "^6.1",
6666
"json-beautify": "^1.1.1",
67-
"lerna": "^4.0.0",
67+
"lerna": "^5.0.0",
6868
"lodash": "^4.17.21",
6969
"pathfinding": "^0.4.18",
7070
"paths-js": "^0.4.11",
71-
"prettier": "^2.3.2",
72-
"puppeteer": "10.1.0",
71+
"prettier": "^2.6.2",
72+
"puppeteer": "14.2.1",
7373
"raf": "^3.4.1",
7474
"raw-loader": "^4.0.2",
75-
"react": "^17.0.2",
76-
"react-dom": "^17.0.2",
77-
"react-test-renderer": "^17.0.2",
75+
"react": "^18.1.0",
76+
"react-dom": "^18.1.0",
77+
"react-test-renderer": "^18.1.0",
7878
"resize-observer-polyfill": "^1.5.1",
7979
"rimraf": "^3.0.2",
80-
"source-map-loader": "^3.0.0",
81-
"style-loader": "^3.2.1",
82-
"terser-webpack-plugin": "^5.1.4",
83-
"ts-jest": "^27.0.4",
84-
"ts-loader": "^9.2.3",
85-
"typescript": "^4.3.5",
86-
"val-loader": "^4.0.0",
87-
"webpack": "^5.46.0",
88-
"webpack-cli": "^4.7.2",
89-
"webpack-dev-server": "^3.11.2",
80+
"source-map-loader": "^3.0.1",
81+
"style-loader": "^3.3.1",
82+
"terser-webpack-plugin": "^5.3.3",
83+
"ts-jest": "^28.0.4",
84+
"ts-loader": "^9.3.0",
85+
"typescript": "^4.7.3",
86+
"val-loader": "^5.0.0",
87+
"webpack": "^5.73.0",
88+
"webpack-cli": "^4.9.2",
89+
"webpack-dev-server": "^4.9.1",
9090
"webpack-node-externals": "^3.0.0"
9191
}
9292
}

‎packages/geometry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@projectstorm/geometry",
3-
"version": "6.7.0",
3+
"version": "6.7.2-alpha.0",
44
"author": "dylanvorster",
55
"license": "MIT",
66
"repository": {

‎packages/react-canvas-core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@projectstorm/react-canvas-core",
3-
"version": "6.7.0",
3+
"version": "6.7.2-alpha.0",
44
"author": "dylanvorster",
55
"license": "MIT",
66
"repository": {
@@ -29,7 +29,7 @@
2929
"module": "./dist/index.js",
3030
"typings": "./dist/@types/index",
3131
"dependencies": {
32-
"@projectstorm/geometry": "^6.7.0"
32+
"@projectstorm/geometry": "^6.7.2-alpha.0"
3333
},
3434
"peerDependencies": {
3535
"lodash": "4.*",

0 commit comments

Comments
 (0)