From 9f1a8f6d5c5bc738dc93098a647b62c4576e3b67 Mon Sep 17 00:00:00 2001 From: Matt Fiddaman Date: Sat, 7 Jun 2025 01:02:35 -0400 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20upgrade=20uuid=20from=209.?= =?UTF-8?q?0.1=20->=2011.1.0=20(#5048)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/api/package.json | 3 +- packages/crdt/package.json | 3 +- packages/desktop-client/package.json | 3 +- packages/loot-core/package.json | 3 +- .../src/platform/client/undo/index.ts | 2 +- packages/sync-server/package.json | 3 +- upcoming-release-notes/5048.md | 6 ++++ yarn.lock | 33 +++++++++---------- 8 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 upcoming-release-notes/5048.md diff --git a/packages/api/package.json b/packages/api/package.json index dade9a9289..17304c8ecb 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -27,10 +27,9 @@ "better-sqlite3": "^11.10.0", "compare-versions": "^6.1.1", "node-fetch": "^3.3.2", - "uuid": "^9.0.1" + "uuid": "^11.1.0" }, "devDependencies": { - "@types/uuid": "^9.0.8", "tsc-alias": "^1.8.16", "typescript": "^5.8.3", "vitest": "^3.1.3" diff --git a/packages/crdt/package.json b/packages/crdt/package.json index 2c0c2e864d..033f27506e 100644 --- a/packages/crdt/package.json +++ b/packages/crdt/package.json @@ -17,10 +17,9 @@ "dependencies": { "google-protobuf": "^3.21.4", "murmurhash": "^2.0.1", - "uuid": "^9.0.1" + "uuid": "^11.1.0" }, "devDependencies": { - "@types/uuid": "^9.0.8", "ts-protoc-gen": "^0.15.0", "typescript": "^5.8.3", "vitest": "^3.1.3" diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json index 4d38e51599..76170c6436 100644 --- a/packages/desktop-client/package.json +++ b/packages/desktop-client/package.json @@ -25,7 +25,6 @@ "@types/react-dom": "^19.1.5", "@types/react-grid-layout": "^1", "@types/react-modal": "^3.16.3", - "@types/uuid": "^9.0.8", "@types/webpack-bundle-analyzer": "^4.7.0", "@use-gesture/react": "^10.3.1", "@vitejs/plugin-basic-ssl": "^1.2.0", @@ -77,7 +76,7 @@ "swc-loader": "^0.2.6", "terser-webpack-plugin": "^5.3.14", "usehooks-ts": "^3.1.1", - "uuid": "^9.0.1", + "uuid": "^11.1.0", "vite": "^6.3.5", "vite-plugin-pwa": "^1.0.0", "vite-tsconfig-paths": "^4.3.2", diff --git a/packages/loot-core/package.json b/packages/loot-core/package.json index 0e6fbfb554..36ed7ce61f 100644 --- a/packages/loot-core/package.json +++ b/packages/loot-core/package.json @@ -37,7 +37,7 @@ "reselect": "^4.1.8", "slash": "3.0.0", "ua-parser-js": "^2.0.3", - "uuid": "^9.0.1" + "uuid": "^11.1.0" }, "devDependencies": { "@actual-app/api": "workspace:^", @@ -49,7 +49,6 @@ "@types/jlongster__sql.js": "npm:@types/sql.js@latest", "@types/node": "^22.15.18", "@types/pegjs": "^0.10.6", - "@types/uuid": "^9.0.8", "@types/webpack": "^5.28.5", "@types/webpack-bundle-analyzer": "^4.7.0", "assert": "^2.1.0", diff --git a/packages/loot-core/src/platform/client/undo/index.ts b/packages/loot-core/src/platform/client/undo/index.ts index d83e78e5d7..3171a01fac 100644 --- a/packages/loot-core/src/platform/client/undo/index.ts +++ b/packages/loot-core/src/platform/client/undo/index.ts @@ -16,7 +16,7 @@ type UndoState = { }; type UndoStateWithId = UndoState & { - id?: ReturnType; + id?: string; }; // List of recently used states. We don't use a true MRU structure diff --git a/packages/sync-server/package.json b/packages/sync-server/package.json index dd6f2c9409..4b7ccc5652 100644 --- a/packages/sync-server/package.json +++ b/packages/sync-server/package.json @@ -45,7 +45,7 @@ "nordigen-node": "^1.4.1", "openid-client": "^5.7.1", "pluggy-sdk": "^0.70.1", - "uuid": "^9.0.1", + "uuid": "^11.1.0", "winston": "^3.17.0" }, "devDependencies": { @@ -60,7 +60,6 @@ "@types/express-actuator": "^1.8.3", "@types/node": "^22.15.18", "@types/supertest": "^2.0.16", - "@types/uuid": "^9.0.8", "@vitest/coverage-v8": "3.1.3", "http-proxy-middleware": "^3.0.5", "nodemon": "^3.1.10", diff --git a/upcoming-release-notes/5048.md b/upcoming-release-notes/5048.md new file mode 100644 index 0000000000..cd8417b5f9 --- /dev/null +++ b/upcoming-release-notes/5048.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [matt-fidd] +--- + +Upgrade uuid from 9.0.1 -> 11.1.0 diff --git a/yarn.lock b/yarn.lock index 4102a1a236..42d2527ec1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,13 +24,12 @@ __metadata: resolution: "@actual-app/api@workspace:packages/api" dependencies: "@actual-app/crdt": "workspace:^" - "@types/uuid": "npm:^9.0.8" better-sqlite3: "npm:^11.10.0" compare-versions: "npm:^6.1.1" node-fetch: "npm:^3.3.2" tsc-alias: "npm:^1.8.16" typescript: "npm:^5.8.3" - uuid: "npm:^9.0.1" + uuid: "npm:^11.1.0" vitest: "npm:^3.1.3" languageName: unknown linkType: soft @@ -68,12 +67,11 @@ __metadata: version: 0.0.0-use.local resolution: "@actual-app/crdt@workspace:packages/crdt" dependencies: - "@types/uuid": "npm:^9.0.8" google-protobuf: "npm:^3.21.4" murmurhash: "npm:^2.0.1" ts-protoc-gen: "npm:^0.15.0" typescript: "npm:^5.8.3" - uuid: "npm:^9.0.1" + uuid: "npm:^11.1.0" vitest: "npm:^3.1.3" languageName: unknown linkType: soft @@ -95,7 +93,6 @@ __metadata: "@types/express-actuator": "npm:^1.8.3" "@types/node": "npm:^22.15.18" "@types/supertest": "npm:^2.0.16" - "@types/uuid": "npm:^9.0.8" "@vitest/coverage-v8": "npm:3.1.3" bcrypt: "npm:^5.1.1" better-sqlite3: "npm:^11.10.0" @@ -117,7 +114,7 @@ __metadata: pluggy-sdk: "npm:^0.70.1" supertest: "npm:^6.3.4" typescript: "npm:^5.8.3" - uuid: "npm:^9.0.1" + uuid: "npm:^11.1.0" vitest: "npm:^3.1.3" winston: "npm:^3.17.0" bin: @@ -148,7 +145,6 @@ __metadata: "@types/react-dom": "npm:^19.1.5" "@types/react-grid-layout": "npm:^1" "@types/react-modal": "npm:^3.16.3" - "@types/uuid": "npm:^9.0.8" "@types/webpack-bundle-analyzer": "npm:^4.7.0" "@use-gesture/react": "npm:^10.3.1" "@vitejs/plugin-basic-ssl": "npm:^1.2.0" @@ -200,7 +196,7 @@ __metadata: swc-loader: "npm:^0.2.6" terser-webpack-plugin: "npm:^5.3.14" usehooks-ts: "npm:^3.1.1" - uuid: "npm:^9.0.1" + uuid: "npm:^11.1.0" vite: "npm:^6.3.5" vite-plugin-pwa: "npm:^1.0.0" vite-tsconfig-paths: "npm:^4.3.2" @@ -6798,13 +6794,6 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:^9.0.8": - version: 9.0.8 - resolution: "@types/uuid@npm:9.0.8" - checksum: 10/b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275 - languageName: node - linkType: hard - "@types/verror@npm:^1.10.3": version: 1.10.6 resolution: "@types/verror@npm:1.10.6" @@ -14701,7 +14690,6 @@ __metadata: "@types/jlongster__sql.js": "npm:@types/sql.js@latest" "@types/node": "npm:^22.15.18" "@types/pegjs": "npm:^0.10.6" - "@types/uuid": "npm:^9.0.8" "@types/webpack": "npm:^5.28.5" "@types/webpack-bundle-analyzer": "npm:^4.7.0" absurd-sql: "npm:0.0.54" @@ -14741,7 +14729,7 @@ __metadata: ts-node: "npm:^10.9.2" typescript: "npm:^5.8.3" ua-parser-js: "npm:^2.0.3" - uuid: "npm:^9.0.1" + uuid: "npm:^11.1.0" vite-plugin-peggy-loader: "npm:^2.0.1" vitest: "npm:^3.1.3" webpack: "npm:^5.99.8" @@ -20781,7 +20769,16 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^9.0.0, uuid@npm:^9.0.1": +"uuid@npm:^11.1.0": + version: 11.1.0 + resolution: "uuid@npm:11.1.0" + bin: + uuid: dist/esm/bin/uuid + checksum: 10/d2da43b49b154d154574891ced66d0c83fc70caaad87e043400cf644423b067542d6f3eb641b7c819224a7cd3b4c2f21906acbedd6ec9c6a05887aa9115a9cf5 + languageName: node + linkType: hard + +"uuid@npm:^9.0.0": version: 9.0.1 resolution: "uuid@npm:9.0.1" bin: