Merge pull request projectstorm#40 from projectstorm/chore/upgrade_st…

…orybook Chore/upgrade storybook
collabsoft · May 9, 2023 · e22c46c · e22c46c
2 parents 21e222a + c7a4537
commit e22c46c
Show file tree

Hide file tree

Showing 19 changed files with 3,986 additions and 7,981 deletions.
diff --git a/.changeset/unlucky-papayas-tease.md b/.changeset/unlucky-papayas-tease.md
@@ -0,0 +1,15 @@
+---
+'@projectstorm/react-workspaces-behavior-divider-dropzone': patch
+'@projectstorm/react-workspaces-behavior-panel-dropzone': patch
+'@projectstorm/react-workspaces-model-floating-window': patch
+'@projectstorm/react-workspaces-dropzone-plugin-tabs': patch
+'@projectstorm/react-workspaces-dropzone-plugin-tray': patch
+'@projectstorm/react-workspaces-behavior-resize': patch
+'@projectstorm/react-workspaces-model-tabs': patch
+'@projectstorm/react-workspaces-model-tray': patch
+'@projectstorm/react-workspaces-demo': patch
+'@projectstorm/react-workspaces-defaults': patch
+'@projectstorm/react-workspaces-core': patch
+---
+
+upgrade dependencies
diff --git a/demo/.babelrc.json b/demo/.babelrc.json
@@ -0,0 +1,15 @@
+{
+  "sourceType": "unambiguous",
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "chrome": 100
+        }
+      }
+    ],
+    "@babel/preset-react"
+  ],
+  "plugins": []
+}
diff --git a/demo/.storybook/main.js b/demo/.storybook/main.js
@@ -1,5 +1,5 @@
 module.exports = {
-  stories: ['../stories/*.stories.tsx'],
+  stories: ['../dist/stories/*.stories.js'],
   webpackFinal: async (config, { configType }) => {
     return {
       ...config,
@@ -17,12 +17,16 @@ module.exports = {
       }
     };
   },
-  core: {
-    builder: 'webpack5'
-  },
   addons: [
     {
       name: '@storybook/addon-essentials'
     }
-  ]
+  ],
+  framework: {
+    name: '@storybook/react-webpack5',
+    options: {}
+  },
+  docs: {
+    autodocs: false
+  }
 };
diff --git a/demo/package.json b/demo/package.json
@@ -3,39 +3,41 @@
   "private": "true",
   "version": null,
   "scripts": {
-    "storybook": "start-storybook",
+    "storybook": "storybook dev",
     "storybook:build": "./node_modules/.bin/build-storybook -c .storybook -o .out"
   },
   "dependencies": {
-    "react": "^18.2.0",
-    "typeface-open-sans": "^1.1.13",
-    "@emotion/styled": "^11.10.5",
-    "lodash": "^4.17.21",
-    "@projectstorm/react-workspaces-core": "workspace:*",
-    "@projectstorm/react-workspaces-model-tray": "workspace:*",
-    "@projectstorm/react-workspaces-model-tabs": "workspace:*",
-    "@projectstorm/react-workspaces-model-floating-window": "workspace:*",
-    "@projectstorm/react-workspaces-defaults": "workspace:*",
-    "@projectstorm/react-workspaces-behavior-resize": "workspace:*",
+    "@emotion/styled": "^11.11.0",
     "@projectstorm/react-workspaces-behavior-divider-dropzone": "workspace:*",
     "@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
+    "@projectstorm/react-workspaces-behavior-resize": "workspace:*",
+    "@projectstorm/react-workspaces-core": "workspace:*",
+    "@projectstorm/react-workspaces-defaults": "workspace:*",
     "@projectstorm/react-workspaces-dropzone-plugin-tabs": "workspace:*",
-    "@projectstorm/react-workspaces-dropzone-plugin-tray": "workspace:*"
+    "@projectstorm/react-workspaces-dropzone-plugin-tray": "workspace:*",
+    "@projectstorm/react-workspaces-model-floating-window": "workspace:*",
+    "@projectstorm/react-workspaces-model-tabs": "workspace:*",
+    "@projectstorm/react-workspaces-model-tray": "workspace:*",
+    "lodash": "^4.17.21",
+    "react": "^18.2.0",
+    "typeface-open-sans": "^1.1.13"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.191",
-    "@storybook/addon-essentials": "^6.5.16",
-    "@storybook/addons": "^6.5.16",
-    "@storybook/builder-webpack5": "^6.5.16",
+    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-react": "^7.18.6",
+    "@storybook/addon-essentials": "^7.0.9",
+    "@storybook/addons": "^7.0.9",
+    "@storybook/react": "^7.0.9",
+    "@storybook/react-webpack5": "^7.0.9",
     "@storybook/storybook-deployer": "^2.8.16",
-    "@storybook/manager-webpack5": "^6.5.16",
-    "@storybook/react": "^6.5.16",
-    "@storybook/theming": "^6.5.16",
-    "@types/node": "^18.11.18",
-    "@types/react": "18.0.27",
-    "@types/react-dom": "^18.0.10",
+    "@storybook/theming": "^7.0.9",
+    "@types/lodash": "^4.14.194",
+    "@types/node": "^20.1.1",
+    "@types/react": "18.2.6",
+    "@types/react-dom": "^18.2.4",
     "react-dom": "18.2.0",
     "source-map-loader": "^4.0.1",
-    "webpack": "^5.75.0"
+    "storybook": "^7.0.9",
+    "webpack": "^5.82.0"
   }
