* (bluefox) Updated GUI packages

ioBroker · Jul 19, 2024 · 42e71b0 · 42e71b0
1 parent cceeab5
commit 42e71b0
Show file tree

Hide file tree

Showing 18 changed files with 200 additions and 322 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -62,7 +62,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

diff --git a/README.md b/README.md
@@ -66,6 +66,9 @@ More description could be found [here](https://github.com/ioBroker/ioBroker.s7/b
 -->
 
 ## Changelog
+### **WORK IN PROGRESS**
+* (bluefox) Updated GUI packages
+
 ### 1.4.3 (2024-02-17)
 * (Bettman66) Fix REAL number parsing error
 

diff --git a/admin/asset-manifest.json b/admin/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.96b3c861.css",
-    "main.js": "./static/js/main.d325f513.js",
+    "main.js": "./static/js/main.2644694c.js",
     "static/media/Ground Floor.svg": "./static/media/Ground Floor.2b7c5c91db7f070935a2.svg",
     "static/media/Second Floor.svg": "./static/media/Second Floor.a2d5ed32df336591c06b.svg",
     "static/media/Cellar.svg": "./static/media/Cellar.7ec1b1803a2437c8b78c.svg",
@@ -123,10 +123,10 @@
     "static/media/Outdoor Blinds.svg": "./static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
     "static/media/Upstairs.svg": "./static/media/Upstairs.441813e54e0daca0882d.svg",
     "main.96b3c861.css.map": "./static/css/main.96b3c861.css.map",
-    "main.d325f513.js.map": "./static/js/main.d325f513.js.map"
+    "main.2644694c.js.map": "./static/js/main.2644694c.js.map"
   },
   "entrypoints": [
     "static/css/main.96b3c861.css",
-    "static/js/main.d325f513.js"
+    "static/js/main.2644694c.js"
   ]
 }
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><script defer="defer" src="./static/js/main.d325f513.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><script defer="defer" src="./static/js/main.2644694c.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/admin/static/css/main.96b3c861.css.map b/admin/static/css/main.96b3c861.css.map
diff --git a/admin/static/js/main.d325f513.js → admin/static/js/main.2644694c.js b/admin/static/js/main.d325f513.js → admin/static/js/main.2644694c.js
diff --git a/admin/static/js/main.2644694c.js.LICENSE.txt b/admin/static/js/main.2644694c.js.LICENSE.txt
@@ -0,0 +1,84 @@
+/*
+  * based on code from:
+  *
+  * @license RequireJS text 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+  * Available via the MIT or new BSD license.
+  * see: http://github.com/jrburke/requirejs for details
+  */
+
+/*!
+ * Cropper.js v1.6.1
+ * https://fengyuanchen.github.io/cropperjs
+ *
+ * Copyright 2015-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2023-09-17T03:44:19.860Z
+ */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @mui/material v5.16.4
+ *
+ * @license MIT
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/admin/static/js/main.d325f513.js.map → admin/static/js/main.2644694c.js.map b/admin/static/js/main.d325f513.js.map → admin/static/js/main.2644694c.js.map
diff --git a/admin/static/js/main.d325f513.js.LICENSE.txt b/admin/static/js/main.d325f513.js.LICENSE.txt
diff --git a/docs/en/s7.md b/docs/en/s7.md
@@ -87,7 +87,7 @@ Column A through M are based on the structure in ioBroker and have to be filled
 * Column O: Formula: ```=CONCATENATE_ _(D2;":";F2;":=";"0.000000e+000;";"//";E2)```
 
 #### Create DB sources in Step7
-We will now generate the DBs in Step7 using the code in column O of our spread sheet. In your Step7 program insert an STL source by clicking the right mouse button on “Sources”. [
+We will now generate the DBs in Step7 using the code in column O of our spread sheet. In your Step7 program, insert an STL source by clicking the right mouse button on “Sources”. [
 ![](img/adapter_en_s7_step7_1.png)
 
 Rename the new source to “DB20”. 
@@ -246,4 +246,4 @@ Drag& drop a switch widget on your view, connect it to the Object ID of a switch
 
 ![](img/adapter_en_s7_15.png)
 
-Important: The user is in charge of connecting the correct data points to the widgets. You can connect a real value to a binary status (e.g. light bulb), so the light bulb will show “on” once the real value is >1.0. That’s all, folks, pretty easy and straight forward, huh?
+Important: The user is in charge of connecting the correct data points to the widgets. You can connect a real value to a binary status (e.g. light bulb), so the light bulb will show “on” once the real value is >1.0. That’s all, folks, pretty easy and straight forward, huh?
diff --git a/package.json b/package.json
@@ -35,23 +35,23 @@
     "url": "https://github.com/ioBroker/ioBroker.s7"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "optionalDependencies": {},
   "dependencies": {
     "node-snap7": "^1.0.7",
     "iconv-lite": "0.6.3",
     "async": "^3.2.5",
-    "@iobroker/adapter-core": "^3.0.4"
+    "@iobroker/adapter-core": "^3.1.6"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.7.0",
+    "@alcalzone/release-script": "^3.7.3",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@iobroker/legacy-testing": "^1.0.12",
     "axios": "^1.7.2",
     "gulp": "^4.0.2",
-    "mocha": "^10.5.2",
+    "mocha": "^10.6.0",
     "chai": "^4.4.1",
     "nan": "2.20.0"
   },

diff --git a/src/package.json b/src/package.json
@@ -1,20 +1,19 @@
 {
-    "name": "modebus-admin",
+    "name": "s7-admin",
     "version": "1.4.3",
     "private": true,
     "dependencies": {
-        "@iobroker/adapter-react-v5": "^4.9.10",
-        "@mui/material": "5.14.14",
-        "@mui/icons-material": "^5.15.21",
-        "@mui/styles": "5.14.14",
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "@iobroker/adapter-react-v5": "^6.1.1",
+        "@mui/material": "^5.16.4",
+        "@mui/icons-material": "^5.16.4",
         "babel-eslint": "^10.1.0",
-        "@sentry/browser": "^7.101.1",
-        "@sentry/integrations": "^7.101.1",
-        "react": "^18.2.0",
-        "react-ace": "^10.1.0",
-        "react-dom": "^18.2.0",
+        "@sentry/browser": "^8.18.0",
+        "react": "^18.3.1",
+        "react-ace": "^12.0.0",
+        "react-dom": "^18.3.1",
         "react-dropzone": "^14.2.3",
-        "react-icons": "^5.0.1",
+        "react-icons": "^5.2.1",
         "react-scripts": "^5.0.1",
         "tsv-json": "^2.0.0"
     },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><script defer="defer" src="./static/js/main.d325f513.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><script defer="defer" src="./static/js/main.2644694c.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>