Merge branch 'main' into chenwz-dev-esmfix

.changeset/afraid-maps-speak.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ui-react': patch
+---
+
+fix: Swapped save and cancel buttons.

.changeset/bright-worms-explain.md

@@ -0,0 +1,10 @@
+---
+"@aws-amplify/ui-react-core": patch
+"@aws-amplify/ui-react-native": patch
+"@aws-amplify/ui-react": patch
+"@aws-amplify/ui": patch
+"@aws-amplify/ui-vue": patch
+"@aws-amplify/ui-angular": patch
+---
+
+fix(authenticator): migrate totpSecretCode generation to state machine

.changeset/config.json

@@ -10,12 +10,13 @@
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": [
+    "amplify-ui-angular-mono",
+    "angular-example",
     "docs",
+    "e2e",
     "environments",
-    "angular-example",
     "next-example",
-    "vue-example",
-    "amplify-ui-angular-mono",
-    "e2e"
+    "react-native-example",
+    "vue-example"
   ]
 }

.changeset/purple-hotels-tease.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ui-react': patch
+---
+
+fix: Updated error text for max file count to be more explicit.

.changeset/sixty-buttons-study.md

@@ -0,0 +1,6 @@
+---
+'@aws-amplify/ui-react-core': patch
+'@aws-amplify/ui': patch
+---
+
+chore(ui,ui-react-core): Add type guard utils

.changeset/thirty-kangaroos-develop.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ui-react': patch
+---
+
+fix: Swap the upload button with the clear all button.

amplify.yml

@@ -10,7 +10,8 @@ applications:
             - nvm use 16
             - node -v
             - export FLUTTER_HOME=${HOME}/sdks/flutter
-            - git clone -b stable --depth 1 https://github.com/flutter/flutter.git ${FLUTTER_HOME}
+            # pin to flutter v3.3.10
+            - git clone -b 3.3.10 --depth 1 https://github.com/flutter/flutter.git ${FLUTTER_HOME}
             - export PATH="$PATH:${FLUTTER_HOME}/bin"
             # Skip cypress binary installation, as it's unneeded for docs and often fails transiently
             # https://docs.cypress.io/guides/references/advanced-installation#Skipping-installation

docs/package.json

@@ -19,7 +19,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@aws-amplify/ui-react": "4.3.4",
+    "@aws-amplify/ui-react": "4.3.5",
     "@cucumber/gherkin": "^19.0.3",
     "@cucumber/messages": "^16.0.1",
     "@docsearch/react": "3",

docs/src/components/InstallScripts.tsx

