mirrors/Hypfer-Valetudo
2
0
Fork 0
mirror of https://github.com/Hypfer/Valetudo.git synced 2025-10-26 11:27:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Bump dependencies

Browse Source
This commit is contained in:
Sören Beye 2022-05-22 18:03:11 +02:00
parent 643dcc581c
commit 8ae420c157
19 changed files with 10331 additions and 22885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.npmrc Normal file
View File

@ -0,0 +1,2 @@
# Currently (2022-05-22) we need to ignore peer dependencies as those break the frontend when using react v18
legacy-peer-deps=true

1
.nvmrc
View File

@ -1 +0,0 @@
v16.2.0

2
backend/lib/webserver/ValetudoRouter.js
View File

@ -21,7 +21,7 @@ class ValetudoRouter {
this.robot = options.robot;
this.validator = options.validator;
this.limiter = new RateLimit({
this.limiter = RateLimit.rateLimit({
windowMs: 30*1000,
max: 30
});

4
backend/lib/webserver/middlewares/ExternalAccessCheckMiddleware.js
View File

@ -1,9 +1,9 @@
const hashlru = require("hashlru");
const isInSubnet = require("is-in-subnet");
const Logger = require("../../Logger");
const QuickLRU = require("quick-lru");
const Tools = require("../../utils/Tools");
const IPAccessLRU = new QuickLRU({ maxSize: 15 });
const IPAccessLRU = hashlru(15);
/**
*

44
backend/package.json
View File

@ -5,7 +5,7 @@
"bin": "index.js",
"license": "Apache-2.0",
"engines": {
"node": ">=15"
"node": ">=16"
},
"pkg": {
"assets": [
@ -26,35 +26,35 @@
"test": "mocha \"test/**/*_spec.js\"",
"prepare_commit": "npm run lint_fix && npm run ts-check && npm run test",
"build": "npm run build_armv7 && npm run build_aarch64 && npm run build_armv7_lowmem",
"build_armv7": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node16-linuxstatic-armv7 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=38\" . --output ../build/armv7/valetudo",
"build_aarch64": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node16-linuxstatic-arm64 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=64\" . --output ../build/aarch64/valetudo",
"build_armv7_lowmem": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node16-linuxstatic-armv7 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=34,optimize-for-size,lite-mode,no-regexp-tier-up,no-expose-wasm\" . --output ../build/armv7/valetudo-lowmem"
"build_armv7": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node18-linuxstatic-armv7 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=38\" . --output ../build/armv7/valetudo",
"build_aarch64": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node18-linuxstatic-arm64 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=64\" . --output ../build/aarch64/valetudo",
"build_armv7_lowmem": "cross-env PKG_CACHE_PATH=../build_dependencies/pkg pkg --targets node18-linuxstatic-armv7 --compress Brotli --no-bytecode --public-packages \"*\" --options \"expose-gc,max-heap-size=34,optimize-for-size,lite-mode,no-regexp-tier-up,no-expose-wasm\" . --output ../build/armv7/valetudo-lowmem"
},
"author": "",
"dependencies": {
"@destinationstransfers/ntp": "2.0.0",
"ajv": "8.8.2",
"async-mqtt": "2.6.1",
"axios": "0.24.0",
"body-parser": "1.19.0",
"ajv": "8.11.0",
"async-mqtt": "2.6.2",
"axios": "0.27.2",
"body-parser": "1.20.0",
"bonjour-service": "1.0.12",
"compression": "1.7.4",
"crc": "3.8.0",
"crc": "4.1.1",
"escape-html": "1.0.3",
"express": "4.17.2",
"express": "4.18.1",
"express-basic-auth": "1.2.1",
"express-dynamic-middleware": "1.0.0",
"express-list-endpoints": "6.0.0",
"express-rate-limit": "5.5.1",
"express-rate-limit": "6.4.0",
"hashlru": "git+https://npm@github.com/Hypfer/hashlru#3.0.0",
"is-in-subnet": "4.0.1",
"jstoxml": "2.2.7",
"mqtt": "4.2.8",
"jstoxml": "3.2.3",
"mqtt": "4.3.7",
"nested-object-assign": "1.0.4",
"nested-property": "4.0.0",
"openapi-validator-middleware": "3.2.4",
"quick-lru": "5.1.1",
"openapi-validator-middleware": "3.2.6",
"semaphore": "1.1.0",
"swagger-ui-express": "4.3.0",
"swagger-ui-express": "4.4.0",
"uuid": "8.3.2",
"zoo-ids": "2.0.7"
},
@ -62,15 +62,15 @@
"@types/compression": "1.7.2",
"@types/express": "4.17.13",
"@types/express-list-endpoints": "6.0.0",
"@types/jstoxml": "2.0.1",
"@types/mocha": "7.0.2",
"@types/node": "16.11.1",
"@types/jstoxml": "2.0.2",
"@types/mocha": "9.1.1",
"@types/node": "17.0.35",
"@types/node-ssdp": "4.0.1",
"@types/semaphore": "1.1.1",
"@types/uuid": "8.3.3",
"@types/uuid": "8.3.4",
"cross-env": "7.0.3",
"mocha": "7.1.1",
"pkg": "5.6.0",
"mocha": "10.0.0",
"pkg": "5.7.0",
"should": "13.2.3"
}
}

0
build_dependencies/pkg/v3.3/built-v16.14.2-linuxstatic-arm64 → build_dependencies/pkg/v3.4/built-v18.1.0-linuxstatic-arm64
View File

0
build_dependencies/pkg/v3.3/built-v16.14.2-linuxstatic-armv7 → build_dependencies/pkg/v3.4/built-v18.1.0-linuxstatic-armv7
View File

51
frontend/package.json
View File

@ -30,37 +30,36 @@
]
},
"dependencies": {
"@emotion/react": "11.6.0",
"@emotion/styled": "11.6.0",
"@fontsource/jetbrains-mono": "4.5.3",
"@fontsource/roboto": "4.5.3",
"@mui/material": "5.2.0",
"@mui/icons-material": "5.2.0",
"@mui/lab": "5.0.0-alpha.48",
"axios": "0.24.0",
"color": "4.0.1",
"date-fns": "2.26.0",
"notistack": "2.0.3",
"react": "17.0.2",
"@fontsource/jetbrains-mono": "4.5.8",
"@fontsource/roboto": "4.5.7",
"@mui/material": "5.8.0",
"@mui/base": "5.0.0-alpha.81",
"@mui/icons-material": "5.8.0",
"@mui/lab": "5.0.0-alpha.82",
"@emotion/styled": "11.8.1",
"@emotion/react": "11.9.0",
"axios": "0.27.2",
"date-fns": "2.28.0",
"notistack": "2.0.5",
"react": "18.1.0",
"react-div-100vh": "0.7.0",
"react-dom": "17.0.2",
"rehype-raw": "6.1.0",
"react-markdown": "7.1.0",
"react-dom": "18.1.0",
"rehype-raw": "6.1.1",
"react-markdown": "8.0.3",
"remark-gfm": "3.0.1",
"react-query": "3.33.5",
"react-router-dom": "5.3.0",
"react-scripts": "4.0.3",
"semaphore": "^1.1.0",
"use-long-press": "2.0.0",
"react-query": "3.39.0",
"react-router-dom": "5.3.3",
"react-scripts": "5.0.1",
"semaphore": "1.1.0",
"use-long-press": "2.0.2",
"uuid": "8.3.2"
},
"devDependencies": {
"@types/color": "3.0.2",
"@types/react": "17.0.37",
"@types/react-dom": "17.0.11",
"@types/react-router-dom": "5.1.8",
"@types/uuid": "8.3.3",
"@types/react": "18.0.9",
"@types/react-dom": "18.0.4",
"@types/react-router-dom": "5.3.3",
"@types/uuid": "8.3.4",
"tsutils": "3.21.0",
"cra-build-watch": "3.4.0"
"cra-build-watch": "git+https://npm@github.com/Hypfer/cra-build-watch.git#5.0.0"
}
}

