Merge remote-tracking branch 'remotes/origin/vis-2-types-package'

# Conflicts:
#	packages/vis-2/src/src/Vis/visLoadWidgets.tsx

.github/workflows/test-and-release.yml

@@ -34,17 +34,17 @@ jobs:
         with:
           node-version: 18.x
 
-      - name: Install Dependencies
-        run: npm install
+      - name: Install Monorepo
+        run: npm run install-monorepo
 
       - name: Build
         run: NODE_OPTIONS=--max_old_space_size=8192 npm run build
 
       - name: Test TypeScript
-        run: npm run check-ts
+        run: npm run check-ts -w packages/vis-2
 
       - name: Run local tests
-        run: npm run test-gui
+        run: npm run test-gui -w packages/vis-2
 
       - name: Archive screenshots
         if: always()
@@ -89,15 +89,16 @@ jobs:
           echo "::set-output name=BODY::$BODY"
 
       - name: Install Dependencies
-        run: npm install --ignore-scripts
+        run: npm run install-monorepo
 
       - name: Create a clean build
         run: npm run build
+
       - name: Publish package to npm
         run: |
           npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
           npm whoami
-          npm publish
+          npx lerna publish from-package --yes
 
       - name: Create Github Release
         uses: actions/create-release@v1

.gitignore

@@ -1,5 +1,5 @@
 /.idea/
-/node_modules
+node_modules
 *.zip
 **/*.zip
 *.tgz
@@ -8,40 +8,17 @@
 /lib/js
 /lib/css
 /www/_socket
-/knx-uf-iconset
-/cordova/www
-/cordova/platforms/android/assets/www
-/cordova/platforms/android/.gradle
-/cordova/platforms/android/build
-/cordova/platforms/android/CordovaLib/build
-/www/edit.full.html
-/www/index.full.html
-/www/worker-css.js
-/www/worker-html.js
-/www/worker-javascript.js
-/www/css/vis.min.css
-/www/css/visEdit.min.css
-/www/js/vis.min.js
-/www/js/vis.mmin.js
-/www/js/visEdit.min.js
-/www/js/visEdit.mmin.js
-/www/css/channel.png
-/www/css/device.png
-/www/css/icons.gif
-/www/css/loading.gif
-/www/css/state.png
-/iob_npm.done
-/package-lock.json
+knx-uf-iconset
+iob_npm.done
+package-lock.json
 admin/i18n/*/flat.txt
 admin/i18n/flat.txt
 *.vis.code-workspace
-/beta
+beta
 
-/src/package-lock.json
-/src/node_modules
-src/build
+build
 /.vscode
-/src/dist
-/www
-/runtime
-/tmp
+src/dist
+**/www
+**/runtime
+**/tmp

lerna.json

@@ -0,0 +1,25 @@
+{
+  "version": "2.9.48",
+  "packages": [
+    "packages/*"
+  ],
+  "command": {
+    "run": {
+      "stream": true
+    },
+    "version": {
+      "npmClientArgs": [
+        "-f"
+      ],
+      "allowBranch": [
+        "master"
+      ],
+      "ignoreChanges": [
+        "*.md"
+      ],
+      "exact": true,
+      "forcePublish": true
+    }
+  },
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+}

package.json

