Skip to content

Commit

Permalink
Merge branch 'main' into bump-cross-spawn-build-system-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dindjarinjs authored Nov 21, 2024
2 parents 105b549 + 3e850ad commit 654d9ed
Show file tree
Hide file tree
Showing 50 changed files with 882 additions and 960 deletions.
45 changes: 0 additions & 45 deletions .changeset/sto-bro-release.md

This file was deleted.

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.6.0",
"@aws-amplify/ui-react": "6.7.0",
"@docsearch/react": "3",
"@mdx-js/loader": "^2.1.0",
"@mdx-js/mdx": "^2.1.0",
Expand All @@ -41,7 +41,7 @@
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "18.2.0",
"react-icons": "^4.3.1",
"react-live": "^2.4.1",
"react-live": "^4.1.8",
"rehype": "^11.0.0",
"rehype-autolink-headings": "^5.1.0",
"rehype-slug": "^4.0.1",
Expand Down
33 changes: 10 additions & 23 deletions docs/src/components/home/HomeEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as React from 'react';
import {
LiveProvider,
LiveEditor,
LivePreview,
LiveContext,
ContextProps,
} from 'react-live';
import { LiveProvider, LiveEditor, LivePreview, LiveContext } from 'react-live';
// only import the primitives to prevent importing sideEffects
import { primitives as AUI } from '@aws-amplify/ui-react';
import { trackClick } from '@/utils/track';
Expand Down Expand Up @@ -47,7 +41,7 @@ const code = `<Card variation="elevated">
</Card>`;

