fix build

ioBroker · May 5, 2024 · bcf35d4 · bcf35d4
1 parent 2ca9a20
commit bcf35d4
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 53 deletions.
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.7"
 }
diff --git a/packages/admin/src/public/css/adapter.css.map b/packages/admin/src/public/css/adapter.css.map
diff --git a/packages/admin/src/public/lib/css/iob/selectID.css.map b/packages/admin/src/public/lib/css/iob/selectID.css.map
diff --git a/packages/admin/src/public/lib/css/jquery.treetable.theme.css.map b/packages/admin/src/public/lib/css/jquery.treetable.theme.css.map
diff --git a/packages/admin/src/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src/src/components/Object/ObjectHistoryData.tsx
@@ -42,7 +42,6 @@ import {
     Close as IconClose,
 } from '@mui/icons-material';
 
-import type { SystemConfig } from '@iobroker/socket-client';
 import { localeMap } from './utils';
 
 const styles: Record<string, any> = (theme: Theme) => ({
@@ -445,7 +444,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
     async prepareData(): Promise<void> {
         const list: { id: string; alive: boolean }[] = await this.getHistoryInstances();
         // read default history
-        const config: SystemConfig = await this.props.socket.getCompactSystemConfig();
+        const config = await this.props.socket.getCompactSystemConfig();
         const defaultHistory = config?.common?.defaultHistory;
 
         // find current history

diff --git a/packages/admin/src/src/tabs/Intro.tsx b/packages/admin/src/src/tabs/Intro.tsx
@@ -16,7 +16,6 @@ import {
 } from '@mui/icons-material';
 
 import { AdminConnection, i18n, Utils as UtilsCommon } from '@iobroker/adapter-react-v5';
-import type { SystemConfig } from '@iobroker/socket-client';
 
 import type InstancesWorker from '@/Workers/InstancesWorker';
 import type HostsWorker from '@/Workers/HostsWorker';
@@ -255,9 +254,9 @@ class Intro extends React.Component<IntroProps, IntroState> {
     };
 
     activateEditMode() {
-        let systemConfig: SystemConfig;
+        let systemConfig: Awaited<ReturnType<typeof this.props.socket.getSystemConfig>>;
         this.props.socket.getSystemConfig(true)
-            .then((_systemConfig: SystemConfig) => {
+            .then(_systemConfig => {
                 systemConfig = _systemConfig;
                 return this.getInstances(true, null, systemConfig);
             })
@@ -641,7 +640,7 @@ class Intro extends React.Component<IntroProps, IntroState> {
         }
     }
 
-    async getInstances(update: boolean | undefined, hosts: Record<string, any> | null, systemConfig: SystemConfig) {
+    async getInstances(update: boolean | undefined, hosts: Record<string, any> | null, systemConfig: Awaited<ReturnType<typeof this.props.socket.getSystemConfig>>) {
         hosts = hosts || this.state.hosts;
 
         try {
@@ -1027,10 +1026,10 @@ class Intro extends React.Component<IntroProps, IntroState> {
 
     getData(update?: boolean) {
         let hosts: any;
-        let systemConfig: SystemConfig;
+        let systemConfig: Awaited<ReturnType<typeof this.props.socket.getSystemConfig>>;
 
         return this.props.socket.getSystemConfig(update)
-            .then((_systemConfig: SystemConfig) => {
+            .then(_systemConfig => {
                 systemConfig = _systemConfig;
                 return this.props.socket.getCompactHosts(update);
             })

diff --git a/packages/jsonConfig/src/JsonConfig.tsx b/packages/jsonConfig/src/JsonConfig.tsx
@@ -20,7 +20,6 @@ import {
 } from '@iobroker/adapter-react-v5';
 
 import type { Theme, ThemeName, ThemeType } from '@iobroker/adapter-react-v5/types';
-import type { SystemConfig } from '@iobroker/socket-client';
 import Utils from '#JC/Utils';
 import ConfigGeneric from './JsonConfigComponent/ConfigGeneric';
 import JsonConfigComponent from './JsonConfigComponent';
@@ -368,7 +367,7 @@ class JsonConfig extends Router<JsonConfigProps, JsonConfigState> {
                 // decode all native attributes listed in obj.encryptedNative
                 if (Array.isArray(obj.encryptedNative)) {
                     return this.props.socket.getSystemConfig()
-                        .then(async (systemConfig: SystemConfig) => {
+                        .then(async systemConfig => {
                             await loadScript('../../lib/js/crypto-js/crypto-js.js', 'crypto-js');
                             this.secret = systemConfig.native.secret;
                             obj.encryptedNative?.forEach(attr => {

diff --git a/packages/jsonConfig/src/JsonConfigComponent/ConfigLanguage.tsx b/packages/jsonConfig/src/JsonConfigComponent/ConfigLanguage.tsx
@@ -9,7 +9,6 @@ import {
     Select,
 } from '@mui/material';
 
-import type { SystemConfig } from '@iobroker/socket-client';
 import { I18n } from '@iobroker/adapter-react-v5';
 
 import ConfigGeneric, { type ConfigGenericProps, type ConfigGenericState } from './ConfigGeneric';
@@ -128,7 +127,7 @@ class ConfigLanguage extends ConfigGeneric<ConfigLanguageProps, ConfigLanguageSt
                                 this.props.changeLanguage && this.props.changeLanguage();
                             } else {
                                 this.props.socket.getSystemConfig()
-                                    .then((systemConfig: SystemConfig) => {
+                                    .then(systemConfig => {
                                         if (systemConfig.common.language === I18n.getLanguage()) {
                                             return;
                                         }