2
frontend/src/controls/PresetSelection.tsx
View File

@ -3,13 +3,13 @@ import {
CircularProgress,
Grid,
Icon,
Mark,
Paper,
Slider,
sliderClasses,
styled,
Typography,
} from "@mui/material";
import {Mark} from "@mui/base";
import React from "react";
import {
Capability,

7
frontend/src/index.tsx
View File

@ -1,6 +1,9 @@
import ReactDOM from "react-dom";
import { createRoot } from "react-dom/client";
import App from "./App";
ReactDOM.render(<App/>, document.getElementById("root"));
// @ts-ignore
const root = createRoot(document.getElementById("root"));
root.render(<App/>);

10
frontend/src/map/structures/client_structures/NoGoAreaClientStructure.ts
View File

@ -3,18 +3,12 @@ import RestrictedZoneClientStructure from "./RestrictedZoneClientStructure";
class NoGoAreaClientStructure extends RestrictedZoneClientStructure {
public static TYPE = "NoGoAreaClientStructure";
protected activeStyle : {
stroke: string,
fill: string,
} = {
protected activeStyle : { stroke: string, fill: string } = {
stroke: "rgb(255, 0, 0)",
fill: "rgba(255, 0, 0, 0)"
};
protected style : {
stroke: string,
fill: string,
} = {
protected style : { stroke: string, fill: string } = {
stroke: "rgb(255, 0, 0)",
fill: "rgba(255, 0, 0, 0.4)"
};

10
frontend/src/map/structures/client_structures/NoMopAreaClientStructure.ts
View File

@ -3,18 +3,12 @@ import RestrictedZoneClientStructure from "./RestrictedZoneClientStructure";
class NoMopAreaClientStructure extends RestrictedZoneClientStructure {
public static TYPE = "NoMopAreaClientStructure";
protected activeStyle : {
stroke: string,
fill: string,
} = {
protected activeStyle : { stroke: string, fill: string } = {
stroke: "rgb(200, 0, 255)",
fill: "rgba(255, 0, 255, 0)"
};
protected style : {
stroke: string,
fill: string,
} = {
protected style : { stroke: string, fill: string } = {
stroke: "rgb(200, 0, 255)",
fill: "rgba(200, 0, 255, 0.4)"
};

10
frontend/src/map/structures/client_structures/RestrictedZoneClientStructure.ts
View File

@ -14,18 +14,12 @@ const buttonSize = 30;
abstract class RestrictedZoneClientStructure extends ClientStructure {
public static TYPE = "RestrictedZoneClientStructure";
protected activeStyle : {
stroke: string,
fill: string,
} = {
protected activeStyle : { stroke: string, fill: string } = {
stroke: "rgb(0, 255, 0)",
fill: "rgba(0, 255, 0, 0)"
};
protected style : {
stroke: string,
fill: string,
} = {
protected style : { stroke: string, fill: string } = {
stroke: "rgb(0, 255, 0)",
fill: "rgba(0, 255, 0, 0.4)"
};

10
frontend/src/robot/capabilities/CapabilityLayout.tsx
View File

@ -1,6 +1,5 @@
import React from "react";
import {Grid, useMediaQuery, useTheme} from "@mui/material";
import MasonryItem from "@mui/lab/MasonryItem";
import Masonry from "@mui/lab/Masonry";
import ReloadableCard from "../../components/ReloadableCard";
@ -12,8 +11,9 @@ const useWideLayout = (): boolean => {
export const CapabilityContainer: React.FunctionComponent<{ children: React.ReactNode }> = ({children}): JSX.Element => {
const wideLayout = useWideLayout();
if (wideLayout && children) {
//As of "@mui/lab": "5.0.0-alpha.82", for some reason, in our setup we need to override flex-flow or else the items will be in a single column
return (
<Masonry columns={3} spacing={2} style={{padding: "0.2rem"}}>
<Masonry columns={3} spacing={2} style={{flexFlow: "row wrap"}}>
{children}
</Masonry>
);
@ -54,11 +54,7 @@ export const CapabilityItem: React.FunctionComponent<
);
if (wideLayout) {
return (
<MasonryItem>
{content}
</MasonryItem>
);
return content;
} else {
return (
<Grid item xs={12} sm={6} md={4}>

2
frontend/src/valetudo/Log.tsx
View File

@ -146,7 +146,7 @@ const Log = (): JSX.Element => {
inputProps={{
"aria-label": "filter",
value: filter,
onChange: (e) => {
onChange: (e: any) => {
setFilter((e.target as HTMLInputElement).value);
}
}}

2
frontend/src/valetudo/timers/TimerEditDialog.tsx
View File

@ -75,7 +75,7 @@ const TimerEditDialog: FunctionComponent<TimerDialogProps> = ({
}, [editTimer, open]);
const setActionParams = React.useCallback(
(newParams) => {
(newParams: any) => {
if (validateParams[editTimer.action.type] !== undefined) {
setValidAction(validateParams[editTimer.action.type](newParams));
} else {

33029
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
package.json
View File

@ -4,7 +4,7 @@
"description": "Self-contained control webinterface for vacuum robots",
"license": "Apache-2.0",
"engines": {
"node": ">=14"
"node": ">=16"
},
"author": "",
"workspaces": [
@ -21,20 +21,20 @@
"build_release_manifest": "node util/build_release_manifest.js"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "5.22.0",
"@typescript-eslint/parser": "5.22.0",
"@typescript-eslint/experimental-utils": "5.22.0",
"eslint": "7.32.0",
"eslint-plugin-react": "7.27.1",
"eslint-plugin-react-hooks": "4.3.0",
"eslint-plugin-jsdoc": "37.0.3",
"@typescript-eslint/eslint-plugin": "5.25.0",
"@typescript-eslint/experimental-utils": "5.25.0",
"@typescript-eslint/parser": "5.25.0",
"eslint": "8.16.0",
"eslint-plugin-jsdoc": "39.3.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-regexp": "1.5.1",
"eslint-plugin-sort-keys-fix": "^1.1.1",
"eslint-plugin-react": "7.30.0",
"eslint-plugin-react-hooks": "4.5.0",
"eslint-plugin-regexp": "1.7.0",
"eslint-plugin-sort-keys-fix": "1.1.2",
"eslint-plugin-sort-requires": "git+https://npm@github.com/Hypfer/eslint-plugin-sort-requires.git#2.1.1",
"swagger-jsdoc": "git+https://npm@github.com/Hypfer/swagger-jsdoc.git#7.0.0-rc.6-noyaml-monorepo-fix",
"swagger-parser": "^10.0.2",
"typescript": "4.5.2",
"swagger-parser": "10.0.3",
"typescript": "4.6.4",
"upx": "git+https://npm@github.com/Hypfer/upx#1.0.10"
}
}

6
util/upx_compress_valetudo.js
View File

@ -4,7 +4,7 @@ const UPX = require("upx");
const binaries = {
armv7: {
base: "./build_dependencies/pkg/v3.3/built-v16.14.2-linuxstatic-armv7",
base: "./build_dependencies/pkg/v3.4/built-v18.1.0-linuxstatic-armv7",
built: "./build/armv7/valetudo",
out: "./build/armv7/valetudo.upx",
upx: UPX({
@ -16,7 +16,7 @@ const binaries = {
})
},
armv7_lowmem: {
base: "./build_dependencies/pkg/v3.3/built-v16.14.2-linuxstatic-armv7",
base: "./build_dependencies/pkg/v3.4/built-v18.1.0-linuxstatic-armv7",
built: "./build/armv7/valetudo-lowmem",
out: "./build/armv7/valetudo-lowmem.upx",
upx: UPX({
@ -28,7 +28,7 @@ const binaries = {
})
},
aarch64: {
base: "./build_dependencies/pkg/v3.3/built-v16.14.2-linuxstatic-arm64",
base: "./build_dependencies/pkg/v3.4/built-v18.1.0-linuxstatic-arm64",
built: "./build/aarch64/valetudo",
out: "./build/aarch64/valetudo.upx",
upx: UPX({