Skip to content

Commit 9f20cec

Browse files
author
Heather Buchel
committed
Merge branch 'main' into react/border-width-color-style-via-style-props
2 parents 84d8935 + 2e4dc9f commit 9f20cec

File tree

80 files changed

+3785
-2321
lines changed

Some content is hidden

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

80 files changed

+3785
-2321
lines changed

.changeset/angry-ligers-enjoy.md

-5
This file was deleted.

.changeset/clever-eagles-design.md

-5
This file was deleted.

.changeset/large-news-grin.md

-6
This file was deleted.

.changeset/wet-walls-repeat.md

-7
This file was deleted.

canary/apps/angular/angularcli/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

canary/apps/angular/angularcli/angular.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
2121
"assets": ["src/favicon.ico", "src/assets"],
22-
"styles": ["src/styles.css"],
22+
"styles": [
23+
"node_modules/@aws-amplify/ui-angular/theme.css",
24+
"src/styles.css"
25+
],
2326
"scripts": [],
2427
"vendorChunk": true,
2528
"extractLicenses": false,
@@ -90,6 +93,5 @@
9093
}
9194
}
9295
}
93-
},
94-
"defaultProject": "angularcli"
96+
}
9597
}

canary/apps/angular/angularcli/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~12.2.16",
14-
"@angular/common": "~12.2.16",
15-
"@angular/compiler": "~12.2.16",
16-
"@angular/core": "~12.2.16",
17-
"@angular/forms": "~12.2.16",
18-
"@angular/platform-browser": "~12.2.16",
19-
"@angular/platform-browser-dynamic": "~12.2.16",
20-
"@angular/router": "~12.2.16",
13+
"@angular/animations": "^14.3.0",
14+
"@angular/common": "^14.3.0",
15+
"@angular/compiler": "^14.3.0",
16+
"@angular/core": "^14.3.0",
17+
"@angular/forms": "^14.3.0",
18+
"@angular/platform-browser": "^14.3.0",
19+
"@angular/platform-browser-dynamic": "^14.3.0",
20+
"@angular/router": "^14.3.0",
2121
"@aws-amplify/ui-angular": "latest",
2222
"aws-amplify": "latest",
2323
"rxjs": "~6.6.0",
2424
"tslib": "^2.0.0",
2525
"zone.js": "~0.11.4"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "~12.2.18",
29-
"@angular/cli": "~12.2.18",
30-
"@angular/compiler-cli": "~12.2.16",
28+
"@angular-devkit/build-angular": "^14.2.11",
29+
"@angular/cli": "^14.2.11",
30+
"@angular/compiler-cli": "^14.3.0",
3131
"@types/jasmine": "~3.6.0",
3232
"@types/node": "^12.11.1",
3333
"codelyzer": "^6.0.0",
@@ -40,6 +40,6 @@
4040
"karma-jasmine": "~4.0.0",
4141
"karma-jasmine-html-reporter": "~1.5.0",
4242
"ts-node": "~8.3.0",
43-
"typescript": "~4.3.5"
43+
"typescript": "~4.6.4"
4444
}
4545
}

canary/apps/angular/angularcli/src/polyfills.ts

-12
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/**
22-
* IE11 requires the following for NgClass support on SVG elements
23-
*/
24-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
25-
26-
/**
27-
* Web Animations `@angular/platform-browser/animations`
28-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
29-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
30-
*/
31-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
32-
3321
/**
3422
* By default, zone.js will patch all possible macroTask and DomEvents
3523
* user can disable parts of macroTask/DomEvents patch by setting following flags
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
/* You can add global styles to this file, and also import other style files */
2-
3-
@import '~@aws-amplify/ui-angular/theme.css';

