Skip to content

Commit 53b80c5

Browse files
Merge pull request #138 from OpenDTU-App/dependabot/npm_and_yarn/development-dependencies-fd886a03b1
2 parents f2bdd8c + 6a02151 commit 53b80c5

File tree

7 files changed

+401
-123
lines changed

7 files changed

+401
-123
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@
8585
"uuid": "^10.0.0"
8686
},
8787
"devDependencies": {
88-
"@babel/core": "^7.24.5",
89-
"@babel/plugin-transform-class-static-block": "^7.24.4",
88+
"@babel/core": "^7.24.9",
89+
"@babel/plugin-transform-class-static-block": "^7.24.7",
9090
"@babel/plugin-transform-private-methods": "^7.24.7",
91-
"@babel/preset-env": "^7.24.7",
92-
"@babel/runtime": "^7.24.5",
91+
"@babel/preset-env": "^7.24.8",
92+
"@babel/runtime": "^7.24.8",
9393
"@react-native/babel-preset": "0.74.85",
9494
"@react-native/eslint-config": "0.74.85",
95-
"@react-native/metro-config": "0.74.84",
96-
"@react-native/typescript-config": "0.74.84",
95+
"@react-native/metro-config": "0.74.85",
96+
"@react-native/typescript-config": "0.74.85",
9797
"@testing-library/react-native": "^12.5.1",
9898
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
9999
"@types/jest": "^29.5.12",
100100
"@types/markdown-it": "^14.1.1",
101101
"@types/npm-license-crawler": "^0.2.3",
102-
"@types/react": "^18.3.2",
102+
"@types/react": "^18.3.3",
103103
"@types/react-native-charts-wrapper": "^0.5.11",
104104
"@types/react-native-zeroconf": "^0.12.3",
105105
"@types/react-test-renderer": "^18.3.0",
@@ -110,17 +110,17 @@
110110
"eslint": "^8.57.0",
111111
"eslint-import-resolver-typescript": "^3.6.1",
112112
"eslint-plugin-import": "^2.29.1",
113-
"eslint-plugin-no-relative-import-paths": "^1.5.4",
113+
"eslint-plugin-no-relative-import-paths": "^1.5.5",
114114
"eslint-plugin-prettier": "5.1.3",
115115
"eslint-plugin-react-hooks": "^4.6.2",
116-
"eslint-plugin-simple-import-sort": "^12.1.0",
116+
"eslint-plugin-simple-import-sort": "^12.1.1",
117117
"eslint-plugin-testing-library": "^6.2.2",
118118
"jest": "^29.7.0",
119-
"prettier": "^3.3.2",
119+
"prettier": "^3.3.3",
120120
"react-native-version": "^4.0.0",
121121
"react-test-renderer": "18.3.1",
122-
"ts-jest": "^29.1.5",
123-
"typescript": "~5.3.3"
122+
"ts-jest": "^29.2.2",
123+
"typescript": "~5.5.3"
124124
},
125125
"engines": {
126126
"node": ">=18"

src/components/OpenDTUValue.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const getOpenDTUValueText = (
2727
const valid =
2828
value !== undefined && decimals !== undefined && unit !== undefined;
2929

30-
return valid ? `${value.toFixed(decimals)} ${unit}` : textWhenInvalid ?? '';
30+
return valid ? `${value.toFixed(decimals)} ${unit}` : (textWhenInvalid ?? '');
3131
};
3232

3333
const OpenDTUValue: FC<OpenDTUValueProps> = ({

src/database/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ const DatabaseProvider: FC<PropsWithChildren> = ({ children }) => {
261261
const inverters = useAppSelector(
262262
state =>
263263
state.settings.selectedDtuConfig !== null
264-
? state.opendtu.dtuStates[state.settings.selectedDtuConfig]?.liveData
265-
?.inverters ?? null
264+
? (state.opendtu.dtuStates[state.settings.selectedDtuConfig]?.liveData
265+
?.inverters ?? null)
266266
: null,
267267
(left, right) =>
268268
left?.map(i => i.serial).join() === right?.map(i => i.serial).join(),

src/database/prometheus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class PrometheusDatabase implements Database {
180180
const data = result.values as PrometheusResult[];
181181

182182
const labelText = labelName
183-
? result.metric.labels[labelName] ?? 'unknown'
183+
? (result.metric.labels[labelName] ?? 'unknown')
184184
: '';
185185

186186
lineChartData.dataSets?.push({

src/hooks/useTriedToConnect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const useTriedToConnect = (): boolean => {
88
return useAppSelector(state =>
99
index === null
1010
? false
11-
: state.opendtu.dtuStates[index]?.triedToConnect ?? false,
11+
: (state.opendtu.dtuStates[index]?.triedToConnect ?? false),
1212
);
1313
};
1414

src/views/navigation/screens/MainScreen.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ const MainScreen: FC<PropsWithNavigation> = ({ navigation }) => {
1717

1818
const deviceName = useAppSelector(state =>
1919
state.settings.selectedDtuConfig !== null
20-
? (state.settings.dtuConfigs[state.settings.selectedDtuConfig]
20+
? ((state.settings.dtuConfigs[state.settings.selectedDtuConfig]
2121
?.customName ||
2222
state.opendtu.dtuStates[state.settings.selectedDtuConfig]
2323
?.systemStatus?.hostname) ??
24-
null
24+
null)
2525
: null,
2626
);
2727

0 commit comments

Comments
 (0)