Chore: Revert AWS package upgrade due to failing mobile build

packages/app-cli/package.json

@@ -44,7 +44,7 @@
     "@joplin/lib": "~2.11",
     "@joplin/renderer": "~2.11",
     "@joplin/utils": "~2.11",
-    "aws-sdk": "2.1363.0",
+    "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
     "fs-extra": "11.1.1",

packages/lib/package.json

@@ -29,8 +29,8 @@
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.317.0",
+    "@aws-sdk/client-s3": "3.296.0",
-    "@aws-sdk/s3-request-presigner": "3.317.0",
+    "@aws-sdk/s3-request-presigner": "3.296.0",
     "@joplin/fork-htmlparser2": "^4.1.43",
     "@joplin/fork-sax": "^1.2.47",
     "@joplin/fork-uslug": "^1.0.8",

packages/server/package.json

@@ -21,7 +21,7 @@
     "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.317.0",
+    "@aws-sdk/client-s3": "3.296.0",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joplin/lib": "~2.11",
     "@joplin/renderer": "~2.11",

renovate.json5

@@ -120,6 +120,31 @@
 		// (v0.5.0). Doesn't seem serious unfortunately.
 		// https://github.com/Leonidas-from-XIV/node-xml2js/issues/677
 		"xml2js",
+
+		// Looks like upgrading AWS causes the mobile build to fail with the following error:
+		//
+		// error: Error: Unable to resolve module @aws-sdk/chunked-blob-reader from /Users/laurent/src/joplin/packages/lib/node_modules/@aws-sdk/hash-blob-browser/dist-cjs/index.js: @aws-sdk/chunked-blob-reader could not be found within the project or in these directories:
+		//   ../lib/node_modules
+		//   ../../node_modules
+		//   ../../../node_modules
+		//   /Users/laurent/src/joplin/packages/app-mobile/node_modules/@aws-sdk/chunked-blob-reader
+		//   2 | Object.defineProperty(exports, "__esModule", { value: true });
+		//   3 | exports.blobHasher = void 0;
+		// > 4 | const chunked_blob_reader_1 = require("@aws-sdk/chunked-blob-reader");
+		//     |                                        ^
+		//   5 | const blobHasher = async function blobHasher(hashCtor, blob) {
+		//   6 |     const hash = new hashCtor();
+		//   7 |     await (0, chunked_blob_reader_1.blobReader)(blob, (chunk) => {
+		//     at ModuleResolver.resolveDependency (/Users/laurent/src/joplin/packages/app-mobile/node_modules/metro/src/node-haste/DependencyGraph/ModuleResolution.js:178:15)
+		//
+		// Started failing with:
+		//
+		//  "aws-sdk": "2.1340.0"
+		// "@aws-sdk/client-s3": "3.296.0"
+		// "@aws-sdk/s3-request-presigner": "3.296.0"
+		"aws-sdk",
+		"@aws-sdk/client-s3",
+		"@aws-sdk/s3-request-presigner",
 	],
 	"packageRules": [
 		{
@@ -150,18 +175,18 @@
 				"@types/*",
 			],
 		},
-		{
+		// {
-			"matchUpdateTypes": ["minor", "patch"],
+		// 	"matchUpdateTypes": ["minor", "patch"],
-			"automerge": true,
+		// 	"automerge": true,
-			"groupName": "aws",
+		// 	"groupName": "aws",
-			"labels": ["automerge"],
+		// 	"labels": ["automerge"],
-			"extends": ["schedule:monthly"],
+		// 	"extends": ["schedule:monthly"],
-			"matchPackagePatterns": [
+		// 	"matchPackagePatterns": [
-				// AWS packages are updated too frequently and we can assume minor
+		// 		// AWS packages are updated too frequently and we can assume minor
-				// updates are stable.
+		// 		// updates are stable.
-				"@aws-sdk/*",
+		// 		"@aws-sdk/*",
-				"aws-sdk",
+		// 		"aws-sdk",
-			],
+		// 	],
-		},
+		// },
 	]
 }