Skip to content

Commit f20902e

Browse files
sobermsoberm
authored
Merge branch 'main' into feat/changesets-migration
2 parents 0a39bf5 + 2e1c146 commit f20902e

File tree

23 files changed

+680
-162
lines changed

23 files changed

+680
-162
lines changed

‎packages/adapter-nextjs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.7.1",
55
"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
66
"peerDependencies": {
7-
"aws-amplify": "^6.13.1",
7+
"aws-amplify": "^6.16.1",
88
"next": ">=13.5.0 <17.0.0"
99
},
1010
"dependencies": {
@@ -14,7 +14,7 @@
1414
"@types/node": "^20.3.1",
1515
"@types/react": "^18.2.13",
1616
"@types/react-dom": "^18.2.6",
17-
"aws-amplify": "6.16.0",
17+
"aws-amplify": "6.16.1",
1818
"jest-fetch-mock": "3.0.3",
1919
"next": ">= 13.5.0 <17.0.0"
2020
},

‎packages/auth/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## 6.19.0
4+
5+
### Minor Changes
6+
7+
- [`85016ca`](https://github.com/aws-amplify/amplify-js/commit/85016ca4c286157de41a4466238cbe24af30a5d5) Thanks [@soberm](https://github.com/soberm)! - Test change
8+
39
All notable changes to this project will be documented in this file.
410
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
511

‎packages/auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/auth",
3-
"version": "6.18.0",
3+
"version": "6.19.0",
44
"description": "Auth category of aws-amplify",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.mjs",

‎packages/aws-amplify/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## 6.16.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`85016ca`](https://github.com/aws-amplify/amplify-js/commit/85016ca4c286157de41a4466238cbe24af30a5d5)]:
8+
- @aws-amplify/auth@6.19.0
9+
- @aws-amplify/storage@6.13.0
10+
311
All notable changes to this project will be documented in this file.
412
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
513

‎packages/aws-amplify/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-amplify",
3-
"version": "6.16.0",
3+
"version": "6.16.1",
44
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.mjs",
@@ -295,11 +295,11 @@
295295
"dependencies": {
296296
"@aws-amplify/analytics": "7.0.92",
297297
"@aws-amplify/api": "6.3.23",
298-
"@aws-amplify/auth": "6.18.0",
298+
"@aws-amplify/auth": "6.19.0",
299299
"@aws-amplify/core": "6.16.0",
300300
"@aws-amplify/datastore": "5.1.4",
301301
"@aws-amplify/notifications": "2.0.92",
302-
"@aws-amplify/storage": "6.12.0",
302+
"@aws-amplify/storage": "6.13.0",
303303
"tslib": "^2.5.0"
304304
},
305305
"size-limit": [

‎packages/core/__tests__/parseAmplifyOutputs.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ describe('parseAmplifyOutputs tests', () => {
189189
user_pool_id: 'us-east-1:test',
190190
user_pool_client_id: 'xxxx',
191191
aws_region: 'us-east-1',
192-
passwordless_options: {
192+
passwordless: {
193193
email_otp_enabled: true,
194194
sms_otp_enabled: true,
195195
web_authn: {
@@ -222,7 +222,7 @@ describe('parseAmplifyOutputs tests', () => {
222222
user_pool_id: 'us-east-1:test',
223223
user_pool_client_id: 'xxxx',
224224
aws_region: 'us-east-1',
225-
passwordless_options: {
225+
passwordless: {
226226
email_otp_enabled: true,
227227
sms_otp_enabled: false,
228228
preferred_challenge: 'EMAIL_OTP',

‎packages/core/src/parseAmplifyOutputs.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function parseAuth(
9090
username_attributes,
9191
standard_required_attributes,
9292
groups,
93-
passwordless_options,
93+
passwordless,
9494
} = amplifyOutputsAuthProperties;
9595

9696
const authConfig = {
@@ -160,18 +160,18 @@ function parseAuth(
160160
);
161161
}
162162

163-
if (passwordless_options) {
163+
if (passwordless) {
164164
authConfig.Cognito.passwordless = {
165-
emailOtpEnabled: passwordless_options.email_otp_enabled,
166-
smsOtpEnabled: passwordless_options.sms_otp_enabled,
167-
webAuthn: passwordless_options.web_authn
165+
emailOtpEnabled: passwordless.email_otp_enabled,
166+
smsOtpEnabled: passwordless.sms_otp_enabled,
167+
webAuthn: passwordless.web_authn
168168
? {
169-
relyingPartyId: passwordless_options.web_authn.relying_party_id,
170-
userVerification: passwordless_options.web_authn.user_verification,
169+
relyingPartyId: passwordless.web_authn.relying_party_id,
170+
userVerification: passwordless.web_authn.user_verification,
171171
}
172172
: undefined,
173173
preferredChallenge:
174-
passwordless_options.preferred_challenge as PreferredChallenge,
174+
passwordless.preferred_challenge as PreferredChallenge,
175175
};
176176
}
177177

‎packages/core/src/singleton/AmplifyOutputs/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface AmplifyOutputsAuthProperties {
4343
mfa_configuration?: string;
4444
mfa_methods?: string[];
4545
groups?: Partial<Record<UserGroupName, UserGroupPrecedence>>[];
46-
passwordless_options?: {
46+
passwordless?: {
4747
email_otp_enabled?: boolean;
4848
sms_otp_enabled?: boolean;
4949
web_authn?: {

‎packages/predictions/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## 6.1.68
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`85016ca`](https://github.com/aws-amplify/amplify-js/commit/85016ca4c286157de41a4466238cbe24af30a5d5)]:
8+
- @aws-amplify/storage@6.13.0
9+
310
All notable changes to this project will be documented in this file.
411
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
512

‎packages/predictions/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/predictions",
3-
"version": "6.1.67",
3+
"version": "6.1.68",
44
"description": "Machine learning category of aws-amplify",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.mjs",
@@ -43,7 +43,7 @@
4343
"src"
4444
],
4545
"dependencies": {
46-
"@aws-amplify/storage": "6.12.0",
46+
"@aws-amplify/storage": "6.13.0",
4747
"@aws-sdk/client-comprehend": "3.723.0",
4848
"@aws-sdk/client-polly": "3.723.0",
4949
"@aws-sdk/client-rekognition": "3.723.0",

0 commit comments

Comments
 (0)