From 0410fcd69a76712bcb7f8b0693acabf2978c9237 Mon Sep 17 00:00:00 2001 From: George Fu Date: Tue, 7 Jan 2025 16:12:49 -0500 Subject: [PATCH 1/4] test: update vitest to 2.1.8 --- package.json | 2 +- yarn.lock | 295 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 203 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 236301355b63..29f05bb3ba21 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "typescript": "~5.2.2", "verdaccio": "5.25.0", "vite": "4.5.5", - "vitest": "0.34.6", + "vitest": "2.1.8", "webpack": "5.76.0", "webpack-cli": "4.10.0", "yargs": "17.5.1" diff --git a/yarn.lock b/yarn.lock index 5861c8ac5cd0..1a2ffe6d8e96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28808,7 +28808,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*": +"@types/estree@npm:*, @types/estree@npm:^1.0.0": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a @@ -29363,14 +29363,43 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:0.34.6": - version: 0.34.6 - resolution: "@vitest/expect@npm:0.34.6" +"@vitest/expect@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/expect@npm:2.1.8" dependencies: - "@vitest/spy": "npm:0.34.6" - "@vitest/utils": "npm:0.34.6" - chai: "npm:^4.3.10" - checksum: 10c0/d68abc53d673c2c98cad84da4fa73bd407d59a1098ca528c6925c202321d4eeecde5eaf512980614a755200ae1aa6b648d44da09b78ce4cc95aa78eff8ee558a + "@vitest/spy": "npm:2.1.8" + "@vitest/utils": "npm:2.1.8" + chai: "npm:^5.1.2" + tinyrainbow: "npm:^1.2.0" + checksum: 10c0/6fbf4abc2360efe4d3671d3425f8bb6012fe2dd932a88720d8b793030b766ba260494822c721d3fc497afe52373515c7e150635a95c25f6e1b567f86155c5408 + languageName: node + linkType: hard + +"@vitest/mocker@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/mocker@npm:2.1.8" + dependencies: + "@vitest/spy": "npm:2.1.8" + estree-walker: "npm:^3.0.3" + magic-string: "npm:^0.30.12" + peerDependencies: + msw: ^2.4.9 + vite: ^5.0.0 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true + checksum: 10c0/b4113ed8a57c0f60101d02e1b1769357a346ecd55ded499eab384d52106fd4b12d51e9aaa6db98f47de0d56662477be0ed8d46d6dfa84c235f9e1b234709814e + languageName: node + linkType: hard + +"@vitest/pretty-format@npm:2.1.8, @vitest/pretty-format@npm:^2.1.8": + version: 2.1.8 + resolution: "@vitest/pretty-format@npm:2.1.8" + dependencies: + tinyrainbow: "npm:^1.2.0" + checksum: 10c0/1dc5c9b1c7c7e78e46a2a16033b6b20be05958bbebc5a5b78f29e32718c80252034804fccd23f34db6b3583239db47e68fc5a8e41942c54b8047cc3b4133a052 languageName: node linkType: hard @@ -29385,14 +29414,13 @@ __metadata: languageName: node linkType: hard -"@vitest/runner@npm:0.34.6": - version: 0.34.6 - resolution: "@vitest/runner@npm:0.34.6" +"@vitest/runner@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/runner@npm:2.1.8" dependencies: - "@vitest/utils": "npm:0.34.6" - p-limit: "npm:^4.0.0" - pathe: "npm:^1.1.1" - checksum: 10c0/d00d8c399513693eb6c82fd08b0e32fcf486bede5b88805e8dea90e156d502418477788b501b1c078abd38f0147e99a187061b2da81819e8d5c162a63edf5b40 + "@vitest/utils": "npm:2.1.8" + pathe: "npm:^1.1.2" + checksum: 10c0/d0826a71494adeafc8c6478257f584d11655145c83e2d8f94c17301d7059c7463ad768a69379e394c50838a7435abcc9255a6b7d8894f5ee06b153e314683a75 languageName: node linkType: hard @@ -29407,14 +29435,14 @@ __metadata: languageName: node linkType: hard -"@vitest/snapshot@npm:0.34.6": - version: 0.34.6 - resolution: "@vitest/snapshot@npm:0.34.6" +"@vitest/snapshot@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/snapshot@npm:2.1.8" dependencies: - magic-string: "npm:^0.30.1" - pathe: "npm:^1.1.1" - pretty-format: "npm:^29.5.0" - checksum: 10c0/08dbfb3cb6d202116e981abf421096eae920d65bca867c38651b02d2623e25a18e2ead6e5de13a49ebe9f2f9d007b2f692714aa6a5c9f18c3ff17b9f8726dbab + "@vitest/pretty-format": "npm:2.1.8" + magic-string: "npm:^0.30.12" + pathe: "npm:^1.1.2" + checksum: 10c0/8d7a77a52e128630ea737ee0a0fe746d1d325cac5848326861dbf042844da4d5c1a5145539ae0ed1a3f0b0363506e98d86f2679fadf114ec4b987f1eb616867b languageName: node linkType: hard @@ -29427,12 +29455,12 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:0.34.6": - version: 0.34.6 - resolution: "@vitest/spy@npm:0.34.6" +"@vitest/spy@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/spy@npm:2.1.8" dependencies: - tinyspy: "npm:^2.1.1" - checksum: 10c0/ea36d31c521f4c458f7e439ceeb0d1e5c2e9298aaafad7c9bc5ebe75f36c9b871c1f3a6dcb5bfd6c4e83b34979d511f9a7830fa8720b7e1faa18ef121845e9d5 + tinyspy: "npm:^3.0.2" + checksum: 10c0/9740f10772ede004ea7f9ffb8a6c3011341d75d9d7f2d4d181b123a701c4691e942f38cf1700684a3bb5eea3c78addf753fd8cdf78c51d8eadc3bada6fadf8f2 languageName: node linkType: hard @@ -29447,14 +29475,14 @@ __metadata: languageName: node linkType: hard -"@vitest/utils@npm:0.34.6": - version: 0.34.6 - resolution: "@vitest/utils@npm:0.34.6" +"@vitest/utils@npm:2.1.8": + version: 2.1.8 + resolution: "@vitest/utils@npm:2.1.8" dependencies: - diff-sequences: "npm:^29.4.3" - loupe: "npm:^2.3.6" - pretty-format: "npm:^29.5.0" - checksum: 10c0/6f32f086b8bf0e8125a11b26cad4ce77ad90943590b55cd1ebb1424412d1feb6d404ee4ded523c346a8f222c265251652b4888f2ede769e3d7fce6fb1ee0a620 + "@vitest/pretty-format": "npm:2.1.8" + loupe: "npm:^3.1.2" + tinyrainbow: "npm:^1.2.0" + checksum: 10c0/d4a29ecd8f6c24c790e4c009f313a044d89e664e331bc9c3cfb57fe1380fb1d2999706dbbfc291f067d6c489602e76d00435309fbc906197c0d01f831ca17d64 languageName: node linkType: hard @@ -30105,6 +30133,13 @@ __metadata: languageName: node linkType: hard +"assertion-error@npm:^2.0.1": + version: 2.0.1 + resolution: "assertion-error@npm:2.0.1" + checksum: 10c0/bbbcb117ac6480138f8c93cf7f535614282dea9dc828f540cdece85e3c665e8f78958b96afac52f29ff883c72638e6a87d469ecc9fe5bc902df03ed24a55dba8 + languageName: node + linkType: hard + "astral-regex@npm:^2.0.0": version: 2.0.0 resolution: "astral-regex@npm:2.0.0" @@ -30216,7 +30251,7 @@ __metadata: typescript: "npm:~5.2.2" verdaccio: "npm:5.25.0" vite: "npm:4.5.5" - vitest: "npm:0.34.6" + vitest: "npm:2.1.8" webpack: "npm:5.76.0" webpack-cli: "npm:4.10.0" yargs: "npm:17.5.1" @@ -30764,7 +30799,7 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.3.10, chai@npm:^4.3.7": +"chai@npm:^4.3.7": version: 4.5.0 resolution: "chai@npm:4.5.0" dependencies: @@ -30779,6 +30814,19 @@ __metadata: languageName: node linkType: hard +"chai@npm:^5.1.2": + version: 5.1.2 + resolution: "chai@npm:5.1.2" + dependencies: + assertion-error: "npm:^2.0.1" + check-error: "npm:^2.1.1" + deep-eql: "npm:^5.0.1" + loupe: "npm:^3.1.0" + pathval: "npm:^2.0.0" + checksum: 10c0/6c04ff8495b6e535df9c1b062b6b094828454e9a3c9493393e55b2f4dbff7aa2a29a4645133cad160fb00a16196c4dc03dc9bb37e1f4ba9df3b5f50d7533a736 + languageName: node + linkType: hard + "chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -30812,6 +30860,13 @@ __metadata: languageName: node linkType: hard +"check-error@npm:^2.1.1": + version: 2.1.1 + resolution: "check-error@npm:2.1.1" + checksum: 10c0/979f13eccab306cf1785fa10941a590b4e7ea9916ea2a4f8c87f0316fc3eab07eabefb6e587424ef0f88cbcd3805791f172ea739863ca3d7ce2afc54641c7f0e + languageName: node + linkType: hard + "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -31597,7 +31652,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.7": version: 4.4.0 resolution: "debug@npm:4.4.0" dependencies: @@ -31682,6 +31737,13 @@ __metadata: languageName: node linkType: hard +"deep-eql@npm:^5.0.1": + version: 5.0.2 + resolution: "deep-eql@npm:5.0.2" + checksum: 10c0/7102cf3b7bb719c6b9c0db2e19bf0aa9318d141581befe8c7ce8ccd39af9eaa4346e5e05adef7f9bd7015da0f13a3a25dcfe306ef79dc8668aedbecb658dd247 + languageName: node + linkType: hard + "deep-is@npm:^0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -32119,6 +32181,13 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^1.5.4": + version: 1.6.0 + resolution: "es-module-lexer@npm:1.6.0" + checksum: 10c0/667309454411c0b95c476025929881e71400d74a746ffa1ff4cb450bd87f8e33e8eef7854d68e401895039ac0bac64e7809acbebb6253e055dd49ea9e3ea9212 + languageName: node + linkType: hard + "es-object-atoms@npm:^1.0.0": version: 1.0.0 resolution: "es-object-atoms@npm:1.0.0" @@ -32665,6 +32734,15 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^3.0.3": + version: 3.0.3 + resolution: "estree-walker@npm:3.0.3" + dependencies: + "@types/estree": "npm:^1.0.0" + checksum: 10c0/c12e3c2b2642d2bcae7d5aa495c60fa2f299160946535763969a1c83fc74518ffa9c2cd3a8b69ac56aea547df6a8aac25f729a342992ef0bbac5f1c73e78995d + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -32758,6 +32836,13 @@ __metadata: languageName: node linkType: hard +"expect-type@npm:^1.1.0": + version: 1.1.0 + resolution: "expect-type@npm:1.1.0" + checksum: 10c0/5af0febbe8fe18da05a6d51e3677adafd75213512285408156b368ca471252565d5ca6e59e4bddab25121f3cfcbbebc6a5489f8cc9db131cc29e69dcdcc7ae15 + languageName: node + linkType: hard + "expect@npm:^28.1.3": version: 28.1.3 resolution: "expect@npm:28.1.3" @@ -36225,6 +36310,13 @@ __metadata: languageName: node linkType: hard +"loupe@npm:^3.1.0, loupe@npm:^3.1.2": + version: 3.1.2 + resolution: "loupe@npm:3.1.2" + checksum: 10c0/b13c02e3ddd6a9d5f8bf84133b3242de556512d824dddeea71cce2dbd6579c8f4d672381c4e742d45cf4423d0701765b4a6e5fbc24701def16bc2b40f8daa96a + languageName: node + linkType: hard + "lowdb@npm:1.0.0": version: 1.0.0 resolution: "lowdb@npm:1.0.0" @@ -36279,7 +36371,7 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.1": +"magic-string@npm:^0.30.1, magic-string@npm:^0.30.12": version: 0.30.17 resolution: "magic-string@npm:0.30.17" dependencies: @@ -37868,6 +37960,13 @@ __metadata: languageName: node linkType: hard +"pathval@npm:^2.0.0": + version: 2.0.0 + resolution: "pathval@npm:2.0.0" + checksum: 10c0/602e4ee347fba8a599115af2ccd8179836a63c925c23e04bd056d0674a64b39e3a081b643cc7bc0b84390517df2d800a46fcc5598d42c155fe4977095c2f77c5 + languageName: node + linkType: hard + "performance-now@npm:^2.1.0": version: 2.1.0 resolution: "performance-now@npm:2.1.0" @@ -39581,7 +39680,7 @@ __metadata: languageName: node linkType: hard -"std-env@npm:^3.3.3": +"std-env@npm:^3.3.3, std-env@npm:^3.8.0": version: 3.8.0 resolution: "std-env@npm:3.8.0" checksum: 10c0/f560a2902fd0fa3d648d7d0acecbd19d664006f7372c1fba197ed4c216b4c9e48db6e2769b5fe1616d42a9333c9f066c5011935035e85c59f45dc4f796272040 @@ -40006,13 +40105,20 @@ __metadata: languageName: node linkType: hard -"tinybench@npm:^2.5.0": +"tinybench@npm:^2.5.0, tinybench@npm:^2.9.0": version: 2.9.0 resolution: "tinybench@npm:2.9.0" checksum: 10c0/c3500b0f60d2eb8db65250afe750b66d51623057ee88720b7f064894a6cb7eb93360ca824a60a31ab16dab30c7b1f06efe0795b352e37914a9d4bad86386a20c languageName: node linkType: hard +"tinyexec@npm:^0.3.1": + version: 0.3.2 + resolution: "tinyexec@npm:0.3.2" + checksum: 10c0/3efbf791a911be0bf0821eab37a3445c2ba07acc1522b1fa84ae1e55f10425076f1290f680286345ed919549ad67527d07281f1c19d584df3b74326909eb1f90 + languageName: node + linkType: hard + "tinypool@npm:^0.6.0": version: 0.6.0 resolution: "tinypool@npm:0.6.0" @@ -40020,10 +40126,17 @@ __metadata: languageName: node linkType: hard -"tinypool@npm:^0.7.0": - version: 0.7.0 - resolution: "tinypool@npm:0.7.0" - checksum: 10c0/ecb35d9f74e72722c059acb1947ffc3c2caccb45266b89b72f74be2d28f0784d948b50bd9c6c68fa4159afd423ac5f5a07271a5f516d18a565dd06af0a37bc44 +"tinypool@npm:^1.0.1": + version: 1.0.2 + resolution: "tinypool@npm:1.0.2" + checksum: 10c0/31ac184c0ff1cf9a074741254fe9ea6de95026749eb2b8ec6fd2b9d8ca94abdccda731f8e102e7f32e72ed3b36d32c6975fd5f5523df3f1b6de6c3d8dfd95e63 + languageName: node + linkType: hard + +"tinyrainbow@npm:^1.2.0": + version: 1.2.0 + resolution: "tinyrainbow@npm:1.2.0" + checksum: 10c0/7f78a4b997e5ba0f5ecb75e7ed786f30bab9063716e7dff24dd84013fb338802e43d176cb21ed12480561f5649a82184cf31efb296601a29d38145b1cdb4c192 languageName: node linkType: hard @@ -40034,6 +40147,13 @@ __metadata: languageName: node linkType: hard +"tinyspy@npm:^3.0.2": + version: 3.0.2 + resolution: "tinyspy@npm:3.0.2" + checksum: 10c0/55ffad24e346622b59292e097c2ee30a63919d5acb7ceca87fc0d1c223090089890587b426e20054733f97a58f20af2c349fb7cc193697203868ab7ba00bcea0 + languageName: node + linkType: hard + "tmp@npm:^0.0.33": version: 0.0.33 resolution: "tmp@npm:0.0.33" @@ -40908,19 +41028,18 @@ __metadata: languageName: node linkType: hard -"vite-node@npm:0.34.6": - version: 0.34.6 - resolution: "vite-node@npm:0.34.6" +"vite-node@npm:2.1.8": + version: 2.1.8 + resolution: "vite-node@npm:2.1.8" dependencies: cac: "npm:^6.7.14" - debug: "npm:^4.3.4" - mlly: "npm:^1.4.0" - pathe: "npm:^1.1.1" - picocolors: "npm:^1.0.0" - vite: "npm:^3.0.0 || ^4.0.0 || ^5.0.0-0" + debug: "npm:^4.3.7" + es-module-lexer: "npm:^1.5.4" + pathe: "npm:^1.1.2" + vite: "npm:^5.0.0" bin: vite-node: vite-node.mjs - checksum: 10c0/0e804eab1ae5f0d98014f0a933ec08bfc287228283c3c4792f5f8b8fec6657896e513498e8436449e3116839a5592f9b497cf0b982b8da1152d7d419ccc306f1 + checksum: 10c0/cb28027a7425ba29780e216164c07d36a4ff9eb60d83afcad3bc222fd5a5f3e36030071c819edd6d910940f502d49e52f7564743617bc1c5875485b0952c72d5 languageName: node linkType: hard @@ -40976,46 +41095,42 @@ __metadata: languageName: node linkType: hard -"vitest@npm:0.34.6": - version: 0.34.6 - resolution: "vitest@npm:0.34.6" +"vitest@npm:2.1.8": + version: 2.1.8 + resolution: "vitest@npm:2.1.8" dependencies: - "@types/chai": "npm:^4.3.5" - "@types/chai-subset": "npm:^1.3.3" - "@types/node": "npm:*" - "@vitest/expect": "npm:0.34.6" - "@vitest/runner": "npm:0.34.6" - "@vitest/snapshot": "npm:0.34.6" - "@vitest/spy": "npm:0.34.6" - "@vitest/utils": "npm:0.34.6" - acorn: "npm:^8.9.0" - acorn-walk: "npm:^8.2.0" - cac: "npm:^6.7.14" - chai: "npm:^4.3.10" - debug: "npm:^4.3.4" - local-pkg: "npm:^0.4.3" - magic-string: "npm:^0.30.1" - pathe: "npm:^1.1.1" - picocolors: "npm:^1.0.0" - std-env: "npm:^3.3.3" - strip-literal: "npm:^1.0.1" - tinybench: "npm:^2.5.0" - tinypool: "npm:^0.7.0" - vite: "npm:^3.1.0 || ^4.0.0 || ^5.0.0-0" - vite-node: "npm:0.34.6" - why-is-node-running: "npm:^2.2.2" + "@vitest/expect": "npm:2.1.8" + "@vitest/mocker": "npm:2.1.8" + "@vitest/pretty-format": "npm:^2.1.8" + "@vitest/runner": "npm:2.1.8" + "@vitest/snapshot": "npm:2.1.8" + "@vitest/spy": "npm:2.1.8" + "@vitest/utils": "npm:2.1.8" + chai: "npm:^5.1.2" + debug: "npm:^4.3.7" + expect-type: "npm:^1.1.0" + magic-string: "npm:^0.30.12" + pathe: "npm:^1.1.2" + std-env: "npm:^3.8.0" + tinybench: "npm:^2.9.0" + tinyexec: "npm:^0.3.1" + tinypool: "npm:^1.0.1" + tinyrainbow: "npm:^1.2.0" + vite: "npm:^5.0.0" + vite-node: "npm:2.1.8" + why-is-node-running: "npm:^2.3.0" peerDependencies: "@edge-runtime/vm": "*" - "@vitest/browser": "*" - "@vitest/ui": "*" + "@types/node": ^18.0.0 || >=20.0.0 + "@vitest/browser": 2.1.8 + "@vitest/ui": 2.1.8 happy-dom: "*" jsdom: "*" - playwright: "*" - safaridriver: "*" - webdriverio: "*" peerDependenciesMeta: "@edge-runtime/vm": optional: true + "@types/node": + optional: true "@vitest/browser": optional: true "@vitest/ui": @@ -41024,15 +41139,9 @@ __metadata: optional: true jsdom: optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true bin: vitest: vitest.mjs - checksum: 10c0/7b5e87875991a66fe5cca62477f21447d7cdf4d101ac381ca02a16f4223b1ae5d0bc17ce42616d6dc74742757730ed511ada05aaa7090b6075e304c883cf0bc3 + checksum: 10c0/e70631bad5662d6c60c5cf836a4baf58b890db6654fef1f608fe6a86aa49a2b9f078aac74b719d4d3c87c5c781968cc73590a7935277b48f3d8b6fb9c5b4d276 languageName: node linkType: hard @@ -41286,7 +41395,7 @@ __metadata: languageName: node linkType: hard -"why-is-node-running@npm:^2.2.2": +"why-is-node-running@npm:^2.2.2, why-is-node-running@npm:^2.3.0": version: 2.3.0 resolution: "why-is-node-running@npm:2.3.0" dependencies: From 53257ca347d82ecf298cec7c6a17b59481b5978a Mon Sep 17 00:00:00 2001 From: George Fu Date: Tue, 7 Jan 2025 16:44:01 -0500 Subject: [PATCH 2/4] test: compatibility with vitest v2 --- clients/client-s3/package.json | 2 +- package.json | 5 +- .../src/fromIni.integ.spec.ts | 8 +- .../src/bucketHostname.spec.ts | 2 +- .../src/createPresignedPost.spec.ts | 8 +- yarn.lock | 507 +++++++++++++++++- 6 files changed, 508 insertions(+), 24 deletions(-) diff --git a/clients/client-s3/package.json b/clients/client-s3/package.json index 07d98536ec62..ae9b964db07e 100644 --- a/clients/client-s3/package.json +++ b/clients/client-s3/package.json @@ -13,7 +13,7 @@ "extract:docs": "api-extractor run --local", "generate:client": "node ../../scripts/generate-clients/single-service --solo s3", "test": "yarn g:vitest run", - "test:browser": "node ./test/browser-build/esbuild && vitest run -c vitest.config.browser.ts --mode development", + "test:browser": "node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts --mode development", "test:browser:watch": "node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts", "test:e2e": "yarn g:vitest run -c vitest.config.e2e.ts --mode development && yarn test:browser", "test:e2e:watch": "yarn g:vitest watch -c vitest.config.e2e.ts", diff --git a/package.json b/package.json index 29f05bb3ba21..f40048b1ff40 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "fs-extra": "^9.0.0", "generate-changelog": "^1.7.1", "glob": "7.1.6", - "happy-dom": "14.12.3", + "happy-dom": "16.3.0", "husky": "^4.2.3", "jest": "29.7.0", "jmespath": "^0.15.0", @@ -108,18 +108,15 @@ "turbo": "2.1.2", "typescript": "~5.2.2", "verdaccio": "5.25.0", - "vite": "4.5.5", "vitest": "2.1.8", "webpack": "5.76.0", "webpack-cli": "4.10.0", "yargs": "17.5.1" }, "overrides": { - "vite": "4.5.5", "typescript": "~5.2.2" }, "resolutions": { - "vite": "4.5.5", "typescript": "~5.2.2" }, "workspaces": { diff --git a/packages/credential-provider-ini/src/fromIni.integ.spec.ts b/packages/credential-provider-ini/src/fromIni.integ.spec.ts index e4a5542d69f7..db87a4ad5822 100644 --- a/packages/credential-provider-ini/src/fromIni.integ.spec.ts +++ b/packages/credential-provider-ini/src/fromIni.integ.spec.ts @@ -172,7 +172,7 @@ describe("fromIni region search order", () => { await sts.getCallerIdentity({}); const credentials = await sts.config.credentials(); - expect(credentials).toContain({ + expect(credentials).toMatchObject({ accessKeyId: "STS_AR_ACCESS_KEY_ID", secretAccessKey: "STS_AR_SECRET_ACCESS_KEY", sessionToken: "STS_AR_SESSION_TOKEN_ap-northeast-1", @@ -192,7 +192,7 @@ describe("fromIni region search order", () => { await sts.getCallerIdentity({}); const credentials = await sts.config.credentials(); - expect(credentials).toContain({ + expect(credentials).toMatchObject({ accessKeyId: "STS_AR_ACCESS_KEY_ID", secretAccessKey: "STS_AR_SECRET_ACCESS_KEY", sessionToken: "STS_AR_SESSION_TOKEN_us-stsar-1", @@ -214,7 +214,7 @@ describe("fromIni region search order", () => { await sts.getCallerIdentity({}); const credentials = await sts.config.credentials(); - expect(credentials).toContain({ + expect(credentials).toMatchObject({ accessKeyId: "STS_AR_ACCESS_KEY_ID", secretAccessKey: "STS_AR_SECRET_ACCESS_KEY", sessionToken: "STS_AR_SESSION_TOKEN_ap-northeast-2", @@ -238,7 +238,7 @@ describe("fromIni region search order", () => { await sts.getCallerIdentity({}); const credentials = await sts.config.credentials(); - expect(credentials).toContain({ + expect(credentials).toMatchObject({ accessKeyId: "STS_AR_ACCESS_KEY_ID", secretAccessKey: "STS_AR_SECRET_ACCESS_KEY", sessionToken: "STS_AR_SESSION_TOKEN_us-east-1", diff --git a/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts b/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts index 18e5519b1544..f32898527543 100644 --- a/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts +++ b/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts @@ -566,7 +566,7 @@ describe("bucketHostname", () => { clientRegion: region, isCustomEndpoint: false, }) - ).toThrow(""); + ).toThrow(); }); it('should populate endpoint from MRAP ARN with access point name "myendpoint"', () => { diff --git a/packages/s3-presigned-post/src/createPresignedPost.spec.ts b/packages/s3-presigned-post/src/createPresignedPost.spec.ts index 5387efc0fe80..1297f7a6c661 100644 --- a/packages/s3-presigned-post/src/createPresignedPost.spec.ts +++ b/packages/s3-presigned-post/src/createPresignedPost.spec.ts @@ -102,7 +102,7 @@ describe("createPresignedPost", () => { Bucket, Key: "path/to/${filename}", }); - const { conditions } = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0]); + const { conditions } = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0] as any); expect(conditions).toContainEqual(["starts-with", "$key", "path/to/"]); }); @@ -112,7 +112,7 @@ describe("createPresignedPost", () => { Bucket, Key, }); - const policy = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0]); + const policy = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0] as any); expect(policy).toMatchObject({ expiration: "2020-10-28T23:56:49Z", }); @@ -125,7 +125,7 @@ describe("createPresignedPost", () => { Key, Expires: 7200, }); - expect(JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0])).toMatchObject({ + expect(JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0] as any)).toMatchObject({ expiration: "2020-10-29T00:56:49Z", }); }); @@ -139,7 +139,7 @@ describe("createPresignedPost", () => { Fields: { acl: "public-read" }, }); expect(fields).toMatchObject({ bucket: Bucket, key: Key, acl: "public-read" }); - const { conditions } = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0]); + const { conditions } = JSON.parse(mockS3Client.config.utf8Decoder.mock.calls[0] as any); expect(conditions).toContainEqual({ acl: "public-read" }); }); }); diff --git a/yarn.lock b/yarn.lock index 1a2ffe6d8e96..3cdda2e799cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25369,6 +25369,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/aix-ppc64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/aix-ppc64@npm:0.23.1" @@ -25390,6 +25397,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/android-arm64@npm:0.23.1" @@ -25411,6 +25425,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/android-arm@npm:0.23.1" @@ -25432,6 +25453,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/android-x64@npm:0.23.1" @@ -25453,6 +25481,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/darwin-arm64@npm:0.23.1" @@ -25474,6 +25509,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/darwin-x64@npm:0.23.1" @@ -25495,6 +25537,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/freebsd-arm64@npm:0.23.1" @@ -25516,6 +25565,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/freebsd-x64@npm:0.23.1" @@ -25537,6 +25593,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-arm64@npm:0.23.1" @@ -25558,6 +25621,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-arm@npm:0.23.1" @@ -25579,6 +25649,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-ia32@npm:0.23.1" @@ -25600,6 +25677,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-loong64@npm:0.23.1" @@ -25621,6 +25705,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-mips64el@npm:0.23.1" @@ -25642,6 +25733,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-ppc64@npm:0.23.1" @@ -25663,6 +25761,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-riscv64@npm:0.23.1" @@ -25684,6 +25789,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-s390x@npm:0.23.1" @@ -25705,6 +25817,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/linux-x64@npm:0.23.1" @@ -25726,6 +25845,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/netbsd-x64@npm:0.23.1" @@ -25754,6 +25880,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/openbsd-x64@npm:0.23.1" @@ -25775,6 +25908,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/sunos-x64@npm:0.23.1" @@ -25796,6 +25936,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/win32-arm64@npm:0.23.1" @@ -25817,6 +25964,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/win32-ia32@npm:0.23.1" @@ -25838,6 +25992,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.23.1": version: 0.23.1 resolution: "@esbuild/win32-x64@npm:0.23.1" @@ -27900,6 +28061,139 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm-eabi@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.30.1" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-android-arm64@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-android-arm64@npm:4.30.1" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-arm64@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-darwin-arm64@npm:4.30.1" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-x64@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-darwin-x64@npm:4.30.1" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-freebsd-arm64@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-freebsd-arm64@npm:4.30.1" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-freebsd-x64@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-freebsd-x64@npm:4.30.1" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-gnueabihf@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.30.1" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-musleabihf@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.30.1" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.30.1" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-musl@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.30.1" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-loongarch64-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.30.1" + conditions: os=linux & cpu=loong64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.30.1" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-riscv64-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.30.1" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-s390x-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.30.1" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-gnu@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.30.1" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-musl@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.30.1" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-win32-arm64-msvc@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.30.1" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-win32-ia32-msvc@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.30.1" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@rollup/rollup-win32-x64-msvc@npm:4.30.1": + version: 4.30.1 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.30.1" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rushstack/node-core-library@npm:3.55.2": version: 3.55.2 resolution: "@rushstack/node-core-library@npm:3.55.2" @@ -28808,7 +29102,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0": +"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.0": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a @@ -30234,7 +30528,7 @@ __metadata: fs-extra: "npm:^9.0.0" generate-changelog: "npm:^1.7.1" glob: "npm:7.1.6" - happy-dom: "npm:14.12.3" + happy-dom: "npm:16.3.0" husky: "npm:^4.2.3" jest: "npm:29.7.0" jmespath: "npm:^0.15.0" @@ -30250,7 +30544,6 @@ __metadata: turbo: "npm:2.1.2" typescript: "npm:~5.2.2" verdaccio: "npm:5.25.0" - vite: "npm:4.5.5" vitest: "npm:2.1.8" webpack: "npm:5.76.0" webpack-cli: "npm:4.10.0" @@ -32400,6 +32693,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.21.3": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.5" + "@esbuild/android-arm": "npm:0.21.5" + "@esbuild/android-arm64": "npm:0.21.5" + "@esbuild/android-x64": "npm:0.21.5" + "@esbuild/darwin-arm64": "npm:0.21.5" + "@esbuild/darwin-x64": "npm:0.21.5" + "@esbuild/freebsd-arm64": "npm:0.21.5" + "@esbuild/freebsd-x64": "npm:0.21.5" + "@esbuild/linux-arm": "npm:0.21.5" + "@esbuild/linux-arm64": "npm:0.21.5" + "@esbuild/linux-ia32": "npm:0.21.5" + "@esbuild/linux-loong64": "npm:0.21.5" + "@esbuild/linux-mips64el": "npm:0.21.5" + "@esbuild/linux-ppc64": "npm:0.21.5" + "@esbuild/linux-riscv64": "npm:0.21.5" + "@esbuild/linux-s390x": "npm:0.21.5" + "@esbuild/linux-x64": "npm:0.21.5" + "@esbuild/netbsd-x64": "npm:0.21.5" + "@esbuild/openbsd-x64": "npm:0.21.5" + "@esbuild/sunos-x64": "npm:0.21.5" + "@esbuild/win32-arm64": "npm:0.21.5" + "@esbuild/win32-ia32": "npm:0.21.5" + "@esbuild/win32-x64": "npm:0.21.5" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de + languageName: node + linkType: hard + "esbuild@npm:~0.23.0": version: 0.23.1 resolution: "esbuild@npm:0.23.1" @@ -33905,14 +34278,13 @@ __metadata: languageName: node linkType: hard -"happy-dom@npm:14.12.3": - version: 14.12.3 - resolution: "happy-dom@npm:14.12.3" +"happy-dom@npm:16.3.0": + version: 16.3.0 + resolution: "happy-dom@npm:16.3.0" dependencies: - entities: "npm:^4.5.0" webidl-conversions: "npm:^7.0.0" whatwg-mimetype: "npm:^3.0.0" - checksum: 10c0/72e817bc9d03c4c0dbb794f8fb5b69aac4b4dbe0ee789a6b6a02a60298a9aa99bac766967a5c642153e5c95c02489437f878de5641ed64fd13b2271c56805df5 + checksum: 10c0/c90e29ff44818008aaae1fc65b276a9a1920455884fe895fdc634ced3f98a71fe81317ddf9a2ec1d7d07af0b300500d9f652ba7cfc144ed96c5f7c480edde83b languageName: node linkType: hard @@ -38153,7 +38525,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.27": +"postcss@npm:^8.4.27, postcss@npm:^8.4.43": version: 8.4.49 resolution: "postcss@npm:8.4.49" dependencies: @@ -38970,6 +39342,78 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^4.20.0": + version: 4.30.1 + resolution: "rollup@npm:4.30.1" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.30.1" + "@rollup/rollup-android-arm64": "npm:4.30.1" + "@rollup/rollup-darwin-arm64": "npm:4.30.1" + "@rollup/rollup-darwin-x64": "npm:4.30.1" + "@rollup/rollup-freebsd-arm64": "npm:4.30.1" + "@rollup/rollup-freebsd-x64": "npm:4.30.1" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.30.1" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.30.1" + "@rollup/rollup-linux-arm64-gnu": "npm:4.30.1" + "@rollup/rollup-linux-arm64-musl": "npm:4.30.1" + "@rollup/rollup-linux-loongarch64-gnu": "npm:4.30.1" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.30.1" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.30.1" + "@rollup/rollup-linux-s390x-gnu": "npm:4.30.1" + "@rollup/rollup-linux-x64-gnu": "npm:4.30.1" + "@rollup/rollup-linux-x64-musl": "npm:4.30.1" + "@rollup/rollup-win32-arm64-msvc": "npm:4.30.1" + "@rollup/rollup-win32-ia32-msvc": "npm:4.30.1" + "@rollup/rollup-win32-x64-msvc": "npm:4.30.1" + "@types/estree": "npm:1.0.6" + fsevents: "npm:~2.3.2" + dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-freebsd-arm64": + optional: true + "@rollup/rollup-freebsd-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm-musleabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-loongarch64-gnu": + optional: true + "@rollup/rollup-linux-powerpc64le-gnu": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-s390x-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 10c0/a318c57e2ca9741e1503bcd75483949c6e83edd72234a468010a3098a34248f523e44f7ad4fde90dc5c2da56abc1b78ac42a9329e1dbd708682728adbd8df7cc + languageName: node + linkType: hard + "rsvp@npm:^4.8.4": version: 4.8.5 resolution: "rsvp@npm:4.8.5" @@ -41043,7 +41487,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:4.5.5": +"vite@npm:^3.0.0 || ^4.0.0": version: 4.5.5 resolution: "vite@npm:4.5.5" dependencies: @@ -41083,6 +41527,49 @@ __metadata: languageName: node linkType: hard +"vite@npm:^5.0.0": + version: 5.4.11 + resolution: "vite@npm:5.4.11" + dependencies: + esbuild: "npm:^0.21.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.43" + rollup: "npm:^4.20.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + sass-embedded: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 10c0/d536bb7af57dd0eca2a808f95f5ff1d7b7ffb8d86e17c6893087680a0448bd0d15e07475270c8a6de65cb5115592d037130a1dd979dc76bcef8c1dda202a1874 + languageName: node + linkType: hard + "vitest-websocket-mock@npm:0.2.3": version: 0.2.3 resolution: "vitest-websocket-mock@npm:0.2.3" From a8d3175ee4f3131723bb09c1bcbd5023e1d56dab Mon Sep 17 00:00:00 2001 From: George Fu Date: Wed, 8 Jan 2025 11:42:28 -0500 Subject: [PATCH 3/4] test: s3 debugging --- clients/client-s3/package.json | 4 ++-- clients/client-s3/test/e2e/S3.browser.e2e.spec.ts | 5 ++++- clients/client-s3/vitest.config.browser.ts | 3 ++- clients/client-s3/vitest.config.e2e.ts | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/clients/client-s3/package.json b/clients/client-s3/package.json index ae9b964db07e..084fca5016f7 100644 --- a/clients/client-s3/package.json +++ b/clients/client-s3/package.json @@ -13,9 +13,9 @@ "extract:docs": "api-extractor run --local", "generate:client": "node ../../scripts/generate-clients/single-service --solo s3", "test": "yarn g:vitest run", - "test:browser": "node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts --mode development", + "test:browser": "node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts", "test:browser:watch": "node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts", - "test:e2e": "yarn g:vitest run -c vitest.config.e2e.ts --mode development && yarn test:browser", + "test:e2e": "yarn g:vitest run -c vitest.config.e2e.ts && yarn test:browser", "test:e2e:watch": "yarn g:vitest watch -c vitest.config.e2e.ts", "test:watch": "yarn g:vitest watch" }, diff --git a/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts b/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts index 11724033d1c7..e9570aebdb4d 100644 --- a/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts +++ b/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts @@ -28,10 +28,13 @@ describe("@aws-sdk/client-s3", () => { Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string; mrapArn = (globalThis as any)?.window?.__env__?.AWS_SMOKE_TEST_MRAP_ARN || process?.env?.AWS_SMOKE_TEST_MRAP_ARN; + const provider = fromNodeProviderChain(); + const credentials = await provider(); + client = new S3Impl( getRuntimeConfig({ region, - credentials: fromNodeProviderChain(), + credentials, requestHandler: new FetchHttpHandler(), logger: { trace() {}, diff --git a/clients/client-s3/vitest.config.browser.ts b/clients/client-s3/vitest.config.browser.ts index cdc198649d30..c351a4d0b9c2 100644 --- a/clients/client-s3/vitest.config.browser.ts +++ b/clients/client-s3/vitest.config.browser.ts @@ -2,7 +2,8 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ test: { - include: ["**/*.browser.e2e.spec.ts", "test/unit/**/*.spec.ts"], + include: ["**/*.browser.e2e.spec.ts"], environment: "happy-dom", }, + mode: "development", }); diff --git a/clients/client-s3/vitest.config.e2e.ts b/clients/client-s3/vitest.config.e2e.ts index eff43a280d0a..ccea26a45905 100644 --- a/clients/client-s3/vitest.config.e2e.ts +++ b/clients/client-s3/vitest.config.e2e.ts @@ -6,4 +6,5 @@ export default defineConfig({ include: ["**/*.e2e.spec.ts"], environment: "node", }, + mode: "development", }); From ffead3e7cfaa533fb1b9a88ea07b01be0ed3996b Mon Sep 17 00:00:00 2001 From: George Fu Date: Wed, 8 Jan 2025 13:36:35 -0500 Subject: [PATCH 4/4] test(client-s3): browser compat --- .../client-s3/test/e2e/S3.browser.e2e.spec.ts | 40 +++++++++++++++---- clients/client-s3/vitest.config.browser.ts | 2 +- tests/e2e/get-integ-test-resources.js | 16 ++++++++ 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts b/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts index e9570aebdb4d..d87e6651c7ad 100644 --- a/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts +++ b/clients/client-s3/test/e2e/S3.browser.e2e.spec.ts @@ -1,6 +1,7 @@ import type { S3, SelectObjectContentEventStream, waitUntilObjectExists } from "@aws-sdk/client-s3"; import { fromNodeProviderChain } from "@aws-sdk/credential-providers"; import { FetchHttpHandler } from "@smithy/fetch-http-handler"; +import { Browser } from "happy-dom"; import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, onTestFailed, test as it } from "vitest"; import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources"; @@ -21,6 +22,9 @@ describe("@aws-sdk/client-s3", () => { }; beforeAll(async () => { + const browser = new Browser(); + browser.settings.fetch.disableSameOriginPolicy = true; + const integTestResourcesEnv = await getIntegTestResources(); Object.assign(process.env, integTestResourcesEnv); @@ -35,7 +39,9 @@ describe("@aws-sdk/client-s3", () => { getRuntimeConfig({ region, credentials, - requestHandler: new FetchHttpHandler(), + requestHandler: FetchHttpHandler.create({ + credentials: "include", + }), logger: { trace() {}, debug() {}, @@ -47,6 +53,24 @@ describe("@aws-sdk/client-s3", () => { }, }) ) as unknown as S3; + + client.middlewareStack.addRelativeTo( + (next: any) => async (args: any) => { + const result = await next(args); + const { response } = result; + for (const [key, value] of Object.entries(response.headers)) { + delete response.headers[key]; + response.headers[String(key).toLowerCase()] = value; + } + return result; + }, + { + toMiddleware: "deserializerMiddleware", + name: "header-casing-middleware", + override: true, + relation: "after", + } + ); }); afterAll(() => { @@ -69,10 +93,7 @@ describe("@aws-sdk/client-s3", () => { const buf = createBuffer("1KB"); - // TODO(vitest) - // Caused by: RequestContentLengthMismatchError: Request body length does not match content-length header - // only in vitest + happy-dom. - it.skip("should succeed with blob body", async () => { + it("should succeed with blob body", async () => { onTestFailed(setTestFailed); const blob = new Blob([buf]); const result = await client.putObject({ @@ -94,7 +115,10 @@ describe("@aws-sdk/client-s3", () => { expect(result.$metadata.httpStatusCode).toEqual(200); }); - it("should succeed with ReadableStream body", async () => { + // TODO(vitest) + // Caused by: SignatureDoesNotMatch + // only in vitest + happy-dom. + it.skip("should succeed with ReadableStream body", async () => { onTestFailed(setTestFailed); const length = 10 * 1000; // 10KB const chunkSize = 10; @@ -173,9 +197,9 @@ describe("@aws-sdk/client-s3", () => { expect(result.Contents).toBeInstanceOf(Array); }); - it("should throw with invalid bucket", () => { + it("should throw with invalid bucket", async () => { onTestFailed(setTestFailed); - expect(() => client.listObjects({ Bucket: "invalid-bucket" })).rejects.toThrow(); + await expect(() => client.listObjects({ Bucket: "invalid-bucket" })).rejects.toThrow(); }); }); diff --git a/clients/client-s3/vitest.config.browser.ts b/clients/client-s3/vitest.config.browser.ts index c351a4d0b9c2..f01e8d31a265 100644 --- a/clients/client-s3/vitest.config.browser.ts +++ b/clients/client-s3/vitest.config.browser.ts @@ -2,7 +2,7 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ test: { - include: ["**/*.browser.e2e.spec.ts"], + include: ["**/*.browser.e2e.spec.ts", "test/unit/**/*.spec.ts"], environment: "happy-dom", }, mode: "development", diff --git a/tests/e2e/get-integ-test-resources.js b/tests/e2e/get-integ-test-resources.js index d1daccb14393..8f6c6799a952 100644 --- a/tests/e2e/get-integ-test-resources.js +++ b/tests/e2e/get-integ-test-resources.js @@ -3,6 +3,7 @@ const { join } = require("path"); const { STSClient, GetCallerIdentityCommand } = require("@aws-sdk/client-sts"); const { CloudFormationClient, DescribeStackResourcesCommand } = require("@aws-sdk/client-cloudformation"); const { S3ControlClient, ListMultiRegionAccessPointsCommand } = require("@aws-sdk/client-s3-control"); +const { S3 } = require("@aws-sdk/client-s3"); const { ensureTestStack } = require("./ensure-test-stack"); const { deleteStaleChangesets } = require("./delete-stale-changesets"); @@ -42,6 +43,21 @@ exports.getIntegTestResources = async () => { const { Alias } = AccessPoints.find((accesspoint) => accesspoint.Name === multiRegionAccessPointName); const mrapArn = `arn:aws:s3::${AccountId}:accesspoint/${Alias}`; + const s3 = new S3({ region }); + await s3.putBucketCors({ + Bucket: bucketName, + CORSConfiguration: { + CORSRules: [ + { + AllowedOrigins: ["*"], + AllowedMethods: ["GET", "PUT", "POST", "DELETE", "HEAD"], + AllowedHeaders: ["*"], + ExposeHeaders: ["ETag"], + }, + ], + }, + }); + return { AWS_SMOKE_TEST_REGION: region, AWS_SMOKE_TEST_IDENTITY_POOL_ID: identityPoolId,