@@ -1,75 +1,80 @@
 {
-  "name": "iobroker.vis-2",
-  "description": "Next generation graphical user interface for ioBroker.",
-  "version": "2.9.48",
-  "author": {
-    "name": "bluefox",
-    "email": "[email protected]"
-  },
-  "contributors": [
-    "bluefox <[email protected]>",
-    "hobbyquaker <[email protected]>"
-  ],
-  "homepage": "https://github.com/iobroker/iobroker.vis-2",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ioBroker/ioBroker.vis-2.git"
-  },
-  "keywords": [
-    "iobroker",
-    "GUI",
-    "DashUI",
-    "web interface",
-    "home automation",
-    "SCADA",
-    "vis-2"
+  "name": "iobroker.vis-2-mono",
+  "private": true,
+  "workspaces": [
+    "packages/*"
   ],
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.6",
-    "axios": "^1.6.8",
-    "jsonwebtoken": "^9.0.2",
-    "mime": "^3.0.0"
+    "@iobroker/types-vis-2": "file:packages/types-vis-2",
+    "iobroker.vis-2": "file:packages/vis-2"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.7.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
-    "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@iobroker/vis-2-widgets-testing": "^1.0.0",
-    "@tsconfig/node18": "^18.2.4",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
-    "gulp": "^4.0.2",
-    "iobroker.web": "*",
-    "mocha": "^10.4.0",
-    "typescript": "^5.4.3",
-    "unzipper": "^0.10.14"
+    "lerna": "^8.1.2",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@craco/craco": "^7.1.0",
+    "@devbookhq/splitter": "^1.4.2",
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
+    "@iobroker/adapter-react-v5": "^4.13.4",
+    "@iobroker/type-detector": "^3.0.5",
+    "@iobroker/types": "^5.0.19",
+    "@iobroker/vis-2-widgets-react-dev": "^1.0.5",
+    "@material-icons/svg": "^1.0.33",
+    "@mui/icons-material": "^5.15.14",
+    "@mui/material": "5.14.14",
+    "@mui/styles": "5.14.14",
+    "@mui/x-date-pickers": "^7.1.0",
+    "@reduxjs/toolkit": "^2.2.3",
+    "@sentry/browser": "^7.109.0",
+    "@sentry/integrations": "^7.109.0",
+    "@types/dom-speech-recognition": "^0.0.4",
+    "@types/react-beautiful-dnd": "^13.1.8",
+    "@types/uuid": "^9.0.8",
+    "ace-builds": "^1.32.9",
+    "craco-module-federation": "^1.1.0",
+    "dayjs": "^1.11.10",
+    "echarts": "^5.5.0",
+    "echarts-for-react": "^3.0.2",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-eqeqeq-fix": "^1.0.3",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-only-warn": "^1.1.0",
+    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "html-to-image": "^1.11.11",
+    "jquery-ui": "^1.13.2",
+    "mime": "^4.0.1",
+    "moment": "^2.30.1",
+    "mui-nested-menu": "^3.3.0",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-ace": "^11.0.1",
+    "react-beautiful-dnd": "^13.1.1",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dnd-preview": "^8.0.3",
+    "react-dnd-touch-backend": "^16.0.1",
+    "react-dom": "^18.2.0",
+    "react-dropzone": "^14.2.3",
+    "react-icons": "^5.0.1",
+    "react-scripts": "^5.0.1",
+    "redux": "^5.0.1",
+    "sass": "^1.72.0",
+    "uuid": "^9.0.1"
   },
-  "bugs": {
-    "url": "https://github.com/iobroker/iobroker.vis/issues"
-  },
-  "main": "main.js",
-  "files": [
-    "admin/",
-    "img/",
-    "lib/",
-    "www/",
-    "io-package.json",
-    "LICENSE",
-    "main.js"
-  ],
   "scripts": {
-    "check-ts": "tsc --project src/tsconfig.json",
-    "start": "cd src && npm run start",
-    "test": "mocha ./test/*.engine.js --exit",
-    "test-gui": "mocha ./test/*.gui.js --exit",
-    "prepublishOnly": "gulp",
-    "build": "gulp",
+    "build": "npm run clean && lerna run build",
+    "clean": "lerna run clean",
+    "install-monorepo": "npm i -f && npm i -w packages/vis-2 -f",
+    "npm": "npm run install-monorepo",
+    "start": "npm run start -w packages/vis-2",
+    "fix-release": "node fixRelease.js",
     "release": "release-script",
-    "release-patch": "release-script patch --yes --no-update-lockfile",
-    "release-minor": "release-script minor --yes --no-update-lockfile",
-    "release-major": "release-script major --yes --no-update-lockfile",
-    "update-packages": "ncu --upgrade && cd src && ncu --upgrade && cd ..",
-    "npm": "npm i && cd src && npm i -f"
-  },
-  "license": "CC-BY-NC-4.0"
-}
+    "release-patch": "release-script patch --yes --no-update-lockfile --publishAll",
+    "release-minor": "release-script minor --yes --no-update-lockfile --publishAll",
+    "release-major": "release-script major --yes --no-update-lockfile --publishAll"
+  }
+}

packages/fixRelease.js

@@ -0,0 +1,22 @@
+/**
+ * Release script adds a version entry to private packages, which introduces conflicts in following releases
+ */
+const fs = require('fs');
+const path = require('path');
+
+function removePackEntry() {
+    const packPath = path.join(__dirname, 'packages', 'vis-2', 'src', 'package.json');
+    const packString = fs.readFileSync(packPath, {
+        encoding: 'utf-8',
+    });
+
+    const packJson = JSON.parse(packString);
+
+    delete packJson.version;
+
+    fs.writeFileSync(packPath, JSON.stringify(packJson, null, 2), { encoding: 'utf-8' });
+}
+
+if (require.main === module) {
+    removePackEntry();
+}