-}
+}
diff --git a/demo/stories/helpers/tools.tsx b/demo/stories/helpers/tools.tsx
@@ -134,7 +134,7 @@ export const CompInternal: React.FC<{ model: WorkspaceNodeModel; engine: Workspa
         styles={css`
           html,
           body,
-          #root {
+          #storybook-root {
             height: 100%;
           }
         `}

diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -4,7 +4,8 @@
     "declarationDir": "dist/@types",
     "rootDir": ".",
     "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
+    "jsx": "react"
   },
   "references": [
     {

diff --git a/example-project-js/package.json b/example-project-js/package.json
@@ -10,21 +10,21 @@
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
     "@projectstorm/react-workspaces-behavior-resize": "workspace:*",
-    "@emotion/react": "^11.10.5",
-    "@emotion/styled": "^11.10.5",
+    "@emotion/react": "^11.11.0",
+    "@emotion/styled": "^11.11.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "html-webpack-plugin": "^5.5.0",
-    "@types/react": "^18.0.27",
-    "@types/react-dom": "^18.0.10",
+    "html-webpack-plugin": "^5.5.1",
+    "@types/react": "^18.2.6",
+    "@types/react-dom": "^18.2.4",
     "babel-loader": "^9.1.2",
-    "@babel/core": "^7.20.12",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/core": "^7.21.8",
+    "@babel/preset-env": "^7.21.5",
     "@babel/preset-react": "^7.18.6",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "webpack": "^5.82.0",
+    "webpack-cli": "^5.1.0",
+    "webpack-dev-server": "^4.15.0"
   }
 }
diff --git a/package.json b/package.json
@@ -32,15 +32,15 @@
   "devDependencies": {
     "babel-loader": "^9.1.2",
     "source-map-loader": "^4.0.1",
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.21.8",
     "@babel/preset-react": "^7.18.6",
-    "@babel/preset-env": "^7.20.2",
-    "prettier": "^2.8.3",
-    "typescript": "^4.9.4",
-    "terser-webpack-plugin": "^5.3.6",
-    "@changesets/cli": "^2.26.0",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
+    "@babel/preset-env": "^7.21.5",
+    "prettier": "^2.8.8",
+    "typescript": "^5.0.4",
+    "terser-webpack-plugin": "^5.3.8",
+    "@changesets/cli": "^2.26.1",
+    "webpack": "^5.82.0",
+    "webpack-cli": "^5.1.0",
     "webpack-node-externals": "^3.0.0"
   }
 }
diff --git a/packages/behavior-divider-dropzone/package.json b/packages/behavior-divider-dropzone/package.json
@@ -13,9 +13,9 @@
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
     "react": "^18.2.0",
