try to fix build (#25)

* fix build * use the official device manager again * change utils import * autofix lint issues * fix lint issue * remove checks because outside check already caught them * try to fix build * fix consistent return * add ts-expect-error for unsure types now * fix another build error * perform lint steps separate and ignore linter during build * get rid of the dependency conflicts and thus force flag on install
ioBroker · Jul 5, 2024 · 1319128 · 1319128
1 parent 3b49a53
commit 1319128
Show file tree

Hide file tree

Showing 16 changed files with 156 additions and 164 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -33,18 +33,15 @@ jobs:
       - name: Install Dependencies
         run: npm run npm
 
+      - name: Lint TypeScript backend code
+        run: npm run lint
+
+      - name: Lint TypeScript frontend code
+        run: npm run lint-frontend
+
       - name: Build
         run: npm run build
 
-#      - name: Perform a type check
-#        run: npm run check:ts
-#        env:
-#          CI: true
-      # - name: Lint TypeScript code
-      #   run: npm run lint
-#      - name: Test package files
-#        run: npm run test:package
-
   # Runs adapter tests on all supported node versions and OSes
   adapter-tests:
     if: contains(github.event.head_commit.message, '[skip ci]') == false
@@ -54,7 +51,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

diff --git a/gulpfile.js b/gulpfile.js
@@ -77,7 +77,8 @@ function build() {
     return new Promise((resolve, reject) => {
         const options = {
             stdio: 'pipe',
-            cwd:   `${__dirname}/src-admin/`
+            cwd:   `${__dirname}/src-admin/`,
+            env: { DISABLE_ESLINT_PLUGIN: true }
         };
 
         const version = JSON.parse(fs.readFileSync(`${__dirname}/package.json`).toString('utf8')).version;

diff --git a/package.json b/package.json
@@ -44,7 +44,6 @@
     "@typescript-eslint/eslint-plugin": "^7.14.1",
     "chai": "^4.4.1",
     "eslint": "^8.57.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-promise": "^6.2.0",
@@ -67,6 +66,7 @@
     "test": "mocha --exit",
     "prepublishOnly": "npm run build",
     "lint": "eslint --ext .ts src/",
+    "lint-frontend": "eslint src-admin/",
     "build": "npm run build:ts && npm run build:gui",
     "build:gui": "gulp",
     "build:ts": "tsc -p tsconfig.build.json",
@@ -75,7 +75,7 @@
     "release-minor": "release-script minor --yes",
     "release-major": "release-script major --yes",
     "update-packages": "ncu --upgrade && cd src-admin && ncu --upgrade",
-    "npm": "npm i -f && cd src-admin && npm i -f",
+    "npm": "npm i && cd src-admin && npm i",
     "dev-server": "dev-server"
   },
   "license": "Apache-2.0",

diff --git a/src-admin/.eslintrc.js b/src-admin/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
     globals: {
         ioBroker: true,
     },
+    ignorePatterns: ['build/*'],
     env: {
         browser: true,
         es2021: true,

diff --git a/src-admin/package.json b/src-admin/package.json
@@ -64,4 +64,4 @@
             }
         ]
     ]
-}
+}
diff --git a/src-admin/src/App.tsx b/src-admin/src/App.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
 
-import { AppBar, Tabs, Tab, IconButton } from '@mui/material';
+import {
+    AppBar, Tabs, Tab, IconButton,
+} from '@mui/material';
 
 import {
     SignalWifiConnectedNoInternet4 as IconNoConnection,
@@ -24,12 +26,6 @@ import ControllerTab from './Tabs/Controller';
 import BridgesTab from './Tabs/Bridges';
 import DevicesTab from './Tabs/Devices';
 
-declare global {
-    interface Window {
-        sentryDSN: string;
-    }
-}
-
 import type {
     MatterAdapterConfig,
     NodeStateResponse,
@@ -39,6 +35,12 @@ import type {
     CommissioningInfo,
 } from './types';
 
+declare global {
+    interface Window {
+        sentryDSN: string;
+    }
+}
+
 const productIDs: string[] = [];
 for (let i = 0x8000; i <= 0x801f; i++) {
     productIDs.push(`0x${i.toString(16)}`);
@@ -75,7 +77,7 @@ interface AppState extends GenericAppState {
 }
 
 class App extends GenericApp<GenericAppProps, AppState> {
-    private isIFrame: boolean = false;
+    private isIFrame = false;
 
     private configHandler: ConfigHandler | null = null;
 
@@ -172,11 +174,15 @@ class App extends GenericApp<GenericAppProps, AppState> {
         const commissioning = this.configHandler.getCommissioning();
         matter.controller = matter.controller || { enabled: false };
         matter.devices = matter.devices || [];
+        // @ts-expect-error list should not exist as it should be an array.. fix types
         if (matter.devices.list) {
+            // @ts-expect-error list should not exist as it should be an array.. fix types
             matter.devices = matter.devices.list;
         }
         matter.bridges = matter.bridges || [];
+        // @ts-expect-error list should not exist as it should be an array.. fix types
         if (matter.bridges.list) {
+            // @ts-expect-error list should not exist as it should be an array.. fix types
             matter.bridges = matter.bridges.list;
         }
 
@@ -188,8 +194,7 @@ class App extends GenericApp<GenericAppProps, AppState> {
             .catch(e =>
                 this.showError(
                     `Cannot subscribe on system.adapter.matter.${this.instance}.alive: ${e}`,
-                ),
-            );
+                ));
 
         const alive = await this.socket.getState(
             `system.adapter.matter.${this.instance}.alive`,
@@ -342,8 +347,7 @@ class App extends GenericApp<GenericAppProps, AppState> {
             theme={this.state.theme}
             detectedDevices={this.state.detectedDevices || []}
             setDetectedDevices={(detectedDevices: DetectedRoom[]) =>
-                this.setState({ detectedDevices })
-            }
+                this.setState({ detectedDevices })}
             productIDs={productIDs}
             matter={this.state.matter}
             updateConfig={this.onChanged}
@@ -372,16 +376,14 @@ class App extends GenericApp<GenericAppProps, AppState> {
             theme={this.state.theme}
             detectedDevices={this.state.detectedDevices || []}
             setDetectedDevices={(detectedDevices: DetectedRoom[]) =>
-                this.setState({ detectedDevices })
-            }
+                this.setState({ detectedDevices })}
             productIDs={productIDs}
             instance={this.instance}
             matter={this.state.matter}
             updateConfig={this.onChanged}
             showToast={(text: string) => this.showToast(text)}
             checkLicenseOnAdd={(matter: MatterConfig) =>
-                this.checkLicenseOnAdd('addDevice', matter)
-            }
+                this.checkLicenseOnAdd('addDevice', matter)}
         />;
     }
 

diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -305,7 +305,9 @@ class BridgesAndDevices<
                                                         fontStyle: 'italic',
                                                     }}
                                                 >
-                          ({info.label})
+                          (
+                                                    {info.label}
+)
                                                 </span>
                                             ) : null}
                                         </TableCell>

