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/release to master #5526

Merged
merged 3 commits into from Apr 23, 2020
Merged

Fix/release to master #5526

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5bd191
Fix merge conflict changes and release changelogs
elorzafe Apr 23, 2020
a64e159
Updating test snapshot from ui-components package
elorzafe Apr 23, 2020
3303f3e
Merge branch 'master' into fix/release-to-master
jordanranz Apr 23, 2020
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
2 changes: 1 addition & 1 deletion ...ponents/src/components/amplify-email-field/__snapshots__/amplify-email-field.spec.ts.snap
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ exports[`amplify-email-field spec: Render logic -> should render \`placeholder\`
exports[`amplify-email-field spec: Render logic -> should render default values by default 1`] = `
<amplify-email-field>
<mock:shadow-root>
<amplify-form-field fieldid="email" label="Email Address *" placeholder="amplify@example.com" type="email"></amplify-form-field>
<amplify-form-field fieldid="email" label="Email Address *" placeholder="Enter your email address" type="email"></amplify-form-field>
</mock:shadow-root>
</amplify-email-field>
`;
8 changes: 8 additions & 0 deletions packages/amplify-ui-react/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.2...@aws-amplify/ui-react@0.2.3) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/ui-react





## [0.2.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.1...@aws-amplify/ui-react@0.2.2) (2020-04-08)


Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-ui-react/package.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/ui-react",
"sideEffects": false,
"version": "0.2.2",
"version": "0.2.3",
"description": "React specific wrapper for @aws-amplify/ui-components",
"publishConfig": {
"access": "public"
Expand Down
11 changes: 11 additions & 0 deletions packages/amplify-ui-storybook/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.2...@aws-amplify/ui-storybook@0.2.3) (2020-04-14)


### Bug Fixes

* **@aws-amplify/ui-storybook:** Fix yarn test ([#5353](https://github.com/aws-amplify/amplify-js/issues/5353)) ([9f13083](https://github.com/aws-amplify/amplify-js/commit/9f13083db80c43f15b77be9a504c6178faf85b46))





## [0.2.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.1...@aws-amplify/ui-storybook@0.2.2) (2020-04-08)


Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-storybook/package.json
View file
Open in desktop
@@ -1,9 +1,9 @@
{
"name": "@aws-amplify/ui-storybook",
"version": "0.2.2",
"version": "0.2.3",
"private": true,
"dependencies": {
"@aws-amplify/ui-react": "^0.2.2",
"@aws-amplify/ui-react": "^0.2.3",
"@storybook/addon-knobs": "^5.3.13",
"@storybook/theming": "^5.3.14",
"@types/jest": "^24.0.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/analytics/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.1.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@3.1.6...@aws-amplify/analytics@3.1.7) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/analytics





## [3.1.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@3.1.5...@aws-amplify/analytics@3.1.6) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/analytics
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/analytics",
"version": "3.1.6",
"version": "3.1.7",
"description": "Analytics category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -37,8 +37,8 @@
},
"homepage": "https://aws-amplify.github.io/",
"dependencies": {
"@aws-amplify/cache": "^3.1.6",
"@aws-amplify/core": "^3.2.3",
"@aws-amplify/cache": "^3.1.7",
"@aws-amplify/core": "^3.2.4",
"@aws-sdk/client-firehose": "1.0.0-beta.3",
"@aws-sdk/client-kinesis": "1.0.0-beta.3",
"@aws-sdk/client-personalize-events": "1.0.0-beta.3",
Expand Down
11 changes: 11 additions & 0 deletions packages/api-graphql/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.9](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@1.0.8...@aws-amplify/api-graphql@1.0.9) (2020-04-14)


### Bug Fixes

* **@aws-amplify/api-graphql:** Add missing @aws-amplify/pubsub… ([#5352](https://github.com/aws-amplify/amplify-js/issues/5352)) ([ffb6514](https://github.com/aws-amplify/amplify-js/commit/ffb6514ab2aa14e09d2aa0df0da110585b5a713f))





## [1.0.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@1.0.7...@aws-amplify/api-graphql@1.0.8) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/api-graphql
Expand Down
12 changes: 6 additions & 6 deletions packages/api-graphql/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/api-graphql",
"version": "1.0.8",
"version": "1.0.9",
"description": "Api-graphql category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -36,11 +36,11 @@
"@types/zen-observable": "^0.8.0"
},
"dependencies": {
"@aws-amplify/api-rest": "^1.0.8",
"@aws-amplify/auth": "^3.2.3",
"@aws-amplify/cache": "^3.1.6",
"@aws-amplify/core": "^3.2.3",
"@aws-amplify/pubsub": "^3.0.7",
"@aws-amplify/api-rest": "^1.0.9",
"@aws-amplify/auth": "^3.2.4",
"@aws-amplify/cache": "^3.1.7",
"@aws-amplify/core": "^3.2.4",
"@aws-amplify/pubsub": "^3.0.8",
"graphql": "14.0.0",
"uuid": "^3.2.1",
"zen-observable-ts": "0.8.19"
Expand Down
8 changes: 8 additions & 0 deletions packages/api-rest/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.9](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@1.0.8...@aws-amplify/api-rest@1.0.9) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/api-rest





## [1.0.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@1.0.7...@aws-amplify/api-rest@1.0.8) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/api-rest
Expand Down
4 changes: 2 additions & 2 deletions packages/api-rest/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/api-rest",
"version": "1.0.8",
"version": "1.0.9",
"description": "Api-rest category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"homepage": "https://aws-amplify.github.io/",
"dependencies": {
"@aws-amplify/core": "^3.2.3",
"@aws-amplify/core": "^3.2.4",
"axios": "0.19.0"
},
"jest": {
Expand Down
8 changes: 8 additions & 0 deletions packages/api/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.1.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@3.1.6...@aws-amplify/api@3.1.7) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/api





## [3.1.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@3.1.5...@aws-amplify/api@3.1.6) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/api
Expand Down
6 changes: 3 additions & 3 deletions packages/api/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/api",
"version": "3.1.6",
"version": "3.1.7",
"description": "Api category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -38,8 +38,8 @@
"@types/zen-observable": "^0.8.0"
},
"dependencies": {
"@aws-amplify/api-graphql": "^1.0.8",
"@aws-amplify/api-rest": "^1.0.8"
"@aws-amplify/api-graphql": "^1.0.9",
"@aws-amplify/api-rest": "^1.0.9"
},
"peerDependencies": {
"@aws-amplify/pubsub": "^2.1.1"
Expand Down
8 changes: 8 additions & 0 deletions packages/auth/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.2.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@3.2.3...@aws-amplify/auth@3.2.4) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/auth





## [3.2.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@3.2.2...@aws-amplify/auth@3.2.3) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/auth
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/auth",
"version": "3.2.3",
"version": "3.2.4",
"description": "Auth category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -35,8 +35,8 @@
},
"homepage": "https://aws-amplify.github.io/",
"dependencies": {
"@aws-amplify/cache": "^3.1.6",
"@aws-amplify/core": "^3.2.3",
"@aws-amplify/cache": "^3.1.7",
"@aws-amplify/core": "^3.2.4",
"amazon-cognito-identity-js": "^4.2.1",
"crypto-js": "^3.3.0"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify-angular/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.0.8](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-angular@5.0.7...aws-amplify-angular@5.0.8) (2020-04-14)

**Note:** Version bump only for package aws-amplify-angular





## [5.0.7](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-angular@5.0.6...aws-amplify-angular@5.0.7) (2020-04-08)

**Note:** Version bump only for package aws-amplify-angular
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-amplify-angular/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "aws-amplify-angular",
"version": "5.0.7",
"version": "5.0.8",
"description": "AWS Amplify Angular Components",
"main": "bundles/aws-amplify-angular.umd.js",
"module": "dist/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"@types/zen-observable": "^0.5.3",
"angular2-template-loader": "^0.6.2",
"awesome-typescript-loader": "^4.0.1",
"aws-amplify": "^3.0.7",
"aws-amplify": "^3.0.8",
"babel-core": "^6.26.3",
"babel-plugin-lodash": "^3.3.4",
"babel-preset-env": "^1.7.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/aws-amplify-react-native/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.0.4](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-react-native@4.0.3...aws-amplify-react-native@4.0.4) (2020-04-14)


### Bug Fixes

* **aws-amplify-react-native:** Replace legacy lifecycle method componentWillReceiveProps ([#5343](https://github.com/aws-amplify/amplify-js/issues/5343)) ([50f9971](https://github.com/aws-amplify/amplify-js/commit/50f99713572a4c692c3f4bd9da3a4859093bd9e9))





## [4.0.3](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-react-native@4.0.2...aws-amplify-react-native@4.0.3) (2020-04-08)


Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify-react-native/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "aws-amplify-react-native",
"version": "4.0.3",
"version": "4.0.4",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "dist/index.js",
"scripts": {
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify-react/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.1.7](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-react@4.1.6...aws-amplify-react@4.1.7) (2020-04-14)

**Note:** Version bump only for package aws-amplify-react





## [4.1.6](https://github.com/aws-amplify/amplify-js/compare/aws-amplify-react@4.1.5...aws-amplify-react@4.1.6) (2020-04-08)

**Note:** Version bump only for package aws-amplify-react
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-amplify-react/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "aws-amplify-react",
"version": "4.1.6",
"version": "4.1.7",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand All @@ -26,7 +26,7 @@
"@types/enzyme-adapter-react-16": "^1.0.3",
"@types/react": "^16.0.41",
"@types/react-dom": "^16.0.11",
"aws-amplify": "^3.0.7",
"aws-amplify": "^3.0.8",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.3",
"enzyme-to-json": "^3.2.1",
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.8](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@3.0.7...aws-amplify@3.0.8) (2020-04-14)

**Note:** Version bump only for package aws-amplify





## [3.0.7](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@3.0.6...aws-amplify@3.0.7) (2020-04-08)

**Note:** Version bump only for package aws-amplify
Expand Down
24 changes: 12 additions & 12 deletions packages/aws-amplify/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "aws-amplify",
"version": "3.0.7",
"version": "3.0.8",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "./lib/index.js",
"module": "./lib-esm/index.js",
Expand Down Expand Up @@ -34,18 +34,18 @@
},
"homepage": "https://aws-amplify.github.io/",
"dependencies": {
"@aws-amplify/analytics": "^3.1.6",
"@aws-amplify/api": "^3.1.6",
"@aws-amplify/auth": "^3.2.3",
"@aws-amplify/cache": "^3.1.6",
"@aws-amplify/core": "^3.2.3",
"@aws-amplify/datastore": "^2.0.7",
"@aws-amplify/interactions": "^3.1.6",
"@aws-amplify/predictions": "^3.1.6",
"@aws-amplify/pubsub": "^3.0.7",
"@aws-amplify/storage": "^3.1.6",
"@aws-amplify/analytics": "^3.1.7",
"@aws-amplify/api": "^3.1.7",
"@aws-amplify/auth": "^3.2.4",
"@aws-amplify/cache": "^3.1.7",
"@aws-amplify/core": "^3.2.4",
"@aws-amplify/datastore": "^2.0.8",
"@aws-amplify/interactions": "^3.1.7",
"@aws-amplify/predictions": "^3.1.7",
"@aws-amplify/pubsub": "^3.0.8",
"@aws-amplify/storage": "^3.1.7",
"@aws-amplify/ui": "^2.0.2",
"@aws-amplify/xr": "^2.1.6"
"@aws-amplify/xr": "^2.1.7"
},
"jest": {
"globals": {
Expand Down
8 changes: 8 additions & 0 deletions packages/cache/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.1.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/cache@3.1.6...@aws-amplify/cache@3.1.7) (2020-04-14)

**Note:** Version bump only for package @aws-amplify/cache





## [3.1.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/cache@3.1.5...@aws-amplify/cache@3.1.6) (2020-04-08)

**Note:** Version bump only for package @aws-amplify/cache
Expand Down