Skip to content

Commit 7a664d5

Browse files
dylanvorsterdylanvorster
authored
Merge pull request #1018 from projectstorm/pnpm_upgrade
Maintenance
2 parents c3146e1 + 66c687a commit 7a664d5

File tree

15 files changed

+5300
-6993
lines changed

15 files changed

+5300
-6993
lines changed

‎.changeset/gold-years-pay.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@projectstorm/react-diagrams-defaults': patch
3+
'@projectstorm/react-diagrams-routing': patch
4+
'@projectstorm/react-diagrams-core': patch
5+
'@projectstorm/react-canvas-core': patch
6+
'@projectstorm/react-diagrams-gallery': patch
7+
'@projectstorm/react-diagrams-demo': patch
8+
'@projectstorm/geometry': patch
9+
---
10+
11+
Upgrade all dependencies and fix Storybook after upgrade

‎diagrams-demo-gallery/.babelrc.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"sourceType": "unambiguous",
3+
"presets": [
4+
[
5+
"@babel/preset-env",
6+
{
7+
"targets": {
8+
"chrome": 100,
9+
"safari": 15,
10+
"firefox": 91
11+
}
12+
}
13+
],
14+
"@babel/preset-react",
15+
"@babel/preset-typescript"
16+
],
17+
"plugins": []
18+
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
stories: ['../demos/*.stories.tsx'],
3-
core: {
4-
builder: 'webpack5'
5-
},
6-
addons: ['@storybook/addon-actions']
3+
addons: ['@storybook/addon-actions'],
4+
framework: {
5+
name: '@storybook/react-webpack5',
6+
options: {}
7+
}
78
};

‎diagrams-demo-gallery/.storybook/preview-head.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<style>
2+
html, body, #storybook-root {
3+
height: 100%;
4+
}
5+
</style>

‎diagrams-demo-gallery/demos/helpers/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
html,
22
body,
3-
#root {
3+
#storybook-root {
44
height: 100%;
55
padding: 0;
66
margin: 0;

‎diagrams-demo-gallery/package.json‎

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,53 @@
11
{
2-
"name": "@projectstorm/react-diagrams-gallery",
3-
"version": "7.1.1",
4-
"author": "dylanvorster",
5-
"license": "MIT",
6-
"private": true,
7-
"repository": {
8-
"type": "git",
9-
"url": "https://github.com/projectstorm/react-diagrams.git"
10-
},
11-
"scripts": {
12-
"start": "./node_modules/.bin/start-storybook",
13-
"storybook:build": "./node_modules/.bin/build-storybook -c .storybook -o .out"
14-
},
15-
"keywords": [
16-
"web",
17-
"diagram",
18-
"diagrams",
19-
"react",
20-
"typescript",
21-
"flowchart",
22-
"simple",
23-
"links",
24-
"nodes"
25-
],
26-
"dependencies": {
27-
"lodash": "^4.17.21",
28-
"@projectstorm/react-canvas-core": "workspace:*",
29-
"@projectstorm/react-diagrams": "workspace:*",
30-
"@projectstorm/react-diagrams-core": "workspace:*",
31-
"@projectstorm/react-diagrams-defaults": "workspace:*",
32-
"gsap": "^3.11.4",
33-
"json-beautify": "^1.1.1",
34-
"react": "^18.2.0"
35-
},
36-
"devDependencies": {
37-
"@types/lodash": "^4.14.191",
38-
"@types/react": "^18.0.27",
39-
"@storybook/addons": "^6.5.15",
40-
"@storybook/addon-actions": "^6.5.15",
41-
"@storybook/addon-options": "^5.3.21",
42-
"@storybook/builder-webpack5": "^6.5.15",
43-
"@storybook/manager-webpack5": "^6.5.15",
44-
"@storybook/react": "^6.5.15",
45-
"@storybook/storybook-deployer": "^2.8.16",
46-
"@storybook/theming": "^6.5.15"
47-
}
2+
"name": "@projectstorm/react-diagrams-gallery",
3+
"version": "7.1.1",
4+
"author": "dylanvorster",
5+
"license": "MIT",
6+
"private": true,
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/projectstorm/react-diagrams.git"
10+
},
11+
"scripts": {
12+
"start": "pnpm storybook dev",
13+
"storybook:build": "./node_modules/.bin/build-storybook -c .storybook -o .out"
14+
},
15+
"keywords": [
16+
"web",
17+
"diagram",
18+
"diagrams",
19+
"react",
20+
"typescript",
21+
"flowchart",
22+
"simple",
23+
"links",
24+
"nodes"
25+
],
26+
"dependencies": {
27+
"@projectstorm/react-canvas-core": "workspace:*",
28+
"@projectstorm/react-diagrams": "workspace:*",
29+
"@projectstorm/react-diagrams-core": "workspace:*",
30+
"@projectstorm/react-diagrams-defaults": "workspace:*",
31+
"gsap": "^3.12.2",
32+
"json-beautify": "^1.1.1",
33+
"lodash": "^4.17.21",
34+
"react": "^18.2.0",
35+
"react-dom": "^18.2.0"
36+
},
37+
"devDependencies": {
38+
"@babel/preset-env": "^7.22.20",
39+
"@babel/preset-react": "^7.22.15",
40+
"@babel/preset-typescript": "^7.22.15",
41+
"@storybook/addon-actions": "^7.4.4",
42+
"@storybook/addon-options": "^5.3.21",
43+
"@storybook/addons": "^7.4.4",
44+
"@storybook/react": "^7.4.4",
45+
"@storybook/react-webpack5": "^7.4.4",
46+
"@storybook/storybook-deployer": "^2.8.16",
47+
"@storybook/theming": "^7.4.4",
48+
"@types/lodash": "^4.14.199",
49+
"@types/react": "^18.2.22",
50+
"@types/react-dom": "^18.2.7",
51+
"storybook": "^7.4.4"
52+
}
4853
}

