diff --git a/.changeset/pretty-cows-remember.md b/.changeset/pretty-cows-remember.md new file mode 100644 index 00000000000..5dc3d064dac --- /dev/null +++ b/.changeset/pretty-cows-remember.md @@ -0,0 +1,6 @@ +--- +"@smithy/middleware-retry": minor +"@smithy/core": minor +--- + +Replace 'uuid' with '@smithy/uuid' diff --git a/packages/core/package.json b/packages/core/package.json index e9fdd028b77..ea63b955d3f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -85,9 +85,8 @@ "@smithy/util-middleware": "workspace:^", "@smithy/util-stream": "workspace:^", "@smithy/util-utf8": "workspace:^", - "@types/uuid": "^9.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" + "@smithy/uuid": "workspace:^", + "tslib": "^2.6.2" }, "engines": { "node": ">=18.0.0" diff --git a/packages/core/src/submodules/serde/generateIdempotencyToken.ts b/packages/core/src/submodules/serde/generateIdempotencyToken.ts index b4e455b34ec..3f8d7520696 100644 --- a/packages/core/src/submodules/serde/generateIdempotencyToken.ts +++ b/packages/core/src/submodules/serde/generateIdempotencyToken.ts @@ -1,3 +1,3 @@ -import { v4 as generateIdempotencyToken } from "uuid"; +import { v4 as generateIdempotencyToken } from "@smithy/uuid"; export { generateIdempotencyToken }; diff --git a/packages/middleware-retry/package.json b/packages/middleware-retry/package.json index 12465e48d0d..85fd6c99f04 100644 --- a/packages/middleware-retry/package.json +++ b/packages/middleware-retry/package.json @@ -41,9 +41,8 @@ "@smithy/types": "workspace:^", "@smithy/util-middleware": "workspace:^", "@smithy/util-retry": "workspace:^", - "@types/uuid": "^9.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" + "@smithy/uuid": "workspace:^", + "tslib": "^2.6.2" }, "devDependencies": { "@smithy/util-test": "workspace:^", diff --git a/packages/middleware-retry/src/StandardRetryStrategy.spec.ts b/packages/middleware-retry/src/StandardRetryStrategy.spec.ts index 393806643fe..58eee0ec2c6 100644 --- a/packages/middleware-retry/src/StandardRetryStrategy.spec.ts +++ b/packages/middleware-retry/src/StandardRetryStrategy.spec.ts @@ -7,7 +7,7 @@ import { RETRY_MODES, THROTTLING_RETRY_DELAY_BASE, } from "@smithy/util-retry"; -import { v4 } from "uuid"; +import { v4 } from "@smithy/uuid"; import { afterEach, beforeEach, describe, expect, test as it, vi } from "vitest"; import { getDefaultRetryQuota } from "./defaultRetryQuota"; @@ -21,7 +21,7 @@ vi.mock("./delayDecider"); vi.mock("./retryDecider"); vi.mock("./defaultRetryQuota"); vi.mock("@smithy/protocol-http"); -vi.mock("uuid"); +vi.mock("@smithy/uuid"); describe("defaultStrategy", () => { let next: any; // variable for next mock function in utility methods diff --git a/packages/middleware-retry/src/StandardRetryStrategy.ts b/packages/middleware-retry/src/StandardRetryStrategy.ts index 2b2ff8d5fd3..4f0d51ba33a 100644 --- a/packages/middleware-retry/src/StandardRetryStrategy.ts +++ b/packages/middleware-retry/src/StandardRetryStrategy.ts @@ -11,7 +11,7 @@ import { RETRY_MODES, THROTTLING_RETRY_DELAY_BASE, } from "@smithy/util-retry"; -import { v4 } from "uuid"; +import { v4 } from "@smithy/uuid"; import { getDefaultRetryQuota } from "./defaultRetryQuota"; import { defaultDelayDecider } from "./delayDecider"; diff --git a/packages/middleware-retry/src/retryMiddleware.spec.ts b/packages/middleware-retry/src/retryMiddleware.spec.ts index 0ec5a947204..cff52ae13aa 100644 --- a/packages/middleware-retry/src/retryMiddleware.spec.ts +++ b/packages/middleware-retry/src/retryMiddleware.spec.ts @@ -2,14 +2,14 @@ import { HttpRequest, HttpResponse } from "@smithy/protocol-http"; import { isServerError, isThrottlingError, isTransientError } from "@smithy/service-error-classification"; import type { FinalizeHandlerArguments, HandlerExecutionContext, MiddlewareStack } from "@smithy/types"; import { INVOCATION_ID_HEADER, REQUEST_HEADER } from "@smithy/util-retry"; -import { v4 } from "uuid"; +import { v4 } from "@smithy/uuid"; import { afterEach, beforeEach, describe, expect, test as it, vi } from "vitest"; import { getRetryPlugin, retryMiddleware, retryMiddlewareOptions } from "./retryMiddleware"; vi.mock("@smithy/service-error-classification"); vi.mock("@smithy/protocol-http"); -vi.mock("uuid"); +vi.mock("@smithy/uuid"); describe(getRetryPlugin.name, () => { const mockClientStack = { diff --git a/packages/middleware-retry/src/retryMiddleware.ts b/packages/middleware-retry/src/retryMiddleware.ts index c0a3a6ad838..26bf4f8c0d7 100644 --- a/packages/middleware-retry/src/retryMiddleware.ts +++ b/packages/middleware-retry/src/retryMiddleware.ts @@ -18,7 +18,7 @@ import type { SdkError, } from "@smithy/types"; import { INVOCATION_ID_HEADER, REQUEST_HEADER } from "@smithy/util-retry"; -import { v4 } from "uuid"; +import { v4 } from "@smithy/uuid"; import type { RetryResolvedConfig } from "./configurations"; import { isStreamingPayload } from "./isStreamingPayload/isStreamingPayload"; diff --git a/yarn.lock b/yarn.lock index 0fa265a3beb..a1eb47736de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2329,15 +2329,14 @@ __metadata: "@smithy/util-middleware": "workspace:^" "@smithy/util-stream": "workspace:^" "@smithy/util-utf8": "workspace:^" + "@smithy/uuid": "workspace:^" "@types/node": "npm:^18.11.9" - "@types/uuid": "npm:^9.0.1" concurrently: "npm:7.0.0" downlevel-dts: "npm:0.10.1" json-bigint: "npm:^1.0.0" rimraf: "npm:3.0.2" tslib: "npm:^2.6.2" typedoc: "npm:0.23.23" - uuid: "npm:^9.0.1" languageName: unknown linkType: soft @@ -2655,13 +2654,12 @@ __metadata: "@smithy/util-middleware": "workspace:^" "@smithy/util-retry": "workspace:^" "@smithy/util-test": "workspace:^" - "@types/uuid": "npm:^9.0.1" + "@smithy/uuid": "workspace:^" concurrently: "npm:7.0.0" downlevel-dts: "npm:0.10.1" rimraf: "npm:3.0.2" tslib: "npm:^2.6.2" typedoc: "npm:0.23.23" - uuid: "npm:^9.0.1" languageName: unknown linkType: soft @@ -3283,7 +3281,7 @@ __metadata: languageName: unknown linkType: soft -"@smithy/uuid@workspace:packages/uuid": +"@smithy/uuid@workspace:^, @smithy/uuid@workspace:packages/uuid": version: 0.0.0-use.local resolution: "@smithy/uuid@workspace:packages/uuid" dependencies: @@ -3563,13 +3561,6 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:^9.0.1": - version: 9.0.8 - resolution: "@types/uuid@npm:9.0.8" - checksum: 10c0/b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489 - languageName: node - linkType: hard - "@types/yargs-parser@npm:*": version: 21.0.0 resolution: "@types/yargs-parser@npm:21.0.0" @@ -10786,15 +10777,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^9.0.1": - version: 9.0.1 - resolution: "uuid@npm:9.0.1" - bin: - uuid: dist/bin/uuid - checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.0.1": version: 9.1.0 resolution: "v8-to-istanbul@npm:9.1.0"