Skip to content

Commit 9de0ecb

Browse files
author
aws-amplify-bot
committed
Merge remote-tracking branch 'origin/main' into pre-prod/main
2 parents 58661b9 + 4c2b40e commit 9de0ecb

File tree

13 files changed

+765
-27
lines changed

13 files changed

+765
-27
lines changed

cspell.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,22 +1626,19 @@
16261626
"preconfigured",
16271627
"manylinux",
16281628
"GOARCH",
1629-
"norpc"
1630-
],
1631-
"flagWords": [
1632-
"hte",
1633-
"full-stack",
1634-
"Full-stack",
1635-
"Full-Stack",
1636-
"sudo"
1629+
"norpc",
1630+
"AWSSDKHTTP",
1631+
"HTTPAPI",
1632+
"AWSSDK",
1633+
"uppercased",
1634+
"autoclosure"
16371635
],
1636+
"flagWords": ["hte", "full-stack", "Full-stack", "Full-Stack", "sudo"],
16381637
"patterns": [
16391638
{
16401639
"name": "youtube-embed-ids",
16411640
"pattern": "/embedId=\".*\" /"
16421641
}
16431642
],
1644-
"ignoreRegExpList": [
1645-
"youtube-embed-ids"
1646-
]
1643+
"ignoreRegExpList": ["youtube-embed-ids"]
16471644
}

src/components/Layout/Layout.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
import { Modal } from '@/components/Modal';
3939
import { Gen1Banner } from '@/components/Gen1Banner';
4040
import { PinpointEOLBanner } from '@/components/PinpointEOLBanner';
41+
import { LexV1EOLBanner } from '../LexV1EOLBanner';
4142
import { ApiModalProvider } from '../ApiDocs/ApiModalProvider';
4243

4344
export const Layout = ({
@@ -283,9 +284,13 @@ export const Layout = ({
283284
<Gen1Banner currentPlatform={currentPlatform} />
284285
)}
285286
{(asPathWithNoHash.includes('/push-notifications/') ||
286-
asPathWithNoHash.includes('/analytics/')) && (
287+
asPathWithNoHash.includes('/analytics/') ||
288+
asPathWithNoHash.includes('/in-app-messaging/')) && (
287289
<PinpointEOLBanner />
288290
)}
291+
{asPathWithNoHash.includes('/interactions/') && (
292+
<LexV1EOLBanner />
293+
)}
289294
{children}
290295
{showNextPrev && <NextPrevious />}
291296
</Flex>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Callout } from '@/components/Callout';
2+
import Link from 'next/link';
3+
import classNames from 'classnames';
4+
5+
export const LexV1EOLBanner = () => {
6+
return (
7+
<Callout backgroundColor="background.error">
8+
<Link
9+
href="https://docs.aws.amazon.com/lex/latest/dg/migrate.html"
10+
passHref
11+
className={classNames('amplify-link')}
12+
>
13+
AWS will end support for Amazon Lex V1 on September 15, 2025,
14+
</Link>
15+
, and is no longer accepting any new users as of March 31. The guidance is
16+
to migrate to{' '}
17+
<Link
18+
href="https://docs.aws.amazon.com/lexv2/latest/dg/getting-started.html"
19+
passHref
20+
className={classNames('amplify-link')}
21+
>
22+
Amazon Lex V2.
23+
</Link>{' '}
24+
</Callout>
25+
);
26+
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { LexV1EOLBanner } from './LexV1EOLBanner';

src/fragments/lib-v1/flutter-maintenance.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Callout warning>
22

3-
Amplify Flutter v1 is now in **Maintenance Mode** until April 30th, 2025. This means that we will continue to include updates to ensure compatibility with backend services and security. No new features will be introduced in v1.
3+
Amplify Flutter v1 is **deprecated** as of April 30th, 2025. No new features or bug fixes will be added. Dependencies may become outdated and potentially introduce compatibility issues.
44

55
Please use the latest version (v2) of [Amplify Flutter](/gen1/[platform]/tools/libraries/) to get started.
66

src/fragments/lib-v1/project-setup/ios/combine/combine.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The `API.subscribe()` method exposes a `subscriptionDataPublisher` for the strea
107107

108108
##### `Hub.publisher(for:)`
109109

110-
The Amplify Hub category exposes only one Combine-related API: `Hub.publisher(for:)`, which returns a publisher for all events on a given channel. You can then apply the standard Combine [`filter`](<https://developer.apple.com/documentation/combine/anypublisher/filter(_:)>) operator to inspect only those events you care about.
110+
The Amplify Hub category exposes only one Combine-related API: `Hub.publisher(for:)`, which returns a publisher for all events on a given channel. You can then apply the standard Combine [`filter`](<https://developer.apple.com/documentation/combine/publishers/filter>) operator to inspect only those events you care about.
111111

112112
##### `Storage` upload & download operations
113113

src/fragments/lib/project-setup/ios/combine/combine.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ When using Amplify.Publisher, cancelling a subscription to a publisher also canc
4949

5050
## Hub.publisher(for:)
5151

52-
The Amplify Hub category exposes only one Combine-related API: `Hub.publisher(for:)`, which returns a publisher for all events on a given channel. You can then apply the standard Combine [`filter`](https://developer.apple.com/documentation/combine/anypublisher/filter(_:)) operator to inspect only those events you care about.
52+
The Amplify Hub category exposes only one Combine-related API: `Hub.publisher(for:)`, which returns a publisher for all events on a given channel. You can then apply the standard Combine [`filter`](https://developer.apple.com/documentation/combine/publishers/filter) operator to inspect only those events you care about.

0 commit comments

Comments
 (0)