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

Update from main #1025

Merged
merged 10 commits into from
Jun 19, 2023
11 changes: 5 additions & 6 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ jobs:
- name: Build amplify-cli
working-directory: amplify-cli
run: |
yarn policies set-version 1.18.0
yarn --network-concurrency 1
yarn install
yarn setup-dev
- name: Install updated codegen libraries
working-directory: amplify-cli/packages/amplify-util-uibuilder
Expand All @@ -52,9 +51,9 @@ jobs:
- name: Build amplify-cli with updated codegen libraries
working-directory: amplify-cli
run: |
yarn policies set-version 1.18.0
yarn --network-concurrency 1
yarn dev-build
yarn install
yarn build
echo "$HOME/work/amplify-codegen-ui/amplify-codegen-ui/amplify-cli/.bin" >> $GITHUB_PATH
- name: Create a test react app
run: npx create-react-app e2e-test-app
- name: Install test app dependencies
Expand Down Expand Up @@ -112,7 +111,7 @@ jobs:
- name: Install packages
run: npm ci
- name: Lerna bootstrap
run: lerna bootstrap
run: npm run bootstrap
- name: Setup Integration Test
run: npm run integ:setup
- name: Cypress run
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.14.2](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.1...v2.14.2) (2023-06-06)

### Bug Fixes

- add getOverrideProps to StorageManager ([#1020](https://github.com/aws-amplify/amplify-codegen-ui/issues/1020)) ([8ff282f](https://github.com/aws-amplify/amplify-codegen-ui/commit/8ff282f5a5b2f42dbbb20737d1060a3f5e60cc90))

## [2.14.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.0...v2.14.1) (2023-05-23)

### Bug Fixes

- fix storage field prop import to storagemanager ([#1016](https://github.com/aws-amplify/amplify-codegen-ui/issues/1016)) ([adf26f4](https://github.com/aws-amplify/amplify-codegen-ui/commit/adf26f43fe6823ba15480a81a2513bb2a98bd7b2))

# [2.14.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.14.0) (2023-05-22)

### Bug Fixes

- **codegen-ui:** fix multiple has one relationships ([#1005](https://github.com/aws-amplify/amplify-codegen-ui/issues/1005)) ([96b7b9d](https://github.com/aws-amplify/amplify-codegen-ui/commit/96b7b9dc3e9e70e1d8527d9abb59334b0bb56ca7))
- parse operand value when field is number type ([#1013](https://github.com/aws-amplify/amplify-codegen-ui/issues/1013)) ([ad9ba60](https://github.com/aws-amplify/amplify-codegen-ui/commit/ad9ba606ab381b2b4759f19f9310a0901dd10fa8))
- upgrade node and pin lerna version in circleci ([#1002](https://github.com/aws-amplify/amplify-codegen-ui/issues/1002)) ([2c70073](https://github.com/aws-amplify/amplify-codegen-ui/commit/2c700733928c28348ab100832b3c9e4fb56ef8a5))

### Features

- exporting processFile to be used in studio ([#1001](https://github.com/aws-amplify/amplify-codegen-ui/issues/1001)) ([ff1ef27](https://github.com/aws-amplify/amplify-codegen-ui/commit/ff1ef272dd0b2192217419300353f8b7388aa26c))

## [2.13.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.13.1) (2023-05-02)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"packages": ["packages/*"],
"exact": true,
"version": "2.13.1",
"version": "2.14.2",
"command": {
"version": {
"message": "chore(release): %s"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"integ:test": "run-script-os",
"integ:test:default": "./scripts/integ-test.sh",
"integ:test:win32": "scripts\\integ-test.bat",
"integ:clean": "npx rimraf packages/integration-test"
"integ:clean": "npx rimraf packages/integration-test",
"bootstrap": "lerna bootstrap"
},
"files": [],
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions packages/codegen-ui-golden-files/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.14.2](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.1...v2.14.2) (2023-06-06)

**Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files

## [2.14.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.0...v2.14.1) (2023-05-23)

**Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files

# [2.14.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.14.0) (2023-05-22)

**Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files

## [2.13.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.13.1) (2023-05-02)

**Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files
Expand Down
4 changes: 2 additions & 2 deletions packages/codegen-ui-golden-files/package-lock.json

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

4 changes: 2 additions & 2 deletions packages/codegen-ui-golden-files/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/codegen-ui-golden-files",
"version": "2.13.1",
"version": "2.14.2",
"description": "Models of outputs to customer project",
"author": "Amazon Web Services",
"homepage": "https://docs.amplify.aws/",
Expand All @@ -11,7 +11,7 @@
"typescript": "^4.8.4"
},
"dependencies": {
"@aws-amplify/codegen-ui": "2.13.1",
"@aws-amplify/codegen-ui": "2.14.2",
"@aws-amplify/datastore": "^3.12.12",
"@aws-amplify/ui-react": "^3.5.7",
"aws-amplify": "^4.3.37",
Expand Down
23 changes: 23 additions & 0 deletions packages/codegen-ui-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.14.2](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.1...v2.14.2) (2023-06-06)

### Bug Fixes

- add getOverrideProps to StorageManager ([#1020](https://github.com/aws-amplify/amplify-codegen-ui/issues/1020)) ([8ff282f](https://github.com/aws-amplify/amplify-codegen-ui/commit/8ff282f5a5b2f42dbbb20737d1060a3f5e60cc90))

## [2.14.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.14.0...v2.14.1) (2023-05-23)

### Bug Fixes

- fix storage field prop import to storagemanager ([#1016](https://github.com/aws-amplify/amplify-codegen-ui/issues/1016)) ([adf26f4](https://github.com/aws-amplify/amplify-codegen-ui/commit/adf26f43fe6823ba15480a81a2513bb2a98bd7b2))

# [2.14.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.14.0) (2023-05-22)

### Bug Fixes

- **codegen-ui:** fix multiple has one relationships ([#1005](https://github.com/aws-amplify/amplify-codegen-ui/issues/1005)) ([96b7b9d](https://github.com/aws-amplify/amplify-codegen-ui/commit/96b7b9dc3e9e70e1d8527d9abb59334b0bb56ca7))
- parse operand value when field is number type ([#1013](https://github.com/aws-amplify/amplify-codegen-ui/issues/1013)) ([ad9ba60](https://github.com/aws-amplify/amplify-codegen-ui/commit/ad9ba606ab381b2b4759f19f9310a0901dd10fa8))

### Features

- exporting processFile to be used in studio ([#1001](https://github.com/aws-amplify/amplify-codegen-ui/issues/1001)) ([ff1ef27](https://github.com/aws-amplify/amplify-codegen-ui/commit/ff1ef272dd0b2192217419300353f8b7388aa26c))

## [2.13.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.13.0...v2.13.1) (2023-05-02)

**Note:** Version bump only for package @aws-amplify/codegen-ui-react
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ export default createTheme({
"
`;

exports[`react theme renderer tests theme should render the theme with ES5 2`] = `
"declare const _default: any;
export default _default;
"
`;

exports[`react theme renderer tests theme should render the theme with TSX 1`] = `
"/* eslint-disable */
import { createTheme } from \\"@aws-amplify/ui-react\\";
Expand Down
Loading