From b0788562c0b7fea70c46ab0da05574c9498c856f Mon Sep 17 00:00:00 2001 From: Eli Front Date: Fri, 14 Mar 2025 19:54:43 -0500 Subject: [PATCH 1/4] fix: update uuid to 11 --- package.json | 2 +- pnpm-lock.yaml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3ab9625..5cbad62 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "tinyexec": "0.3.2", "tree-kill": "1.2.2", "uid-promise": "1.0.0", - "uuid": "3.3.2", + "uuid": "11.1.0", "xdg-app-paths": "5.1.0", "yauzl-promise": "2.1.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 182490e..4495a1b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: 1.0.0 version: 1.0.0 uuid: - specifier: 3.3.2 - version: 3.3.2 + specifier: 11.1.0 + version: 11.1.0 xdg-app-paths: specifier: 5.1.0 version: 5.1.0 @@ -183,7 +183,6 @@ packages: '@esbuild/darwin-arm64@0.24.2': resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==} engines: {node: '>=18'} - cpu: [arm64] os: [darwin] '@esbuild/darwin-x64@0.24.2': @@ -2225,6 +2224,10 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + uuid@11.1.0: + resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} + hasBin: true + uuid@3.3.2: resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==} deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. @@ -4493,6 +4496,8 @@ snapshots: util-deprecate@1.0.2: {} + uuid@11.1.0: {} + uuid@3.3.2: {} validate-npm-package-license@3.0.4: From 7b74674093161a5340941a4b0339114d4b09ba0a Mon Sep 17 00:00:00 2001 From: Eli Front Date: Fri, 14 Mar 2025 20:05:09 -0500 Subject: [PATCH 2/4] fix: update uuid import to stay consistent and work with new version --- src/providers/native/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/native/index.ts b/src/providers/native/index.ts index 2fe092c..d48eacb 100644 --- a/src/providers/native/index.ts +++ b/src/providers/native/index.ts @@ -1,5 +1,5 @@ import ms from 'ms'; -import uuid from 'uuid/v4'; +import { v4 as uuid } from 'uuid'; import createDebug from 'debug'; import { promisify } from 'node:util'; import { AddressInfo } from 'node:net'; From b80c4abb575868a37cb634392790adcfc75f970a Mon Sep 17 00:00:00 2001 From: Trek Glowacki Date: Mon, 12 May 2025 10:40:04 -0500 Subject: [PATCH 3/4] Use node native uuid behavior --- package.json | 2 -- pnpm-lock.yaml | 17 ----------------- src/providers/native/index.ts | 3 ++- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 5cbad62..7ea40a1 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "tinyexec": "0.3.2", "tree-kill": "1.2.2", "uid-promise": "1.0.0", - "uuid": "11.1.0", "xdg-app-paths": "5.1.0", "yauzl-promise": "2.1.3" }, @@ -47,7 +46,6 @@ "@types/node": "18.19.74", "@types/node-fetch": "2.5.0", "@types/tar": "4.0.0", - "@types/uuid": "8.3.1", "@types/yauzl-promise": "2.1.0", "codecov": "3.7.1", "cpy-cli": "2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4495a1b..9ba1c3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,9 +56,6 @@ importers: uid-promise: specifier: 1.0.0 version: 1.0.0 - uuid: - specifier: 11.1.0 - version: 11.1.0 xdg-app-paths: specifier: 5.1.0 version: 5.1.0 @@ -87,9 +84,6 @@ importers: '@types/tar': specifier: 4.0.0 version: 4.0.0 - '@types/uuid': - specifier: 8.3.1 - version: 8.3.1 '@types/yauzl-promise': specifier: 2.1.0 version: 2.1.0 @@ -501,9 +495,6 @@ packages: '@types/tar@4.0.0': resolution: {integrity: sha512-YybbEHNngcHlIWVCYsoj7Oo1JU9JqONuAlt1LlTH/lmL8BMhbzdFUgReY87a05rY1j8mfK47Del+TCkaLAXwLw==} - '@types/uuid@8.3.1': - resolution: {integrity: sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==} - '@types/yauzl-promise@2.1.0': resolution: {integrity: sha512-7PkQ5UtElDsanzjdUQzXnstCqxx6KAOTMURuHwOuqC6YO2WaYQ6ItLnLy3TiEVNQMO/pD+QSOcfnAkeSX4hsTA==} @@ -2224,10 +2215,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - uuid@11.1.0: - resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} - hasBin: true - uuid@3.3.2: resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==} deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. @@ -2671,8 +2658,6 @@ snapshots: dependencies: '@types/node': 18.19.74 - '@types/uuid@8.3.1': {} - '@types/yauzl-promise@2.1.0': dependencies: '@types/events': 3.0.3 @@ -4496,8 +4481,6 @@ snapshots: util-deprecate@1.0.2: {} - uuid@11.1.0: {} - uuid@3.3.2: {} validate-npm-package-license@3.0.4: diff --git a/src/providers/native/index.ts b/src/providers/native/index.ts index d48eacb..bf63640 100644 --- a/src/providers/native/index.ts +++ b/src/providers/native/index.ts @@ -1,5 +1,6 @@ import ms from 'ms'; -import { v4 as uuid } from 'uuid'; +import { randomUUID as uuid } from 'node:crypto'; + import createDebug from 'debug'; import { promisify } from 'node:util'; import { AddressInfo } from 'node:net'; From c4901b86ed3add8d70952fefce2fb07812aa0838 Mon Sep 17 00:00:00 2001 From: Trek Glowacki Date: Mon, 12 May 2025 10:51:30 -0500 Subject: [PATCH 4/4] Missed one --- src/runtime-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime-server.ts b/src/runtime-server.ts index b228250..1faabf3 100644 --- a/src/runtime-server.ts +++ b/src/runtime-server.ts @@ -2,7 +2,7 @@ import http, { Server } from 'node:http'; import { parse } from 'node:url'; import createDebug from 'debug'; import { run, text } from 'micro'; -import { v4 as uuid } from 'uuid'; +import { randomUUID as uuid } from 'node:crypto'; import createPathMatch from 'path-match'; import once from '@tootallnate/once';