Revert gulp back

ioBroker · Apr 19, 2024 · 601872e · 601872e
1 parent c7d4eac
commit 601872e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ The icons may not be reused in other projects without the proper flaticon licens
 	### **WORK IN PROGRESS**
 -->
 ## Changelog
-### 6.17.5 (2024-04-18)
+### **WORK IN PROGRESS**
 * (bluefox) Extend the table JSON Config with the encryption possibility
 * (bluefox) Do not read historical data if instance is not active
 

diff --git a/package.json b/package.json
@@ -28,13 +28,13 @@
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fnando/sparkline": "^0.3.10",
     "@honkhonk/vite-plugin-svgr": "^1.1.0",
-    "@iobroker/adapter-react-v5": "^4.13.6",
+    "@iobroker/adapter-react-v5": "^4.13.8",
     "@iobroker/admin-component-easy-access": "^0.3.2",
     "@iobroker/dm-utils": "^0.1.9",
     "@iobroker/legacy-testing": "^1.0.11",
     "@iobroker/socket-client": "^2.4.6",
     "@iobroker/testing": "^4.1.3",
-    "@iobroker/types": "^5.0.20-alpha.0-20240308-3bbff415",
+    "@iobroker/types": "^5.0.20-alpha.0-20240419-d343afbb",
     "@mui/icons-material": "^5.15.15",
     "@mui/lab": "5.0.0-alpha.170",
     "@mui/material": "5.14.14",
@@ -81,7 +81,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "gulp": "^5.0.0",
+    "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
     "gulp-less": "^5.0.0",

diff --git a/packages/admin/gulpfile.js b/packages/admin/gulpfile.js
@@ -1,12 +1,12 @@
-const fs = require('fs');
-const cp = require('child_process');
+const fs = require('node:fs');
+const cp = require('node:child_process');
 const gulp = require('gulp');
 const replace = require('gulp-replace');
 const sourcemaps = require('gulp-sourcemaps');
 const less = require('gulp-less');
 const concat = require('gulp-concat');
 const cleanCSS = require('gulp-clean-css');
-const path = require('path');
+const path = require('node:path');
 
 const srcRx = 'src/';
 const src = `${__dirname}/${srcRx}`;

diff --git a/packages/admin/io-package.json b/packages/admin/io-package.json
@@ -18,19 +18,6 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
-      "6.17.5": {
-        "en": "Extend the table JSON Config with the encryption possibility\nDo not read historical data if instance is not active",
-        "de": "Erweitern Sie die Tabelle JSON Config mit der Verschlüsselungsmöglichkeit\nLesen Sie historische Daten nicht, wenn Instanz nicht aktiv ist",
-        "ru": "Расширение таблицы JSON Config с возможностью шифрования\nНе читайте исторические данные, если экземпляр не активен",
-        "pt": "Estenda a tabela JSON Config com a possibilidade de criptografia\nNão leia dados históricos se a instância não estiver ativa",
-        "nl": "De tabel JSON instellen uitbreiden met de versleutelingsmogelijkheid\nNiet lezen van historische gegevens als instantie niet actief is",
-        "fr": "Étendre la table JSON Config avec la possibilité de chiffrement\nNe pas lire les données historiques si l'instance n'est pas active",
-        "it": "Estendere il tavolo JSON Config con la possibilità di crittografia\nNon leggere i dati storici se l'istanza non è attiva",
-        "es": "Extender la tabla JSON Config con la posibilidad de cifrado\nNo lea datos históricos si la instancia no es activa",
-        "pl": "Rozszerzenie tabeli JSON Config z możliwością szyfrowania\nNie należy odczytywać danych historycznych, jeśli instancja nie jest aktywna",
-        "uk": "Розширення таблиці JSON Config з можливістю шифрування\nНе прочитайте історичні дані, якщо не активна",
-        "zh-cn": "扩展表 JSON 配置到加密可能性\n如果实例不活动, 不读取历史数据"
-      },
       "6.17.3": {
         "en": "fixed npm adapter installation",
         "de": "installation von npm adapter",

diff --git a/packages/admin/src/package.json b/packages/admin/src/package.json
@@ -1,41 +1,42 @@
 {
-  "name": "src-rx",
-  "private": true,
-  "homepage": ".",
-  "scripts": {
-    "start": "set DANGEROUSLY_DISABLE_HOST_CHECK=true&& craco start",
-    "old-start": "react-scripts start",
-    "lint": "eslint --fix --ext .js,.jsx,.tsx src",
-    "build": "craco build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "check-ts": "tsc --noEmit --checkJS false",
-    "tsc": "tsc --project tsconfig.build.json"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not op_mini all"
-  ],
-  "dependencies": {
-    "@iobroker/json-config": "file:../../jsonConfig"
-  },
-  "proxy": "http://127.0.0.1:8081",
-  "plugins": [
-    [
-      "@babel/plugin-proposal-decorators",
-      {
-        "legacy": true
-      }
+    "name": "src-rx",
+    "private": true,
+    "homepage": ".",
+    "scripts": {
+        "start": "set DANGEROUSLY_DISABLE_HOST_CHECK=true&& craco start",
+        "old-start": "react-scripts start",
+        "lint": "eslint --fix --ext .js,.jsx,.tsx src",
+        "build": "craco build",
+        "test": "react-scripts test",
+        "eject": "react-scripts eject",
+        "check-ts": "tsc --noEmit --checkJS false",
+        "tsc": "tsc --project tsconfig.build.json"
+    },
+    "eslintConfig": {
+        "extends": "react-app"
+    },
+    "browserslist": [
+        ">0.2%",
+        "not dead",
+        "not op_mini all"
     ],
-    [
-      "@babel/plugin-proposal-class-properties",
-      {
-        "loose": true
-      }
-    ]
-  ]
+    "dependencies": {
+        "@iobroker/json-config": "file:../../jsonConfig"
+    },
+    "proxy": "http://127.0.0.1:8081",
+    "plugins": [
+        [
+            "@babel/plugin-proposal-decorators",
+            {
+                "legacy": true
+            }
+        ],
+        [
+            "@babel/plugin-proposal-class-properties",
+            {
+                "loose": true
+            }
+        ]
+    ],
+    "version": "6.17.5"
 }
diff --git a/packages/admin/src/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src/src/components/Object/ObjectHistoryData.tsx
@@ -1137,7 +1137,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
             aria-labelledby="edit-dialog-title"
             aria-describedby="edit-dialog-description"
         >
-            <DialogTitle id="edit-dialog-title">{ this.state.updateOpened ? this.props.t('Update entry') : this.props.t('Insert entry') }</DialogTitle>
+            <DialogTitle id="edit-dialog-title">{this.state.updateOpened ? this.props.t('Update entry') : this.props.t('Insert entry')}</DialogTitle>
             <DialogContent>
                 <form className={classes.dialogForm} noValidate autoComplete="off">
                     {typeof this.state.edit.val === 'boolean' ?

diff --git a/packages/jsonConfig/SCHEMA.md b/packages/jsonConfig/SCHEMA.md
@@ -178,8 +178,8 @@ Possible types:
     - `textAlive` - default text is `Instance %s is alive`, where %s will be replaced by `ADAPTER.0`.
     - `textNotAlive` - default text is `Instance %s is not alive`, where %s will be replaced by `ADAPTER.0`.
 
-- `pattern` - read only field with pattern like 'https://${data.ip}:${data.port}' (will not be saved in config)
-  Text input with the read only flag, that shows a pattern.
+- `pattern` - read-only field with pattern like 'https://${data.ip}:${data.port}' (will not be saved in config)
+  Text input with the read-only flag, that shows a pattern.
     - `copyToClipboard` - if true - show button
     - `pattern` - my pattern