Skip to content

Commit 4278329

Browse files
dylanvorsterdylanvorster
authored
Merge pull request #72 from projectstorm/deps_upgrade
Deps upgrade
2 parents c6b0f0a + c487638 commit 4278329

File tree

58 files changed

+2153
-2642
lines changed

Some content is hidden

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

58 files changed

+2153
-2642
lines changed

‎.changeset/weak-beds-refuse.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
'@projectstorm/react-workspaces-behavior-divider-dropzone': patch
3+
'@projectstorm/react-workspaces-behavior-panel-dropzone': patch
4+
'@projectstorm/react-workspaces-model-floating-window': patch
5+
'@projectstorm/react-workspaces-dropzone-plugin-tabs': patch
6+
'@projectstorm/react-workspaces-dropzone-plugin-tray': patch
7+
'@projectstorm/react-workspaces-behavior-resize': patch
8+
'@projectstorm/react-workspaces-model-tabs': patch
9+
'@projectstorm/react-workspaces-model-tray': patch
10+
'@projectstorm/react-workspaces-demo': patch
11+
'@projectstorm/react-workspaces-defaults': patch
12+
'@projectstorm/react-workspaces-core': patch
13+
---
14+
15+
Bumped all dependencies

‎demo/.storybook/main.ts‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,31 @@
11
import type { StorybookConfig } from '@storybook/react-webpack5';
22

33
const config: StorybookConfig = {
4-
addons: [
5-
{
6-
name: '@storybook/addon-essentials'
7-
},
8-
{
9-
name: '@storybook/addon-webpack5-compiler-babel'
10-
}
11-
],
12-
docs: {
13-
autodocs: false
4+
stories: ['../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
5+
addons: ['@storybook/addon-webpack5-compiler-swc'],
6+
framework: {
7+
name: '@storybook/react-webpack5',
8+
options: {}
149
},
15-
stories: ['../dist/stories/*.stories.js'],
1610
webpackFinal: async (config, { configType }) => {
1711
return {
1812
...config,
1913
devtool: 'inline-source-map',
20-
resolve: {
21-
...config.resolve,
22-
alias: {
23-
'@emotion/react': require.resolve('@emotion/react')
24-
}
25-
},
2614
module: {
2715
...config.module,
2816
rules: [
17+
...config.module.rules,
2918
{
30-
enforce: 'pre',
31-
test: /\.js$/,
32-
loader: 'source-map-loader'
19+
test: /\.(woff|woff2|eot|ttf|otf|svg|png|gif|ico)$/,
20+
type: 'asset/resource'
3321
},
34-
...config.module.rules
22+
{
23+
test: /\.xml$/,
24+
type: 'asset/source'
25+
}
3526
]
3627
}
3728
};
38-
},
39-
framework: {
40-
name: '@storybook/react-webpack5',
41-
options: {}
4229
}
4330
};
44-
4531
export default config;

‎demo/.storybook/manager.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎demo/.storybook/preview.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Replace your-framework with the framework you are using, e.g. react-vite, nextjs, vue3-vite, etc.
2+
import type { Preview } from '@storybook/react-webpack5';
3+
4+
const preview: Preview = {
5+
parameters: {
6+
layout: 'fullscreen',
7+
backgrounds: {
8+
options: {
9+
// 👇 Default options
10+
dark: { name: 'Dark', value: '#333' },
11+
light: { name: 'Light', value: '#F7F9F2' }
12+
}
13+
}
14+
},
15+
initialGlobals: {
16+
// 👇 Set the initial background color
17+
backgrounds: { value: 'dark' }
18+
}
19+
};
20+
21+
export default preview;

‎demo/.storybook/theme.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎demo/package.json‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"storybook:build": "storybook build -o .out"
88
},
99
"dependencies": {
10-
"@emotion/styled": "^11.13.5",
10+
"@emotion/styled": "^11.14.1",
1111
"@projectstorm/react-workspaces-behavior-divider-dropzone": "workspace:*",
1212
"@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
1313
"@projectstorm/react-workspaces-behavior-resize": "workspace:*",
@@ -19,26 +19,21 @@
1919
"@projectstorm/react-workspaces-model-tabs": "workspace:*",
2020
"@projectstorm/react-workspaces-model-tray": "workspace:*",
2121
"lodash": "^4.17.21",
22-
"react": "^18.3.1",
22+
"react": "^19.1.1",
2323
"typeface-open-sans": "^1.1.13"
2424
},
2525
"devDependencies": {
26-
"@babel/preset-env": "^7.26.0",
27-
"@babel/preset-react": "^7.25.9",
28-
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
29-
"@storybook/addon-essentials": "^8.4.5",
30-
"@storybook/addons": "^7.6.17",
31-
"@storybook/react": "^8.4.5",
32-
"@storybook/react-webpack5": "^8.4.5",
33-
"@storybook/storybook-deployer": "^2.8.16",
34-
"@storybook/theming": "^8.4.5",
35-
"@types/lodash": "^4.17.13",
36-
"@types/node": "^22.10.0",
37-
"@types/react": "18.3.12",
38-
"@types/react-dom": "^18.3.1",
39-
"react-dom": "18.3.1",
26+
"@storybook/addon-webpack5-compiler-swc": "^3.0.0",
27+
"@storybook/builder-webpack5": "^9.1.0",
28+
"@storybook/react": "^9.1.0",
29+
"@storybook/react-webpack5": "^9.1.0",
30+
"@types/lodash": "^4.17.20",
31+
"@types/node": "^24.2.0",
32+
"@types/react": "19.1.9",
33+
"@types/react-dom": "^19.1.7",
34+
"react-dom": "19.1.1",
4035
"source-map-loader": "^5.0.0",
41-
"storybook": "^8.4.5",
42-
"webpack": "^5.96.1"
36+
"storybook": "^9.1.1",
37+
"webpack": "^5.101.0"
4338
}
4439
}

