Dependencies cleanup

packages/core-js/package.json

@@ -27,8 +27,7 @@
         "clean-webpack-plugin": "^4.0.0-alpha.0",
         "core-js": "^3.15.2",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.7.2",
-        "webpack-merge": "^5.8.0"
+        "webpack-cli": "^4.10.0"
     },
     "dependencies": {}
 }

packages/editor/package.json

@@ -28,8 +28,8 @@
     "copy-webpack-plugin": "^10.2.1",
     "css-loader": "^6.7.1",
     "cypress": "^10.11.0",
-    "eslint": "^7.14.0",
     "cypress-image-snapshot": "^4.0.1",
+    "eslint": "^7.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -40,27 +40,22 @@
     "style-loader": "^3.3.1",
     "ts-jest": "^27.1.0",
     "typescript": "^4.8.4",
-    "webpack": "^5.74.0",
-    "webpack-merge": "^5.8.0"
+    "webpack": "^5.75.0"
   },
   "dependencies": {
-    "@emotion/styled": "^11.10.5",
     "@wisemapping/mindplot": "^5.0.15",
     "emoji-picker-react": "^4.4.4",
-    "react-color": "^2.19.3",
-    "react-dom": "^18.2.0",
-    "styled-components": "^5.3.6"
+    "react-color": "^2.19.3"
   },
   "peerDependencies": {
-    "@emotion": "^11.10.5",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mui/icons-material": "^5.9.3",
     "@mui/material": "^5.10.11",
-    "lodash": "^4.17.14",
+    "@mui/material/esm": "^5.10.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-intl": "^6.2.1",
     "styled-components": "^5.3.6"
   }
-}
+}

packages/editor/webpack.common.js

@@ -11,8 +11,7 @@ module.exports = {
   },
   stats: {
     errorDetails: true,
-  },
-  entry: {
+  }, entry: {
     'editor.bundle': path.join(__dirname, 'src', 'index.tsx'),
   },
   mode: 'development',

packages/editor/webpack.prod.js

@@ -7,14 +7,24 @@ const prodConfig = {
     usedExports: true,
     minimize: true,
   },
-  externals: {
+  externals: [{
     'react': 'react',
     'react-dom': 'react-dom',
     'react-intl': 'react-intl',
     '@emotion/styled': '@emotion/styled',
     '@emotion/react': '@emotion/react',
+    "@mui/system": "@mui/system",
+    "@mui": "@mui",
+    "@mui/material": "@mui/material",
+    "@mui/material/esm": "@mui/material/esm",
     'styled-components': 'styled-components',
+    'xml-formatter': 'xml-formatter',
+    'lodash-es': 'lodash-es',
   },
+    /^@mui/,
+    /^lodash/
+    
+  ],
   plugins: [new CleanWebpackPlugin()],
 };
 

packages/mindplot/package.json

@@ -73,10 +73,9 @@
         "ts-jest": "^27.1.2",
         "ts-loader": "^9.2.6",
         "ts-node": "^10.4.0",
-        "webpack": "^5.74.0",
+        "webpack": "^5.75.0",
         "webpack-bundle-analyzer": "^4.5.0",
-        "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "^3.11.2",
-        "webpack-merge": "^5.8.0"
+        "webpack-cli": "^4.10.0",
+        "webpack-dev-server": "^4.11.1"
     }
 }

packages/mindplot/tsconfig.json

@@ -16,8 +16,6 @@
   },
   "include": [
     "src/**/*",
-	"../editor/src/classes/menu/AccountSettingsPanel.js", 
-	"../editor/src/classes/menu/IMenu.ts"
   ],
   "exclude": [
     "node_modules"

packages/web2d/package.json

@@ -43,10 +43,9 @@
         "html-webpack-plugin": "^5.3.2",
         "nodemon": "^2.0.12",
         "start-server-and-test": "^1.14.0",
-        "webpack": "^5.74.0",
-        "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "^3.11.2",
-        "webpack-merge": "^5.8.0"
+        "webpack": "^5.75.0",
+        "webpack-cli": "^4.10.0",
+        "webpack-dev-server": "^4.11.1"
     },
     "dependencies": {
         "@wisemapping/core-js": "^0.4.0",

packages/webapp/package.json

@@ -40,11 +40,11 @@
         "start-server-and-test": "^1.12.0",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-bundle-analyzer": "^4.4.0",
-        "webpack-merge": "^5.7.3"
+        "webpack-bundle-analyzer": "^4.4.0"
     },
     "dependencies": {
         "@emotion/react": "^11.10.4",
+        "@emotion/styled": "^11.10.5",
         "@mui/icons-material": "^5.9.3",
         "@mui/lab": "^5.0.0-alpha.98",
         "@mui/material": "^5.10.11",
@@ -54,11 +54,13 @@
         "axios": "^0.27.2",
         "dayjs": "^1.10.7",
         "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "react-ga4": "^1.4.1",
         "react-google-recaptcha": "^2.1.0",
         "react-intl": "^6.2.1",
         "react-query": "^3.39.1",
         "react-redux": "^7.2.2",
-        "react-router-dom": "^5.2.0"
+        "react-router-dom": "^5.2.0",
+        "styled-components": "^5.3.6"
     }
-}
+}

packages/webapp/webpack.dev.js

@@ -8,7 +8,6 @@ module.exports = merge(common, {
   mode: 'development',
   devtool: 'source-map',
   devServer: {
-    contentBase: path.join(__dirname, 'dist'),
     port: 3000,
     hot: true,
     historyApiFallback: {