Skip to content

Commit 966e82b

Browse files
authored
Merge branch 'aws-amplify:main' into main
2 parents b7e7682 + f169e9b commit 966e82b

File tree

35 files changed

+236
-359
lines changed

35 files changed

+236
-359
lines changed

generatePathMap.cjs.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ function generatePathMap(
114114
},
115115
'/cli/function': {
116116
page: '/cli/function'
117+
},
118+
'/flutter-references': {
119+
page: '/flutter-references'
120+
},
121+
'/contribute': {
122+
page: '/contribute'
117123
}
118124
},
119125
removeChoosePages = false //this flag if set will generate a pathmap without the choose platform pages

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"@algolia/autocomplete-shared": "^1.5.6",
1919
"@algolia/autocomplete-theme-classic": "^1.6.1",
2020
"@algolia/client-search": "^4.13.0",
21-
"@aws-amplify/amplify-cli-core": "^4.0.1",
21+
"@aws-amplify/amplify-cli-core": "^4.0.2",
2222
"@aws-amplify/ui-components": "latest",
23-
"@aws-amplify/ui-react": "^4.4.3",
23+
"@aws-amplify/ui-react": "^4.6.0",
2424
"@emotion/react": "^11.1.5",
2525
"@emotion/styled": "^11.3.0",
2626
"@mdx-js/mdx": "^2.0.0",
@@ -96,7 +96,8 @@
9696
"loader-utils": "2.0.4",
9797
"minimatch": "3.0.5",
9898
"json5": "2.2.2",
99-
"decode-uri-component": "0.2.1"
99+
"decode-uri-component": "0.2.1",
100+
"vm2": "3.9.15"
100101
},
101102
"jest": {
102103
"preset": "ts-jest",

src/components/contribute/QuickstartResources.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default function QuickstartResources() {
1919
<Flex wrap={'wrap'} justifyContent={'center'} width="100%" gap="2em">
2020
<View width={{ base: '90%', large: '40%' }}>
2121
<iframe
22+
sandbox
2223
width="600"
2324
height="350"
2425
src="https://www.youtube-nocookie.com/embed/8BUSqSkhqtw"
@@ -30,6 +31,7 @@ export default function QuickstartResources() {
3031
</View>
3132
<View width={{ base: '90%', large: '40%' }}>
3233
<iframe
34+
sandbox
3335
width="600"
3436
height="350"
3537
src="https://www.youtube-nocookie.com/embed/WMKVE98hEzE"

src/directory/directory.mjs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -820,21 +820,6 @@ export const directory = {
820820
}
821821
]
822822
},
823-
xr: {
824-
title: 'XR',
825-
items: [
826-
{
827-
title: 'Getting started',
828-
route: '/lib/xr/getting-started',
829-
filters: ['js']
830-
},
831-
{
832-
title: 'Scene API',
833-
route: '/lib/xr/sceneapi',
834-
filters: ['js']
835-
}
836-
]
837-
},
838823
utilities: {
839824
title: 'Utilities',
840825
items: [
@@ -1760,6 +1745,11 @@ export const directory = {
17601745
route: '/cli/graphql/schema-evolution',
17611746
filters: []
17621747
},
1748+
{
1749+
title: 'Directives reference',
1750+
route: '/cli/graphql/directives-reference',
1751+
filters: []
1752+
},
17631753
{
17641754
title: 'JavaScript, Java, Swift code generation',
17651755
route: '/cli/graphql/client-code-generation',

src/fragments/cli-config.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Successfully set up the new user.
7777
Watch the video below to learn how to install and configure the Amplify CLI or skip to the next section to follow the step-by-step instructions.
7878

7979
<iframe
80+
sandbox
8081
src="https://www.youtube-nocookie.com/embed/fWbM5DLh25U"
8182
frameborder="0"
8283
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
In this video you will learn how to configure a custom domain using the Amplify Console.
22

3-
<iframe src="https://www.youtube-nocookie.com/embed/uaG2mMYLI68" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
3+
<iframe sandbox src="https://www.youtube-nocookie.com/embed/uaG2mMYLI68" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

src/fragments/guides/hosting/nextjs.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
In this guide you'll learn how to deploy a [Next.js](https://nextjs.org/) app using Amplify Hosting. Amplify supports the hosting of static apps and apps with dynamic server-side rendered routes (SSR).
22

3-
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/eqoZrXulE8A" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
3+
<iframe sandbox width="560" height="315" src="https://www.youtube-nocookie.com/embed/eqoZrXulE8A" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
44

55
## Prerequisites
66

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
In this video you will learn how to configure password-protection for your Amplify web deployments using the Amplify Console.
22

3-
<iframe src="https://www.youtube-nocookie.com/embed/QIxm9HPefT0" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
3+
<iframe sandbox src="https://www.youtube-nocookie.com/embed/QIxm9HPefT0" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
In this video you will learn how to enable Pull Request Previews using the Amplify Console.
22

3-
<iframe src="https://www.youtube-nocookie.com/embed/NMln6UpcodE" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
3+
<iframe sandbox src="https://www.youtube-nocookie.com/embed/NMln6UpcodE" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

src/fragments/lib-v1/datastore/native_common/how-it-works.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Amplify DataStore provides a persistent on-device storage repository for you to
33

44
## How it Works
55

6-
<iframe src="https://www.youtube-nocookie.com/embed/KcYl6_We0EU" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
6+
<iframe sandbox src="https://www.youtube-nocookie.com/embed/KcYl6_We0EU" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
77

88
Amplify DataStore is an on device persistent repository for interacting with your local data while it synchronizes with the cloud. The core idea is to focus on your data modeling in your application with GraphQL, adding any authorization rules or business logic into your application when needed. This can be done using Amplify CLI project functionality (`amplify add auth` or `amplify add function`) as well as the [GraphQL Transformer](/cli/graphql/overview).
99

0 commit comments

Comments
 (0)