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.

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

chore(release): Merge main into dev #13484

Merged
merged 2 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/amplify-category-notifications/CHANGELOG.md
Original file line number Diff line number Diff line change
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.

## [2.26.11](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)

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





## [2.26.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)

**Note:** Version bump only for package @aws-amplify/amplify-category-notifications
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-category-notifications/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-category-notifications",
"version": "2.26.10",
"version": "2.26.11",
"description": "amplify-cli notifications plugin",
"repository": {
"type": "git",
Expand Down Expand Up @@ -29,7 +29,7 @@
"@aws-amplify/amplify-cli-core": "4.3.0",
"@aws-amplify/amplify-environment-parameters": "1.9.5",
"@aws-amplify/amplify-prompts": "2.8.6",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.0",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.1",
"aws-sdk": "^2.1464.0",
"chalk": "^4.1.1",
"fs-extra": "^8.1.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/amplify-cli-npm/CHANGELOG.md
Original file line number Diff line number Diff line change
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.

# [12.10.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)


### Features

* bump version 12.9.0 ([#13462](https://github.com/aws-amplify/amplify-cli/issues/13462)) ([02afaa4](https://github.com/aws-amplify/amplify-cli/commit/02afaa492bec6f5e73dd6bad234fc4646ebcc4c3))





# [12.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-cli-npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/cli",
"version": "12.9.0",
"version": "12.10.0",
"description": "Amplify CLI",
"repository": {
"type": "git",
Expand Down Expand Up @@ -36,7 +36,7 @@
"tar-stream": "^2.2.0"
},
"devDependencies": {
"@aws-amplify/cli-internal": "12.9.0",
"@aws-amplify/cli-internal": "12.10.0",
"@types/tar": "^6.1.1",
"rimraf": "^3.0.2"
},
Expand Down
11 changes: 11 additions & 0 deletions packages/amplify-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
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.

# [12.10.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)


### Features

* bump version 12.9.0 ([#13462](https://github.com/aws-amplify/amplify-cli/issues/13462)) ([02afaa4](https://github.com/aws-amplify/amplify-cli/commit/02afaa492bec6f5e73dd6bad234fc4646ebcc4c3))





# [12.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
12 changes: 6 additions & 6 deletions packages/amplify-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/cli-internal",
"version": "12.9.0",
"version": "12.10.0",
"description": "Amplify CLI",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,14 +43,14 @@
"@aws-amplify/amplify-category-geo": "3.5.5",
"@aws-amplify/amplify-category-hosting": "3.5.27",
"@aws-amplify/amplify-category-interactions": "5.1.19",
"@aws-amplify/amplify-category-notifications": "2.26.10",
"@aws-amplify/amplify-category-notifications": "2.26.11",
"@aws-amplify/amplify-category-predictions": "5.5.5",
"@aws-amplify/amplify-category-storage": "5.5.5",
"@aws-amplify/amplify-cli-core": "4.3.0",
"@aws-amplify/amplify-cli-logger": "1.3.8",
"@aws-amplify/amplify-cli-shared-interfaces": "1.2.5",
"@aws-amplify/amplify-console-hosting": "2.5.24",
"@aws-amplify/amplify-container-hosting": "2.8.0",
"@aws-amplify/amplify-container-hosting": "2.8.1",
"@aws-amplify/amplify-dotnet-function-template-provider": "2.6.0",
"@aws-amplify/amplify-environment-parameters": "1.9.5",
"@aws-amplify/amplify-frontend-android": "3.5.8",
Expand All @@ -60,11 +60,11 @@
"@aws-amplify/amplify-go-function-template-provider": "1.4.7",
"@aws-amplify/amplify-nodejs-function-template-provider": "2.10.0",
"@aws-amplify/amplify-prompts": "2.8.6",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.0",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.1",
"@aws-amplify/amplify-python-function-template-provider": "1.4.7",
"@aws-amplify/amplify-util-import": "2.8.3",
"@aws-amplify/amplify-util-mock": "5.9.0",
"@aws-amplify/amplify-util-uibuilder": "1.14.0",
"@aws-amplify/amplify-util-mock": "5.9.1",
"@aws-amplify/amplify-util-uibuilder": "1.14.1",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"amplify-codegen": "^4.7.3",
"amplify-dotnet-function-runtime-provider": "2.0.19",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-container-hosting/CHANGELOG.md
Original file line number Diff line number Diff line change
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.

## [2.8.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)

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





# [2.8.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-container-hosting/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-container-hosting",
"version": "2.8.0",
"version": "2.8.1",
"description": "amplify-cli hosting plugin for containers",
"repository": {
"type": "git",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-e2e-tests/CHANGELOG.md
Original file line number Diff line number Diff line change
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.9.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.9.1) (2023-12-16)

**Note:** Version bump only for package amplify-e2e-tests





# [4.9.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.9.0) (2023-12-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amplify-e2e-tests",
"version": "4.9.0",
"version": "4.9.1",
"description": "",
"repository": {
"type": "git",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-provider-awscloudformation/CHANGELOG.md
Original file line number Diff line number Diff line change
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.

## [8.10.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)

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





# [8.10.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-provider-awscloudformation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-provider-awscloudformation",
"version": "8.10.0",
"version": "8.10.1",
"description": "AWS CloudFormation Provider",
"repository": {
"type": "git",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-util-mock/CHANGELOG.md
Original file line number Diff line number Diff line change
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.9.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)

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





# [5.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-util-mock/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-util-mock",
"version": "5.9.0",
"version": "5.9.1",
"description": "amplify cli plugin providing local testing",
"repository": {
"type": "git",
Expand Down Expand Up @@ -37,7 +37,7 @@
"@aws-amplify/amplify-environment-parameters": "1.9.5",
"@aws-amplify/amplify-opensearch-simulator": "1.7.5",
"@aws-amplify/amplify-prompts": "2.8.6",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.0",
"@aws-amplify/amplify-provider-awscloudformation": "8.10.1",
"@hapi/topo": "^5.0.0",
"amplify-codegen": "^4.7.3",
"amplify-dynamodb-simulator": "2.9.9",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-util-uibuilder/CHANGELOG.md
Original file line number Diff line number Diff line change
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.14.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-16)

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





# [1.14.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-util-uibuilder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-util-uibuilder",
"version": "1.14.0",
"version": "1.14.1",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/[email protected].10, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
"@aws-amplify/[email protected].11, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
version: 0.0.0-use.local
resolution: "@aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications"
dependencies:
"@aws-amplify/amplify-cli-core": 4.3.0
"@aws-amplify/amplify-environment-parameters": 1.9.5
"@aws-amplify/amplify-prompts": 2.8.6
"@aws-amplify/amplify-provider-awscloudformation": 8.10.0
"@aws-amplify/amplify-provider-awscloudformation": 8.10.1
aws-sdk: ^2.1464.0
chalk: ^4.1.1
fs-extra: ^8.1.0
Expand Down Expand Up @@ -499,7 +499,7 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/[email protected].0, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
"@aws-amplify/[email protected].1, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
version: 0.0.0-use.local
resolution: "@aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting"
dependencies:
Expand Down Expand Up @@ -793,7 +793,7 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/[email protected].0, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
"@aws-amplify/[email protected].1, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
version: 0.0.0-use.local
resolution: "@aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation"
dependencies:
Expand Down Expand Up @@ -868,7 +868,7 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/[email protected].0, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
"@aws-amplify/[email protected].1, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
version: 0.0.0-use.local
resolution: "@aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock"
dependencies:
Expand All @@ -879,7 +879,7 @@ __metadata:
"@aws-amplify/amplify-function-plugin-interface": 1.12.1
"@aws-amplify/amplify-opensearch-simulator": 1.7.5
"@aws-amplify/amplify-prompts": 2.8.6
"@aws-amplify/amplify-provider-awscloudformation": 8.10.0
"@aws-amplify/amplify-provider-awscloudformation": 8.10.1
"@aws-amplify/graphql-auth-transformer": ^3.3.1
"@aws-amplify/graphql-default-value-transformer": ^2.2.1
"@aws-amplify/graphql-function-transformer": ^2.1.13
Expand Down Expand Up @@ -938,7 +938,7 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/[email protected].0, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
"@aws-amplify/[email protected].1, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
version: 0.0.0-use.local
resolution: "@aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder"
dependencies:
Expand Down Expand Up @@ -1067,7 +1067,7 @@ __metadata:
languageName: unknown
linkType: soft

"@aws-amplify/cli-internal@12.9.0, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
"@aws-amplify/cli-internal@12.10.0, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
version: 0.0.0-use.local
resolution: "@aws-amplify/cli-internal@workspace:packages/amplify-cli"
dependencies:
Expand All @@ -1080,14 +1080,14 @@ __metadata:
"@aws-amplify/amplify-category-geo": 3.5.5
"@aws-amplify/amplify-category-hosting": 3.5.27
"@aws-amplify/amplify-category-interactions": 5.1.19
"@aws-amplify/amplify-category-notifications": 2.26.10
"@aws-amplify/amplify-category-notifications": 2.26.11
"@aws-amplify/amplify-category-predictions": 5.5.5
"@aws-amplify/amplify-category-storage": 5.5.5
"@aws-amplify/amplify-cli-core": 4.3.0
"@aws-amplify/amplify-cli-logger": 1.3.8
"@aws-amplify/amplify-cli-shared-interfaces": 1.2.5
"@aws-amplify/amplify-console-hosting": 2.5.24
"@aws-amplify/amplify-container-hosting": 2.8.0
"@aws-amplify/amplify-container-hosting": 2.8.1
"@aws-amplify/amplify-dotnet-function-template-provider": 2.6.0
"@aws-amplify/amplify-environment-parameters": 1.9.5
"@aws-amplify/amplify-frontend-android": 3.5.8
Expand All @@ -1098,11 +1098,11 @@ __metadata:
"@aws-amplify/amplify-go-function-template-provider": 1.4.7
"@aws-amplify/amplify-nodejs-function-template-provider": 2.10.0
"@aws-amplify/amplify-prompts": 2.8.6
"@aws-amplify/amplify-provider-awscloudformation": 8.10.0
"@aws-amplify/amplify-provider-awscloudformation": 8.10.1
"@aws-amplify/amplify-python-function-template-provider": 1.4.7
"@aws-amplify/amplify-util-import": 2.8.3
"@aws-amplify/amplify-util-mock": 5.9.0
"@aws-amplify/amplify-util-uibuilder": 1.14.0
"@aws-amplify/amplify-util-mock": 5.9.1
"@aws-amplify/amplify-util-uibuilder": 1.14.1
"@aws-cdk/cloudformation-diff": ~2.68.0
"@types/archiver": ^5.3.1
"@types/columnify": ^1.5.1
Expand Down Expand Up @@ -1167,7 +1167,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@aws-amplify/cli@workspace:packages/amplify-cli-npm"
dependencies:
"@aws-amplify/cli-internal": 12.9.0
"@aws-amplify/cli-internal": 12.10.0
"@types/tar": ^6.1.1
axios: ^1.6.2
rimraf: ^3.0.2
Expand Down