@aws-amplify/ui-react-core 2.1.10 → 2.1.12

package/dist/esm/Authenticator/context/{AuthenticatorProvider.js → AuthenticatorProvider.mjs}

@@ -1,8 +1,7 @@
-import { jsx } from 'react/jsx-runtime';
-import { useContext, useMemo, useEffect } from 'react';
+import React, { useContext, useMemo, useEffect } from 'react';
 import { useInterpret } from '@xstate/react';
 import { createAuthenticatorMachine, listenToAuthHub } from '@aws-amplify/ui';
-import { AuthenticatorContext } from './AuthenticatorContext.js';
+import { AuthenticatorContext } from './AuthenticatorContext.mjs';
 
 function AuthenticatorProvider({ children, }) {
     /**
@@ -20,7 +19,7 @@ function AuthenticatorProvider({ children, }) {
         const unsubscribe = listenToAuthHub(activeService);
         return unsubscribe;
     }, [activeService]);
-    return (jsx(AuthenticatorContext.Provider, Object.assign({ value: value }, { children: children })));
+    return (React.createElement(AuthenticatorContext.Provider, { value: value }, children));
 }
 
 export { AuthenticatorProvider as default };

package/dist/esm/Authenticator/hooks/useAuthenticator/{useAuthenticator.js → useAuthenticator.mjs}

@@ -1,11 +1,10 @@
-import { __rest } from '../../../node_modules/tslib/tslib.es6.js';
-import React, { useCallback, useMemo } from 'react';
+import { __rest } from '../../../node_modules/tslib/tslib.es6.mjs';
+import React, { useCallback } from 'react';
 import { useSelector } from '@xstate/react';
 import { getServiceFacade } from '@aws-amplify/ui';
-import 'react/jsx-runtime';
-import { AuthenticatorContext } from '../../context/AuthenticatorContext.js';
-import { USE_AUTHENTICATOR_ERROR } from './constants.js';
-import { getQRFields, getMachineFields, getTotpSecretCodeCallback, getComparator, defaultComparator } from './utils.js';
+import { AuthenticatorContext } from '../../context/AuthenticatorContext.mjs';
+import { USE_AUTHENTICATOR_ERROR } from './constants.mjs';
+import { getQRFields, getMachineFields, getTotpSecretCodeCallback, getComparator, defaultComparator } from './utils.mjs';
 
 /**
  * [📖 Docs](https://ui.docs.amplify.aws/react/connected-components/authenticator/headless#useauthenticator-hook)
@@ -20,21 +19,20 @@ function useAuthenticator(selector) {
     const xstateSelector = useCallback((state) => (Object.assign({}, getServiceFacade({ send, state }))), [send]);
     const comparator = selector ? getComparator(selector) : defaultComparator;
     const facade = useSelector(service, xstateSelector, comparator);
-    const { route, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "unverifiedContactMethods", "user"]);
+    const { route, totpSecretCode, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "totpSecretCode", "unverifiedContactMethods", "user"]);
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
     // `fields` from updating with current form state on value changes
     const serviceSnapshot = service.getSnapshot();
     // legacy `QRFields` values only used for SetupTOTP page to retrieve issuer information, will be removed in future
-    const QRFields = useMemo(() => getQRFields(serviceSnapshot), [serviceSnapshot]);
+    const QRFields = route === 'setupTOTP' ? getQRFields(serviceSnapshot) : null;
     // legacy `formFields` values required until form state is removed from state machine
-    const fields = useMemo(() => getMachineFields(route, serviceSnapshot, unverifiedContactMethods), [route, serviceSnapshot, unverifiedContactMethods]);
-    return Object.assign(Object.assign({}, rest), { getTotpSecretCode: getTotpSecretCodeCallback(user), route,
+    const fields = getMachineFields(route, serviceSnapshot, unverifiedContactMethods);
+    return Object.assign(Object.assign({}, rest), { route,
+        totpSecretCode,
         unverifiedContactMethods,
         user,
         /** @deprecated For internal use only */
-        fields,
-        /** @deprecated For internal use only */
-        QRFields });
+        fields, getTotpSecretCode: getTotpSecretCodeCallback(user), QRFields });
 }
 
 export { useAuthenticator as default };

package/dist/esm/Authenticator/hooks/useAuthenticator/{utils.js → utils.mjs}

@@ -1,9 +1,8 @@
-import { __awaiter } from '../../../node_modules/tslib/tslib.es6.js';
+import { __awaiter } from '../../../node_modules/tslib/tslib.es6.mjs';
 import { Auth } from 'aws-amplify';
