Fixing CI pipeline

ioBroker · Dec 12, 2024 · 5c49f01 · 5c49f01
1 parent 2a7e5ae
commit 5c49f01
Show file tree

Hide file tree

Showing 16 changed files with 367 additions and 272 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,6 +15,8 @@
         "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
         "@alcalzone/release-script-plugin-license": "^3.7.0",
         "@alcalzone/release-script-plugin-lerna": "^3.7.0",
+        "@iobroker/types": "^7.0.6",
+        "@iobroker/dm-utils": "^0.6.11",
         "lerna": "^8.1.9"
     },
     "scripts": {

diff --git a/packages/adapter-react-v5/README.md b/packages/adapter-react-v5/README.md
@@ -13,7 +13,7 @@ If you want to create the configuration page with ReactJS:
     - Change `name` from `src` to `ADAPTERNAME-admin` (Of course replace `ADAPTERNAME` with yours)
     - Add to devDependencies:
         ```json
-        "@iobroker/adapter-react-v5": "^7.4.5",
+        "@iobroker/adapter-react-v5": "^7.4.6",
         ```
         Versions can be higher.
         So your `src/package.json` should look like:
@@ -24,7 +24,7 @@ If you want to create the configuration page with ReactJS:
     "version": "0.1.0",
     "private": true,
     "dependencies": {
-        "@iobroker/adapter-react-v5": "^7.4.5",
+        "@iobroker/adapter-react-v5": "^7.4.6",
         "@iobroker/build-tools": "^1.0.0",
         "babel-eslint": "^10.1.0",
         "react-scripts": "^5.0.1"

diff --git a/packages/adapter-react-v5/package.json b/packages/adapter-react-v5/package.json
@@ -56,10 +56,10 @@
     "dependencies": {
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.13.5",
-        "@iobroker/js-controller-common": "^6.0.11",
-        "@iobroker/js-controller-common-db": "^6.0.11",
-        "@iobroker/socket-client": "^3.1.3",
-        "@iobroker/types": "^6.0.11",
+        "@iobroker/js-controller-common": "^7.0.6",
+        "@iobroker/js-controller-common-db": "^7.0.6",
+        "@iobroker/socket-client": "^4.0.0",
+        "@iobroker/types": "^7.0.6",
         "@mui/icons-material": "^6.1.9",
         "@mui/material": "^6.1.9",
         "@sentry/browser": "^8.43.0",

diff --git a/packages/adapter-react-v5/src/Components/ObjectBrowser.tsx b/packages/adapter-react-v5/src/Components/ObjectBrowser.tsx
@@ -5576,7 +5576,6 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
                     from: false,
                     ack: false,
                     q: false,
-                    // @ts-expect-error fixed in js-controller 7
                     addId: false,
                     aggregate: 'minmax',
                 })

diff --git a/packages/adapter-react-v5/src/LegacyConnection.tsx b/packages/adapter-react-v5/src/LegacyConnection.tsx
@@ -1674,7 +1674,6 @@ export class LegacyConnection {
                 obj._id = newId as ioBroker.ObjectIDs.Group;
                 if (newName !== undefined) {
                     obj.common = obj.common || ({} as ioBroker.GroupCommon);
-                    // @ts-expect-error fixed in js-controller 7
                     obj.common.name = newName;
                 }
 
@@ -2848,7 +2847,7 @@ export class LegacyConnection {
     getHistoryEx(
         id: string,
         options: ioBroker.GetHistoryOptions,
-    ): Promise<{ values: ioBroker.GetHistoryResult; sessionId: string; stepIgnore: number }> {
+    ): Promise<{ values: ioBroker.GetHistoryResult; sessionId: string; step: number }> {
         if (!this.connected) {
             return Promise.reject(new Error(NOT_CONNECTED));
         }
@@ -2858,8 +2857,8 @@ export class LegacyConnection {
                 'getHistory',
                 id,
                 options,
-                (err: string | null, values: ioBroker.GetHistoryResult, stepIgnore: number, sessionId: string) =>
-                    err ? reject(new Error(err)) : resolve({ values, sessionId, stepIgnore }),
+                (err: string | null, values: ioBroker.GetHistoryResult, step: number, sessionId: string) =>
+                    err ? reject(new Error(err)) : resolve({ values, sessionId, step }),
             );
         });
     }

diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -23,7 +23,7 @@
         "setup"
     ],
     "dependencies": {
-        "@iobroker/adapter-core": "^3.2.2",
+        "@iobroker/adapter-core": "^3.2.3",
         "@iobroker/i18n": "^0.3.1",
         "@iobroker/socket-classes": "^1.6.2",
         "@iobroker/webserver": "^1.0.6",

diff --git a/packages/admin/src-admin/package.json b/packages/admin/src-admin/package.json
@@ -36,7 +36,7 @@
         "@foxriver76/iob-component-lib": "^0.1.6",
         "@honkhonk/vite-plugin-svgr": "^1.1.0",
         "@iobroker/admin-component-easy-access": "^1.0.11",
-        "@iobroker/dm-utils": "^0.6.9",
+        "@iobroker/dm-utils": "^0.6.11",
         "@iobroker/socket-client": "^3.1.3",
         "@originjs/vite-plugin-commonjs": "^1.0.3",
         "@react-leaflet/core": "^2.1.0",
@@ -104,4 +104,4 @@
         ]
     ],
     "version": "7.4.5"
