Skip to content

Commit

Permalink
Merge pull request #669 from aws-amplify/pr/repo-sync
Browse files Browse the repository at this point in the history
Sync amplify-ui to amplify-ui-staging
  • Loading branch information
ayush987goyal authored Dec 30, 2022
2 parents a28eb05 + be2c495 commit d51fd12
Show file tree
Hide file tree
Showing 25 changed files with 77 additions and 37 deletions.
5 changes: 0 additions & 5 deletions .changeset/rich-peaches-trade.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test": "jest"
},
"dependencies": {
"@aws-amplify/ui-react": "4.3.1",
"@aws-amplify/ui-react": "4.3.2",
"@cucumber/gherkin": "^19.0.3",
"@cucumber/messages": "^16.0.1",
"@docsearch/react": "3",
Expand Down
2 changes: 1 addition & 1 deletion examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@angular/platform-browser": "~12.2.16",
"@angular/platform-browser-dynamic": "~12.2.16",
"@angular/router": "~12.2.16",
"@aws-amplify/ui-angular": "^3.2.1",
"@aws-amplify/ui-angular": "^3.2.2",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "next lint"
},
"dependencies": {
"@aws-amplify/ui-react": "^4.3.1",
"@aws-amplify/ui-react": "^4.3.2",
"aws-amplify": "latest",
"next": "^11.1.3",
"next-global-css": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "vite preview --port 3000"
},
"dependencies": {
"@aws-amplify/ui-vue": "^3.1.1",
"@aws-amplify/ui-vue": "^3.1.2",
"aws-amplify": "latest",
"vue": "^3.0.5",
"vue-router": "4"
Expand Down
7 changes: 7 additions & 0 deletions packages/angular/projects/ui-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @aws-amplify/ui-angular

## 3.2.2

### Patch Changes

- Updated dependencies [[`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed), [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05)]:
- @aws-amplify/ui@5.4.2

## 3.2.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/projects/ui-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-angular",
"version": "3.2.1",
"version": "3.2.2",
"scripts": {
"build": "yarn --cwd ../../ build",
"dev": "yarn --cwd ../../ dev",
Expand All @@ -17,7 +17,7 @@
"aws-amplify": "5.x.x"
},
"dependencies": {
"@aws-amplify/ui": "5.4.1",
"@aws-amplify/ui": "5.4.2",
"nanoid": "3.1.31",
"qrcode": "1.5.0",
"tslib": "2.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/projects/ui-angular/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '3.2.1';
export const VERSION = '3.2.2';
2 changes: 1 addition & 1 deletion packages/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"devDependencies": {
"@aws-amplify/ui": "^5.4.1",
"@aws-amplify/ui": "^5.4.2",
"@badeball/cypress-cucumber-preprocessor": "^12.1.0",
"@bahmutov/cypress-esbuild-preprocessor": "^2.1.3",
"@nuintun/qrcode": "^3.3.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/react-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @aws-amplify/ui-react-core

## 2.1.7

### Patch Changes

- Updated dependencies [[`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed), [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05)]:
- @aws-amplify/ui@5.4.2

## 2.1.6

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/react-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-react-core",
"version": "2.1.6",
"version": "2.1.7",
"main": "dist/index.js",
"module": "dist/esm/index.js",
"react-native": "dist/index.js",
Expand Down Expand Up @@ -28,7 +28,7 @@
"test:watch": "yarn test --watch"
},
"dependencies": {
"@aws-amplify/ui": "5.4.1",
"@aws-amplify/ui": "5.4.2",
"@xstate/react": "3.0.1",
"lodash": "4.17.21",
"xstate": "^4.33.6"
Expand Down
8 changes: 8 additions & 0 deletions packages/react-native/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @aws-amplify/ui-react-native

## 1.2.2

### Patch Changes

- Updated dependencies [[`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed), [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05)]:
- @aws-amplify/ui@5.4.2
- @aws-amplify/ui-react-core@2.1.7

## 1.2.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-react-native",
"version": "1.2.1",
"version": "1.2.2",
"main": "dist/index.js",
"module": "dist/esm/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -43,8 +43,8 @@
"type-fest": "^2.3.4"
},
"dependencies": {
"@aws-amplify/ui": "5.4.1",
"@aws-amplify/ui-react-core": "2.1.6"
"@aws-amplify/ui": "5.4.2",
"@aws-amplify/ui-react-core": "2.1.7"
},
"peerDependencies": {
"aws-amplify": ">= 5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '1.2.1';
export const VERSION = '1.2.2';
8 changes: 8 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @aws-amplify/ui-react

## 4.3.2

### Patch Changes

- Updated dependencies [[`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed), [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05)]:
- @aws-amplify/ui@5.4.2
- @aws-amplify/ui-react-core@2.1.7

## 4.3.1

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/react/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ module.exports = {
],
coverageThreshold: {
global: {
branches: 72,
functions: 60,
lines: 85,
statements: 85,
branches: 80,
functions: 70,
lines: 91,
statements: 91,
},
},
globals: { 'ts-jest': { tsconfig: 'tsconfig.json' } },
Expand Down
7 changes: 3 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-react",
"version": "4.3.1",
"version": "4.3.2",
"main": "dist/index.js",
"module": "dist/esm/index.js",
"exports": {
Expand Down Expand Up @@ -48,8 +48,8 @@
"size": "yarn run size-limit"
},
"dependencies": {
"@aws-amplify/ui": "5.4.1",
"@aws-amplify/ui-react-core": "2.1.6",
"@aws-amplify/ui": "5.4.2",
"@aws-amplify/ui-react-core": "2.1.7",
"@radix-ui/react-accordion": "1.0.0",
"@radix-ui/react-direction": "1.0.0",
"@radix-ui/react-dropdown-menu": "1.0.0",
Expand Down Expand Up @@ -94,7 +94,6 @@
"@types/tinycolor2": "^1.4.3",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"degit": "^2.8.4",
"esbuild-register": "^3.3.3",
"eslint": "^8.13.0",
"eslint-config-prettier": "^8.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '4.3.1';
export const VERSION = '4.3.2';
10 changes: 10 additions & 0 deletions packages/ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @aws-amplify/ui

## 5.4.2

### Patch Changes

- [#3201](https://github.com/aws-amplify/amplify-ui/pull/3201) [`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed) Thanks [@ErikCH](https://github.com/ErikCH)! - Updated logic so users will now receive a code, when they are displayed the reset password page that asks for a code after signing in. This occurs when the users are imported into Cognito.

- [#3238](https://github.com/aws-amplify/amplify-ui/pull/3238) [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05) Thanks [@wlee221](https://github.com/wlee221)! - fix(react): Manually add `overflow: clip` to remediate chrome 108 breaking change.

Ref: https://developer.chrome.com/blog/overflow-replaced-elements/

## 5.4.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui",
"version": "5.4.1",
"version": "5.4.2",
"main": "dist/index.js",
"module": "dist/esm/index.js",
"exports": {
Expand Down
4 changes: 4 additions & 0 deletions packages/ui/src/theme/css/component/image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
max-width: var(--amplify-components-image-max-width);
object-fit: var(--amplify-components-image-object-fit);
object-position: var(--amplify-components-image-object-position);

// need to set overflow to clip to resolve chrome 108 breaking change:
// https://developer.chrome.com/blog/overflow-replaced-elements/
overflow: clip;
}
7 changes: 7 additions & 0 deletions packages/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @aws-amplify/ui-vue

## 3.1.2

### Patch Changes

- Updated dependencies [[`2912fe3af`](https://github.com/aws-amplify/amplify-ui/commit/2912fe3af6f29cde562a35e931bc2e3a0de470ed), [`ea1b10a2c`](https://github.com/aws-amplify/amplify-ui/commit/ea1b10a2c802b08ee019669ba442d7446f23bd05)]:
- @aws-amplify/ui@5.4.2

## 3.1.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-vue",
"version": "3.1.1",
"version": "3.1.2",
"type": "module",
"main": "dist/index.cjs",
"module": "dist/index.js",
Expand Down Expand Up @@ -34,7 +34,7 @@
"test:unit:watch": "jest --watch"
},
"dependencies": {
"@aws-amplify/ui": "5.4.1",
"@aws-amplify/ui": "5.4.2",
"@vue/tsconfig": "^0.1.3",
"@vueuse/core": "7.5.5",
"@xstate/vue": "0.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '3.1.1';
export const VERSION = '3.1.2';
5 changes: 0 additions & 5 deletions yarn.lock

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

0 comments on commit d51fd12

Please sign in to comment.