-import { getActorContext, getSortedFormFields } from '@aws-amplify/ui';
-import isString from 'lodash/isString';
-import { areEmptyArrays, areEmptyObjects } from '../../../utils/index.js';
-import { isComponentRouteKey } from '../utils.js';
+import { getActorContext, getSortedFormFields, isString } from '@aws-amplify/ui';
+import { areEmptyArrays, areEmptyObjects } from '../../../utils/index.mjs';
+import { isComponentRouteKey } from '../utils.mjs';
 
 const defaultComparator = () => false;
 /**
@@ -31,9 +30,7 @@ const getComparator = (selector) => (currentFacade, nextFacade) => {
 };
 const getQRFields = (state) => {
     var _a, _b, _c;
-    const fields = getActorContext(state);
-    const QR = (_c = (_b = (_a = fields === null || fields === void 0 ? void 0 : fields.formFields) === null || _a === void 0 ? void 0 : _a.setupTOTP) === null || _b === void 0 ? void 0 : _b.QR) !== null && _c !== void 0 ? _c : {};
-    return Object.assign({}, QR);
+    return (Object.assign({}, (_c = (_b = (_a = getActorContext(state)) === null || _a === void 0 ? void 0 : _a.formFields) === null || _b === void 0 ? void 0 : _b.setupTOTP) === null || _c === void 0 ? void 0 : _c.QR));
 };
 const getTotpSecretCodeCallback = (user) => function getTotpSecretCode() {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/esm/Authenticator/hooks/useAuthenticatorInitMachine/{useAuthenticatorInitMachine.js → useAuthenticatorInitMachine.mjs}

@@ -1,5 +1,5 @@
 import React from 'react';
-import useAuthenticator from '../useAuthenticator/useAuthenticator.js';
+import useAuthenticator from '../useAuthenticator/useAuthenticator.mjs';
 
 // only select `route` from machine context
 const routeSelector = ({ route }) => [route];

package/dist/esm/Authenticator/hooks/useAuthenticatorRoute/{constants.js → constants.mjs}

@@ -52,6 +52,7 @@ const SIGN_UP_MACHINE_KEYS = [
 const SETUP_TOTP_MACHINE_KEYS = [
     ...COMMON_ROUTE_MACHINE_KEYS,
     'toSignIn',
+    'totpSecretCode',
 ];
 const VERIFY_USER_MACHINE_KEYS = [
     ...COMMON_ROUTE_MACHINE_KEYS,

package/dist/esm/Authenticator/hooks/useAuthenticatorRoute/{useAuthenticatorRoute.js → useAuthenticatorRoute.mjs}

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
-import useAuthenticator from '../useAuthenticator/useAuthenticator.js';
-import { getRouteMachineSelector, resolveDefault, resolveVerifyUserRoute, resolveSignUpRoute, resolveSignInRoute, resolveSetupTOTPRoute, resolveResetPasswordRoute, resolveForceNewPasswordRoute, resolveConfirmVerifyUserRoute, resolveConfirmSignUpRoute, resolveConfirmSignInRoute, resolveConfirmResetPasswordRoute, routeSelector } from './utils.js';
+import useAuthenticator from '../useAuthenticator/useAuthenticator.mjs';
+import { getRouteMachineSelector, resolveDefault, resolveVerifyUserRoute, resolveSignUpRoute, resolveSignInRoute, resolveSetupTOTPRoute, resolveResetPasswordRoute, resolveForceNewPasswordRoute, resolveConfirmVerifyUserRoute, resolveConfirmSignUpRoute, resolveConfirmSignInRoute, resolveConfirmResetPasswordRoute, routeSelector } from './utils.mjs';
 
 function useAuthenticatorRoute({ components, }) {
     const { route } = useAuthenticator(routeSelector);

package/dist/esm/Authenticator/hooks/useAuthenticatorRoute/{utils.js → utils.mjs}

@@ -1,7 +1,7 @@
-import { __rest } from '../../../node_modules/tslib/tslib.es6.js';
-import RenderNothing from '../../../components/RenderNothing/RenderNothing.js';
-import { isComponentRouteKey } from '../utils.js';
-import { MACHINE_PROP_KEYS, EVENT_HANDLER_KEY_MAP } from './constants.js';
+import { __rest } from '../../../node_modules/tslib/tslib.es6.mjs';
+import RenderNothing from '../../../components/RenderNothing/RenderNothing.mjs';
+import { isComponentRouteKey } from '../utils.mjs';
+import { MACHINE_PROP_KEYS, EVENT_HANDLER_KEY_MAP } from './constants.mjs';
 
 // only select `route` from machine context
 const routeSelector = ({ route }) => [route];
@@ -52,11 +52,10 @@ function resolveResetPasswordRoute(Component, props) {
         props: Object.assign(Object.assign({}, Component), getConvertedMachineProps('resetPassword', props)),
     };
 }
-function resolveSetupTOTPRoute(Component, _a) {
-    var { getTotpSecretCode } = _a, props = __rest(_a, ["getTotpSecretCode"]);
+function resolveSetupTOTPRoute(Component, props) {
     return {
         Component,
-        props: Object.assign(Object.assign(Object.assign({}, Component), getConvertedMachineProps('setupTOTP', props)), { getTotpSecretCode }),
+        props: Object.assign(Object.assign({}, Component), getConvertedMachineProps('setupTOTP', props)),
     };
 }
 function resolveSignInRoute(Component, props) {

package/dist/esm/Authenticator/hooks/{utils.js → utils.mjs}

@@ -1,4 +1,4 @@
-import { COMPONENT_ROUTE_KEYS, COMPONENT_ROUTE_NAMES } from './constants.js';
+import { COMPONENT_ROUTE_KEYS, COMPONENT_ROUTE_NAMES } from './constants.mjs';
 
 const isComponentRouteKey = (route) => COMPONENT_ROUTE_KEYS.some((componentRoute) => componentRoute === route);
 function resolveAuthenticatorComponents(defaults, overrides) {

package/dist/esm/InAppMessaging/context/InAppMessagingProvider/{InAppMessagingProvider.js → InAppMessagingProvider.mjs}

@@ -1,7 +1,6 @@
-import { jsx } from 'react/jsx-runtime';
-import { useState, useEffect, useCallback, useMemo } from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { Notifications } from '@aws-amplify/notifications';
-import InAppMessagingContext from '../InAppMessagingContext/InAppMessagingContext.js';
+import InAppMessagingContext from '../InAppMessagingContext/InAppMessagingContext.mjs';
 
 const { InAppMessaging } = Notifications;
 function InAppMessagingProvider({ children, }) {
@@ -20,7 +19,7 @@ function InAppMessagingProvider({ children, }) {
         displayMessage: setMessage,
         message,
     }), [clearMessage, message]);
-    return (jsx(InAppMessagingContext.Provider, Object.assign({ value: value }, { children: children })));
+    return (React.createElement(InAppMessagingContext.Provider, { value: value }, children));
 }
 
 export { InAppMessagingProvider as default };

package/dist/esm/InAppMessaging/hooks/useInAppMessaging/{useInAppMessaging.js → useInAppMessaging.mjs}

@@ -1,6 +1,5 @@
 import { useContext } from 'react';
-import InAppMessagingContext from '../../context/InAppMessagingContext/InAppMessagingContext.js';
-import 'react/jsx-runtime';
+import InAppMessagingContext from '../../context/InAppMessagingContext/InAppMessagingContext.mjs';
 import '@aws-amplify/notifications';
 
 /**

package/dist/esm/InAppMessaging/hooks/useMessage/{useMessage.js → useMessage.mjs}

@@ -1,9 +1,9 @@
 import { ConsoleLogger } from '@aws-amplify/core';
 import { InAppMessageInteractionEvent, Notifications } from '@aws-amplify/notifications';
-import isNil from 'lodash/isNil';
-import RenderNothing from '../../../components/RenderNothing/RenderNothing.js';
-import useInAppMessaging from '../useInAppMessaging/useInAppMessaging.js';
-import { getContentProps, getPositionProp } from './utils.js';
+import { isNil } from '@aws-amplify/ui';
+import RenderNothing from '../../../components/RenderNothing/RenderNothing.mjs';
+import useInAppMessaging from '../useInAppMessaging/useInAppMessaging.mjs';
+import { getContentProps, getPositionProp } from './utils.mjs';
 
 const EMPTY_PROPS = Object.freeze({});
 const logger = new ConsoleLogger('Notifications.InAppMessaging');

package/dist/esm/InAppMessaging/hooks/useMessage/{utils.js → utils.mjs}

@@ -1,4 +1,4 @@
-import { __rest } from '../../../node_modules/tslib/tslib.es6.js';
+import { __rest } from '../../../node_modules/tslib/tslib.es6.mjs';
 import { ConsoleLogger } from '@aws-amplify/core';
 
 const logger = new ConsoleLogger('Notifications.InAppMessaging');

package/dist/esm/InAppMessaging/utils/{handleMessageAction.js → handleMessageAction.mjs}

@@ -1,5 +1,5 @@
 import { ConsoleLogger } from '@aws-amplify/core';
-import isString from 'lodash/isString';
+import { isString } from '@aws-amplify/ui';
 
 const logger = new ConsoleLogger('Notifications.InAppMessaging');
 const handleMessageAction = ({ action, handleMessageLinkAction, url, }) => {

package/dist/esm/hooks/{useHasValueUpdated.js → useHasValueUpdated.mjs}

@@ -1,5 +1,5 @@
-import usePreviousValue from './usePreviousValue.js';
-import isUndefined from 'lodash/isUndefined';
+import { isUndefined } from '@aws-amplify/ui';
+import usePreviousValue from './usePreviousValue.mjs';
 
 function useHasValueUpdated(value, ignoreFirstRender = false) {
     const previous = usePreviousValue(value);

package/dist/esm/{index.js → index.mjs}

@@ -1,14 +1,14 @@
-export { default as AuthenticatorProvider } from './Authenticator/context/AuthenticatorProvider.js';
-import './Authenticator/context/AuthenticatorContext.js';
-export { default as useAuthenticator } from './Authenticator/hooks/useAuthenticator/useAuthenticator.js';
-export { default as useAuthenticatorRoute } from './Authenticator/hooks/useAuthenticatorRoute/useAuthenticatorRoute.js';
-export { default as useAuthenticatorInitMachine } from './Authenticator/hooks/useAuthenticatorInitMachine/useAuthenticatorInitMachine.js';
-export { isComponentRouteKey as isAuthenticatorComponentRouteKey, resolveAuthenticatorComponents } from './Authenticator/hooks/utils.js';
-export { default as useInAppMessaging } from './InAppMessaging/hooks/useInAppMessaging/useInAppMessaging.js';
-export { default as useMessage } from './InAppMessaging/hooks/useMessage/useMessage.js';
-import './InAppMessaging/context/InAppMessagingContext/InAppMessagingContext.js';
-export { default as InAppMessagingProvider } from './InAppMessaging/context/InAppMessagingProvider/InAppMessagingProvider.js';
-export { default as handleMessageAction } from './InAppMessaging/utils/handleMessageAction.js';
-export { default as usePreviousValue } from './hooks/usePreviousValue.js';
-export { default as useHasValueUpdated } from './hooks/useHasValueUpdated.js';
-export { templateJoin } from './utils/index.js';
+export { default as AuthenticatorProvider } from './Authenticator/context/AuthenticatorProvider.mjs';
+import './Authenticator/context/AuthenticatorContext.mjs';
+export { default as useAuthenticator } from './Authenticator/hooks/useAuthenticator/useAuthenticator.mjs';
+export { default as useAuthenticatorRoute } from './Authenticator/hooks/useAuthenticatorRoute/useAuthenticatorRoute.mjs';
+export { default as useAuthenticatorInitMachine } from './Authenticator/hooks/useAuthenticatorInitMachine/useAuthenticatorInitMachine.mjs';
+export { isComponentRouteKey as isAuthenticatorComponentRouteKey, resolveAuthenticatorComponents } from './Authenticator/hooks/utils.mjs';
+export { default as useInAppMessaging } from './InAppMessaging/hooks/useInAppMessaging/useInAppMessaging.mjs';
+export { default as useMessage } from './InAppMessaging/hooks/useMessage/useMessage.mjs';
+import './InAppMessaging/context/InAppMessagingContext/InAppMessagingContext.mjs';
+export { default as InAppMessagingProvider } from './InAppMessaging/context/InAppMessagingProvider/InAppMessagingProvider.mjs';
+export { default as handleMessageAction } from './InAppMessaging/utils/handleMessageAction.mjs';
+export { default as usePreviousValue } from './hooks/usePreviousValue.mjs';
+export { default as useHasValueUpdated } from './hooks/useHasValueUpdated.mjs';
+export { templateJoin } from './utils/index.mjs';

package/dist/esm/utils/{index.js → index.mjs}

@@ -1,6 +1,4 @@
-import isEmpty from 'lodash/isEmpty';
-import isObject from 'lodash/isObject';
-import isString from 'lodash/isString';
+import { isString, isEmpty, isObject } from '@aws-amplify/ui';
 
 function isEmptyArray(value) {
     return Array.isArray(value) && isEmpty(value);
@@ -9,7 +7,7 @@ function areEmptyArrays(...values) {
     return values.every(isEmptyArray);
 }
 function isEmptyObject(value) {
-    return isObject(value) && !Array.isArray(value) && isEmpty(value);
+    return isObject(value) && isEmpty(value);
 }
 function areEmptyObjects(...values) {
     return values.every(isEmptyObject);

package/dist/index.js

@@ -2,27 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var react = require('@xstate/react');
 var ui = require('@aws-amplify/ui');
 var awsAmplify = require('aws-amplify');
-var isString = require('lodash/isString');
-var isEmpty = require('lodash/isEmpty');
-var isObject = require('lodash/isObject');
 var notifications = require('@aws-amplify/notifications');
 var core = require('@aws-amplify/core');
-var isNil = require('lodash/isNil');
-var isUndefined = require('lodash/isUndefined');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
-var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
-var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
-var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
-var isUndefined__default = /*#__PURE__*/_interopDefaultLegacy(isUndefined);
 
 /**
  * AuthenticatorContext serves static reference to the auth machine service.
@@ -47,7 +36,7 @@ function AuthenticatorProvider({ children, }) {
         const unsubscribe = ui.listenToAuthHub(activeService);
         return unsubscribe;
     }, [activeService]);
-    return (jsxRuntime.jsx(AuthenticatorContext.Provider, Object.assign({ value: value }, { children: children })));
+    return (React__default["default"].createElement(AuthenticatorContext.Provider, { value: value }, children));
 }
 
 /******************************************************************************
@@ -90,19 +79,19 @@ function __awaiter(thisArg, _arguments, P, generator) {
 const USE_AUTHENTICATOR_ERROR = '`useAuthenticator` must be used inside an `Authenticator.Provider`.';
 
 function isEmptyArray(value) {
-    return Array.isArray(value) && isEmpty__default["default"](value);
+    return Array.isArray(value) && ui.isEmpty(value);
 }
 function areEmptyArrays(...values) {
     return values.every(isEmptyArray);
 }
 function isEmptyObject(value) {
-    return isObject__default["default"](value) && !Array.isArray(value) && isEmpty__default["default"](value);
+    return ui.isObject(value) && ui.isEmpty(value);
 }
 function areEmptyObjects(...values) {
     return values.every(isEmptyObject);
 }
 function templateJoin(values, template) {
-    return values.reduce((acc, curr) => `${acc}${isString__default["default"](curr) ? template(curr) : ''}`, '');
+    return values.reduce((acc, curr) => `${acc}${ui.isString(curr) ? template(curr) : ''}`, '');
 }
 
 const COMPONENT_ROUTE_KEYS = [
@@ -177,9 +166,7 @@ const getComparator = (selector) => (currentFacade, nextFacade) => {
 };
 const getQRFields = (state) => {
     var _a, _b, _c;
-    const fields = ui.getActorContext(state);
-    const QR = (_c = (_b = (_a = fields === null || fields === void 0 ? void 0 : fields.formFields) === null || _a === void 0 ? void 0 : _a.setupTOTP) === null || _b === void 0 ? void 0 : _b.QR) !== null && _c !== void 0 ? _c : {};
-    return Object.assign({}, QR);
+    return (Object.assign({}, (_c = (_b = (_a = ui.getActorContext(state)) === null || _a === void 0 ? void 0 : _a.formFields) === null || _b === void 0 ? void 0 : _b.setupTOTP) === null || _c === void 0 ? void 0 : _c.QR));
 };
 const getTotpSecretCodeCallback = (user) => function getTotpSecretCode() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -190,7 +177,7 @@ const flattenFormFields = (fields) => fields.flatMap(([name, options]) => (Objec
 const convertContactMethodsToFields = (unverifiedContactMethods) => {
     return (unverifiedContactMethods &&
         Object.entries(unverifiedContactMethods).map(([name, value]) => {
-            const valueIsString = isString__default["default"](value);
+            const valueIsString = ui.isString(value);
             if (!valueIsString || !name) {
                 return {};
             }
@@ -223,21 +210,20 @@ function useAuthenticator(selector) {
     const xstateSelector = React.useCallback((state) => (Object.assign({}, ui.getServiceFacade({ send, state }))), [send]);
     const comparator = selector ? getComparator(selector) : defaultComparator;
     const facade = react.useSelector(service, xstateSelector, comparator);
-    const { route, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "unverifiedContactMethods", "user"]);
+    const { route, totpSecretCode, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "totpSecretCode", "unverifiedContactMethods", "user"]);
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
     // `fields` from updating with current form state on value changes
     const serviceSnapshot = service.getSnapshot();
     // legacy `QRFields` values only used for SetupTOTP page to retrieve issuer information, will be removed in future
-    const QRFields = React.useMemo(() => getQRFields(serviceSnapshot), [serviceSnapshot]);
+    const QRFields = route === 'setupTOTP' ? getQRFields(serviceSnapshot) : null;
     // legacy `formFields` values required until form state is removed from state machine
-    const fields = React.useMemo(() => getMachineFields(route, serviceSnapshot, unverifiedContactMethods), [route, serviceSnapshot, unverifiedContactMethods]);
-    return Object.assign(Object.assign({}, rest), { getTotpSecretCode: getTotpSecretCodeCallback(user), route,
+    const fields = getMachineFields(route, serviceSnapshot, unverifiedContactMethods);
+    return Object.assign(Object.assign({}, rest), { route,
+        totpSecretCode,
         unverifiedContactMethods,
         user,
         /** @deprecated For internal use only */