-    "@emotion/styled": "^11.10.5"
+    "@emotion/styled": "^11.11.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27"
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/behavior-panel-dropzone/package.json b/packages/behavior-panel-dropzone/package.json
@@ -12,15 +12,15 @@
   },
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "react": "^18.2.0",
     "lodash": "^4.17.21",
-    "@emotion/styled": "^11.10.5"
+    "@emotion/styled": "^11.11.0"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.191",
-    "@types/react": "^18.0.27"
+    "@types/lodash": "^4.14.194",
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/behavior-resize/package.json b/packages/behavior-resize/package.json
@@ -13,9 +13,9 @@
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
     "react": "^18.2.0",
-    "@emotion/styled": "^11.10.5"
+    "@emotion/styled": "^11.11.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27"
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -13,16 +13,16 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@emotion/styled": "^11.10.5",
-    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.11.0",
+    "@emotion/react": "^11.11.0",
     "lodash": "^4.17.21",
     "color": "^4.2.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27",
-    "@types/react-dom": "^18.0.10",
-    "@types/lodash": "^4.14.191",
-    "@types/uuid": "^9.0.0"
+    "@types/react": "^18.2.6",
+    "@types/react-dom": "^18.2.4",
+    "@types/lodash": "^4.14.194",
+    "@types/uuid": "^9.0.1"
   }
 }
diff --git a/packages/defaults/package.json b/packages/defaults/package.json
@@ -12,19 +12,19 @@
   },
   "dependencies": {
     "react": "^18.2.0",
-    "@emotion/styled": "^11.10.5",
-    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.11.0",
+    "@emotion/react": "^11.11.0",
     "lodash": "^4.17.21",
     "@projectstorm/react-workspaces-core": "workspace:*",
     "@projectstorm/react-workspaces-model-tabs": "workspace:*",
     "@projectstorm/react-workspaces-model-tray": "workspace:*",
     "@projectstorm/react-workspaces-model-floating-window": "workspace:*",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1"
+    "@fortawesome/fontawesome-svg-core": "^6.4.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27",
-    "@types/lodash": "^4.14.191"
+    "@types/react": "^18.2.6",
+    "@types/lodash": "^4.14.194"
   }
 }
diff --git a/packages/dropzone-plugin-tabs/package.json b/packages/dropzone-plugin-tabs/package.json
@@ -15,10 +15,10 @@
     "@projectstorm/react-workspaces-core": "workspace:*",
     "@projectstorm/react-workspaces-model-tabs": "workspace:*",
     "@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1"
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27"
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/dropzone-plugin-tray/package.json b/packages/dropzone-plugin-tray/package.json
@@ -15,10 +15,10 @@
     "@projectstorm/react-workspaces-core": "workspace:*",
     "@projectstorm/react-workspaces-model-tray": "workspace:*",
     "@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1"
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27"
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/model-floating-window/package.json b/packages/model-floating-window/package.json
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "react": "^18.2.0",
-    "@emotion/styled": "^11.10.5"
+    "@emotion/styled": "^11.11.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27"
+    "@types/react": "^18.2.6"
   }
 }
diff --git a/packages/model-tabs/package.json b/packages/model-tabs/package.json
@@ -13,12 +13,12 @@
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
     "react": "^18.2.0",
-    "@emotion/styled": "^11.10.5",
-    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.11.0",
+    "@emotion/react": "^11.11.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27",
-    "@types/lodash": "^4.14.191"
+    "@types/react": "^18.2.6",
+    "@types/lodash": "^4.14.194"
   }
 }
diff --git a/packages/model-tray/package.json b/packages/model-tray/package.json
@@ -13,12 +13,12 @@
   "dependencies": {
     "@projectstorm/react-workspaces-core": "workspace:*",
     "@projectstorm/react-workspaces-model-floating-window": "workspace:*",
-    "@emotion/styled": "^11.10.5",
+    "@emotion/styled": "^11.11.0",
     "react": "^18.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27",
-    "@types/lodash": "^4.14.191"
+    "@types/react": "^18.2.6",
+    "@types/lodash": "^4.14.194"
   }
 }