chore: resolve conflicts with merge back

Ashwin Kumar · Ashwin Kumar · commit 0b9403feb51a · 2025-04-28T17:51:14.000-07:00
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -103,8 +103,8 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
-		"@aws-amplify/react-native": "1.1.8",
+		"@aws-amplify/core": "6.11.4",
+		"@aws-amplify/react-native": "1.1.9",
 		"@aws-sdk/types": "3.398.0"
 	}
 }
diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -87,8 +87,8 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
-		"@aws-amplify/react-native": "1.1.8",
+		"@aws-amplify/core": "6.11.4",
+		"@aws-amplify/react-native": "1.1.9",
 		"@aws-sdk/types": "3.387.0"
 	}
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -68,7 +68,7 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
+		"@aws-amplify/core": "6.11.4",
 		"jest-fetch-mock": "3.0.3"
 	},
 	"files": [
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -99,8 +99,8 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
-		"@aws-amplify/react-native": "1.1.8",
+		"@aws-amplify/core": "6.11.4",
+		"@aws-amplify/react-native": "1.1.9",
 		"@jest/test-sequencer": "^29.7.0"
 	}
 }
diff --git a/packages/geo/package.json b/packages/geo/package.json
@@ -77,7 +77,7 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3"
+		"@aws-amplify/core": "6.11.4"
 	},
 	"size-limit": [
 		{
diff --git a/packages/interactions/package.json b/packages/interactions/package.json
@@ -81,7 +81,7 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3"
+		"@aws-amplify/core": "6.11.4"
 	},
 	"size-limit": [
 		{
diff --git a/packages/notifications/package.json b/packages/notifications/package.json
@@ -99,7 +99,7 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
-		"@aws-amplify/react-native": "1.1.8"
+		"@aws-amplify/core": "6.11.4",
+		"@aws-amplify/react-native": "1.1.9"
 	}
 }
diff --git a/packages/predictions/package.json b/packages/predictions/package.json
@@ -59,7 +59,7 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3"
+		"@aws-amplify/core": "6.11.4"
 	},
 	"size-limit": [
 		{
diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json
@@ -84,7 +84,7 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3"
+		"@aws-amplify/core": "6.11.4"
 	},
 	"size-limit": [
 		{
diff --git a/packages/storage/package.json b/packages/storage/package.json
@@ -111,8 +111,8 @@
 		"@aws-amplify/core": "^6.1.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/core": "6.11.3",
-		"@aws-amplify/react-native": "1.1.8",
+		"@aws-amplify/core": "6.11.4",
+		"@aws-amplify/react-native": "1.1.9",
 		"@types/node": "20.14.12"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@`
`103`	`103`	`"@aws-amplify/core": "^6.1.0"`
`104`	`104`	`},`
`105`	`105`	`"devDependencies": {`
`106`		`- "@aws-amplify/core": "6.11.3",`
`107`		`- "@aws-amplify/react-native": "1.1.8",`
	`106`	`+ "@aws-amplify/core": "6.11.4",`
	`107`	`+ "@aws-amplify/react-native": "1.1.9",`
`108`	`108`	`"@aws-sdk/types": "3.398.0"`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,8 @@`
`87`	`87`	`"@aws-amplify/core": "^6.1.0"`
`88`	`88`	`},`
`89`	`89`	`"devDependencies": {`
`90`		`- "@aws-amplify/core": "6.11.3",`
`91`		`- "@aws-amplify/react-native": "1.1.8",`
	`90`	`+ "@aws-amplify/core": "6.11.4",`
	`91`	`+ "@aws-amplify/react-native": "1.1.9",`
`92`	`92`	`"@aws-sdk/types": "3.387.0"`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@`
`99`	`99`	`"@aws-amplify/core": "^6.1.0"`
`100`	`100`	`},`
`101`	`101`	`"devDependencies": {`
`102`		`- "@aws-amplify/core": "6.11.3",`
`103`		`- "@aws-amplify/react-native": "1.1.8",`
	`102`	`+ "@aws-amplify/core": "6.11.4",`
	`103`	`+ "@aws-amplify/react-native": "1.1.9",`
`104`	`104`	`"@jest/test-sequencer": "^29.7.0"`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`"@aws-amplify/core": "^6.1.0"`
`78`	`78`	`},`
`79`	`79`	`"devDependencies": {`
`80`		`- "@aws-amplify/core": "6.11.3"`
	`80`	`+ "@aws-amplify/core": "6.11.4"`
`81`	`81`	`},`
`82`	`82`	`"size-limit": [`
`83`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	`"uuid": "^9.0.0"`
`82`	`82`	`},`
`83`	`83`	`"devDependencies": {`
`84`		`- "@aws-amplify/core": "6.11.3"`
	`84`	`+ "@aws-amplify/core": "6.11.4"`
`85`	`85`	`},`
`86`	`86`	`"size-limit": [`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@`
`99`	`99`	`"@aws-amplify/core": "^6.1.0"`
`100`	`100`	`},`
`101`	`101`	`"devDependencies": {`
`102`		`- "@aws-amplify/core": "6.11.3",`
`103`		`- "@aws-amplify/react-native": "1.1.8"`
	`102`	`+ "@aws-amplify/core": "6.11.4",`
	`103`	`+ "@aws-amplify/react-native": "1.1.9"`
`104`	`104`	`}`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`"@aws-amplify/core": "^6.1.0"`
`60`	`60`	`},`
`61`	`61`	`"devDependencies": {`
`62`		`- "@aws-amplify/core": "6.11.3"`
	`62`	`+ "@aws-amplify/core": "6.11.4"`
`63`	`63`	`},`
`64`	`64`	`"size-limit": [`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`"@aws-amplify/core": "^6.1.0"`
`85`	`85`	`},`
`86`	`86`	`"devDependencies": {`
`87`		`- "@aws-amplify/core": "6.11.3"`
	`87`	`+ "@aws-amplify/core": "6.11.4"`
`88`	`88`	`},`
`89`	`89`	`"size-limit": [`
`90`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@`
`111`	`111`	`"@aws-amplify/core": "^6.1.0"`
`112`	`112`	`},`
`113`	`113`	`"devDependencies": {`
`114`		`- "@aws-amplify/core": "6.11.3",`
`115`		`- "@aws-amplify/react-native": "1.1.8",`
	`114`	`+ "@aws-amplify/core": "6.11.4",`
	`115`	`+ "@aws-amplify/react-native": "1.1.9",`
`116`	`116`	`"@types/node": "20.14.12"`
`117`	`117`	`}`
`118`	`118`	`}`