‎demo/stories/helpers/tools.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { resizingBehavior } from '@projectstorm/react-workspaces-behavior-resize
2929
import { RootWorkspaceModel } from '@projectstorm/react-workspaces-model-floating-window';
3030
import { ConvertToTabZone, getDirectiveForTabModel } from '@projectstorm/react-workspaces-dropzone-plugin-tabs';
3131
import { ConvertToTrayZone, getDirectiveForTrayModel } from '@projectstorm/react-workspaces-dropzone-plugin-tray';
32-
import { css, Global } from '@storybook/theming';
32+
import { css, Global } from 'storybook/theming';
3333

3434
export const genVerticalNode = () => {
3535
const m1 = new DefaultWorkspacePanelModel('Panel 1');

‎example-project-js/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
"dependencies": {
1111
"@projectstorm/react-workspaces-core": "workspace:*",
1212
"@projectstorm/react-workspaces-behavior-resize": "workspace:*",
13-
"@emotion/react": "^11.13.5",
14-
"@emotion/styled": "^11.13.5",
15-
"react": "^18.3.1",
16-
"react-dom": "^18.3.1"
13+
"@emotion/react": "^11.14.0",
14+
"@emotion/styled": "^11.14.1",
15+
"react": "^19.1.1",
16+
"react-dom": "^19.1.1"
1717
},
1818
"devDependencies": {
1919
"html-webpack-plugin": "^5.6.3",
20-
"@types/react": "^18.3.12",
21-
"@types/react-dom": "^18.3.1",
22-
"babel-loader": "^9.2.1",
23-
"@babel/core": "^7.26.0",
24-
"@babel/preset-env": "^7.26.0",
25-
"@babel/preset-react": "^7.25.9",
26-
"webpack": "^5.96.1",
27-
"webpack-cli": "^5.1.4",
28-
"webpack-dev-server": "^5.1.0"
20+
"@types/react": "^19.1.9",
21+
"@types/react-dom": "^19.1.7",
22+
"babel-loader": "^10.0.0",
23+
"@babel/core": "^7.28.0",
24+
"@babel/preset-env": "^7.28.0",
25+
"@babel/preset-react": "^7.27.1",
26+
"webpack": "^5.101.0",
27+
"webpack-cli": "^6.0.1",
28+
"webpack-dev-server": "^5.2.2"
2929
}
3030
}

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
"release:storybook": "tsc --build && cd demo && pnpm storybook:build && ./node_modules/.bin/storybook-to-ghpages --existing-output-dir .out"
3131
},
3232
"devDependencies": {
33-
"babel-loader": "^9.2.1",
33+
"babel-loader": "^10.0.0",
3434
"source-map-loader": "^5.0.0",
35-
"@babel/core": "^7.26.0",
36-
"@babel/preset-react": "^7.25.9",
37-
"@babel/preset-env": "^7.26.0",
38-
"prettier": "^3.4.1",
39-
"typescript": "^5.7.2",
40-
"terser-webpack-plugin": "^5.3.10",
41-
"@changesets/cli": "^2.27.10",
42-
"webpack": "^5.96.1",
43-
"webpack-cli": "^5.1.4",
35+
"@babel/core": "^7.28.0",
36+
"@babel/preset-react": "^7.27.1",
37+
"@babel/preset-env": "^7.28.0",
38+
"prettier": "^3.6.2",
39+
"typescript": "^5.9.2",
40+
"terser-webpack-plugin": "^5.3.14",
41+
"@changesets/cli": "^2.29.5",
42+
"webpack": "^5.101.0",
43+
"webpack-cli": "^6.0.1",
4444
"webpack-node-externals": "^3.0.0"
4545
}
4646
}

‎packages/behavior-divider-dropzone/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
},
1313
"dependencies": {
1414
"@projectstorm/react-workspaces-core": "workspace:*",
15-
"react": "^18.3.1",
16-
"@emotion/styled": "^11.13.5"
15+
"react": "^19.1.1",
16+
"@emotion/styled": "^11.14.1"
1717
},
1818
"devDependencies": {
19-
"@types/react": "^18.3.12"
19+
"@types/react": "^19.1.9"
2020
}
2121
}

0 commit comments

Comments
 (0)