diff --git a/packages/lib/package.json b/packages/lib/package.json index 7cfdaf114..b1474aa3a 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -29,8 +29,8 @@ "typescript": "4.9.4" }, "dependencies": { - "@aws-sdk/client-s3": "3.226.0", - "@aws-sdk/s3-request-presigner": "3.226.0", + "@aws-sdk/client-s3": "3.229.0", + "@aws-sdk/s3-request-presigner": "3.229.0", "@joplin/fork-htmlparser2": "^4.1.41", "@joplin/fork-sax": "^1.2.45", "@joplin/fork-uslug": "^1.0.6", diff --git a/packages/server/package.json b/packages/server/package.json index 0edaf9061..7a9a31894 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -21,7 +21,7 @@ "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json" }, "dependencies": { - "@aws-sdk/client-s3": "3.226.0", + "@aws-sdk/client-s3": "3.229.0", "@fortawesome/fontawesome-free": "5.15.4", "@joplin/lib": "~2.9", "@joplin/renderer": "~2.9", diff --git a/yarn.lock b/yarn.lock index e889893b1..944668993 100644 --- a/yarn.lock +++ b/yarn.lock @@ -164,16 +164,16 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/client-s3@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/client-s3@npm:3.226.0" +"@aws-sdk/client-s3@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/client-s3@npm:3.229.0" dependencies: "@aws-crypto/sha1-browser": 2.0.0 "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/client-sts": 3.226.0 + "@aws-sdk/client-sts": 3.229.0 "@aws-sdk/config-resolver": 3.226.0 - "@aws-sdk/credential-provider-node": 3.226.0 + "@aws-sdk/credential-provider-node": 3.229.0 "@aws-sdk/eventstream-serde-browser": 3.226.0 "@aws-sdk/eventstream-serde-config-resolver": 3.226.0 "@aws-sdk/eventstream-serde-node": 3.226.0 @@ -192,7 +192,7 @@ __metadata: "@aws-sdk/middleware-location-constraint": 3.226.0 "@aws-sdk/middleware-logger": 3.226.0 "@aws-sdk/middleware-recursion-detection": 3.226.0 - "@aws-sdk/middleware-retry": 3.226.0 + "@aws-sdk/middleware-retry": 3.229.0 "@aws-sdk/middleware-sdk-s3": 3.226.0 "@aws-sdk/middleware-serde": 3.226.0 "@aws-sdk/middleware-signing": 3.226.0 @@ -212,6 +212,7 @@ __metadata: "@aws-sdk/util-defaults-mode-browser": 3.226.0 "@aws-sdk/util-defaults-mode-node": 3.226.0 "@aws-sdk/util-endpoints": 3.226.0 + "@aws-sdk/util-retry": 3.229.0 "@aws-sdk/util-stream-browser": 3.226.0 "@aws-sdk/util-stream-node": 3.226.0 "@aws-sdk/util-user-agent-browser": 3.226.0 @@ -222,13 +223,13 @@ __metadata: "@aws-sdk/xml-builder": 3.201.0 fast-xml-parser: 4.0.11 tslib: ^2.3.1 - checksum: 5616e74c836dc9f202b5cd73ceb90c580a8a3319cc59a1bfa1dae49f001ade1e38e2a1fc842319ff443470fb63eb000e6acef727f7f95a1b96d360647386900b + checksum: 982874fcb2206ae29cc51ca765b50de5536bac7a0e4bd22fbfeee8c5163dcf49df093d61a239bb87dd27fb0267817ab89d4b2b1b918782272d7366d9063cbeb6 languageName: node linkType: hard -"@aws-sdk/client-sso-oidc@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/client-sso-oidc@npm:3.226.0" +"@aws-sdk/client-sso-oidc@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/client-sso-oidc@npm:3.229.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 @@ -241,7 +242,7 @@ __metadata: "@aws-sdk/middleware-host-header": 3.226.0 "@aws-sdk/middleware-logger": 3.226.0 "@aws-sdk/middleware-recursion-detection": 3.226.0 - "@aws-sdk/middleware-retry": 3.226.0 + "@aws-sdk/middleware-retry": 3.229.0 "@aws-sdk/middleware-serde": 3.226.0 "@aws-sdk/middleware-stack": 3.226.0 "@aws-sdk/middleware-user-agent": 3.226.0 @@ -257,18 +258,19 @@ __metadata: "@aws-sdk/util-defaults-mode-browser": 3.226.0 "@aws-sdk/util-defaults-mode-node": 3.226.0 "@aws-sdk/util-endpoints": 3.226.0 + "@aws-sdk/util-retry": 3.229.0 "@aws-sdk/util-user-agent-browser": 3.226.0 "@aws-sdk/util-user-agent-node": 3.226.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: 911e3484bba6b500da9817734851614d11f00ade21ad77d9ec722dc60f37ed1154dc12d37faf55ea425f750277fc361e71a39bddbda86c05fef0981db258bd1d + checksum: 031bedebd213f7f2522321abb55bb50a2271e4d63ad38e3596eab6daeddb39044a4d72f554fc3e716ea4108317b3169ffb681b6e75f45ec83f730619b588eac6 languageName: node linkType: hard -"@aws-sdk/client-sso@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/client-sso@npm:3.226.0" +"@aws-sdk/client-sso@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/client-sso@npm:3.229.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 @@ -281,7 +283,7 @@ __metadata: "@aws-sdk/middleware-host-header": 3.226.0 "@aws-sdk/middleware-logger": 3.226.0 "@aws-sdk/middleware-recursion-detection": 3.226.0 - "@aws-sdk/middleware-retry": 3.226.0 + "@aws-sdk/middleware-retry": 3.229.0 "@aws-sdk/middleware-serde": 3.226.0 "@aws-sdk/middleware-stack": 3.226.0 "@aws-sdk/middleware-user-agent": 3.226.0 @@ -297,23 +299,24 @@ __metadata: "@aws-sdk/util-defaults-mode-browser": 3.226.0 "@aws-sdk/util-defaults-mode-node": 3.226.0 "@aws-sdk/util-endpoints": 3.226.0 + "@aws-sdk/util-retry": 3.229.0 "@aws-sdk/util-user-agent-browser": 3.226.0 "@aws-sdk/util-user-agent-node": 3.226.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: c0747f2e8611e3aa1b46a6a0c44e8ed53271853a43999ec7d94d228c962b88c0f7dd6a9b4c6fe10b0224e31a57d78787753635357fb014c7ceb9125a9eaaac38 + checksum: 970e6ea9666a6e976f0b4e7f693e286ade8c090aca1ae780835050623f5d8bd3ecbc0336d1b3f4037e92d50c48b5d18d5ad6d595ddb62db7efe38b90ab928129 languageName: node linkType: hard -"@aws-sdk/client-sts@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/client-sts@npm:3.226.0" +"@aws-sdk/client-sts@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/client-sts@npm:3.229.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 "@aws-sdk/config-resolver": 3.226.0 - "@aws-sdk/credential-provider-node": 3.226.0 + "@aws-sdk/credential-provider-node": 3.229.0 "@aws-sdk/fetch-http-handler": 3.226.0 "@aws-sdk/hash-node": 3.226.0 "@aws-sdk/invalid-dependency": 3.226.0 @@ -322,7 +325,7 @@ __metadata: "@aws-sdk/middleware-host-header": 3.226.0 "@aws-sdk/middleware-logger": 3.226.0 "@aws-sdk/middleware-recursion-detection": 3.226.0 - "@aws-sdk/middleware-retry": 3.226.0 + "@aws-sdk/middleware-retry": 3.229.0 "@aws-sdk/middleware-sdk-sts": 3.226.0 "@aws-sdk/middleware-serde": 3.226.0 "@aws-sdk/middleware-signing": 3.226.0 @@ -340,13 +343,14 @@ __metadata: "@aws-sdk/util-defaults-mode-browser": 3.226.0 "@aws-sdk/util-defaults-mode-node": 3.226.0 "@aws-sdk/util-endpoints": 3.226.0 + "@aws-sdk/util-retry": 3.229.0 "@aws-sdk/util-user-agent-browser": 3.226.0 "@aws-sdk/util-user-agent-node": 3.226.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 fast-xml-parser: 4.0.11 tslib: ^2.3.1 - checksum: df44bfa28034e6361fc300ce42350ad975afcfae833a59bf8b9ccee8f8f4cc606258b905fa34b052eeb71941d1d471ba89c9b6df7bc0188147038082626c1155 + checksum: 18d357f2433ef832948f867c0e22ba34ac57c096e8b5209e0203d892acab9de60d9114a513f8ec9354ec83a89652a8285a49f89ee3203cededc514a25eea67f5 languageName: node linkType: hard @@ -387,37 +391,37 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/credential-provider-ini@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/credential-provider-ini@npm:3.226.0" +"@aws-sdk/credential-provider-ini@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/credential-provider-ini@npm:3.229.0" dependencies: "@aws-sdk/credential-provider-env": 3.226.0 "@aws-sdk/credential-provider-imds": 3.226.0 - "@aws-sdk/credential-provider-sso": 3.226.0 + "@aws-sdk/credential-provider-sso": 3.229.0 "@aws-sdk/credential-provider-web-identity": 3.226.0 "@aws-sdk/property-provider": 3.226.0 "@aws-sdk/shared-ini-file-loader": 3.226.0 "@aws-sdk/types": 3.226.0 tslib: ^2.3.1 - checksum: ed1a0db8eddaeb6d8ad181c11c317c1e2c53061d03444252d5d142897e02c655848728f00b356fce7799bffacacb40a4ca0680098b904cfc798914206ef60290 + checksum: fb573675c0c34c7fa0e207c78190bce73e42fc1713d93a25868b50002352a70f3584e2ab0a0b249103bcf25c3a60c26261ad3dcfc1d6280b4f5dc8ad4e4b3f49 languageName: node linkType: hard -"@aws-sdk/credential-provider-node@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/credential-provider-node@npm:3.226.0" +"@aws-sdk/credential-provider-node@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/credential-provider-node@npm:3.229.0" dependencies: "@aws-sdk/credential-provider-env": 3.226.0 "@aws-sdk/credential-provider-imds": 3.226.0 - "@aws-sdk/credential-provider-ini": 3.226.0 + "@aws-sdk/credential-provider-ini": 3.229.0 "@aws-sdk/credential-provider-process": 3.226.0 - "@aws-sdk/credential-provider-sso": 3.226.0 + "@aws-sdk/credential-provider-sso": 3.229.0 "@aws-sdk/credential-provider-web-identity": 3.226.0 "@aws-sdk/property-provider": 3.226.0 "@aws-sdk/shared-ini-file-loader": 3.226.0 "@aws-sdk/types": 3.226.0 tslib: ^2.3.1 - checksum: e015d97c354743e91855729b05db80926da8c16e3170c89699f6519b5911ea4ccd95822ecce6633315e08310c59aa374bb90e56764920241cfffb0b736eda432 + checksum: a8ad0f6aeb3c7ee03937e7389dbcabeb81f2a6e23c3bfeb84f518b063fb156a2d2f2e4a7267655c6bdfa178ba51e9e0ea74c98397dd6dd58b9a315d9e5a4a6de languageName: node linkType: hard @@ -433,17 +437,17 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/credential-provider-sso@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/credential-provider-sso@npm:3.226.0" +"@aws-sdk/credential-provider-sso@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/credential-provider-sso@npm:3.229.0" dependencies: - "@aws-sdk/client-sso": 3.226.0 + "@aws-sdk/client-sso": 3.229.0 "@aws-sdk/property-provider": 3.226.0 "@aws-sdk/shared-ini-file-loader": 3.226.0 - "@aws-sdk/token-providers": 3.226.0 + "@aws-sdk/token-providers": 3.229.0 "@aws-sdk/types": 3.226.0 tslib: ^2.3.1 - checksum: 1fc6631926569ab17cc5f69cfa836b35a0f985bee6e760af46892961547e1f8f7376955ab8f404c1aa1e9c3edffe5965b5fa4feb09b2b791694415c4dea26fec + checksum: 9497a8c5dfddf70a4740e9e485cea757070a6e9c5c94469cc51599918f2689f6ca794fcaba98320b20aa7b81e7e56c3b91f11d3cf8111335e445638825d0ee58 languageName: node linkType: hard @@ -697,17 +701,17 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/middleware-retry@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/middleware-retry@npm:3.226.0" +"@aws-sdk/middleware-retry@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/middleware-retry@npm:3.229.0" dependencies: "@aws-sdk/protocol-http": 3.226.0 - "@aws-sdk/service-error-classification": 3.226.0 + "@aws-sdk/service-error-classification": 3.229.0 "@aws-sdk/types": 3.226.0 "@aws-sdk/util-middleware": 3.226.0 tslib: ^2.3.1 uuid: ^8.3.2 - checksum: 08da2eabddb6400a71d07f4e59dfe32d763089f070c42ab6ffc41a4028f05561efa974d19cf45c3e9227f79aea98175222ce9892941889a43939fecc1a39f48b + checksum: a146879b0d4d940aed398c4bfd288b28e678bff7cbe04983123caf3bcb73fecc801ec19d13ca82ac1b2977515dc71ebe28efc400c07839004213017f93369b04 languageName: node linkType: hard @@ -858,9 +862,9 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/s3-request-presigner@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/s3-request-presigner@npm:3.226.0" +"@aws-sdk/s3-request-presigner@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/s3-request-presigner@npm:3.229.0" dependencies: "@aws-sdk/middleware-endpoint": 3.226.0 "@aws-sdk/middleware-sdk-s3": 3.226.0 @@ -871,14 +875,14 @@ __metadata: "@aws-sdk/util-create-request": 3.226.0 "@aws-sdk/util-format-url": 3.226.0 tslib: ^2.3.1 - checksum: 5eefe3404faba363e113b5b06e25f21fc5a0028d58c71c8dc47e80121e3988e05967a159c795ca9a565e3ea2d7a7f2e4efe390d71e1de89b4bef069f6e57e910 + checksum: b609e5e2c396ef290dc27bad4bac2908f1f6dd375fdfa6348aa3c5232c8bfb26fd283fd37c149f2e4a9148b8589b9c96d19b70ff120de31e394f94e83f02a397 languageName: node linkType: hard -"@aws-sdk/service-error-classification@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/service-error-classification@npm:3.226.0" - checksum: 4b3e9741ee58285b6bdec303b09090b638cc99ff09d2fac660d638da5fdf391ccfeb62f4af5065c975ed272040652c5c52557e599613af9577acfe3cf328ab04 +"@aws-sdk/service-error-classification@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/service-error-classification@npm:3.229.0" + checksum: 7877963d62f4d43ce5116f0ddfd1b27cffab2b0e74a4ceb4006b1f85b17dd50eb9ae2f227cabf935261e42b7615d0a9de190dd684380c30e03dee6e9f7e12587 languageName: node linkType: hard @@ -935,16 +939,16 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/token-providers@npm:3.226.0": - version: 3.226.0 - resolution: "@aws-sdk/token-providers@npm:3.226.0" +"@aws-sdk/token-providers@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/token-providers@npm:3.229.0" dependencies: - "@aws-sdk/client-sso-oidc": 3.226.0 + "@aws-sdk/client-sso-oidc": 3.229.0 "@aws-sdk/property-provider": 3.226.0 "@aws-sdk/shared-ini-file-loader": 3.226.0 "@aws-sdk/types": 3.226.0 tslib: ^2.3.1 - checksum: f9e26e7126f7df5ed94af129e75d2910c5784c3c37e79fdf940645bc07dee44e8cddaa487fac19bceab445c473be6864a49b9471f0b6df95607df32f7b786a99 + checksum: b099537ba47f3c2520f8081590ef97d22279aea39fcb1f3883f611273c8f15f4190d7b44f3f2debfdb36900f124e5f188193b039ce95c45c6e20d3b48ef9a3da languageName: node linkType: hard @@ -1117,6 +1121,16 @@ __metadata: languageName: node linkType: hard +"@aws-sdk/util-retry@npm:3.229.0": + version: 3.229.0 + resolution: "@aws-sdk/util-retry@npm:3.229.0" + dependencies: + "@aws-sdk/service-error-classification": 3.229.0 + tslib: ^2.3.1 + checksum: e4ab435000abfa1dc21153682ce684302bd6e69d48b7d2c876ff8dfa66793a43223961a3755d05abb1f94f82765eac2b9d48e55c688a957a7f6b5d032bbc46ee + languageName: node + linkType: hard + "@aws-sdk/util-stream-browser@npm:3.226.0": version: 3.226.0 resolution: "@aws-sdk/util-stream-browser@npm:3.226.0" @@ -4417,8 +4431,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joplin/lib@workspace:packages/lib" dependencies: - "@aws-sdk/client-s3": 3.226.0 - "@aws-sdk/s3-request-presigner": 3.226.0 + "@aws-sdk/client-s3": 3.229.0 + "@aws-sdk/s3-request-presigner": 3.229.0 "@joplin/fork-htmlparser2": ^4.1.41 "@joplin/fork-sax": ^1.2.45 "@joplin/fork-uslug": ^1.0.6 @@ -4609,7 +4623,7 @@ __metadata: version: 0.0.0-use.local resolution: "@joplin/server@workspace:packages/server" dependencies: - "@aws-sdk/client-s3": 3.226.0 + "@aws-sdk/client-s3": 3.229.0 "@fortawesome/fontawesome-free": 5.15.4 "@joplin/lib": ~2.9 "@joplin/renderer": ~2.9