-        fields,
-        /** @deprecated For internal use only */
-        QRFields });
+        fields, getTotpSecretCode: getTotpSecretCodeCallback(user), QRFields });
 }
 
 /**
@@ -301,6 +287,7 @@ const SIGN_UP_MACHINE_KEYS = [
 const SETUP_TOTP_MACHINE_KEYS = [
     ...COMMON_ROUTE_MACHINE_KEYS,
     'toSignIn',
+    'totpSecretCode',
 ];
 const VERIFY_USER_MACHINE_KEYS = [
     ...COMMON_ROUTE_MACHINE_KEYS,
@@ -368,11 +355,10 @@ function resolveResetPasswordRoute(Component, props) {
         props: Object.assign(Object.assign({}, Component), getConvertedMachineProps('resetPassword', props)),
     };
 }
-function resolveSetupTOTPRoute(Component, _a) {
-    var { getTotpSecretCode } = _a, props = __rest(_a, ["getTotpSecretCode"]);
+function resolveSetupTOTPRoute(Component, props) {
     return {
         Component,
-        props: Object.assign(Object.assign(Object.assign({}, Component), getConvertedMachineProps('setupTOTP', props)), { getTotpSecretCode }),
+        props: Object.assign(Object.assign({}, Component), getConvertedMachineProps('setupTOTP', props)),
     };
 }
 function resolveSignInRoute(Component, props) {
@@ -481,7 +467,7 @@ function InAppMessagingProvider({ children, }) {
         displayMessage: setMessage,
         message,
     }), [clearMessage, message]);
-    return (jsxRuntime.jsx(InAppMessagingContext.Provider, Object.assign({ value: value }, { children: children })));
+    return (React__default["default"].createElement(InAppMessagingContext.Provider, { value: value }, children));
 }
 
 /**
@@ -548,7 +534,7 @@ const { InAppMessaging } = notifications.Notifications;
 function useMessage({ components, onMessageAction, }) {
     const { clearMessage, message } = useInAppMessaging();
     const { BannerMessage, CarouselMessage, FullScreenMessage, ModalMessage } = components;
-    if (isNil__default["default"](message)) {
+    if (ui.isNil(message)) {
         return {
             Component: RenderNothing,
             props: EMPTY_PROPS,
@@ -610,7 +596,7 @@ const logger = new core.ConsoleLogger('Notifications.InAppMessaging');
 const handleMessageAction = ({ action, handleMessageLinkAction, url, }) => {
     logger.info(`Handle action: ${action}`);
     if (action === 'LINK' || action === 'DEEP_LINK') {
-        if (!isString__default["default"](url)) {
+        if (!ui.isString(url)) {
             logger.warn(`url must be of type string. Received: ${url}`);
             return;
         }
@@ -630,7 +616,7 @@ function usePreviousValue(value) {
 
 function useHasValueUpdated(value, ignoreFirstRender = false) {
     const previous = usePreviousValue(value);
-    const shouldIgnoreChange = isUndefined__default["default"](previous) && ignoreFirstRender;
+    const shouldIgnoreChange = ui.isUndefined(previous) && ignoreFirstRender;
     if (shouldIgnoreChange) {
         return false;
     }

package/dist/types/Authenticator/hooks/types.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AuthChallengeName, AuthenticatorServiceFacade, LegacyFormFieldOptions } from '@aws-amplify/ui';
+import { UseAuthenticator } from './useAuthenticator';
 export declare type AuthenticatorRouteComponentKey = 'confirmResetPassword' | 'confirmSignIn' | 'confirmSignUp' | 'confirmVerifyUser' | 'forceNewPassword' | 'resetPassword' | 'setupTOTP' | 'signIn' | 'signUp' | 'verifyUser';
 export declare type AuthenticatorLegacyField = LegacyFormFieldOptions;
 export declare type AuthenticatorLegacyFields = AuthenticatorLegacyField[];
@@ -10,7 +11,6 @@ export declare type AuthenticatorLegacyFields = AuthenticatorLegacyField[];
 export declare type AuthenticatorMachineContext = AuthenticatorServiceFacade;
 export declare type AuthenticatorMachineContextKey = keyof AuthenticatorMachineContext;
 export declare type AuthenticatorRouteComponentName = Capitalize<AuthenticatorRouteComponentKey>;
-export declare type GetTotpSecretCode = () => Promise<string>;
 interface HeaderProps {
     children?: React.ReactNode;
 }
@@ -18,8 +18,8 @@ interface FooterProps {
     children?: React.ReactNode;
 }
 declare type FormFieldsProps = {
-    isPending: AuthenticatorMachineContext['isPending'];
-    validationErrors?: AuthenticatorMachineContext['validationErrors'];
+    isPending: UseAuthenticator['isPending'];
+    validationErrors?: UseAuthenticator['validationErrors'];
 };
 export declare type FooterComponent<Props = {}> = React.ComponentType<FooterProps & Props>;
 export declare type FormFieldsComponent<FieldType, Props = {}> = React.ComponentType<FormFieldsProps & {
@@ -35,55 +35,55 @@ export interface ComponentSlots<FieldType = {}> {
  * Common component prop types used for both RWA and RNA implementations
  */
 export declare type CommonRouteProps = {
-    error?: AuthenticatorMachineContext['error'];
-    isPending: AuthenticatorMachineContext['isPending'];
-    handleBlur: AuthenticatorMachineContext['updateBlur'];
-    handleChange: AuthenticatorMachineContext['updateForm'];
-    handleSubmit: AuthenticatorMachineContext['submitForm'];
+    error?: UseAuthenticator['error'];
+    isPending: UseAuthenticator['isPending'];
+    handleBlur: UseAuthenticator['updateBlur'];
+    handleChange: UseAuthenticator['updateForm'];
+    handleSubmit: UseAuthenticator['submitForm'];
 };
 /**
  * Base Route component props
  */
 export declare type ConfirmResetPasswordBaseProps<FieldType = {}> = {
-    resendCode: AuthenticatorMachineContext['resendCode'];
-    validationErrors?: AuthenticatorMachineContext['validationErrors'];
+    resendCode: UseAuthenticator['resendCode'];
+    validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type ConfirmSignInBaseProps<FieldType = {}> = {
     challengeName: AuthChallengeName;
-    toSignIn: AuthenticatorMachineContext['toSignIn'];
+    toSignIn: UseAuthenticator['toSignIn'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type ConfirmSignUpBaseProps<FieldType = {}> = {
-    codeDeliveryDetails: AuthenticatorMachineContext['codeDeliveryDetails'];
-    resendCode: AuthenticatorMachineContext['resendCode'];
+    codeDeliveryDetails: UseAuthenticator['codeDeliveryDetails'];
+    resendCode: UseAuthenticator['resendCode'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type ConfirmVerifyUserProps<FieldType = {}> = {
-    skipVerification: AuthenticatorMachineContext['skipVerification'];
+    skipVerification: UseAuthenticator['skipVerification'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type ForceResetPasswordBaseProps<FieldType = {}> = {
-    toSignIn: AuthenticatorMachineContext['toSignIn'];
-    validationErrors?: AuthenticatorMachineContext['validationErrors'];
+    toSignIn: UseAuthenticator['toSignIn'];
+    validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type ResetPasswordBaseProps<FieldType = {}> = {
-    toSignIn: AuthenticatorMachineContext['toSignIn'];
+    toSignIn: UseAuthenticator['toSignIn'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type SetupTOTPBaseProps<FieldType = {}> = {
-    getTotpSecretCode: GetTotpSecretCode;
-    toSignIn: AuthenticatorMachineContext['toSignIn'];
+    toSignIn: UseAuthenticator['toSignIn'];
+    totpSecretCode: UseAuthenticator['totpSecretCode'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type SignInBaseProps<FieldType = {}> = {
     hideSignUp?: boolean;
-    toFederatedSignIn: AuthenticatorMachineContext['toFederatedSignIn'];
-    toResetPassword: AuthenticatorMachineContext['toResetPassword'];
-    toSignUp: AuthenticatorMachineContext['toSignUp'];
+    toFederatedSignIn: UseAuthenticator['toFederatedSignIn'];
+    toResetPassword: UseAuthenticator['toResetPassword'];
+    toSignUp: UseAuthenticator['toSignUp'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type SignUpBaseProps<FieldType = {}> = {
     hideSignIn?: boolean;
-    toFederatedSignIn: AuthenticatorMachineContext['toFederatedSignIn'];
-    toSignIn: AuthenticatorMachineContext['toSignIn'];
-    validationErrors?: AuthenticatorMachineContext['validationErrors'];
+    toFederatedSignIn: UseAuthenticator['toFederatedSignIn'];
+    toSignIn: UseAuthenticator['toSignIn'];
+    validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export declare type VerifyUserProps<FieldType = {}> = {
-    skipVerification: AuthenticatorMachineContext['skipVerification'];
+    skipVerification: UseAuthenticator['skipVerification'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export interface DefaultProps<FieldType = {}> {
     ConfirmSignIn: ConfirmSignInBaseProps<FieldType>;

package/dist/types/Authenticator/hooks/useAuthenticator/types.d.ts

@@ -15,14 +15,15 @@ export declare type AuthenticatorLegacyFields = LegacyFormFieldOptions[];
  */
 export declare type UseAuthenticatorSelector = (context: AuthenticatorMachineContext) => AuthenticatorMachineContext[AuthenticatorMachineContextKey][];
 export interface UseAuthenticator extends AuthenticatorServiceFacade {
+    /** @deprecated For internal use only */
+    fields: AuthenticatorLegacyFields;
+    /** @deprecated For internal use only */
     getTotpSecretCode: () => Promise<string>;
     /** @deprecated For internal use only */
     QRFields: {
         totpIssuer?: string;
         totpUsername?: string;
-    };
-    /** @deprecated For internal use only */
-    fields: AuthenticatorLegacyFields;
+    } | null;
 }
 export declare type Comparator = (currentMachineContext: AuthenticatorMachineContext, nextMachineContext: AuthenticatorMachineContext) => boolean;
 export {};

package/dist/types/Authenticator/hooks/useAuthenticatorRoute/utils.d.ts

@@ -10,7 +10,7 @@ export declare function resolveConfirmSignUpRoute<FieldType = {}>(Component: Def
 export declare function resolveConfirmVerifyUserRoute<FieldType = {}>(Component: Defaults<FieldType>['ConfirmVerifyUser'], props: UseAuthenticator): UseAuthenticatorRoute<'ConfirmVerifyUser', FieldType>;
 export declare function resolveForceNewPasswordRoute<FieldType = {}>(Component: Defaults<FieldType>['ForceNewPassword'], props: UseAuthenticator): UseAuthenticatorRoute<'ForceNewPassword', FieldType>;
 export declare function resolveResetPasswordRoute<FieldType = {}>(Component: Defaults<FieldType>['ResetPassword'], props: UseAuthenticator): UseAuthenticatorRoute<'ResetPassword', FieldType>;
-export declare function resolveSetupTOTPRoute<FieldType = {}>(Component: Defaults<FieldType>['SetupTOTP'], { getTotpSecretCode, ...props }: UseAuthenticator): UseAuthenticatorRoute<'SetupTOTP', FieldType>;
+export declare function resolveSetupTOTPRoute<FieldType = {}>(Component: Defaults<FieldType>['SetupTOTP'], props: UseAuthenticator): UseAuthenticatorRoute<'SetupTOTP', FieldType>;
 export declare function resolveSignInRoute<FieldType = {}>(Component: Defaults<FieldType>['SignIn'], props: UseAuthenticator): UseAuthenticatorRoute<'SignIn', FieldType>;
 export declare function resolveSignUpRoute<FieldType = {}>(Component: Defaults<FieldType>['SignUp'], props: UseAuthenticator): UseAuthenticatorRoute<'SignUp', FieldType>;
 export declare function resolveVerifyUserRoute<FieldType = {}>(Component: Defaults<FieldType>['VerifyUser'], props: UseAuthenticator): UseAuthenticatorRoute<'VerifyUser', FieldType>;

package/dist/types/components/RenderNothing/RenderNothing.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * Utility component for rendering nothing.
  */

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@aws-amplify/ui-react-core",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "main": "dist/index.js",
-  "module": "dist/esm/index.js",
+  "module": "dist/esm/index.mjs",
   "react-native": "dist/index.js",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
+      "import": "./dist/esm/index.mjs",
       "require": "./dist/index.js"
     },
     "./package.json": "./package.json"
@@ -28,7 +28,7 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.5.2",
+    "@aws-amplify/ui": "5.5.4",
     "@xstate/react": "3.0.1",
     "lodash": "4.17.21",
     "xstate": "^4.33.6"
@@ -38,7 +38,6 @@
     "react": ">= 16.14.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^22.0.1",
     "@rollup/plugin-typescript": "^8.3.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",