Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
nodeLinker: node-modules

npmMinimalAgeGate: 0
5 changes: 5 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@
"Cocoapods",
"CocoaPods",
"CodeCommit",
"codeconnections",
"codegen",
"CODEGENJOB",
"COGNITO_USERPOOL_ID",
Expand Down Expand Up @@ -945,6 +946,7 @@
"nextsteps",
"ng-recaptcha",
"Nkjd",
"nitro", "nitropack",
"node_modules",
"Node.js.",
"node.js",
Expand Down Expand Up @@ -997,6 +999,7 @@
"OpenID",
"OpenSearch",
"opensearchservice",
"opennextjs",
"openssl",
"orderId",
"osis",
Expand Down Expand Up @@ -1157,6 +1160,7 @@
"ROOT_QUERY.listPosts",
"ROOT_QUERY",
"rootstack",
"rollouts",
"Route53",
"runOnUiThread",
"runtime's",
Expand Down Expand Up @@ -1460,6 +1464,7 @@
"xcworkspace",
"xfbml",
"xib",
"xlarge",
"xml",
"XR.start",
"xr",
Expand Down
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
import "./client/www/next-build/dev/types/routes.d.ts";
import "./.next/types/routes.d.ts";

// NOTE: This file should not be edited
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
90 changes: 90 additions & 0 deletions public/images/gen2/deploy-cycle-self-hosted.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 90 additions & 0 deletions public/images/gen2/deploy-cycle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 59 additions & 4 deletions redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -9656,12 +9656,12 @@
},
{
"source": "/gen2/deploy-and-host/fullstack-branching/",
"target": "/gen1/gen2/deploy-and-host/fullstack-branching/",
"target": "/react/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
"source": "/gen2/deploy-and-host/hosting/",
"target": "/gen1/gen2/deploy-and-host/hosting/",
"target": "/react/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
Expand Down Expand Up @@ -9836,12 +9836,12 @@
},
{
"source": "/gen1/gen2/deploy-and-host/hosting/",
"target": "/react/deploy-and-host/hosting/",
"target": "/react/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
"source": "/gen1/gen2/deploy-and-host/fullstack-branching/",
"target": "/react/deploy-and-host/fullstack-branching/",
"target": "/react/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
Expand Down Expand Up @@ -10433,5 +10433,60 @@
"source": "/<platform>/start/mcp-server/<*>",
"target": "/<platform>/develop-with-ai/mcp-server/<*>",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/hosting/",
"target": "/<platform>/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/hosting/<*>",
"target": "/<platform>/deploy-and-host/amplify-hosting/<*>",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/",
"target": "/<platform>/deploy-and-host/amplify-hosting/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/branch-deployments/",
"target": "/<platform>/deploy-and-host/amplify-hosting/branch-deployments/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/pr-previews/",
"target": "/<platform>/deploy-and-host/amplify-hosting/pr-previews/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/secrets-and-vars/",
"target": "/<platform>/deploy-and-host/amplify-hosting/secrets-and-vars/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/share-resources/",
"target": "/<platform>/deploy-and-host/amplify-hosting/share-resources/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/custom-pipelines/",
"target": "/<platform>/deploy-and-host/amplify-hosting/custom-pipelines/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/cross-account-deployments/",
"target": "/<platform>/deploy-and-host/amplify-hosting/cross-account-deployments/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/mono-and-multi-repos/",
"target": "/<platform>/deploy-and-host/amplify-hosting/mono-and-multi-repos/",
"status": "301"
},
{
"source": "/<platform>/deploy-and-host/fullstack-branching/monorepos/",
"target": "/<platform>/deploy-and-host/amplify-hosting/monorepos/",
"status": "301"
}
]
10 changes: 5 additions & 5 deletions src/components/FeatureLists/__tests__/FeatureLists.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ describe('FeatureLists', () => {
const featureListComponent = (
<FeatureList heading="Deploy" level={2}>
<FeatureItem
linkText="SSR/SSG/ISR hosting support"
href="/react/deploy-and-host/hosting/"
linkText="Managed hosting with Git CI/CD"
href="/react/deploy-and-host/amplify-hosting/"
>
Deploy apps in Next.js, Nuxt.js, Gatsby, React, Vue, Angular (and more)
by simply connecting your Git repository.
Connect your Git repository to Amplify Hosting. Your app builds and
deploys on every push with SSR, SSG, and ISR support.
</FeatureItem>
</FeatureList>
);
Expand All @@ -41,7 +41,7 @@ describe('FeatureLists', () => {
render(featureListComponent);

const link = await screen.findByRole('link', {
name: 'SSR/SSG/ISR hosting support'
name: 'Managed hosting with Git CI/CD'
});

expect(link).toBeInTheDocument();
Expand Down
2 changes: 1 addition & 1 deletion src/components/NextPrevious/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,5 @@ export const NEXT_PREVIOUS_SECTIONS = [
'/[platform]/build-a-backend/add-aws-services/',
'/[platform]/build-ui/formbuilder/',
'/[platform]/deploy-and-host/sandbox-environments/',
'/[platform]/deploy-and-host/fullstack-branching/'
'/[platform]/deploy-and-host/amplify-hosting/'
];
Loading
Loading