Merge branch 'aws-amplify:main' into main

src/fragments/lib-v1/restapi/flutter/authz.mdx

@@ -86,12 +86,6 @@ With this configuration, your access token will automatically be included in out
 
 ## OIDC
 
-<Callout>
-
-OIDC is not yet supported in REST on Android, but is available in GraphQL and DataStore. Please follow [the Github issue](https://github.com/aws-amplify/amplify-flutter/issues/978) for the latest updates.
-
-</Callout>
-
 import flutter0 from "/src/fragments/lib-v1/graphqlapi/flutter/authz/20_oidc.mdx";
 
 <Fragments fragments={{flutter: flutter0}} />

src/fragments/lib/auth/js/react-native-social.mdx

@@ -217,7 +217,7 @@ Amplify.configure(updatedAwsConfig);
 For React Native applications, you need to define a custom URL scheme for your application before testing locally or publishing to the app store. This is different for Expo or vanilla React Native. For Expo, follow the steps in [Expo Linking Guide](https://docs.expo.io/guides/linking/). For vanilla React Native, follow the steps in [React Native Linking Guide](https://reactnative.dev/docs/linking). After completing those steps, assuming you are using `myapp` as the name of your URL Scheme (or whatever friendly name you have chosen), you will use these URLs as *Sign in Redirect URI(s)* and/or *Sign out redirect URI(s)* inputs. Your URIs could look like any of these:
 
 - `myapp://`
-- `exp://127.0.0.1:19000/--/` (Local development if your app is running [in the Expo client](https://docs.expo.io/versions/latest/workflow/linking/#linking-to-your-app)).
+- `exp://127.0.0.1:19000/--/` (Local development if your app is running [in the Expo client](https://docs.expo.dev/guides/linking/#linking-to-your-app)).
 
 *React Native - iOS - Info.plist*
 

src/fragments/lib/restapi/flutter/authz.mdx

@@ -86,12 +86,6 @@ With this configuration, your access token will automatically be included in out
 
 ## OIDC
 
-<Callout>
-
-OIDC is not yet supported in REST on Android, but is available in GraphQL and DataStore. Please follow [the Github issue](https://github.com/aws-amplify/amplify-flutter/issues/978) for the latest updates.
-
-</Callout>
-
 import flutter0 from "/src/fragments/lib/graphqlapi/flutter/authz/20_oidc.mdx";
 
 <Fragments fragments={{flutter: flutter0}} />

src/fragments/lib/utilities/serviceworker.mdx

@@ -126,7 +126,7 @@ You can see those analytics events are related metrics in Amazon Pinpoint consol
 
 ## API Reference
 
-For the complete API documentation for ServiceWorker module, visit our [API Reference](https://aws-amplify.github.io/amplify-js/docs/api/classes/serviceworkerclass.html)
+For the complete API documentation for ServiceWorker module, visit our [API Reference](https://aws-amplify.github.io/amplify-js/api/classes/serviceworkerclass.html)
 
 ## Example Service Worker
 

src/pages/cli/graphql/custom-business-logic.mdx

@@ -504,10 +504,11 @@ Finally, add your custom resolvers into the `cdk-stack.ts` file. You can either
 
 #### Unit Resolver
 ```ts
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import * as AmplifyHelpers from '@aws-amplify/cli-extensibility-helper';
-import * as appsync from '@aws-cdk/aws-appsync';
+import * as appsync from 'aws-cdk-lib/aws-appsync';
 import { AmplifyDependentResourcesAttributes } from '../../types/amplify-dependent-resources-ref';
+import { Construct } from 'constructs';
 
 const requestVTL =`
 <YOUR CUSTOM VTL REQUEST MAPPING TEMPLATE HERE>
@@ -517,7 +518,7 @@ const responseVTL =`
 `
 
 export class cdkStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
     super(scope, id, props);
     /* Do not remove - Amplify CLI automatically injects the current deployment environment in this input parameter */
     new cdk.CfnParameter(this, 'env', {
@@ -553,10 +554,11 @@ export class cdkStack extends cdk.Stack {
 #### Pipeline Resolver
 
 ```ts 
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import * as AmplifyHelpers from '@aws-amplify/cli-extensibility-helper';
-import * as appsync from '@aws-cdk/aws-appsync';
+import * as appsync from 'aws-cdk-lib/aws-appsync';
 import { AmplifyDependentResourcesAttributes } from '../../types/amplify-dependent-resources-ref';
+import { Construct } from 'constructs';
 
 const beforeMappingVTL =`
 <YOUR CUSTOM VTL REQUEST MAPPING TEMPLATE HERE>
@@ -577,7 +579,7 @@ const function2responseVTL=`
 <YOUR CUSTOM VTL FUNCTION 2 RESPONSE MAPPING TEMPLATE HERE>
 `
 export class cdkStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
     super(scope, id, props);
     /* Do not remove - Amplify CLI automatically injects the current deployment environment in this input parameter */
     new cdk.CfnParameter(this, 'env', {

tasks/generate-sitemap.mjs

@@ -78,6 +78,9 @@ const writeRobots = () => {
   if (typeof process.env.ALLOW_ROBOTS === 'undefined') {
     robotsContent = `User-agent: *\nDisallow: /\n`;
   }
+  if (process.env.BUILD_ENV === 'production') {
+    robotsContent += `Sitemap: ${domain}/sitemap.xml\n`;
+  }
 
   const robotsPath = './public/robots.txt';
   fs.writeFileSync(robotsPath, robotsContent);