const Error = () => {
const context: ContextProps = React.useContext(LiveContext);
const context = React.useContext(LiveContext);
const { error } = context;
if (error) {
return <Alert variation="error">{error}</Alert>;
Expand All @@ -58,6 +52,7 @@ const Error = () => {

const HomeEditor = () => {
const [edited, setEdited] = React.useState(false);

return (
<LiveProvider
scope={{ ...AUI }}
Expand All @@ -73,22 +68,14 @@ const HomeEditor = () => {
<View
flex="1"
className="docs-home-editor__code-panel with-lines scrollable"
onKeyUp={() => {
if (!edited) {
trackClick('HomeCodeEdit');
setEdited(true);
}
}}
>
<LiveEditor
onKeyDown={(e) => {
// This makes sure the editor is not a focus trap, allowing customers to 'tab' out of the editor
if (e.keyCode === 9) {
// tab key
e.preventDefault();
e.currentTarget.blur();
return;
}
if (!edited) {
trackClick('HomeCodeEdit');
setEdited(true);
}
}}
/>
<LiveEditor tabMode="focus" />
</View>
<View
aria-label="Live preview results"
Expand Down
11 changes: 9 additions & 2 deletions docs/src/styles/docs/code.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
* Based on Atom's One Light theme: https://github.com/atom/atom/tree/master/packages/one-light-syntax
*/

.docs-home code.prism-code {
font-size: inherit;
.docs-home {
code.prism-code {
font-size: inherit;
}

pre.prism-code {
display: flex;
flex-direction: column;
}
}

code[class*='language-'],
Expand Down
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.31",
"@aws-amplify/ui-angular": "^5.0.32",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
Expand Down
10 changes: 5 additions & 5 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"lint": "next lint"
},
"dependencies": {
"@aws-amplify/ui-react": "^6.6.0",
"@aws-amplify/ui-react": "^6.7.0",
"@aws-amplify/ui-react-ai": "1.0.0",
"@aws-amplify/ui-react-geo": "^2.0.31",
"@aws-amplify/ui-react-liveness": "^3.1.16",
"@aws-amplify/ui-react-notifications": "^2.0.35",
"@aws-amplify/ui-react-storage": "^3.3.10",
"@aws-amplify/ui-react-geo": "^2.0.32",
"@aws-amplify/ui-react-liveness": "^3.1.17",
"@aws-amplify/ui-react-notifications": "^2.0.36",
"@aws-amplify/ui-react-storage": "^3.4.0",
"@aws-sdk/credential-providers": "^3.370.0",
"next": "^14.2.10",
"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 @@ -11,7 +11,7 @@
"start": "vite preview --port 3000"
},
"dependencies": {
"@aws-amplify/ui-vue": "^4.2.23",
"@aws-amplify/ui-vue": "^4.2.24",
"vue": "^3.0.5",
"vue-router": "4"
},
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"body-parser": "1.20.3",
"browserslist": "^4.16.15",
"cookie": "^0.7.0",
"cross-spawn": "7.0.5",
"docs/next-plugin-preval/webpack": "^5.76.0",
"follow-redirects": "^1.15.6",
"json5": "^2.2.1",
Expand Down Expand Up @@ -113,7 +114,7 @@
"@aws-amplify/eslint-config-amplify-ui": "0.0.0",
"@aws-amplify/typescript-config": "0.0.0",
"@changesets/changelog-github": "0.4.1",
"@changesets/cli": "^2.26.2",
"@changesets/cli": "^2.27.10",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-typescript": "^12.1.0",
"@size-limit/preset-big-lib": "^11.1.5",
Expand All @@ -125,7 +126,7 @@
"@types/jest": "^29.5.5",
"@types/react-test-renderer": "^18.0.2",
"@vitejs/plugin-vue": "^2.3.4",
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"esbuild-register": "^3.5.0",
"eslint": "^8.44.0",
"fs-extra": "^11.1.1",
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

## 5.0.32

### Patch Changes

- Updated dependencies [[`70971f310`](https://github.com/aws-amplify/amplify-ui/commit/70971f310f69717657849f29d0a9e1d993b08d9a)]:
- @aws-amplify/ui@6.7.0

## 5.0.31

### Patch Changes
Expand Down
6 changes: 3 additions & 3 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.31",
"version": "5.0.32",
"scripts": {
"build": "yarn --cwd ../../ build",
"dev": "yarn --cwd ../../ dev",
Expand All @@ -16,11 +16,11 @@
"peerDependencies": {
"@angular/core": ">= 14.0.0",
"@angular/common": ">= 14.0.0",
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"rxjs": "^6.5.3 || ^7.4.0"
},
"dependencies": {
"@aws-amplify/ui": "6.6.6",
"@aws-amplify/ui": "6.7.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.31';
export const VERSION = '5.0.32';
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.6.6",
"@aws-amplify/ui": "^6.7.0",
"@badeball/cypress-cucumber-preprocessor": "^18.0.6",
"@bahmutov/cypress-esbuild-preprocessor": "~2.2.0",
"@cucumber/cucumber": "^10.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ai/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"peerDependencies": {
"@aws-amplify/api-graphql": "unstable",
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"react": "^16.14.0 || ^17.0 || ^18.0",
"react-dom": "^16.14.0 || ^17.0 || ^18.0"
},
Expand Down
10 changes: 10 additions & 0 deletions packages/react-auth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @aws-amplify/ui-react-auth

## 0.0.38

### Patch Changes

- Updated dependencies [[`70971f310`](https://github.com/aws-amplify/amplify-ui/commit/70971f310f69717657849f29d0a9e1d993b08d9a)]:
- @aws-amplify/ui-react@6.7.0
- @aws-amplify/ui-react-core@3.1.0
- @aws-amplify/ui@6.7.0
- @aws-amplify/ui-react-core-auth@0.0.33

## 0.0.37

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/react-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/ui-react-auth",
"private": true,
"version": "0.0.37",
"version": "0.0.38",
"main": "dist/index.js",
"module": "dist/esm/index.mjs",
"exports": {
Expand Down Expand Up @@ -40,16 +40,16 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@aws-amplify/ui": "6.6.6",
"@aws-amplify/ui-react": "6.6.0",
"@aws-amplify/ui-react-core": "3.0.30",
"@aws-amplify/ui-react-core-auth": "0.0.32",
"@aws-amplify/ui": "6.7.0",
"@aws-amplify/ui-react": "6.7.0",
"@aws-amplify/ui-react-core": "3.1.0",
"@aws-amplify/ui-react-core-auth": "0.0.33",
"@xstate/react": "3.2.2",
"lodash": "4.17.21",
"tslib": "^2.5.2"
},
"peerDependencies": {
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"react": "^16.14.0 || ^17.0 || ^18.0",
"react-dom": "^16.14.0 || ^17.0 || ^18.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-auth/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '0.0.37';
export const VERSION = '0.0.38';
8 changes: 8 additions & 0 deletions packages/react-core-auth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @aws-amplify/ui-react-core-auth

## 0.0.33

### Patch Changes

- Updated dependencies [[`70971f310`](https://github.com/aws-amplify/amplify-ui/commit/70971f310f69717657849f29d0a9e1d993b08d9a)]:
- @aws-amplify/ui-react-core@3.1.0
- @aws-amplify/ui@6.7.0

## 0.0.32

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/react-core-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/ui-react-core-auth",
"private": true,
"version": "0.0.32",
"version": "0.0.33",
"main": "dist/index.js",
"module": "dist/esm/index.mjs",
"react-native": "src/index.ts",
Expand Down Expand Up @@ -33,16 +33,16 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@aws-amplify/ui": "6.6.6",
"@aws-amplify/ui-react-core": "3.0.30",
"@aws-amplify/ui": "6.7.0",
"@aws-amplify/ui-react-core": "3.1.0",
"@xstate/react": "3.2.2",
"lodash": "4.17.21",
"qrcode": "1.5.0",
"xstate": "^4.33.6"
},
"peerDependencies": {
"@aws-amplify/core": "*",
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"react": "^16.14.0 || ^17.0 || ^18.0"
},
"sideEffects": false
Expand Down
8 changes: 8 additions & 0 deletions packages/react-core-notifications/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @aws-amplify/ui-react-core-notifications

## 2.0.31

### Patch Changes

- Updated dependencies [[`70971f310`](https://github.com/aws-amplify/amplify-ui/commit/70971f310f69717657849f29d0a9e1d993b08d9a)]:
- @aws-amplify/ui-react-core@3.1.0
- @aws-amplify/ui@6.7.0

## 2.0.30

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/react-core-notifications/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-react-core-notifications",
"version": "2.0.30",
"version": "2.0.31",
"main": "dist/index.js",
"module": "dist/esm/index.mjs",
"exports": {
Expand Down Expand Up @@ -35,11 +35,11 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@aws-amplify/ui": "6.6.6",
"@aws-amplify/ui-react-core": "3.0.30"
"@aws-amplify/ui": "6.7.0",
"@aws-amplify/ui-react-core": "3.1.0"
},
"peerDependencies": {
"aws-amplify": "unstable",
"aws-amplify": "^6.9.0",
"react": "^16.14.0 || ^17.0 || ^18.0"
},
"sideEffects": false
Expand Down
Loading

0 comments on commit 654d9ed

Please sign in to comment.