‎diagrams-demo-project/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
},
3232
"devDependencies": {
3333
"source-map-loader": "^4.0.1",
34-
"html-webpack-plugin": "^5.5.0",
35-
"@babel/core": "^7.20.12",
36-
"@babel/preset-react": "^7.18.6",
37-
"@types/react": "^18.0.27",
38-
"@types/react-dom": "^18.0.10",
39-
"babel-loader": "^9.1.2",
40-
"css-loader": "^6.7.3",
41-
"style-loader": "^3.3.1",
42-
"webpack": "^5.75.0",
43-
"webpack-cli": "^5.0.1",
44-
"webpack-dev-server": "^4.11.1"
34+
"html-webpack-plugin": "^5.5.3",
35+
"@babel/core": "^7.22.20",
36+
"@babel/preset-react": "^7.22.15",
37+
"@types/react": "^18.2.22",
38+
"@types/react-dom": "^18.2.7",
39+
"babel-loader": "^9.1.3",
40+
"css-loader": "^6.8.1",
41+
"style-loader": "^3.3.3",
42+
"webpack": "^5.88.2",
43+
"webpack-cli": "^5.1.4",
44+
"webpack-dev-server": "^4.15.1"
4545
}
4646
}

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
"release:storybook": "tsc --build && cd diagrams-demo-gallery && pnpm storybook:build && ./node_modules/.bin/storybook-to-ghpages --existing-output-dir .out"
2929
},
3030
"devDependencies": {
31-
"@changesets/cli": "^2.26.0",
32-
"@types/jest": "^29.2.6",
33-
"@types/node": "^18.11.18",
34-
"jest": "^29.4.0",
35-
"jest-cli": "^29.4.0",
36-
"prettier": "^2.8.3",
37-
"rimraf": "^4.1.2",
31+
"@changesets/cli": "^2.26.2",
32+
"@types/jest": "^29.5.5",
33+
"@types/node": "^20.6.3",
34+
"jest": "^29.7.0",
35+
"jest-cli": "^29.7.0",
36+
"prettier": "^3.0.3",
37+
"rimraf": "^5.0.1",
3838
"source-map-loader": "^4.0.1",
39-
"terser-webpack-plugin": "^5.3.6",
40-
"ts-jest": "^29.0.5",
41-
"ts-loader": "^9.4.2",
42-
"typescript": "^4.9.4",
43-
"webpack": "^5.75.0",
44-
"webpack-cli": "^5.0.1",
45-
"webpack-dev-server": "^4.11.1",
39+
"terser-webpack-plugin": "^5.3.9",
40+
"ts-jest": "^29.1.1",
41+
"ts-loader": "^9.4.4",
42+
"typescript": "^5.2.2",
43+
"webpack": "^5.88.2",
44+
"webpack-cli": "^5.1.4",
45+
"webpack-dev-server": "^4.15.1",
4646
"webpack-node-externals": "^3.0.0"
4747
}
4848
}

‎packages/geometry/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"lodash": "^4.17.21"
3333
},
3434
"devDependencies": {
35-
"@types/lodash": "^4.14.191"
35+
"@types/lodash": "^4.14.199"
3636
}
3737
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
"module": "./dist/index.js",
3030
"typings": "./dist/@types/index",
3131
"dependencies": {
32-
"@emotion/react": "^11.10.5",
33-
"@emotion/styled": "^11.10.5",
32+
"@emotion/react": "^11.11.1",
33+
"@emotion/styled": "^11.11.0",
3434
"@projectstorm/geometry": "workspace:*",
3535
"react": "^18.2.0",
3636
"lodash": "^4.17.21"
3737
},
3838
"devDependencies": {
39-
"@types/react": "^18.0.27",
40-
"@types/lodash": "^4.14.191"
39+
"@types/react": "^18.2.22",
40+
"@types/lodash": "^4.14.199"
4141
}
4242
}

0 commit comments

Comments
 (0)