Skip to content

Commit 91faece

Browse files
authored
Merge branch 'aws-amplify:main' into main
2 parents 7714224 + f6b1943 commit 91faece

File tree

57 files changed

+483
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+483
-136
lines changed

.changeset/chatty-beans-begin.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@aws-amplify/backend-function': minor
3+
'@aws-amplify/backend-auth': minor
4+
'@aws-amplify/backend': minor
5+
'@aws-amplify/backend-storage': minor
6+
---
7+
8+
expose stack property for backend, function resource, storage resource, and auth resource

.changeset/fluffy-months-prove.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/backend-cli': patch
3+
---
4+
5+
correctly handle stack argument for generate schema command

.changeset/forty-squids-help.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@aws-amplify/schema-generator': patch
3+
'@aws-amplify/model-generator': patch
4+
'@aws-amplify/form-generator': patch
5+
---
6+
7+
Prefer amplify errors in generators

.changeset/four-drinks-yell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/plugin-types': minor
3+
---
4+
5+
add new type to handle exposing stack

.changeset/itchy-vans-behave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/backend-cli': patch
3+
---
4+
5+
update fallback for backend id resolvers if stack, app id, or branch are in args

.changeset/poor-owls-listen.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/rich-jokes-divide.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/silver-bulldogs-play.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/spicy-toys-scream.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/schema-generator': patch
3+
---
4+
5+
Handle schema errors

packages/backend-auth/API.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { OidcProviderProps } from '@aws-amplify/auth-construct';
2020
import { ResourceAccessAcceptor } from '@aws-amplify/plugin-types';
2121
import { ResourceAccessAcceptorFactory } from '@aws-amplify/plugin-types';
2222
import { ResourceProvider } from '@aws-amplify/plugin-types';
23+
import { StackProvider } from '@aws-amplify/plugin-types';
2324
import { TriggerEvent } from '@aws-amplify/auth-construct';
2425

2526
// @public
@@ -77,7 +78,7 @@ export type AuthLoginWithFactoryProps = Omit<AuthProps['loginWith'], 'externalPr
7778
};
7879

7980
// @public (undocumented)
80-
export type BackendAuth = ResourceProvider<AuthResources> & ResourceAccessAcceptorFactory<AuthRoleName | string>;
81+
export type BackendAuth = ResourceProvider<AuthResources> & ResourceAccessAcceptorFactory<AuthRoleName | string> & StackProvider;
8182

8283
// @public
8384
export const defineAuth: (props: AmplifyAuthProps) => ConstructFactory<BackendAuth>;

0 commit comments

Comments
 (0)