Merge d06d78a63a into 46d90a6a99

1.23.14 changes merge to 2.0.0 (#5138 )
Resolve conflict of package-lock.json
2024-10-01 01:25:45 -04:00 · 2024-09-29 15:06:26 +00:00 · 2024-09-29 23:06:09 +08:00 · 2024-09-29 22:13:05 +08:00 · 2024-09-29 22:12:25 +08:00 · 2024-09-29 22:05:23 +08:00
3 changed files with 3109 additions and 2334 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -47,7 +47,7 @@
        "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push",
        "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.23.13 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.14 && npm ci --production && npm run download-dist",
        "download-dist": "node extra/download-dist.js",
        "mark-as-nightly": "node extra/mark-as-nightly.js",
        "reset-password": "node extra/reset-password.js",
@ -72,7 +72,7 @@
        "start-server-node14-win": "private\\node14\\node.exe server/server.js"
    },
    "dependencies": {
-        "@grpc/grpc-js": "~1.7.3",
+        "@grpc/grpc-js": "~1.8.22",
        "@louislam/ping": "~0.4.4-mod.1",
        "@louislam/sqlite3": "15.1.6",
        "@vvo/tzdb": "^6.125.0",
@ -91,7 +91,7 @@
        "dayjs": "~1.11.5",
        "dev-null": "^0.1.1",
        "dotenv": "~16.0.3",
-        "express": "~4.19.2",
+        "express": "~4.21.0",
        "express-basic-auth": "~1.2.1",
        "express-static-gzip": "~2.1.7",
        "feed": "^4.2.2",
@ -138,8 +138,8 @@
        "redbean-node": "~0.3.0",
        "redis": "~4.5.1",
        "semver": "~7.5.4",
-        "socket.io": "~4.7.5",
-        "socket.io-client": "~4.7.5",
+        "socket.io": "~4.8.0",
+        "socket.io-client": "~4.8.0",
        "socks-proxy-agent": "6.1.1",
        "tar": "~6.2.1",
        "tcp-ping": "~0.1.1",
@ -172,7 +172,7 @@
        "cross-env": "~7.0.3",
        "delay": "^5.0.0",
        "dns2": "~2.0.1",
-        "dompurify": "~3.0.11",
+        "dompurify": "~3.1.7",
        "eslint": "~8.14.0",
        "eslint-plugin-jsdoc": "~46.4.6",
        "eslint-plugin-vue": "~8.7.1",
--- a/src/router.js
+++ b/src/router.js
@ -68,15 +68,17 @@ const routes = [
                                    },
                                ],
                            },
+                        ],
+                    },
+                    {
+                        path: "/add",
+                        component: EditMonitor,
+                        children: [
                            {
                                path: "/clone/:id",
                                component: EditMonitor,
                            },
-                            {
-                                path: "/add",
-                                component: EditMonitor,
-                            },
-                        ],
+                        ]
                    },
                    {
                        path: "/list",
Author	SHA1	Message	Date
Frank Elsinga	1ce21cfeae	Merge `d06d78a63a` into `46d90a6a99`	2024-09-29 15:06:26 +00:00
Louis Lam	46d90a6a99	1.23.14 changes merge to 2.0.0 (#5138 )	2024-09-29 23:06:09 +08:00
Louis Lam	3479992302	Resolve conflict of package-lock.json	2024-09-29 22:13:05 +08:00
Louis Lam	030bb1c0b8	Merge branch 'master' into 1.23.14-to-2.0.0 # Conflicts: # package-lock.json	2024-09-29 22:12:25 +08:00
Louis Lam	7da401662f	Merge branch '1.23.X' into 1.23.14-to-2.0.0 # Conflicts: # package-lock.json # package.json	2024-09-29 22:05:23 +08:00
Louis Lam	243726b03c	Update to 1.23.14	2024-09-29 21:46:19 +08:00
Louis Lam	936665aac3	[1.23.X] Update dependencies (#5132 )	2024-09-28 03:43:54 +08:00
Frank Elsinga	d06d78a63a	Merge branch 'master' into unnested_router	2024-01-18 14:04:30 +01:00
Frank Elsinga	4608b4573f	Merge branch 'master' into unnested_router	2023-12-04 15:47:36 +01:00
Frank Elsinga	18e5f348b1	Merge branch 'master' into unnested_router	2023-09-06 16:08:11 +02:00
Frank Elsinga	d908d995c7	Merge branch 'master' into unnested_router	2023-08-21 16:46:29 +02:00
Frank Elsinga	fd9cb1853b	reverted the change to `/edit/:id`	2023-07-25 19:15:43 +02:00
Frank Elsinga	4f09996eff	Merge branch 'master' into unnested_router	2023-07-25 19:07:49 +02:00
Frank Elsinga	28715e46b8	fixed clone not being an operation which adds things	2023-06-26 15:40:23 +02:00
Frank Elsinga	78bbc364f3	fixed both `Add` and `Home` being shown as selected on the home-screen	2023-06-26 15:40:23 +02:00