Merge remote-tracking branch 'french/bugfix/clean-dependencies-and-webpack-conf' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wisemapping-front-end",
-  "version": "0.4.0",
+  "version": "0.0.0",
   "private": true,
   "homepage": "http://localhost:8080/react",
   "license": "https://wisemapping.atlassian.net/wiki/spaces/WS/pages/524357/WiseMapping+Public+License+Version+1.0+WPL",
@@ -15,7 +15,6 @@
     "packages/*"
   ],
   "scripts": {
-    "bootstrap": "lerna run bootstrap",
     "build": "lerna run build",
     "clean": "lerna clean && rm -rf node_modules",
     "lint": "lerna run lint --stream",

packages/editor/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@wisemapping/editor",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "repository": "http://www.wisemapping.com",
   "license": "MIT",
   "author": "Paulo Veiga <pveiga@gmail.com>, Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>",
   "main": "dist/editor.bundle.js",
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "bootstrap": "yalc publish;yalc add @wisemapping/mindplot",
     "build": "webpack --config webpack.prod.js",
     "cy:open": "cypress open",
     "cy:run": "cypress run",
@@ -19,7 +21,7 @@
     "test:unit": "jest ./test/unit/* --detectOpenHandles"
   },
   "dependencies": {
-    "@wisemapping/mindplot": "^5.1.0",
+    "@wisemapping/mindplot": "^5.1.1",
     "emoji-picker-react": "^4.4.7",
     "react-color": "^2.19.3",
     "react-loader-spinner": "^5.3.4"
@@ -33,6 +35,7 @@
     "cypress-image-snapshot": "^4.0.1",
     "jest-transform-stub": "^2.0.0",
     "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "start-server-and-test": "^2.0.0"
   },
   "peerDependencies": {

packages/mindplot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisemapping/mindplot",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "WiseMapping - Mindplot Canvas Library",
   "homepage": "http://www.wisemapping.org/",
   "repository": {
@@ -15,7 +15,8 @@
   "files": [
     "src",
     "assets",
-    "dist"
+    "dist",
+    "libraries"
   ],
   "scripts": {
     "build": "webpack --config webpack.prod.js",
@@ -32,7 +33,7 @@
   "dependencies": {
     "@types/jquery": "^3.5.11",
     "@wisemapping/core-js": "^0.6.0",
-    "@wisemapping/web2d": "^0.6.0",
+    "@wisemapping/web2d": "^0.6.1",
     "emoji-picker-react": "^4.4.3",
     "jquery": "3.6.0",
     "lodash": "^4.17.21",

packages/mindplot/webpack.prod.js

@@ -1,11 +1,13 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common');
+const pkg = require('./package.json');
 
 const prodConfig = {
   optimization: {
     usedExports: true,
     minimize: true,
   },
+  externals: [...Object.keys(pkg.dependencies)],
 };
 
 module.exports = merge(common, prodConfig);

packages/web2d/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisemapping/web2d",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "WiseMapping - Web2D Render Library",
   "homepage": "http://www.wisemapping.org/",
   "repository": {
@@ -23,10 +23,6 @@
     "test": "yarn test:integration",
     "test:integration": "start-server-and-test storybook http-get://localhost:6006 cy:run"
   },
-  "dependencies": {
-    "@wisemapping/core-js": "^0.6.0",
-    "jquery": "^3.6.0"
-  },
   "devDependencies": {
     "@mdx-js/react": "^1.6.22",
     "@storybook/addon-actions": "^6.5.15",
@@ -43,7 +39,7 @@
     "start-server-and-test": "^1.15.2"
   },
   "peerDependencies": {
-    "@wisemapping/core-js": "*",
+    "@wisemapping/core-js": "^0.6.0",
     "jquery": "^3.6.0"
   },
   "publishConfig": {

packages/web2d/webpack.prod.js

@@ -1,10 +1,12 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common');
+const pkg = require('./package.json');
 
 /** @type {import('webpack').Configuration} */
 const prodConfig = {
   mode: 'production',
   devtool: 'source-map',
+  externals: [...Object.keys(pkg.peerDependencies)],
 };
 
 module.exports = merge(common, prodConfig);

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wisemapping/webapp",
-    "version": "5.1.0",
+    "version": "5.1.1",
     "repository": "http://www.wisemapping.com",
     "license": "MIT",
     "author": "Paulo Veiga <pveiga@gmail.com>, Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>",
@@ -28,7 +28,7 @@
         "@mui/lab": "^5.0.0-alpha.129",
         "@mui/material": "^5.12.3",
         "@reduxjs/toolkit": "^1.5.0",
-        "@wisemapping/editor": "^0.6.0",
+        "@wisemapping/editor": "^0.6.1",
         "axios": "^0.27.2",
         "dayjs": "^1.10.7",
         "react": "^18.2.0",

yarn.lock

@@ -5940,14 +5940,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@wisemapping/editor@^0.6.0, @wisemapping/editor@workspace:packages/editor":
+"@wisemapping/editor@^0.6.1, @wisemapping/editor@workspace:packages/editor":
   version: 0.0.0-use.local
   resolution: "@wisemapping/editor@workspace:packages/editor"
   dependencies:
     "@formatjs/cli": ^6.0.4
     "@testing-library/react": ^13.4.0
     "@types/cypress-image-snapshot": ^3.1.6
-    "@wisemapping/mindplot": ^5.1.0
+    "@wisemapping/mindplot": ^5.1.1
     babel-polyfill: ^6.26.0
     cypress: ^12.3.0
     cypress-image-snapshot: ^4.0.1
@@ -5955,6 +5955,7 @@ __metadata:
     jest-transform-stub: ^2.0.0
     react: ^18.2.0
     react-color: ^2.19.3
+    react-dom: ^18.2.0
     react-loader-spinner: ^5.3.4
     start-server-and-test: ^2.0.0
   peerDependencies:
@@ -5969,7 +5970,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@wisemapping/mindplot@^5.1.0, @wisemapping/mindplot@workspace:packages/mindplot":
+"@wisemapping/mindplot@^5.1.1, @wisemapping/mindplot@workspace:packages/mindplot":
   version: 0.0.0-use.local
   resolution: "@wisemapping/mindplot@workspace:packages/mindplot"
   dependencies:
@@ -5986,7 +5987,7 @@ __metadata:
     "@storybook/testing-library": ^0.0.13
     "@types/jquery": ^3.5.11
     "@wisemapping/core-js": ^0.6.0
-    "@wisemapping/web2d": ^0.6.0
+    "@wisemapping/web2d": ^0.6.1
     babel-loader: ^8.3.0
     blob-polyfill: ^6.0.20211015
     cypress: ^12.3.0
@@ -6001,7 +6002,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@wisemapping/web2d@^0.6.0, @wisemapping/web2d@workspace:packages/web2d":
+"@wisemapping/web2d@^0.6.1, @wisemapping/web2d@workspace:packages/web2d":
   version: 0.0.0-use.local
   resolution: "@wisemapping/web2d@workspace:packages/web2d"
   dependencies:
@@ -6015,13 +6016,11 @@ __metadata:
     "@storybook/html": ^6.5.15
     "@storybook/manager-webpack5": ^6.5.15
     "@storybook/testing-library": ^0.0.13
-    "@wisemapping/core-js": ^0.6.0
     cypress: 12.3.0
     cypress-image-snapshot: ^4.0.1
-    jquery: ^3.6.0
     start-server-and-test: ^1.15.2
   peerDependencies:
-    "@wisemapping/core-js": "*"
+    "@wisemapping/core-js": ^0.6.0
     jquery: ^3.6.0
   languageName: unknown
   linkType: soft
@@ -6040,7 +6039,7 @@ __metadata:
     "@testing-library/cypress": ^8.0.3
     "@types/testing-library__cypress": ^5.0.8
     "@welldone-software/why-did-you-render": ^7.0.1
-    "@wisemapping/editor": ^0.6.0
+    "@wisemapping/editor": ^0.6.1
     axios: ^0.27.2
     cypress: ^12.3.0
     cypress-image-snapshot: ^4.0.1
@@ -14407,13 +14406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jquery@npm:^3.6.0":
-  version: 3.6.3
-  resolution: "jquery@npm:3.6.3"
-  checksum: 0fd366bdcaa0c84a7a8751ce20f8192290141913978b5059574426d9b01f4365daa675f95aab3eec94fd794d27b08d32078a2236bef404b8ba78073009988ce6
-  languageName: node
-  linkType: hard
-
 "js-sdsl@npm:^4.1.4":
   version: 4.3.0
   resolution: "js-sdsl@npm:4.3.0"