canary/apps/angular/angularcli/src/test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ declare const require: {
2121
// First, initialize the Angular testing environment.
2222
getTestBed().initTestEnvironment(
2323
BrowserDynamicTestingModule,
24-
platformBrowserDynamicTesting()
24+
platformBrowserDynamicTesting(),
25+
{
26+
teardown: { destroyAfterEach: false },
27+
}
2528
);
2629
// Then we find all the tests.
2730
const context = require.context('./', true, /\.spec\.ts$/);

canary/apps/angular/angularcli/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"experimentalDecorators": true,
1111
"moduleResolution": "node",
1212
"importHelpers": true,
13-
"target": "es2015",
13+
"target": "es2020",
1414
"module": "es2020",
1515
"lib": [
1616
"es2018",

docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"test:links": "node --require esbuild-register ./scripts/link-checker-puppeteer.ts"
2222
},
2323
"dependencies": {
24-
"@aws-amplify/ui-react": "5.0.1",
25-
"@aws-amplify/ui-react-storage": "2.0.1",
24+
"@aws-amplify/ui-react": "5.0.2",
25+
"@aws-amplify/ui-react-storage": "2.0.2",
2626
"@cucumber/gherkin": "^19.0.3",
2727
"@cucumber/messages": "^16.0.1",
2828
"@docsearch/react": "3",

docs/src/pages/[platform]/connected-components/authenticator/quick-start-example.angular.mdx

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { Alert } from '@aws-amplify/ui-react';
22

33
Register and configure Amplify inside `app.module.ts`
44

5-
```ts{3,12}
5+
```ts{3-4,7,9,13}
66
import { NgModule } from '@angular/core';
77
import { BrowserModule } from '@angular/platform-browser';
8+
import { Amplify } from 'aws-amplify';
89
import { AmplifyAuthenticatorModule } from '@aws-amplify/ui-angular';
910
1011
import { AppComponent } from './app.component';
@@ -21,10 +22,13 @@ Amplify.configure(awsconfig);
2122
export class AppModule {}
2223
```
2324

24-
Import Authenticator style inside `styles.css`
25+
Open your `angular.json` file, and add `node_modules/@aws-amplify/ui-angular/theme.css` to `styles` array in your `angular.json`. This array is located in `projects.<project-name>.architect.build.options`.
2526

26-
```css
27-
@import '~@aws-amplify/ui-angular/theme.css';
27+
```json{2}
28+
"styles": [
29+
"node_modules/@aws-amplify/ui-angular/theme.css",
30+
"src/styles.css"
31+
],
2832
```
2933

3034
Wrap your template with `amplify-authenticator` inside `app.component.html`
@@ -43,7 +47,5 @@ Wrap your template with `amplify-authenticator` inside `app.component.html`
4347
```
4448

4549
<Alert role="none" variation="info" heading="Angular Authenticator v1">
46-
Looking for a previous version of Authenticator? Checkout the [Authenticator
47-
v1
48-
documentation](https://github.com/aws-amplify/amplify-ui/tree/legacy/legacy/amplify-ui-angular).
50+
Looking for a previous version of Authenticator? Checkout the [Authenticator v1 documentation](https://github.com/aws-amplify/amplify-ui/tree/legacy/legacy/amplify-ui-angular).
4951
</Alert>

docs/src/pages/[platform]/connected-components/authenticator/quick-start.angular.mdx

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ import { Fragment } from '@/components/Fragment';
1818
{({ platform }) => import('../../getting-started/troubleshooting/shared/angular-polyfill.mdx')}
1919
</Fragment>
2020

21-
### Step 4. Add the Authenticator
21+
### Step 4. Add declaration file for aws-exports
22+
23+
<Fragment>
24+
{({ platform }) => import('../../getting-started/troubleshooting/shared/add-aws-exports-type.mdx')}
25+
</Fragment>
26+
27+
### Step 5. Add the Authenticator
2228

2329
<Fragment useCommonWebContent>
2430
{({ platform }) => import(`./quick-start-add.${platform}.mdx`)}

docs/src/pages/[platform]/connected-components/liveness/QuickStartReact.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ export function LivenessQuickStartReact() {
5656
sessionId={createLivenessApiData.sessionId}
5757
region="us-east-1"
5858
onAnalysisComplete={handleAnalysisComplete}
59+
onError={(error) => {
60+
console.error(error);
61+
}}
5962
/>
6063
)}
6164
</ThemeProvider>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
export const FACE_LIVENESS_DETECTOR_PARAMETERS = [
2+
{
3+
name: `sessionID`,
4+
description: 'The sessionID as returned by CreateFaceLivenessSession API.',
5+
type: `String`,
6+
},
7+
{
8+
name: `region`,
9+
description:
10+
'The AWS region to stream the video to, this should match the region you called the CreateFaceLivenessSession API in.',
11+
type: `String`,
12+
},
13+
{
14+
name: `credentialsProvider`,
15+
description: 'An optional paramter that provides AWS Credentials',
16+
type: `AWSCredentialsProvider?`,
17+
},
18+
{
19+
name: `disableStartView`,
20+
description:
21+
'Optional parameter for the disabling the intial view with instructions, default = false.',
22+
type: `Boolean`,
23+
},
24+
{
25+
name: `onComplete`,
26+
description:
27+
'Callback that signals when the liveness session has completed.',
28+
type: 'Action; equivalent to () -> Void',
29+
},
30+
{
31+
name: `onError`,
32+
description:
33+
'Callback that signals when the liveness session has returned an error.',
34+
type: 'Consumer<FaceLivenessDetectionException>; equivalent to (Exception) -> Void',
35+
},
36+
];
37+
38+
export const FACE_LIVENESS_DETECTOR_ERROR_STATES = [
39+
{
40+
name: `FaceLivenessDetectionException`,
41+
description: 'An unknown error occurred, retry the face liveness check.',
42+
type: `Error`,
43+
},
44+
{
45+
name: `FaceLivenessDetectionException.SessionNotFoundException`,
46+
description: 'Session not found.',
47+
type: `Error`,
48+
},
49+
{
50+
name: `FaceLivenessDetectionException.AccessDeniedException`,
51+
description: 'Not authorized to perform a face liveness check.',
52+
type: `Error`,
53+
},
54+
{
55+
name: `FaceLivenessDetectionException.CameraPermissionDeniedException`,
56+
description: 'The camera permission has not been granted.',
57+
type: `Error`,
58+
},
59+
{
60+
name: `FaceLivenessDetectionException.SessionTimedOutException`,
61+
description:
62+
'The session timed out and did not receive response from server within the time limit.',
63+
type: `Error`,
64+
},
65+
{
66+
name: `FaceLivenessDetectionException.UserCancelledException`,
67+
description: 'The user cancelled the face liveness check.',
68+
type: `Error`,
69+
},
70+
];
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Tabs, TabItem, Table, TableHead, TableRow, TableCell, TableBody, View } from '@aws-amplify/ui-react';
2+
import ReactPropsTable from '@/components/propsTable/ReactPropsTable';
3+
import { FACE_LIVENESS_DETECTOR_PARAMETERS, FACE_LIVENESS_DETECTOR_ERROR_STATES } from './android-props';
4+
5+
## Full API Reference
6+
7+
### FaceLivenessDetectorView Parameters
8+
9+
Below is the full list of parameters that can be used with the `FaceLivenessDetector` component. You can also reference the [source code here](https://github.com/aws-amplify/amplify-ui-android/blob/main/liveness/src/main/java/com/amplifyframework/ui/liveness/ui/FaceLivenessDetector.kt#L73).
10+
11+
<ReactPropsTable props={FACE_LIVENESS_DETECTOR_PARAMETERS} />
12+
13+
### Error States
14+
15+
Below is the full list of error states that can be returned from the `onComplete` handler of `FaceLivenessDetector`. You can also reference the [source code here](https://github.com/aws-amplify/amplify-ui-android/blob/main/liveness/src/main/java/com/amplifyframework/ui/liveness/model/FaceLivenessDetectionException.kt#L18).
16+
17+
<ReactPropsTable props={FACE_LIVENESS_DETECTOR_ERROR_STATES} />
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Tabs, TabItem, Table, TableHead, TableRow, TableCell, TableBody, View } from '@aws-amplify/ui-react';
2+
import ReactPropsTable from '@/components/propsTable/ReactPropsTable';
3+
import { FACE_LIVENESS_DETECTOR_PARAMETERS, FACE_LIVENESS_DETECTOR_ERROR_STATES } from './swift-props';
4+
5+
## Full API Reference
6+
7+
### FaceLivenessDetectorView Parameters
8+
9+
Below is the full list of parameters that can be used with the `FaceLivenessDetectorView` component. You can also reference the [source code here](https://github.com/aws-amplify/amplify-ui-swift-liveness/blob/main/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionView.swift#L27).
10+
11+
<ReactPropsTable props={FACE_LIVENESS_DETECTOR_PARAMETERS} />
12+
13+
### Error States
14+
15+
Below is the full list of error states that can be returned from the `onCompletion` handler of `FaceLivenessDetectorView`. You can also reference the [source code here](https://github.com/aws-amplify/amplify-ui-swift-liveness/blob/main/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionError.swift).
16+
17+
<ReactPropsTable props={FACE_LIVENESS_DETECTOR_ERROR_STATES} />

0 commit comments

Comments
 (0)