Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(angular): Support strict: true #890

Merged
merged 11 commits into from
Dec 1, 2021
Merged

fix(angular): Support strict: true #890

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50c3128
Set strict to true
wlee221 Nov 26, 2021
ff8eb05
Merge branch 'main' into angular/strict
wlee221 Dec 1, 2021
78b152b
Update yarn.lock to use latest aws-amplify
wlee221 Dec 1, 2021
990fd12
Use `Required` to prevent types from being undefined
wlee221 Dec 1, 2021
1a2342b
Fix implicitAnyIndex error
wlee221 Dec 1, 2021
a821253
Add `.d.ts` for `aws-export`s
wlee221 Dec 1, 2021
96c6a5b
Create khaki-hounds-brush.md
wlee221 Dec 1, 2021
aac0bb4
Update .changeset/khaki-hounds-brush.md
wlee221 Dec 1, 2021
a79d704
Use matching aws-sdk versions
wlee221 Dec 1, 2021
fc66ea1
Merge branch 'main' into angular/strict
wlee221 Dec 1, 2021
8964373
Update yarn.lock
wlee221 Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/khaki-hounds-brush.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aws-amplify/ui": patch
wlee221 marked this conversation as resolved.
Show resolved Hide resolved
---

fix(angular): Add first class support for `strict: true`
2 changes: 1 addition & 1 deletion examples/angular/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class AppComponent {

constructor() {
if (typeof window !== 'undefined') {
window['Amplify'] = Amplify;
(window as any)['Amplify'] = Amplify;
}
}
}
2 changes: 2 additions & 0 deletions ...ples/angular/src/pages/ui/components/authenticator/custom-sign-up-fields/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/custom-slots/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/i18n/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/modal/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/reset-password/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-federated/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-sms-mfa/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-totp-mfa/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-totp-sms/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-with-email/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-in-with-phone/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...ples/angular/src/pages/ui/components/authenticator/sign-in-with-username/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...es/angular/src/pages/ui/components/authenticator/sign-up-with-attributes/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .../angular/src/pages/ui/components/authenticator/sign-up-with-email-lambda/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-up-with-email/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/angular/src/pages/ui/components/authenticator/sign-up-with-phone/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...ples/angular/src/pages/ui/components/authenticator/sign-up-with-username/aws-exports.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/angular/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"module": "es2020",
"lib": ["es2018", "dom"],
"esModuleInterop": true,
"strict": true,
"paths": {
"@aws-amplify/ui-angular": ["../../packages/angular/dist/ui-angular"],
"@aws-amplify/ui-angular/*": ["../../packages/angular/dist/ui-angular/*"],
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/types/authMachine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ interface BaseFormContext {
}

export interface SignInContext extends BaseFormContext {
loginMechanisms: AuthContext['config']['loginMechanisms'];
socialProviders: AuthContext['config']['socialProviders'];
loginMechanisms: Required<AuthContext>['config']['loginMechanisms'];
socialProviders: Required<AuthContext>['config']['socialProviders'];
Comment on lines +31 to +32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is adding Required going to cause any of the frameworks to complain if these props aren't passed into the authenticator?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, because the parent machine have default values for loginMechanisms and socialProviders even if these props weren't passed by the end user:

amplify-ui/packages/ui/src/machines/authenticator/index.ts

Lines 164 to 172 in 8964373

loginMechanisms: loginMechanisms ?? cliLoginMechanisms,
signUpAttributes:
signUpAttributes ??
Array.from(
new Set([
...cliVerificationMechanisms,
...cliSignUpAttributes,
])
),

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

attributeToVerify?: string;
redirectIntent?: string;
unverifiedAttributes?: Record<string, string>;
Expand Down Expand Up @@ -69,8 +69,8 @@ export type SignUpAttribute =
| SignUpFieldsWithoutDefaults;

export interface SignUpContext extends BaseFormContext {
loginMechanisms: AuthContext['config']['loginMechanisms'];
socialProviders: AuthContext['config']['socialProviders'];
loginMechanisms: Required<AuthContext>['config']['loginMechanisms'];
socialProviders: Required<AuthContext>['config']['socialProviders'];
unverifiedAttributes?: Record<string, string>;
}

Expand Down