@@ -19,7 +19,7 @@ const frameworkInstallScript = (
   const isReactNative = framework === 'react-native';
 
   const packageManagerPrefix = `${
-    packageManager === 'npm' ? 'npm i' : 'yarn add'
+    packageManager === 'npm' ? 'npm install' : 'yarn add'
   }`;
 
   const extraDependencies = `${

docs/src/components/home/sections/HeroSection.tsx

@@ -102,7 +102,17 @@ export const HeroSection = () => {
             </Grid>
           ) : null}
 
-          <TerminalCommand command={frameworkInstallScript} variant="hero" />
+          {platform === 'flutter' ? (
+            <TerminalCommand
+              command={`flutter pub add ${frameworkInstallScript}`}
+              variant="hero"
+            />
+          ) : (
+            <TerminalCommand
+              command={`npm install ${frameworkInstallScript}`}
+              variant="hero"
+            />
+          )}
 
           <Flex direction="row">
             <Button

docs/src/data/frameworks.ts

@@ -27,9 +27,9 @@ export const REACT_NATIVE_DEPENDENCIES =
   'react-native-safe-area-context amazon-cognito-identity-js @react-native-community/netinfo @react-native-async-storage/async-storage react-native-get-random-values react-native-url-polyfill';
 
 export const FRAMEWORK_INSTALL_SCRIPTS = {
-  react: 'npm i @aws-amplify/ui-react aws-amplify',
-  vue: 'npm i @aws-amplify/ui-vue aws-amplify',
-  angular: 'npm i @aws-amplify/ui-angular aws-amplify',
-  flutter: 'flutter pub add amplify_authenticator',
-  'react-native': `npm i @aws-amplify/ui-react-native aws-amplify ${REACT_NATIVE_DEPENDENCIES}`,
+  react: '@aws-amplify/ui-react aws-amplify',
+  vue: '@aws-amplify/ui-vue aws-amplify',
+  angular: '@aws-amplify/ui-angular aws-amplify',
+  flutter: 'amplify_authenticator',
+  'react-native': `@aws-amplify/ui-react-native aws-amplify ${REACT_NATIVE_DEPENDENCIES}`,
 };

docs/src/pages/[platform]/getting-started/installation/fonts.web.mdx

@@ -1,4 +1,6 @@
+import { Tabs, TabItem } from '@aws-amplify/ui-react';
 import { Fragment } from '@/components/Fragment';
+import { TerminalCommand } from '@/components/InstallScripts';
 
 ### Fonts
 
@@ -21,9 +23,18 @@ or
 
 You can also install it as an NPM dependency:
 
-```bash
-npm install @fontsource/inter
-```
+<Tabs>
+<TabItem title="npm">
+
+<TerminalCommand command="npm install @fontsource/inter" />
+
+</TabItem>
+<TabItem title="yarn">
+
+<TerminalCommand command="yarn add @fontsource/inter" />
+
+</TabItem>
+</Tabs>
 
 Then import the variable font in your application:
 

docs/src/pages/[platform]/getting-started/migration/migration.angular.mdx

@@ -1,23 +1,16 @@
-import { Tabs, TabItem } from '@aws-amplify/ui-react';
-import { Alert } from '@aws-amplify/ui-react';
+import { Alert, Tabs, TabItem } from '@aws-amplify/ui-react';
+import { TerminalCommand } from '@/components/InstallScripts';
 
 ## 2.x to 3.x
 ### Installation
 Install the 3.x version of the `@aws-amplify/ui-angular` library and the 5.x version of the `aws-amplify` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 
@@ -94,19 +87,10 @@ If you wish to still use the legacy components, you can do so by installing `@aw
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm i @aws-amplify/ui-angular-v2@npm:@aws-amplify/ui-angular@^2.4.27
-```
-
+<TerminalCommand command="npm install @aws-amplify/ui-angular-v2@npm:@aws-amplify/ui-angular@^2.4.27" />
 </TabItem>
 <TabItem title="yarn">
-
-
-```shell
-yarn add @aws-amplify/ui-angular-v2@npm:@aws-amplify/ui-angular@^2.4.27
-```
-
+<TerminalCommand command="yarn add @aws-amplify/ui-angular-v2@npm:@aws-amplify/ui-angular@^2.4.27" />
 </TabItem>
 </Tabs>
 
@@ -140,17 +124,10 @@ Install the 2.x version of the `@aws-amplify/ui-angular` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 

docs/src/pages/[platform]/getting-started/migration/migration.react.mdx

@@ -1,23 +1,16 @@
-import { Tabs, TabItem } from '@aws-amplify/ui-react';
-import { Alert } from '@aws-amplify/ui-react';
+import { Alert,  Tabs, TabItem } from '@aws-amplify/ui-react';
+import { TerminalCommand } from '@/components/InstallScripts';
 
 ## 3.x to 4.x
 ### Installation
 Install the 4.x version of the `@aws-amplify/ui-react` library and the 5.x version of the `aws-amplify` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 
@@ -122,17 +115,10 @@ Install the 3.x version of the `@aws-amplify/ui-react` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 
@@ -162,17 +148,10 @@ Install the 2.x version of the `@aws-amplify/ui-react` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add aws-amplify @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add aws-amplify @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 

docs/src/pages/[platform]/getting-started/migration/migration.vue.mdx

@@ -1,23 +1,16 @@
-import { Tabs, TabItem } from '@aws-amplify/ui-react';
-import { Alert } from '@aws-amplify/ui-react';
+import { Alert, Tabs, TabItem } from '@aws-amplify/ui-react';
+import { TerminalCommand } from '@/components/InstallScripts';
 
 ## 2.x to 3.x
 ### Installation
 Install the 3.x version of the `@aws-amplify/ui-vue` library and the 5.x version of the `aws-amplify` library.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="npm install [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add [email protected] @aws-amplify/[email protected]
-```
-
+<TerminalCommand command="yarn add [email protected] @aws-amplify/[email protected]" />
 </TabItem>
 </Tabs>
 
@@ -63,15 +56,11 @@ Install the 2.x version of the `@aws-amplify/ui-vue` library.
 <Tabs>
 <TabItem title="npm">
 
-```shell
-npm install aws-amplify @aws-amplify/ui-vue@2
-```
+<TerminalCommand command="npm install aws-amplify @aws-amplify/ui-vue@2" />
 
 </TabItem>
 <TabItem title="yarn">
-```shell
-yarn add aws-amplify @aws-amplify/ui-vue@2
-```
+<TerminalCommand command="yarn add aws-amplify @aws-amplify/ui-vue@2" />
 
 </TabItem>
 </Tabs>

docs/src/pages/[platform]/getting-started/troubleshooting/troubleshooting.react.mdx

@@ -1,4 +1,5 @@
 import { Alert, Tabs, TabItem } from '@aws-amplify/ui-react';
+import { TerminalCommand } from '@/components/InstallScripts';
 
 ## Webpack 5+
 
@@ -22,18 +23,10 @@ Webpack 4 already includes this polyfill.
 
 <Tabs>
 <TabItem title="npm">
-
-```shell
-npm install node-polyfill-webpack-plugin -D
-```
-
+<TerminalCommand command="npm install node-polyfill-webpack-plugin -D" />
 </TabItem>
 <TabItem title="yarn">
-
-```shell
-yarn add node-polyfill-webpack-plugin -D
-```
-
+<TerminalCommand command="yarn add node-polyfill-webpack-plugin -D" />
 </TabItem>
 </Tabs>