-}
+}
diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
@@ -2411,13 +2411,9 @@ class App extends Router<AppProps, AppState> {
         if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
             return (
                 <div>
-                    {
-                        // @ts-expect-error fixed in js-controller 7
-                        this.state.systemConfig.common.siteName ? (
-                            // @ts-expect-error fixed in js-controller 7
-                            <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
-                        ) : null
-                    }
+                    {this.state.systemConfig.common.siteName ? (
+                        <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
+                    ) : null}
 
                     <Box
                         component="div"
@@ -2460,9 +2456,7 @@ class App extends Router<AppProps, AppState> {
                 </div>
             );
         }
-        // @ts-expect-error fixed in js-controller 7
         if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) {
-            // @ts-expect-error fixed in js-controller 7
             return <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
         }
         return null;

diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
@@ -520,7 +520,6 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
                     from: false,
                     ack: false,
                     q: false,
-                    // @ts-expect-error fixed in js-controller 7
                     addId: false,
                     aggregate: 'none',
                 })
@@ -566,7 +565,6 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
             from: false,
             ack: false,
             q: false,
-            // @ts-expect-error fixed in js-controller 7
             addId: false,
             aggregate: 'none',
             returnNewestEntries: true,

diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -522,7 +522,6 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: true,
                 ack: true,
                 q: true,
-                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
                 returnNewestEntries: true,
@@ -634,7 +633,6 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: false,
                 ack: false,
                 q: false,
-                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
             })

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -655,15 +655,13 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     variant="standard"
                                     id="siteName"
                                     label={this.props.t('Site name')}
-                                    // @ts-expect-error Fixed in js-controller 7
                                     value={this.props.data.common.siteName || ''}
                                     onChange={e => this.doChange('siteName', e.target.value)}
                                     helperText={this.props.t(
                                         "This name will be shown in admin's header. Just to identify the whole installation",
                                     )}
                                     slotProps={{
                                         input: {
-                                            // @ts-expect-error Fixed in js-controller 7
                                             endAdornment: this.props.data.common.siteName ? (
                                                 <InputAdornment position="end">
                                                     <IconButton

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
@@ -459,7 +459,6 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
                         <span>
                             <Checkbox
                                 disabled
-                                // @ts-expect-error Fixed in js-controller 7
                                 checked={this.props.repoInfo[item.title]?.stable}
                                 indeterminate={!this.props.repoInfo[item.title]}
                             />

diff --git a/packages/admin/src/lib/web.ts b/packages/admin/src/lib/web.ts
@@ -389,7 +389,6 @@ class Web {
             `system.adapter.${adapterName}`,
         );
 
-        // @ts-expect-error fixed in js-controller 7
         if (res?.common.adminUI?.config === 'json') {
             try {
                 const ajv = new Ajv({

diff --git a/packages/admin/tasks.js b/packages/admin/tasks.js
@@ -218,7 +218,7 @@ if (process.argv.includes('--patch-webpack')) {
     clean();
 } else if (process.argv.find(e => e.replace(/^-*/, '') === 'react-2-npm')) {
     if (!existsSync(`${src}node_modules`)) {
-        npmInstall(src, { clean: true }).catch(e => {
+        npmInstall(src).catch(e => {
             console.error(e);
             process.exit(1);
         });
@@ -241,7 +241,7 @@ if (process.argv.includes('--patch-webpack')) {
         .then(async () => {
             clean();
             if (!existsSync(`${src}node_modules`)) {
-                await npmInstall(src, { clean: true });
+                await npmInstall(src);
             }
             await configCSS();
             await iobCSS();

diff --git a/packages/dm-gui-components/package.json b/packages/dm-gui-components/package.json
@@ -53,6 +53,6 @@
     },
     "devDependencies": {
         "@craco/craco": "^7.1.0",
-        "@iobroker/dm-utils": "^0.6.9"
+        "@iobroker/dm-utils": "^0.6.11"
     }
 }