diff --git a/src-admin/src/Tabs/Controller.tsx b/src-admin/src/Tabs/Controller.tsx
@@ -40,19 +40,20 @@ import {
 } from '@mui/icons-material';
 
 import {
-    AdminConnection,
     I18n,
     IconClosed,
     IconOpen,
-    type ThemeName,
-    type ThemeType,
-    type IobTheme,
 } from '@iobroker/adapter-react-v5';
-// import DeviceManager from '@iobroker/dm-gui-components';
+import type {
+    AdminConnection,
+    ThemeName,
+    ThemeType,
+    IobTheme,
+} from '@iobroker/adapter-react-v5';
+import DeviceManager from '@iobroker/dm-gui-components';
 
 import type { CommissionableDevice, GUIMessage, MatterConfig } from '@/types';
 import { getText } from '../Utils';
-import DeviceManager from '../components/InstanceManager';
 
 const styles: Record<string, React.CSSProperties> = {
     panel: {
@@ -142,8 +143,6 @@ class Controller extends Component<ComponentProps, ComponentState> {
 
     private qrScanner: QrScanner | null | true = null;
 
-    private aliveState: boolean;
-
     constructor(props: ComponentProps) {
         super(props);
         const openedNodesStr = window.localStorage.getItem('openedNodes');
@@ -173,8 +172,6 @@ class Controller extends Component<ComponentProps, ComponentState> {
             showQrCodeDialog: null,
         };
 
-        this.aliveState = this.props.alive;
-
         this.refQrScanner = React.createRef();
     }
 
@@ -241,16 +238,14 @@ class Controller extends Component<ComponentProps, ComponentState> {
                         `matter.${this.props.instance}.controller.*`,
                         this.onObjectChange,
                     )
-                    .catch(e => window.alert(`Cannot subscribe: ${e}`)),
-            )
+                    .catch(e => window.alert(`Cannot subscribe: ${e}`)))
             .then(() =>
                 this.props.socket
                     .subscribeState(
                         `matter.${this.props.instance}.controller.*`,
                         this.onStateChange,
                     )
-                    .catch(e => window.alert(`Cannot subscribe 1: ${e}`)),
-            );
+                    .catch(e => window.alert(`Cannot subscribe 1: ${e}`)));
     }
 
     onObjectChange = (id: string, obj: ioBroker.Object | null | undefined) => {
@@ -368,8 +363,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
         return <Dialog
             open={!0}
             onClose={() =>
-                this.setState({ showQrCodeDialog: null }, () => this.destroyQrCode())
-            }
+                this.setState({ showQrCodeDialog: null }, () => this.destroyQrCode())}
         >
             <DialogTitle>{I18n.t('QR Code')}</DialogTitle>
             <DialogContent>
@@ -427,8 +421,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
                     onClick={() => {
                         const device = this.state.showQrCodeDialog;
                         this.setState({ showQrCodeDialog: null }, () =>
-                            this.destroyQrCode(),
-                        );
+                            this.destroyQrCode());
                         this.props.socket
                             .sendTo(
                                 `matter.${this.props.instance}`,
@@ -458,9 +451,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
                     color="grey"
                     onClick={() =>
                         this.setState({ showQrCodeDialog: null }, () =>
-                            this.destroyQrCode(),
-                        )
-                    }
+                            this.destroyQrCode())}
                     startIcon={<Close />}
                 >
                     {I18n.t('Close')}
@@ -496,7 +487,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                                 manualCode: '',
                                                 qrCode: '',
                                             });
-                                            setTimeout(async() => this.initQrCode(), 500);
+                                            setTimeout(async () => this.initQrCode(), 500);
                                         }}
                                     >
                                         <LeakAdd />
@@ -518,8 +509,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                 'controllerDiscoveryStop',
                                 {},
                             )
-                            .then(() => this.setState({ discoveryDone: false }))
-                    }
+                            .then(() => this.setState({ discoveryDone: false }))}
                     startIcon={<SearchOff />}
                 >
                     {I18n.t('Stop')}
@@ -951,8 +941,7 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                                 });
                                             }
                                         },
-                                    ),
-                            );
+                                    ));
                         }}
                     >
                         {I18n.t('Discovery devices')}
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,4 +64,4 @@ @@
                 }
             ]
         ]
-    }
+    }