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: merge feat-storage-browser/main into feat-storage-browser/release #5832

Open
wants to merge 20 commits into
base: feat-storage-browser/release
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7b4d97f
fix(e2e): fix placeholder matching rn e2e android (#5793)
thaddmt Sep 11, 2024
7b9e301
chore(deps): bump dset from 3.1.3 to 3.1.4 (#5795)
dependabot[bot] Sep 12, 2024
aa07847
chore: move amplify backend deps to top level devDeps (#5797)
calebpollman Sep 12, 2024
f2fb980
fix: adding resolutions for path-to-regexp to fix dependabot issue (#…
jordanvn Sep 16, 2024
b80bab0
fix(ai): fix renders for empty toolUse messages (#5799)
thaddmt Sep 16, 2024
6ef1835
Version Packages (#5792)
github-actions[bot] Sep 17, 2024
db75c53
chore(deps-dev): bump vite from 5.2.8 to 5.2.14 (#5804)
dependabot[bot] Sep 17, 2024
8f43ce3
chore(deps): bump next from 14.2.3 to 14.2.10 (#5805)
dependabot[bot] Sep 17, 2024
7a12237
fix(ui): add missing FR and ES translations (#5807)
zerbusdetroy Sep 18, 2024
2f0119f
fix(liveness): use video stream dimensions instead of videoEl dimensi…
thaddmt Sep 18, 2024
557c08e
chore(dependabot): Upgrade vite in canaries (#5811)
esauerbo Sep 19, 2024
0ddeea9
feat(theming) add custom component style rendering (#5812)
dbanksdesign Sep 19, 2024
15745e0
chore: Change pending-triage label to pending-maintainer-response (#5…
jordanvn Sep 19, 2024
eb97f90
chore: update pending-maintainer-response usage and restore pending-t…
jordanvn Sep 19, 2024
028a91b
chore(storage): Export FileUploaderHandle and StorageManagerHandle (#…
esauerbo Sep 19, 2024
a4302c2
Update README.md (#5781)
plug-n-play Sep 20, 2024
0d50470
fix(file-uploader): fix duplicate upload requests (#5818)
calebpollman Sep 21, 2024
c855f47
Version Packages (#5809)
github-actions[bot] Sep 21, 2024
6c1f8d3
Merge branch 'main' of https://github.com/aws-amplify/amplify-ui into…
esauerbo Sep 23, 2024
b49ba15
Merge pull request #5823 from aws-amplify/storage-merge-main
esauerbo Sep 24, 2024
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
12 changes: 0 additions & 12 deletions .changeset/olive-bats-obey.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thin-pants-turn.md

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/issue-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Description: This workflow automatically removes triage labels from issues that have been closed
#
# Triggered by: closing issues

name: Issue Closed

on:
issues:
types: [closed]

jobs:
clean_labels:
runs-on: ubuntu-latest

permissions:
issues: write

if: ${{ (contains(github.event.issue.labels.*.name, 'pending-community-response') || contains(github.event.issue.labels.*.name, 'pending-maintainer-response') || contains(github.event.issue.labels.*.name, 'pending-triage')) }}
steps:
- name: Remove unnecessary labels after closing
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-community-response" --remove-label "pending-maintainer-response" --remove-label "pending-triage"
38 changes: 38 additions & 0 deletions .github/workflows/issue-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Description: This workflow automatically adds appropriate labels to issues that have been commented on
#
# Triggered by: a new comment being added to an issue

name: Issue Comment

on:
issue_comment:
types: [created]

jobs:
adjust_labels:
runs-on: ubuntu-latest

permissions:
issues: write

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}

steps:
- name: Remove pending-community-response when new community comment received
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) && !github.event.issue.pull_request }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-community-response"
- name: Add pending-maintainer-response when new community comment received
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
- name: Remove pending-maintainer-response when new owner/member comment received
if: ${{ contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-maintainer-response"
19 changes: 15 additions & 4 deletions .github/workflows/label-new-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ jobs:
permissions:
issues: write

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
steps:
- uses: actions/checkout@b80ff79f1755d06ba70441c368a6fe801f5f3a62 # v4.1.3 https://github.com/actions/checkout/commit/cd7d8d697e10461458bc61a30d094dc601a8b017
- name: Add pending-triage label
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
# run bash script to sanitize issue number and add label
# first sanitize the ISSUE_NUMBER which is a assumed to be string representing an integer
# remove any newline characters with tr because awk only works with single lines of code and may have unexpected behavior if newline is present
Expand All @@ -33,4 +34,14 @@ jobs:
echo "Issue number must be a positive integer"
exit 1
fi
gh issue edit $ISSUE_NUMBER_INT --add-label 'pending-triage'
gh issue edit $ISSUE_NUMBER_INT --repo $REPOSITORY_NAME --add-label 'pending-triage'
- name: Add pending-maintainer-response label
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.issue.author_association) }}
shell: bash
run: |
ISSUE_NUMBER_INT=$(echo "$ISSUE_NUMBER" | tr -d '\n' | awk '{print int($0)}')
if [ "$ISSUE_NUMBER_INT" -le 0 ]; then
echo "Issue number must be a positive integer"
exit 1
fi
gh issue edit $ISSUE_NUMBER_INT --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
21 changes: 7 additions & 14 deletions canary/apps/react/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,19 @@
"scripts": {
"dev": "vite",
"build": "vite build",
"postbuild": "yarn run size-limit",
"preview": "vite preview",
"start": "vite preview --port 3000"
},
"dependencies": {
"@aws-amplify/ui-react": "latest",
"aws-amplify": "latest",
"react": "latest",
"react-dom": "latest"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@size-limit/preset-app": "^8.2.6",
"@vitejs/plugin-react": "^1.0.7",
"size-limit": "^8.2.6",
"vite": "^2.8.0"
},
"size-limit": [
{
"path": "dist/assets/index.*.js",
"limit": "300 kB"
}
]
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"vite": "latest"
}
}
4 changes: 2 additions & 2 deletions canary/apps/vue/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"dependencies": {
"@aws-amplify/ui-vue": "latest",
"aws-amplify": "latest",
"vue": "^3.2.27"
"vue": "latest"
},
"devDependencies": {
"@vitejs/plugin-vue": "^2.0.1",
"vite": "^2.7.13"
"vite": "latest"
}
}
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:links": "node --require esbuild-register ./scripts/link-checker-puppeteer.ts"
},
"dependencies": {
"@aws-amplify/ui-react": "6.3.1",
"@aws-amplify/ui-react": "6.5.0",
"@docsearch/react": "3",
"@mdx-js/loader": "^2.1.0",
"@mdx-js/mdx": "^2.1.0",
Expand All @@ -33,7 +33,7 @@
"gray-matter": "^4.0.3",
"lodash": "^4.17.21",
"mdx-prism": "^0.3.3",
"next": "^14.1.1",
"next": "^14.2.10",
"next-plugin-preval": "^1.2.1",
"prism-react-renderer": "1.2.1",
"raw-loader": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion environments/ai/gen2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "@aws-amplify/ui-gen2-ai-environment",
"version": "0.0.1",
"scripts": {
"generate": "AWS_REGION=us-west-2 npx ampx generate outputs --branch gen2-ai-backend --app-id dlbmj68rw0w3c"
"generate": "AWS_REGION=us-west-2 npx @aws-amplify/backend-cli@latest generate outputs --branch gen2-ai-backend --app-id dlbmj68rw0w3c"
}
}
7 changes: 0 additions & 7 deletions environments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,5 @@
"liveness": "yarn --cwd liveness/",
"storage": "yarn --cwd storage/",
"in-app-messaging": "yarn --cwd in-app-messaging/"
},
"devDependencies": {
"@aws-amplify/backend-cli": "^1.1.1",
"@aws-amplify/cli": "latest",
"aws-cdk": "^2.143.1",
"aws-cdk-lib": "^2.143.1",
"constructs": "^10.3.0"
}
}
2 changes: 1 addition & 1 deletion examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/platform-browser": "^14.3.0",
"@angular/platform-browser-dynamic": "^14.3.0",
"@angular/router": "^14.3.0",
"@aws-amplify/ui-angular": "^5.0.23",
"@aws-amplify/ui-angular": "^5.0.25",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/next-app-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@aws-amplify/ui-react": "^6.1.0",
"next": "^14.1.1",
"next": "^14.2.10",
"react": "18.2.0",
"react-dom": "^18",
"react-icons": "^4.3.1"
Expand Down
6 changes: 0 additions & 6 deletions examples/next/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,3 @@ To learn more about Next.js, take a look at the following resources:
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
15 changes: 7 additions & 8 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"lint": "next lint"
},
"dependencies": {
"@aws-amplify/ui-react": "^6.3.1",
"@aws-amplify/ui-react-ai": "0.1.1",
"@aws-amplify/ui-react-geo": "^2.0.23",
"@aws-amplify/ui-react-liveness": "^3.1.8",
"@aws-amplify/ui-react-notifications": "^2.0.27",
"@aws-amplify/ui-react-storage": "^3.3.2",
"@aws-amplify/ui-react": "^6.5.0",
"@aws-amplify/ui-react-ai": "0.2.0",
"@aws-amplify/ui-react-geo": "^2.0.25",
"@aws-amplify/ui-react-liveness": "^3.1.10",
"@aws-amplify/ui-react-notifications": "^2.0.29",
"@aws-amplify/ui-react-storage": "^3.3.4",
"@aws-sdk/credential-providers": "^3.370.0",
"next": "^14.1.1",
"next": "^14.2.10",
"next-global-css": "^1.1.1",
"react": "18.2.0",
"react-copy-to-clipboard": "^5.1.0",
Expand All @@ -27,7 +27,6 @@
"swr": "^2.0.0"
},
"devDependencies": {
"@aws-amplify/backend": "^1.0.4",
"@types/node": "^15.12.4",
"@types/react": "^18.2.22",
"eslint": "^8.44.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"start": "vite preview --port 3000"
},
"dependencies": {
"@aws-amplify/ui-vue": "^4.2.15",
"@aws-amplify/ui-vue": "^4.2.17",
"vue": "^3.0.5",
"vue-router": "4"
},
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"**/@angular-devkit/build-angular/webpack": "^5.76.0",
"**/@size-limit/webpack/webpack": "^5.76.0",
"**/serve/serve-handler/minimatch": "3.0.5",
"**/serve/serve-handler/path-to-regexp": "3.3.0",
"@adobe/css-tools": "^4.3.2",
"@babel/traverse": "7.23.2",
"@cypress/request": "^3.0.0",
Expand All @@ -89,6 +90,7 @@
"loader-utils": "2.0.4",
"node-forge": "1.3.0",
"nth-check": "^2.0.1",
"path-to-regexp": "0.1.10",
"postcss": "^8.4.31",
"prismjs": "^1.25.0",
"react": "18.2.0",
Expand All @@ -105,6 +107,7 @@
"ws": "^8.17.1"
},
"devDependencies": {
"@aws-amplify/backend": "^1.2.1",
"@aws-amplify/eslint-config-amplify-ui": "0.0.0",
"@aws-amplify/typescript-config": "0.0.0",
"@changesets/changelog-github": "0.4.1",
Expand Down Expand Up @@ -137,7 +140,7 @@
"ts-morph": "^17.0.0",
"turbo": "^2.0.11",
"typescript": "^5.2.2",
"vite": "^5.2.8",
"vite": "^5.2.14",
"vue-tsc": "^2.0.7"
}
}
14 changes: 14 additions & 0 deletions packages/angular/projects/ui-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @aws-amplify/ui-angular

## 5.0.25

### Patch Changes

- Updated dependencies [[`0ddeea9d4`](https://github.com/aws-amplify/amplify-ui/commit/0ddeea9d432f12621e0e32dae346e72881b790db), [`7a12237d2`](https://github.com/aws-amplify/amplify-ui/commit/7a12237d2c96107ef97d3c62d9d26d6b6f1d824c)]:
- @aws-amplify/[email protected]

## 5.0.24

### Patch Changes

- Updated dependencies [[`0ebf8b346`](https://github.com/aws-amplify/amplify-ui/commit/0ebf8b346bc744cd73e1e7891eafc07538d6419d)]:
- @aws-amplify/[email protected]

## 5.0.23

### 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": "5.0.23",
"version": "5.0.25",
"scripts": {
"build": "yarn --cwd ../../ build",
"dev": "yarn --cwd ../../ dev",
Expand All @@ -18,7 +18,7 @@
"aws-amplify": "storage-browser"
},
"dependencies": {
"@aws-amplify/ui": "6.4.1",
"@aws-amplify/ui": "6.6.0",
"nanoid": "3.1.31",
"qrcode": "1.5.0",
"tslib": "^2.5.2",
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 = '5.0.23';
export const VERSION = '5.0.25';
13 changes: 12 additions & 1 deletion packages/e2e/detox/integration/common/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,18 @@ Then(
);

Then('I see placeholder {string}', async (placeholder: string) => {
await expect(element(by.text(placeholder))).toExist();
const emailField = element(
by.id('authenticator__text-field__input-username')
);
await expect(emailField).toExist();
const attributes = await emailField.getAttributes();
if ((attributes as Detox.ElementAttributes).placeholder) {
if ((attributes as any).placeholder !== placeholder) {
throw new Error(
`No element found with placeholder value: ${placeholder}`
);
}
}
});

Then(
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
]
},
"devDependencies": {
"@aws-amplify/ui": "^6.4.1",
"@aws-amplify/ui": "^6.6.0",
"@badeball/cypress-cucumber-preprocessor": "^18.0.6",
"@bahmutov/cypress-esbuild-preprocessor": "~2.2.0",
"@cucumber/cucumber": "^10.0.1",
Expand Down
Loading