-
{menuItems.map(item => (
{userConfig.name}
{userConfig.detail ? {userConfig.detail}
: null}
{ userActionConfig && (
-
+
)}
diff --git a/packages/terra-application/src/application-navigation/private/drawer-menu/_DrawerMenu.jsx b/packages/terra-application/src/application-navigation/private/drawer-menu/_DrawerMenu.jsx
index 100470451..2744620b5 100644
--- a/packages/terra-application/src/application-navigation/private/drawer-menu/_DrawerMenu.jsx
+++ b/packages/terra-application/src/application-navigation/private/drawer-menu/_DrawerMenu.jsx
@@ -93,13 +93,6 @@ const propTypes = {
* A configuration object to render an action button for user Config.
*/
userActionConfig: userActionConfigPropType,
- /**
- * @private
- * Given a callback function, menuClosingCallback will return a new function
- * that will ensure that the various menu states are reset before the callback function
- * is executed.
- */
- menuClosingCallback: PropTypes.func,
};
const defaultProps = {
@@ -123,18 +116,9 @@ const DrawerMenu = ({
notifications,
intl,
userActionConfig,
- menuClosingCallback,
}) => {
const titleComponent = titleConfig && !(titleConfig.element || titleConfig.hideTitleWithinDrawerMenu) ? {userConfig.name}
{userConfig.detail ? {userConfig.detail}
: null}
{ userActionConfig && (
-
+
)}
Supported `height` values include: `'240'`, `'420'`, `'600'`, `'690'`, `'780'`, `'870'`, `'960'`, `'1140'`.
Supported `width` values include: `'320'`, `'480'`, `'560'`, `'640'`, `'800'`, `'960'`, `'1120'`, `'1280'`, `'1440'`, `'1600'`, `'1760'`, `'1920'`.| |`content`|**required**|An Object containing a key and a component describing the component to be disclosed. See the `content` API below.| +### Content props + `content` Object API: |Key|Is Required|Value| diff --git a/packages/terra-application/src/terra-dev-site/app/demo/AppPage.jsx b/packages/terra-application/src/terra-dev-site/app/demo/AppPage.jsx index 1c53187cb..a6893f4f1 100644 --- a/packages/terra-application/src/terra-dev-site/app/demo/AppPage.jsx +++ b/packages/terra-application/src/terra-dev-site/app/demo/AppPage.jsx @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import classNames from 'classnames/bind'; import { ActiveBreakpointContext } from 'terra-application/lib/breakpoints'; import ApplicationLoadingOverlay from 'terra-application/lib/application-loading-overlay'; -import { ApplicationIntlContext } from 'terra-application/lib/application-intl'; +import { useIntl } from 'react-intl'; import { ThemeContext } from 'terra-application/lib/theme'; import { ApplicationNavigationActionsContext } from 'terra-application/lib/application-navigation'; @@ -23,7 +23,7 @@ const AppPage = ({ pageName }) => { const [isInitialized, setIsInitialized] = useState(false); const activeBreakpoint = useContext(ActiveBreakpointContext); - const applicationIntl = useContext(ApplicationIntlContext); + const applicationIntl = useIntl(); const theme = React.useContext(ThemeContext); const [hasError, setHasError] = useState(false); diff --git a/packages/terra-application/src/terra-dev-site/app/demo/ModalPresenter.jsx b/packages/terra-application/src/terra-dev-site/app/demo/ModalPresenter.jsx index 9c56f1866..80152a4d8 100644 --- a/packages/terra-application/src/terra-dev-site/app/demo/ModalPresenter.jsx +++ b/packages/terra-application/src/terra-dev-site/app/demo/ModalPresenter.jsx @@ -7,7 +7,7 @@ import classNames from 'classnames/bind'; import Scroll from 'terra-scroll'; import { ActiveBreakpointContext } from 'terra-application/lib/breakpoints'; import ApplicationLoadingOverlay from 'terra-application/lib/application-loading-overlay'; -import { ApplicationIntlContext } from 'terra-application/lib/application-intl'; +import { useIntl } from 'react-intl'; import { DisclosureManagerContext, DisclosureManagerHeaderAdapter } from 'terra-application/lib/disclosure-manager'; import PendingActionToggle from './PendingActionToggle'; @@ -17,7 +17,7 @@ const cx = classNames.bind(styles); const ModalContent = ({ name, onSubmit }) => { const activeBreakpoint = useContext(ActiveBreakpointContext); - const applicationIntl = useContext(ApplicationIntlContext); + const applicationIntl = useIntl(); const disclosureManager = useContext(DisclosureManagerContext); const [hasError, setHasError] = useState(false); diff --git a/packages/terra-application/src/terra-dev-site/app/how-to.3/use-translated-strings.app.mdx b/packages/terra-application/src/terra-dev-site/app/how-to.3/use-translated-strings.app.mdx index dd4a1240f..d36195c00 100644 --- a/packages/terra-application/src/terra-dev-site/app/how-to.3/use-translated-strings.app.mdx +++ b/packages/terra-application/src/terra-dev-site/app/how-to.3/use-translated-strings.app.mdx @@ -7,15 +7,12 @@ Every child of [ApplicationBase](/application/terra-application/components/appli application's translated strings. Please review Terra's [recommended consumption guides](https://engineering.cerner.com/terra-ui/guides/terra-ui/internationalization/building-components-which-include-translations) for more information. -Additionally, ApplicateBase provides react-intl's APIs through the [ApplicationIntlContext](/application/terra-application/contexts/application-intl-context) -for consumers seeking a modern Context implementation. - ```jsx import React, { useContext } from 'react'; -import { ApplicationIntlContext } from 'terra-application/lib/application-intl'; +import { useIntl } from 'react-intl'; const ExampleComponent = () => { - const applicationIntl = useContext(ApplicationIntlContext); + const applicationIntl = useIntl(); return (
@@ -33,4 +30,4 @@ export default ExampleComponent;
```
> Accessing react-intl's [legacy context value](https://reactjs.org/docs/legacy-context.html) directly is **not recommended**.
-> This API is deprecated and not provided by react-intl v3.x. Terra's recommended usage patterns are supported by versions 2.x and 3.x of react-intl.
+> This API is deprecated and not provided by react-intl v3.x. Terra's recommended usage patterns are supported by versions 5.x of react-intl.
diff --git a/packages/terra-application/src/terra-dev-site/test/application-base/ApplicationBaseTest.test.jsx b/packages/terra-application/src/terra-dev-site/test/application-base/ApplicationBaseTest.test.jsx
index 4365833ce..f675e1564 100644
--- a/packages/terra-application/src/terra-dev-site/test/application-base/ApplicationBaseTest.test.jsx
+++ b/packages/terra-application/src/terra-dev-site/test/application-base/ApplicationBaseTest.test.jsx
@@ -4,7 +4,7 @@ import ApplicationLoadingOverlay from 'terra-application/lib/application-loading
import ApplicationStatusOverlay from 'terra-application/lib/application-status-overlay';
import ApplicationBase from 'terra-application/lib/application-base';
import NavigationPrompt from 'terra-application/lib/navigation-prompt';
-import { ApplicationIntlContext } from 'terra-application/lib/application-intl';
+import { useIntl } from 'react-intl';
import { ThemeContext } from 'terra-application/lib/theme';
const ApplicationContentTest = () => {
@@ -14,7 +14,7 @@ const ApplicationContentTest = () => {
const [showStatusOverlay, setShowStatusOverlay] = useState(false);
const activeBreakpoint = useContext(ActiveBreakpointContext);
- const applicationIntl = useContext(ApplicationIntlContext);
+ const applicationIntl = useIntl();
const theme = useContext(ThemeContext);
if (throwError) {
diff --git a/packages/terra-application/src/terra-dev-site/test/application-base/private/testOverridesTest.test.jsx b/packages/terra-application/src/terra-dev-site/test/application-base/private/testOverridesTest.test.jsx
index e74eec9e1..602ca5457 100644
--- a/packages/terra-application/src/terra-dev-site/test/application-base/private/testOverridesTest.test.jsx
+++ b/packages/terra-application/src/terra-dev-site/test/application-base/private/testOverridesTest.test.jsx
@@ -1,9 +1,9 @@
import React, { useContext } from 'react';
-import { ApplicationIntlContext } from 'terra-application/lib/application-intl';
+import { useIntl } from 'react-intl';
import { ThemeContext } from 'terra-application/lib/theme';
const TestOverrideTest = () => {
- const applicationIntl = useContext(ApplicationIntlContext);
+ const applicationIntl = useIntl();
const theme = useContext(ThemeContext);
return (
));
expect(wrapper).toMatchSnapshot();
});
+
it('should render without scroll', () => {
- const wrapper = enzyme.shallow((
+ const wrapper = enzymeIntl.mountWithIntl((
));
expect(wrapper).toMatchSnapshot();
});
-
- it('should render with theme and density', () => {
- const wrapper = enzyme.shallow((
-
-
- ));
-
- const themeProvider = wrapper.find('ThemeProvider');
- expect(themeProvider.props().themeName).toBe('test-theme');
- expect(themeProvider.props().density).toBe('compact');
-
- const themeContext = wrapper.find('ThemeContextProvider');
- expect(themeContext.props().theme).toStrictEqual({ name: 'test-theme', className: 'test-theme', density: 'compact' });
- });
-
- it('should render with density', () => {
- const wrapper = enzyme.shallow((
-
-
- ));
-
- const themeProvider = wrapper.find('ThemeProvider');
- expect(themeProvider.props().themeName).toBeUndefined();
- expect(themeProvider.props().density).toBe('compact');
-
- const themeContext = wrapper.find('ThemeContextProvider');
- expect(themeContext.props().theme).toStrictEqual({ name: 'terra-default-theme', className: undefined, density: 'compact' });
- });
});
diff --git a/packages/terra-application/tests/jest/application-base/private/i18nloader.test.js b/packages/terra-application/tests/jest/application-base/private/i18nloader.test.js
new file mode 100644
index 000000000..95ce26954
--- /dev/null
+++ b/packages/terra-application/tests/jest/application-base/private/i18nloader.test.js
@@ -0,0 +1,201 @@
+/* eslint-disable no-console, import/no-unresolved */
+import * as relativetimeformatPolyfill from '@formatjs/intl-relativetimeformat/should-polyfill';
+import i18nLoader from '../../../../src/application-base/private/i18nLoader';
+import defaultLoadIntl from '../../../../src/application-base/private/intlLoaders';
+import loadTranslations from '../../../../src/application-base/private/translationsLoaders';
+
+jest.mock('../../../../src/application-base/private/intlLoaders');
+jest.mock('../../../../src/application-base/private/translationsLoaders');
+jest.mock('@formatjs/intl-relativetimeformat/should-polyfill');
+
+global.console.warn = jest.fn();
+
+describe('i18nLoader', () => {
+ beforeEach(() => {
+ console.warn.mockClear();
+ });
+
+ describe('when intl is provided by browser', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ global.Intl = { DateTimeFormat: jest.fn(), NumberFormat: jest.fn(), PluralRules: jest.fn() };
+ relativetimeformatPolyfill.shouldPolyfill = jest.fn().mockReturnValue(false);
+ i18nLoader('en');
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('does not add the intl polyfill ', () => {
+ expect(global.IntlPolyfill).not.toBeDefined();
+ });
+
+ it('does not load intl data', () => {
+ expect(defaultLoadIntl).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('when Intl.RelativeTimeFormat is not defined', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ loadTranslations.mockClear();
+ global.Intl = { DateTimeFormat: jest.fn(), NumberFormat: jest.fn(), PluralRules: jest.fn() };
+ relativetimeformatPolyfill.shouldPolyfill = jest.fn().mockReturnValue(true);
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('loads en locale', () => {
+ i18nLoader('en');
+
+ // adds the intl polyfill
+ expect(global.Intl).toBeDefined();
+
+ // loads the locale data
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'en', 'relativetimeformat');
+
+ // loads translations
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'en');
+ });
+
+ it('loads es locale', () => {
+ i18nLoader('es');
+
+ // loads the new locale data on sequential load
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'es', 'relativetimeformat');
+
+ // loads the new translation data on sequential load
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'es');
+ });
+ });
+
+ describe('when intl is not defined', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ loadTranslations.mockClear();
+ relativetimeformatPolyfill.shouldPolyfill = jest.fn().mockReturnValue(false);
+ global.Intl = undefined;
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('loads en locale', () => {
+ i18nLoader('en');
+
+ // adds the intl polyfill
+ expect(global.Intl).toBeDefined();
+ expect(global.IntlPolyfill).toBeDefined();
+
+ // loads the locale data
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'en', 'intl');
+
+ // loads translations
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'en');
+ });
+
+ it('loads es locale', () => {
+ i18nLoader('es');
+
+ // loads the new locale data on sequential load
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'es', 'intl');
+
+ // loads the new translation data on sequential load
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'es');
+ });
+ });
+
+ describe('when Intl.DataTimeFormat is not defined', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ loadTranslations.mockClear();
+ global.Intl = { DateTimeFormat: undefined };
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('loads en locale', () => {
+ i18nLoader('en');
+
+ // adds the intl polyfill
+ expect(global.Intl).toBeDefined();
+ expect(global.IntlPolyfill).toBeDefined();
+
+ // loads the locale data
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'en', 'intl');
+
+ // loads translations
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'en');
+ });
+
+ it('loads es locale', () => {
+ i18nLoader('es');
+
+ // loads the new locale data on sequential load
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'es', 'intl');
+
+ // loads the new translation data on sequential load
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'es');
+ });
+ });
+
+ describe('when Intl.NumberFormat is not defined', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ loadTranslations.mockClear();
+ global.Intl = { DateTimeFormat: jest.fn() };
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('loads en locale', () => {
+ i18nLoader('en');
+
+ // adds the intl polyfill
+ expect(global.Intl).toBeDefined();
+ expect(global.IntlPolyfill).toBeDefined();
+
+ // loads the locale data
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'en', 'intl');
+
+ // loads translations
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'en');
+ });
+
+ it('loads es locale', () => {
+ i18nLoader('es');
+
+ // loads the new locale data on sequential load
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'es', 'intl');
+
+ // loads the new translation data on sequential load
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'es');
+ });
+ });
+
+ describe('when Intl.PluralRules is not defined', () => {
+ beforeAll(() => {
+ defaultLoadIntl.mockClear();
+ loadTranslations.mockClear();
+ global.Intl = { DateTimeFormat: jest.fn(), NumberFormat: jest.fn() };
+ });
+ afterAll(() => { global.Intl = undefined; });
+
+ it('loads en locale', () => {
+ i18nLoader('en');
+
+ // adds the intl polyfill
+ expect(global.Intl).toBeDefined();
+ expect(global.IntlPolyfill).toBeDefined();
+
+ // loads the locale data
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'en', 'intl');
+
+ // loads translations
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'en');
+ });
+
+ it('loads es locale', () => {
+ i18nLoader('es');
+
+ // loads the new locale data on sequential load
+ expect(defaultLoadIntl).toHaveBeenNthCalledWith(1, 'es', 'intl');
+
+ // loads the new translation data on sequential load
+ expect(loadTranslations).toHaveBeenNthCalledWith(1, 'es');
+ });
+ });
+});
diff --git a/packages/terra-application/tests/jest/application-base/private/intlLoaders.test.js b/packages/terra-application/tests/jest/application-base/private/intlLoaders.test.js
new file mode 100644
index 000000000..e4f58298b
--- /dev/null
+++ b/packages/terra-application/tests/jest/application-base/private/intlLoaders.test.js
@@ -0,0 +1,239 @@
+import hasIntlData from 'intl-locales-supported';
+import * as loadLocaleData from '../../../../src/application-base/private/loadLocaleData';
+import loadIntl from '../../../../src/application-base/private/intlLoaders';
+import logger from '../../../../src/utils/logger';
+
+jest.mock('intl-locales-supported');
+jest.mock('../../../../src/application-base/private/loadLocaleData');
+jest.mock('../../../../src/utils/logger', () => ({
+ warn: jest.fn(),
+}));
+
+const supportedIntlConstructors = [
+ Intl.DateTimeFormat,
+ Intl.NumberFormat,
+ Intl.PluralRules,
+];
+
+describe('intlLoaders', () => {
+ beforeAll(() => {
+ hasIntlData.mockReturnValue(false);
+ });
+
+ afterAll(() => {
+ window.Intl.mockReset();
+ });
+
+ describe('dev environment', () => {
+ beforeEach(() => {
+ logger.warn.mockClear();
+ });
+
+ it('logs a warning when the regional locale is not provided and locale fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data was not supplied for the es-US locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(4);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(logger.warn).toBeCalledWith('Locale data was not supplied for the es-US locale. Using es data as the fallback locale data.');
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(2);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(2, 'es', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ });
+ });
+
+ it('logs a warning when the locale is not provided and en fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es') {
+ return Promise.reject(Error('Locale data was not supplied for the es locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(3);
+ return loadIntl('es', 'intl').then(() => {
+ expect(logger.warn).toBeCalledWith('Locale data was not supplied for the es locale. Using en data as the fallback locale data.');
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(2);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(2, 'en', 'intl');
+ });
+ });
+
+ it('logs a warning when the regional locale and locale are not provided and en fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data was not supplied for the es-US locale.'));
+ }
+ if (locale === 'es') {
+ return Promise.reject(Error('Locale data was not supplied for the es locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(4);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(logger.warn).toBeCalledWith('Locale data was not supplied for the es-US locale. Using es data as the fallback locale data.');
+ expect(logger.warn).toBeCalledWith('Locale data was not supplied for the es locale. Using en data as the fallback locale data.');
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(3);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(3, 'en', 'intl');
+ });
+ });
+
+ it('throws an error when the regional locale and en fallback are not provided', () => {
+ loadLocaleData.default = jest.fn(() => Promise.reject(Error('Test no locale data')));
+ return expect(loadIntl('es-US', 'intl')).rejects.toThrow('Test no locale data');
+ });
+
+ it('throws an error when the locale and en fallback are not provided', () => {
+ loadLocaleData.default = jest.fn(() => Promise.reject(Error('Test no locale data')));
+ return expect(loadIntl('es', 'intl')).rejects.toThrow('Test no locale data');
+ });
+ });
+
+ describe('production environment', () => {
+ beforeEach(() => {
+ process.env.NODE_ENV = 'production';
+ logger.warn.mockClear();
+ });
+
+ afterEach(() => {
+ delete process.env.NODE_ENV;
+ });
+
+ it('only fallbacks when the regional locale is not provided and locale fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data was not supplied for the es-US locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(3);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(2);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(2, 'es', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ });
+ });
+
+ it('only fallbacks when the regional locale and locale are not provided and en fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es') {
+ return Promise.reject(Error('Locale data was not supplied for the es locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(2);
+ return loadIntl('es', 'intl').then(() => {
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(2);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(2, 'en', 'intl');
+ });
+ });
+
+ it('only fallbacks when the locale is not provided and en fallback is used', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data was not supplied for the es-US locale.'));
+ }
+ if (locale === 'es') {
+ return Promise.reject(Error('Locale data was not supplied for the es locale.'));
+ }
+ return Promise.resolve();
+ });
+ expect.assertions(2);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(loadLocaleData.default).toHaveBeenCalledTimes(3);
+ expect(loadLocaleData.default).toHaveBeenNthCalledWith(3, 'en', 'intl');
+ });
+ });
+
+ it('still throws an error when the locale and en fallback are not provided', () => {
+ loadLocaleData.default = jest.fn(() => Promise.reject(Error('Test no locale data')));
+ return expect(loadIntl('es-US', 'intl')).rejects.toThrow('Test no locale data');
+ });
+
+ it('still throws an error when the regional locale and en fallback are not provided', () => {
+ loadLocaleData.default = jest.fn(() => Promise.reject(Error('Test no locale data')));
+ return expect(loadIntl('es', 'intl')).rejects.toThrow('Test no locale data');
+ });
+ });
+ describe('loads locale data as needed', () => {
+ beforeEach(() => {
+ hasIntlData.mockClear();
+ loadLocaleData.default = jest.fn(() => Promise.resolve());
+ });
+
+ it('loads locale data', () => {
+ hasIntlData.mockReturnValue(false);
+ expect.assertions(3);
+ return loadIntl('es', 'intl').then(() => {
+ expect(loadLocaleData.default).toHaveBeenCalledWith('es', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ expect(hasIntlData).toBeCalledWith(['es'], supportedIntlConstructors);
+ });
+ });
+
+ it('does not re-load locale data when it has already been loaded', () => {
+ hasIntlData.mockReturnValue(true);
+ expect.assertions(3);
+ return loadIntl('es', 'intl').then(() => {
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('es', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ expect(hasIntlData).toBeCalledWith(['es'], supportedIntlConstructors);
+ });
+ });
+
+ it('does load new locale data', () => {
+ hasIntlData.mockReturnValue(false);
+ expect.assertions(3);
+ return loadIntl('pt', 'intl').then(() => {
+ expect(loadLocaleData.default).toHaveBeenCalledWith('pt', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ expect(hasIntlData).toBeCalledWith(['pt'], supportedIntlConstructors);
+ });
+ });
+
+ it('does not re-load region locale data if regional local has already been loaded', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data not provided for es-US locale.'));
+ }
+
+ return Promise.resolve();
+ });
+ hasIntlData.mockReturnValue(true);
+ expect.assertions(3);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('es', 'intl');
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ expect(hasIntlData).toHaveBeenNthCalledWith(1, ['es-US'], supportedIntlConstructors);
+ });
+ });
+
+ it('does not fallback locale data if fallback has already been loaded', () => {
+ loadLocaleData.default = jest.fn(locale => {
+ if (locale === 'es-US') {
+ return Promise.reject(Error('Locale data not provided for es-US locale.'));
+ }
+ if (locale === 'es') {
+ return Promise.reject(Error('Locale data not provided for es locale.'));
+ }
+
+ return Promise.resolve();
+ });
+ hasIntlData.mockReturnValue(false).mockReturnValueOnce(true);
+ expect.assertions(2);
+ return loadIntl('es-US', 'intl').then(() => {
+ expect(loadLocaleData.default).not.toHaveBeenCalledWith('en', 'intl');
+ expect(hasIntlData).toHaveBeenNthCalledWith(1, ['es-US'], supportedIntlConstructors);
+ });
+ });
+
+ it('does not add supported Intl constructors if supportedLocalesOf property does not exist', () => {
+ delete Intl.DateTimeFormat.supportedLocalesOf;
+ delete Intl.NumberFormat.supportedLocalesOf;
+ return loadIntl('en', 'intl').then(() => {
+ expect(hasIntlData).toHaveBeenNthCalledWith(1, ['en'], []);
+ });
+ });
+ });
+});
diff --git a/packages/terra-application/tests/jest/application-base/private/loadLocaleData.test.js b/packages/terra-application/tests/jest/application-base/private/loadLocaleData.test.js
new file mode 100644
index 000000000..7aefba5e4
--- /dev/null
+++ b/packages/terra-application/tests/jest/application-base/private/loadLocaleData.test.js
@@ -0,0 +1,83 @@
+import loadLocaleData from '../../../../src/application-base/private/loadLocaleData';
+
+const locales = ['en', 'en-AU', 'en-CA', 'en-US', 'en-GB', 'es', 'es-US', 'es-ES', 'de', 'fr', 'fr-FR', 'nl', 'nl-BE', 'pt', 'pt-BR', 'sv', 'sv-SE'];
+
+describe('loadLocaleData', () => {
+ beforeEach(() => {
+ jest.resetModules();
+ });
+
+ locales.forEach((locale) => {
+ it(`loads ${locale} intl data`, () => {
+ jest.doMock(`intl/locale-data/jsonp/${locale}.js`, () => ({
+ localeData: `${locale} included`,
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl').then((module) => {
+ expect(module.localeData).toEqual(`${locale} included`);
+ });
+ });
+
+ if (locale === 'es-ES') {
+ it('loads es intl-relativetimeformat data for es-ES locale', () => {
+ jest.doMock('@formatjs/intl-relativetimeformat/locale-data/es.js', () => ({
+ localeData: 'es included',
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl-relativetimeformat').then((module) => {
+ expect(module.localeData).toEqual('es included');
+ });
+ });
+ } else if (locale === 'fr-FR') {
+ it('loads fr intl-relativetimeformat data for fr-FR locale', () => {
+ jest.doMock('@formatjs/intl-relativetimeformat/locale-data/fr.js', () => ({
+ localeData: 'fr included',
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl-relativetimeformat').then((module) => {
+ expect(module.localeData).toEqual('fr included');
+ });
+ });
+ } else if (locale === 'sv-SE') {
+ it('loads sv intl-relativetimeformat data for sv-SE locale', () => {
+ jest.doMock('@formatjs/intl-relativetimeformat/locale-data/sv.js', () => ({
+ localeData: 'sv included',
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl-relativetimeformat').then((module) => {
+ expect(module.localeData).toEqual('sv included');
+ });
+ });
+ } else if (locale === 'pt-BR') {
+ it('loads pt intl-relativetimeformat data for pt-BR locale', () => {
+ jest.doMock('@formatjs/intl-relativetimeformat/locale-data/pt.js', () => ({
+ localeData: 'pt included',
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl-relativetimeformat').then((module) => {
+ expect(module.localeData).toEqual('pt included');
+ });
+ });
+ } else {
+ it(`loads ${locale} intl-relativetimeformat data`, () => {
+ jest.doMock(`@formatjs/intl-relativetimeformat/locale-data/${locale}.js`, () => ({
+ localeData: `${locale} included`,
+ }));
+ expect.assertions(1);
+ return loadLocaleData(locale, 'intl-relativetimeformat').then((module) => {
+ expect(module.localeData).toEqual(`${locale} included`);
+ });
+ });
+ }
+ });
+
+ it('throws error when intl locale data does not exist', () => {
+ expect.assertions(1);
+ return expect(loadLocaleData('fake', 'intl')).rejects.toThrow();
+ });
+
+ it('throws error when intl-relativetimeformat locale data does not exist', () => {
+ expect.assertions(1);
+ return expect(loadLocaleData('fake', 'intl-relativetimeformat')).rejects.toThrow();
+ });
+});
diff --git a/packages/terra-application/tests/jest/application-base/private/translationsLoaders.test.js b/packages/terra-application/tests/jest/application-base/private/translationsLoaders.test.js
new file mode 100644
index 000000000..7f58b718c
--- /dev/null
+++ b/packages/terra-application/tests/jest/application-base/private/translationsLoaders.test.js
@@ -0,0 +1,157 @@
+import loadTranslations from '../../../../src/application-base/private/translationsLoaders';
+import Logger from '../../../../src/utils/logger';
+
+describe('translationsLoaders', () => {
+ beforeEach(() => {
+ jest.resetModules();
+ });
+
+ it('loads en translation file', async () => {
+ jest.doMock('en.js', () => ({
+ test: 'test',
+ }));
+ expect.assertions(1);
+ await loadTranslations('en').then(messages => {
+ expect(messages.test).toEqual('test');
+ });
+ });
+
+ it('logs a warning when the regional locale is not provided and locale fallback is used', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+ jest.doMock('es.js', () => ({
+ test: 'test-es',
+ }));
+ expect.assertions(1);
+ await loadTranslations('es-US').then(() => {
+ expect(spy).toBeCalledWith(expect.stringContaining('Translations were not supplied for the es-US locale. Using es data as the fallback locale.'));
+ spy.mockRestore();
+ });
+ });
+
+ it('logs a warning when the locale is not provided and en fallback is used', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+
+ let callCount = 0;
+
+ // this doMock actually mocks both 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the es locale.');
+ }
+ return ({
+ test: 'test',
+ });
+ });
+
+ await loadTranslations('es').then((messages) => {
+ expect(messages.test).toEqual('test');
+ expect(spy).toBeCalledWith(expect.stringContaining('Translations were not supplied for the es locale. Using en as the fallback locale.'));
+ spy.mockRestore();
+ });
+ });
+
+ it('logs a warning when the regional locale and locale are not provided and en fallback is used', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+
+ let callCount = 0;
+
+ // this doMock actually mocks 'es-ES.js' 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the es-ES locale.');
+ }
+ if (callCount === 1) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the es locale.');
+ }
+ return ({
+ test: 'test',
+ });
+ });
+ await loadTranslations('es-ES').then((messages) => {
+ expect(messages.test).toEqual('test');
+ expect(spy).toHaveBeenNthCalledWith(1, expect.stringContaining('Translations were not supplied for the es-ES locale. Using es data as the fallback locale.'));
+ expect(spy).toHaveBeenNthCalledWith(2, expect.stringContaining('Translations were not supplied for the es locale. Using en as the fallback locale.'));
+ spy.mockRestore();
+ });
+ });
+
+ it('throws an error when the locale and en fallback are not provided', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+ let callCount = 0;
+
+ // this doMock actually mocks both 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the es locale.');
+ }
+ throw new Error('Translations were not supplied for the en locale.');
+ });
+
+ await expect(loadTranslations('es')).rejects.toThrow('Translations were not supplied for the en locale.');
+ spy.mockRestore();
+ });
+
+ it('throws an error when the regional locale and en fallback are not provided', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+ let callCount = 0;
+
+ // this doMock actually mocks both 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the en-US locale.');
+ }
+ throw new Error('Translations were not supplied for the en locale.');
+ });
+
+ await expect(loadTranslations('en-US')).rejects.toThrow('Translations were not supplied for the en locale.');
+ spy.mockRestore();
+ });
+
+ describe('production environment', () => {
+ beforeEach(() => {
+ process.env.NODE_ENV = 'production';
+ });
+
+ afterEach(() => {
+ delete process.env.NODE_ENV;
+ });
+
+ it('still throws an error when the locale and en fallback are not provided', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+ let callCount = 0;
+
+ // this doMock actually mocks both 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the es locale.');
+ }
+ throw new Error('Translations were not supplied for the en locale.');
+ });
+
+ await expect(loadTranslations('es')).rejects.toThrow('Translations were not supplied for the en locale.');
+ spy.mockRestore();
+ });
+
+ it('still throws an error when the regional locale and en fallback are not provided', async () => {
+ const spy = jest.spyOn(Logger, 'warn').mockImplementation(() => {});
+ let callCount = 0;
+
+ // this doMock actually mocks both 'en.js' and 'es.js' due to the module name mapper mapping the en and es files to the same file.
+ jest.doMock('en.js', () => {
+ if (callCount === 0) {
+ callCount += 1;
+ throw new Error('Translations were not supplied for the en-US locale.');
+ }
+ throw new Error('Translations were not supplied for the en locale.');
+ });
+ await expect(loadTranslations('en-US')).rejects.toThrow('Translations were not supplied for the en locale.');
+ spy.mockRestore();
+ });
+ });
+});
diff --git a/packages/terra-application/tests/jest/application-navigation/ApplicationNavigation.test.jsx b/packages/terra-application/tests/jest/application-navigation/ApplicationNavigation.test.jsx
index e69423df2..4de579d21 100644
--- a/packages/terra-application/tests/jest/application-navigation/ApplicationNavigation.test.jsx
+++ b/packages/terra-application/tests/jest/application-navigation/ApplicationNavigation.test.jsx
@@ -1,7 +1,18 @@
import React from 'react';
-
import ApplicationNavigation from '../../../src/application-navigation/ApplicationNavigation';
+jest.mock('react-intl', () => {
+ const reactIntl = jest.requireActual('react-intl');
+ const intl = reactIntl.createIntl({
+ locale: 'en',
+ });
+
+ return {
+ ...reactIntl,
+ useIntl: () => intl,
+ };
+});
+
describe('ApplicationNavigation', () => {
it('should render default element', () => {
const shallowComponent = enzyme.shallow(
diff --git a/packages/terra-application/tests/jest/workspace/Workspace.test.jsx b/packages/terra-application/tests/jest/workspace/Workspace.test.jsx
index cc32cee10..b7da0f7ab 100644
--- a/packages/terra-application/tests/jest/workspace/Workspace.test.jsx
+++ b/packages/terra-application/tests/jest/workspace/Workspace.test.jsx
@@ -10,6 +10,18 @@ import MockApplication from '../MockApplication';
const testMetaData1 = { data: 1 };
const testMetaData2 = { data: 1 };
+jest.mock('react-intl', () => {
+ const reactIntl = jest.requireActual('react-intl');
+ const intl = reactIntl.createIntl({
+ locale: 'en',
+ });
+
+ return {
+ ...reactIntl,
+ useIntl: () => intl,
+ };
+});
+
const TestWorkspace = (props) => (
Date: Thu, 25 Apr 2024 09:45:54 -0500
Subject: [PATCH 05/34] updated dependencies
---
package-lock.json | 281 +++++++++++++++++++++++++++++++++++++++++-----
package.json | 4 +-
2 files changed, 257 insertions(+), 28 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7c4231c9f..522f13768 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,6 +95,7 @@
"@cerner/package-json-lint-config-terra": "2",
"@cerner/stylelint-config-terra": "5",
"@cerner/terra-cli": "1",
+ "@cerner/terra-enzyme-intl": "4",
"@cerner/terra-functional-testing": "4",
"@cerner/terra-open-source-scripts": "1",
"@cerner/webpack-config-terra": "3",
@@ -115,7 +116,6 @@
"react-dom": "16",
"react-intl": "2",
"stylelint": "15",
- "terra-enzyme-intl": "3",
"webpack": "5",
"webpack-cli": "4",
"webpack-dev-server": "4",
@@ -128,7 +128,7 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2"
+ "react-intl": "5"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@@ -2462,6 +2462,105 @@
"react-dom": "^16.8.5"
}
},
+ "node_modules/@cerner/terra-enzyme-intl": {
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/@cerner/terra-enzyme-intl/-/terra-enzyme-intl-4.9.0.tgz",
+ "integrity": "sha512-UwaTKsGTh1nYxZyFfIz7t3Lx50HptFbwTctCZg5kg6i0j3TeSpv/Ztl0bTA6XYxpVjwuQULDCYzpFAperIKAMA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "prop-types": "^15.7.2",
+ "react-intl": "^5.25.1"
+ },
+ "engines": {
+ "node": "10 || 12 || 14",
+ "npm": "6 || 9"
+ },
+ "peerDependencies": {
+ "enzyme": "^3.9.0",
+ "react": "^16.8.5",
+ "react-dom": "^16.8.5"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/@formatjs/ecma402-abstract": {
+ "version": "1.11.4",
+ "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz",
+ "integrity": "sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/@formatjs/icu-messageformat-parser": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz",
+ "integrity": "sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/icu-skeleton-parser": "1.3.6",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/@formatjs/icu-skeleton-parser": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz",
+ "integrity": "sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/@formatjs/intl-localematcher": {
+ "version": "0.2.25",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz",
+ "integrity": "sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/intl-messageformat": {
+ "version": "9.13.0",
+ "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz",
+ "integrity": "sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/fast-memoize": "1.2.1",
+ "@formatjs/icu-messageformat-parser": "2.1.0",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@cerner/terra-enzyme-intl/node_modules/react-intl": {
+ "version": "5.25.1",
+ "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz",
+ "integrity": "sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/icu-messageformat-parser": "2.1.0",
+ "@formatjs/intl": "2.2.1",
+ "@formatjs/intl-displaynames": "5.4.3",
+ "@formatjs/intl-listformat": "6.5.3",
+ "@types/hoist-non-react-statics": "^3.3.1",
+ "@types/react": "16 || 17 || 18",
+ "hoist-non-react-statics": "^3.3.2",
+ "intl-messageformat": "9.13.0",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "react": "^16.3.0 || 17 || 18",
+ "typescript": "^4.5"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@cerner/terra-functional-testing": {
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/@cerner/terra-functional-testing/-/terra-functional-testing-4.8.0.tgz",
@@ -2793,6 +2892,15 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@formatjs/fast-memoize": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz",
+ "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
"node_modules/@formatjs/icu-messageformat-parser": {
"version": "2.0.15",
"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.15.tgz",
@@ -2814,6 +2922,29 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@formatjs/intl": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz",
+ "integrity": "sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/fast-memoize": "1.2.1",
+ "@formatjs/icu-messageformat-parser": "2.1.0",
+ "@formatjs/intl-displaynames": "5.4.3",
+ "@formatjs/intl-listformat": "6.5.3",
+ "intl-messageformat": "9.13.0",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "typescript": "^4.5"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@formatjs/intl-datetimeformat": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-5.0.2.tgz",
@@ -2841,6 +2972,36 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@formatjs/intl-displaynames": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz",
+ "integrity": "sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
+ "version": "1.11.4",
+ "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz",
+ "integrity": "sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
+ "version": "0.2.25",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz",
+ "integrity": "sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
"node_modules/@formatjs/intl-getcanonicallocales": {
"version": "1.9.2",
"resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.9.2.tgz",
@@ -2849,6 +3010,36 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@formatjs/intl-listformat": {
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz",
+ "integrity": "sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
+ "version": "1.11.4",
+ "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz",
+ "integrity": "sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
+ "version": "0.2.25",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz",
+ "integrity": "sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
"node_modules/@formatjs/intl-locale": {
"version": "2.4.47",
"resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.47.tgz",
@@ -2902,6 +3093,58 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
+ "version": "1.11.4",
+ "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz",
+ "integrity": "sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-localematcher": "0.2.25",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl/node_modules/@formatjs/icu-messageformat-parser": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz",
+ "integrity": "sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/icu-skeleton-parser": "1.3.6",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl/node_modules/@formatjs/icu-skeleton-parser": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz",
+ "integrity": "sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
+ "version": "0.2.25",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz",
+ "integrity": "sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl/node_modules/intl-messageformat": {
+ "version": "9.13.0",
+ "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz",
+ "integrity": "sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "1.11.4",
+ "@formatjs/fast-memoize": "1.2.1",
+ "@formatjs/icu-messageformat-parser": "2.1.0",
+ "tslib": "^2.1.0"
+ }
+ },
"node_modules/@formatjs/ts-transformer": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.7.0.tgz",
@@ -11023,9 +11266,9 @@
"optional": true
},
"node_modules/aws-sdk": {
- "version": "2.1605.0",
- "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1605.0.tgz",
- "integrity": "sha512-/wtOuF7WgkbN6YL3xJ+FB54kvIAfnP/DQVDaE6rSYv6ft0xr01Si94NgQWhb5OcFkFfRAC4auZX8PiFNtOi9xQ==",
+ "version": "2.1606.0",
+ "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1606.0.tgz",
+ "integrity": "sha512-Sg1y0p93XI0ce86D9mi402sKMiH7LDoq6k3YzMja9yA0i3i0Pg3py4jjZ7p3HlKNOsDUF0t+9DLdCjtbTbuM6w==",
"dev": true,
"hasInstallScript": true,
"optional": true,
@@ -14872,9 +15115,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.747",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz",
- "integrity": "sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw=="
+ "version": "1.4.748",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz",
+ "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A=="
},
"node_modules/email-addresses": {
"version": "3.1.0",
@@ -15236,14 +15479,14 @@
}
},
"node_modules/es-iterator-helpers": {
- "version": "1.0.18",
- "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz",
- "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==",
+ "version": "1.0.19",
+ "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
+ "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
- "es-abstract": "^1.23.0",
+ "es-abstract": "^1.23.3",
"es-errors": "^1.3.0",
"es-set-tostringtag": "^2.0.3",
"function-bind": "^1.1.2",
@@ -32754,20 +32997,6 @@
"terra-theme-provider": "^4.16.0"
}
},
- "node_modules/terra-enzyme-intl": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/terra-enzyme-intl/-/terra-enzyme-intl-3.4.0.tgz",
- "integrity": "sha512-rgr0/vNg8GPc/r7mDu/hDSp5/y6rxEpYxiPK4RnG6H+mFAUeW5o/LNzPnSA5aAxKLC1MzAPQDF/riGg8zrRIdQ==",
- "dev": true,
- "engines": {
- "node": ">=8.9.2"
- },
- "peerDependencies": {
- "enzyme": "3.x",
- "react": "16.x",
- "react-intl": ">= 2.7"
- }
- },
"node_modules/terra-form-checkbox": {
"version": "4.26.0",
"resolved": "https://registry.npmjs.org/terra-form-checkbox/-/terra-form-checkbox-4.26.0.tgz",
diff --git a/package.json b/package.json
index 9d4bbb148..1aa064f45 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2"
+ "react-intl": "5"
},
"devDependencies": {
"@babel/cli": "7",
@@ -54,6 +54,7 @@
"@cerner/package-json-lint-config-terra": "2",
"@cerner/stylelint-config-terra": "5",
"@cerner/terra-cli": "1",
+ "@cerner/terra-enzyme-intl": "4",
"@cerner/terra-functional-testing": "4",
"@cerner/terra-open-source-scripts": "1",
"@cerner/webpack-config-terra": "3",
@@ -74,7 +75,6 @@
"react-dom": "16",
"react-intl": "2",
"stylelint": "15",
- "terra-enzyme-intl": "3",
"webpack": "5",
"webpack-cli": "4",
"webpack-dev-server": "4",
From 471b397de0f7bb4f72364e8f7637d12ee2f26f86 Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 09:53:55 -0500
Subject: [PATCH 06/34] updated CHANGELOGS
---
packages/terra-application-docs/CHANGELOG.md | 17 +++++++++++
packages/terra-application/CHANGELOG.md | 30 ++++++++++++++++++++
packages/terra-dev-site/CHANGELOG.md | 26 +++++++++++++++++
packages/terra-polyfill/CHANGELOG.md | 11 +++++++
4 files changed, 84 insertions(+)
diff --git a/packages/terra-application-docs/CHANGELOG.md b/packages/terra-application-docs/CHANGELOG.md
index 4bce095db..10bc23d98 100644
--- a/packages/terra-application-docs/CHANGELOG.md
+++ b/packages/terra-application-docs/CHANGELOG.md
@@ -2,6 +2,23 @@
## Unreleased
+## 3.1.0 - (June 22, 2022)
+
+* Changed
+ * Minor dependency version bump
+
+## 3.0.1 - (June 8, 2022)
+
+* Changed
+ * Minor dependency bump.
+
+## 3.0.0 - (May 31, 2022)
+
+* Breaking
+ * Dropped v2-v4 react-intl support
+
+---
+
## 2.14.0 - (April 23, 2024)
* Changed
diff --git a/packages/terra-application/CHANGELOG.md b/packages/terra-application/CHANGELOG.md
index 3d14cc501..c616cdb59 100644
--- a/packages/terra-application/CHANGELOG.md
+++ b/packages/terra-application/CHANGELOG.md
@@ -2,6 +2,36 @@
## Unreleased
+* Changed
+ * Updated `getBrowserLocale` method for IE.
+ * Updated jest snapshots for terra-icon and terra-button changes.
+ * Updated size explanations for ModalManager managed by DisclosureManagerContext.
+ * Locked `uuid` dependency to `3.4.0`.
+
+* Added
+ * Added user action utility button.
+ * Added `noScroll` prop to remove scroll in powerchart.
+
+## 2.1.0 - (June 22, 2022)
+
+* Changed
+ * updated condition statement added to check `inert` polyfill is required.
+ * updated `wicg-inert` to latest version.
+
+## 2.0.1 - (June 8, 2022)
+
+* Minor dependency bump
+
+## 2.0.0 - (May 31, 2022)
+
+* Breaking
+ * Dropped v2-v4 react-intl support ([Upgrade Guide](https://engineering.cerner.com/terra-application/dev_tools/cerner-terra-application-docs/terra-dev-site/upgrade-guides/application-v-2)).
+ * `customTranslatedMessages` prop removed, thus dropping support for the ability of consumers to provide translations for an unsupported locale.
+ * `contextShape` will not be provided by `ApplicationIntlContext` anymore since `intlShape` is no longer exported by `react-intl`.
+ * `translationsLoadingPlaceholder` prop removed.
+
+---
+
## 1.58.0 - (April 23, 2024)
* Added
diff --git a/packages/terra-dev-site/CHANGELOG.md b/packages/terra-dev-site/CHANGELOG.md
index f92f6ce7c..c26369b80 100644
--- a/packages/terra-dev-site/CHANGELOG.md
+++ b/packages/terra-dev-site/CHANGELOG.md
@@ -2,6 +2,32 @@
## Unreleased
+* Fixed
+ * Fixed clipping issue of test pages on dev-site.
+ * Fixed scroll issue of doc pages with longer content.
+
+* Changed
+ * Updated jest snapshot for terra-icon and terra-button changes.
+ * Updated wdio snapshot to fix build.
+ * Locked `uuid` dependency to `3.4.0`.
+
+## 8.1.0 - (June 22, 2022)
+
+* Changed
+ * Minor dependency version bump
+
+## 8.0.1 - (June 7, 2022)
+
+* Changed
+ * updated `terra-application` version in peer dependency.
+
+## 8.0.0 - (May 31, 2022)
+
+* Breaking
+ * Dropped v2-v4 react-intl support
+
+---
+
## 7.13.0 - (April 23, 2024)
* Added
diff --git a/packages/terra-polyfill/CHANGELOG.md b/packages/terra-polyfill/CHANGELOG.md
index 64d252b0b..bc89e0a7c 100644
--- a/packages/terra-polyfill/CHANGELOG.md
+++ b/packages/terra-polyfill/CHANGELOG.md
@@ -2,6 +2,17 @@
## Unreleased
+## 1.4.0 - (June 22, 2022)
+
+* Changed
+ * updated condition statement added to check `inert` polyfill is required.
+ * updated `wicg-inert` to latest version.
+
+## 1.3.0 - (June 7, 2022)
+
+* Added
+ * Added `@formatjs/intl-datetimeformat` polyfill to support date-time functions in ie 10.
+
## 1.2.0 - (February 14, 2022)
* Changed
From 9ba9803c6b44711c038e1f63cb1ef83c6e34e0ef Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 09:55:58 -0500
Subject: [PATCH 07/34] updated terra-application-docs package.json
---
packages/terra-application-docs/package.json | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/packages/terra-application-docs/package.json b/packages/terra-application-docs/package.json
index 6dcbc05ba..d5ff044f6 100644
--- a/packages/terra-application-docs/package.json
+++ b/packages/terra-application-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@cerner/terra-application-docs",
- "version": "2.14.0",
+ "version": "3.1.0",
"description": "Contains documentation for packages in the terra-application monorepo",
"author": "Cerner Corporation",
"repository": {
@@ -22,7 +22,7 @@
"access": "public"
},
"engines": {
- "node": ">=10.13.0"
+ "node": "14"
},
"main": "index.js",
"files": [
@@ -44,11 +44,8 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2 || 3 || 4 || 5",
- "terra-application": "1"
- },
- "devDependencies": {
- "terra-application": "^1.58.0"
+ "react-intl": "5",
+ "terra-application": "2"
},
"scripts": {
"compile": "babel --root-mode upward src --out-dir lib --copy-files",
From 6f054a3499164d3d76a3cf4edaf557d1c086709e Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 09:56:30 -0500
Subject: [PATCH 08/34] updated terra-application-docs package.json
---
packages/terra-application-docs/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/terra-application-docs/package.json b/packages/terra-application-docs/package.json
index d5ff044f6..098bbef65 100644
--- a/packages/terra-application-docs/package.json
+++ b/packages/terra-application-docs/package.json
@@ -30,7 +30,7 @@
"src"
],
"dependencies": {
- "@cerner/terra-dev-site": "^7.13.0",
+ "@cerner/terra-dev-site": "8",
"@cerner/terra-docs": "1",
"classnames": "2",
"prop-types": "15",
From a8b047e033eebcc14e9d0f0dbfacbfa40d4dbad7 Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:00:05 -0500
Subject: [PATCH 09/34] updated terra-application package.json
---
packages/terra-application/package.json | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/terra-application/package.json b/packages/terra-application/package.json
index 1f64f87a3..761b6252e 100644
--- a/packages/terra-application/package.json
+++ b/packages/terra-application/package.json
@@ -1,6 +1,6 @@
{
"name": "terra-application",
- "version": "1.58.0",
+ "version": "2.1.0",
"description": "A framework to support application development with Terra components",
"author": "Cerner Corporation",
"repository": {
@@ -30,9 +30,12 @@
],
"dependencies": {
"@cerner/terra-docs": "1",
+ "@formatjs/intl-relativetimeformat": "8",
"classnames": "2",
"eventemitter3": "4",
"focus-trap-react": "6",
+ "intl": "1",
+ "intl-locales-supported": ">=1.8.4 <1.8.12 || ^1.8.13",
"keycode-js": "3",
"lodash.debounce": "4",
"mutationobserver-shim": "<=0.3.3",
@@ -43,7 +46,6 @@
"terra-action-footer": "2",
"terra-action-header": "2",
"terra-avatar": "3",
- "terra-base": "5",
"terra-breakpoints": "2",
"terra-button": "3",
"terra-collapsible-menu-view": "6",
@@ -69,7 +71,7 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2"
+ "react-intl": "5"
},
"scripts": {
"compile": "babel --root-mode upward src --out-dir lib --copy-files",
From 67d6d5cc43351844620caebd5508598995a21613 Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:02:14 -0500
Subject: [PATCH 10/34] updated examples
---
.../secondary-navigation-layout/side-nav/SideNavHeader.jsx | 4 ++--
packages/terra-dev-site/src/pages/page/PageHeader.jsx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/terra-dev-site/src/layouts/secondary-navigation-layout/side-nav/SideNavHeader.jsx b/packages/terra-dev-site/src/layouts/secondary-navigation-layout/side-nav/SideNavHeader.jsx
index 07f88b6ff..53b1ed209 100644
--- a/packages/terra-dev-site/src/layouts/secondary-navigation-layout/side-nav/SideNavHeader.jsx
+++ b/packages/terra-dev-site/src/layouts/secondary-navigation-layout/side-nav/SideNavHeader.jsx
@@ -4,7 +4,7 @@ import classNames from 'classnames/bind';
import Button, { ButtonVariants } from 'terra-button';
import IconLeft from 'terra-icon/lib/icon/IconLeft';
import { ThemeContext } from 'terra-application/lib/theme';
-import { ApplicationIntlContext } from 'terra-application/lib/application-intl';
+import { useIntl } from 'react-intl';
import styles from './SideNavHeader.module.scss';
@@ -26,7 +26,7 @@ const SideNavHeader = ({
onRequestClose, label,
}) => {
const theme = React.useContext(ThemeContext);
- const applicationIntl = React.useContext(ApplicationIntlContext);
+ const applicationIntl = useIntl();
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -27,7 +26,7 @@ describe('ApplicationErrorBoundary', () => {
const spy = jest.spyOn(Logger, 'error').mockImplementation(() => {});
const ErrorComponent = () => ;
- const wrapper = mountWithIntl((
+ const wrapper = enzymeIntl.mountWithIntl((
diff --git a/packages/terra-application/tests/jest/application-error-boundary/__snapshots__/ApplicationErrorBoundary.test.jsx.snap b/packages/terra-application/tests/jest/application-error-boundary/__snapshots__/ApplicationErrorBoundary.test.jsx.snap
index 14c0d3fa2..e5a6841c3 100644
--- a/packages/terra-application/tests/jest/application-error-boundary/__snapshots__/ApplicationErrorBoundary.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-error-boundary/__snapshots__/ApplicationErrorBoundary.test.jsx.snap
@@ -1,61 +1,45 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ApplicationErrorBoundary Snapshots should render error view when an error is detected 1`] = `
-
+
@@ -63,65 +47,49 @@ exports[`ApplicationErrorBoundary Snapshots should render error view when an err
-
+
`;
exports[`ApplicationErrorBoundary Snapshots should render error view when an error is detected 2`] = `
-
+
@@ -156,11 +124,8 @@ exports[`ApplicationErrorBoundary Snapshots should render error view when an err
>
-
- Terra.status-view.error
-
+ Terra.status-view.error
-
+
+
@@ -99,7 +99,7 @@ exports[`ApplicationNavigation should render with all props 1`] = `
-
+
-
+
diff --git a/packages/terra-application/tests/jest/application-navigation/private/__snapshots__/ApplicationNavigation.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/private/__snapshots__/ApplicationNavigation.test.jsx.snap
index e52c97759..276ddcacc 100644
--- a/packages/terra-application/tests/jest/application-navigation/private/__snapshots__/ApplicationNavigation.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-navigation/private/__snapshots__/ApplicationNavigation.test.jsx.snap
@@ -1,38 +1,17 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ApplicationNavigation correctly applies the theme context className 1`] = `
-
+
-
diff --git a/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationDisabledPromptsTest.test.jsx b/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationDisabledPromptsTest.test.jsx
index 6c102d6ad..efc375831 100644
--- a/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationDisabledPromptsTest.test.jsx
+++ b/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationDisabledPromptsTest.test.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useContext } from 'react';
+import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { ThemeContext } from 'terra-application/lib/theme';
-import { ApplicationIntlContext } from '../../../application-intl';
+import { useIntl } from 'react-intl';
import ApplicationBase from '../../../application-base';
import ApplicationNavigation from '../../../application-navigation';
import NavigationPrompt from '../../../navigation-prompt';
@@ -35,7 +35,7 @@ PageContent.propTypes = {
};
const ApplicationNavigationDisabledPromptsTest = () => {
- const applicationIntl = useContext(ApplicationIntlContext);
+ const applicationIntl = useIntl();
const theme = React.useContext(ThemeContext);
const [activeNavItem, setActiveNavItem] = useState('page_1');
const [loggedOut, setLoggedOut] = useState(false);
diff --git a/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationTest.test.jsx b/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationTest.test.jsx
index 67fe745ae..b7ee683b3 100644
--- a/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationTest.test.jsx
+++ b/packages/terra-application/src/terra-dev-site/test/application-navigation/ApplicationNavigationTest.test.jsx
@@ -1,11 +1,11 @@
-import React, { useState, useContext } from 'react';
+import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { ThemeContext } from 'terra-application/lib/theme';
import ApplicationNavigation, {
ApplicationNavigationActionsContext,
} from 'terra-application/lib/application-navigation';
+import { useIntl } from 'react-intl';
import { WorkspaceContent } from '../../../workspace';
-import { ApplicationIntlContext } from '../../../application-intl';
import ApplicationBase from '../../../application-base';
import NavigationPrompt from '../../../navigation-prompt';
@@ -119,7 +119,7 @@ const workspace = (
);
const ApplicationNavigationTest = () => {
- const applicationIntl = useContext(ApplicationIntlContext);
+ const applicationIntl = useIntl();
const theme = React.useContext(ThemeContext);
const [activeNavItem, setActiveNavItem] = useState('page_1');
const [loggedOut, setLoggedOut] = useState(false);
diff --git a/packages/terra-application/src/terra-dev-site/test/application-navigation/private/application-navigation/ApplicationNavigation.test.jsx b/packages/terra-application/src/terra-dev-site/test/application-navigation/private/application-navigation/ApplicationNavigation.test.jsx
index 1499d643b..f2a1360fe 100644
--- a/packages/terra-application/src/terra-dev-site/test/application-navigation/private/application-navigation/ApplicationNavigation.test.jsx
+++ b/packages/terra-application/src/terra-dev-site/test/application-navigation/private/application-navigation/ApplicationNavigation.test.jsx
@@ -14,6 +14,12 @@ const userConfig = {
initials: 'TN',
};
+const userActionConfig = {
+ text: 'Edit Photo',
+ // eslint-disable-next-line no-console
+ userActionCallback: () => console.log('Button Clicked'),
+};
+
const extensionItems = [
{
icon:
@@ -12,14 +12,11 @@ describe('ApplicationBase', () => {
});
it('should render with all props', () => {
- const wrapper = enzyme.shallow((
+ const wrapper = enzymeIntl.mountWithIntl((
placeholder
}
+ unloadPromptIsDisabled
themeName="test-theme"
- themeIsGlobal
- fitToParentIsDisabled
>
content
content
@@ -27,50 +24,21 @@ describe('ApplicationBase', () => {
expect(wrapper).toMatchSnapshot();
});
- it('should render with the preferred browser local', () => {
- const wrapper = enzyme.shallow((
+ it('should render with the preferred browser locale', () => {
+ const wrapper = enzymeIntl.mountWithIntl((
content
content
content
- content
-
diff --git a/packages/terra-dev-site/src/pages/page/PageHeader.jsx b/packages/terra-dev-site/src/pages/page/PageHeader.jsx
index 0c5f08557..c7579b6d8 100644
--- a/packages/terra-dev-site/src/pages/page/PageHeader.jsx
+++ b/packages/terra-dev-site/src/pages/page/PageHeader.jsx
@@ -7,7 +7,7 @@ import Popup from 'terra-popup';
import ThemeContext from 'terra-theme-context';
import ActionMenu, { ActionMenuItem } from 'terra-application/lib/action-menu';
-import { ApplicationIntlContext } from 'terra-application/lib/application-intl';
+import { useIntl } from 'react-intl';
import useElementSize, { breakpointFilter } from '../../shared/useElementSize';
import PageContainerContext from '../../layouts/page-container/PageContainerContext';
@@ -37,7 +37,7 @@ const propTypes = {
const PageHeader = ({
actions, label, onSelectBack,
}) => {
- const intl = React.useContext(ApplicationIntlContext);
+ const intl = useIntl();
const pageContainerContext = React.useContext(PageContainerContext);
const theme = React.useContext(ThemeContext);
From 8a3e1f8537c46969a3c3e376565611b3efec117b Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:46:13 -0500
Subject: [PATCH 11/34] update package-lock
---
package-lock.json | 57 ++++++----------------------
packages/terra-dev-site/package.json | 4 +-
2 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 26a9adb78..36a806655 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36389,13 +36389,16 @@
}
},
"packages/terra-application": {
- "version": "1.58.0",
+ "version": "2.1.0",
"license": "Apache-2.0",
"dependencies": {
"@cerner/terra-docs": "1",
+ "@formatjs/intl-relativetimeformat": "8",
"classnames": "2",
"eventemitter3": "4",
"focus-trap-react": "6",
+ "intl": "1",
+ "intl-locales-supported": ">=1.8.4 <1.8.12 || ^1.8.13",
"keycode-js": "3",
"lodash.debounce": "4",
"mutationobserver-shim": "<=0.3.3",
@@ -36406,7 +36409,6 @@
"terra-action-footer": "2",
"terra-action-header": "2",
"terra-avatar": "3",
- "terra-base": "5",
"terra-breakpoints": "2",
"terra-button": "3",
"terra-collapsible-menu-view": "6",
@@ -36435,15 +36437,15 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2"
+ "react-intl": "5"
}
},
"packages/terra-application-docs": {
"name": "@cerner/terra-application-docs",
- "version": "2.14.0",
+ "version": "3.1.0",
"license": "Apache-2.0",
"dependencies": {
- "@cerner/terra-dev-site": "^7.13.0",
+ "@cerner/terra-dev-site": "8",
"@cerner/terra-docs": "1",
"classnames": "2",
"prop-types": "15",
@@ -36454,54 +36456,19 @@
"terra-mixins": "1",
"terra-toolbar": "1"
},
- "devDependencies": {
- "terra-application": "^1.58.0"
- },
"engines": {
- "node": ">=10.13.0"
+ "node": "14"
},
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "react-intl": "2 || 3 || 4 || 5",
- "terra-application": "1"
- }
- },
- "packages/terra-application/node_modules/terra-base": {
- "version": "5.53.0",
- "resolved": "https://registry.npmjs.org/terra-base/-/terra-base-5.53.0.tgz",
- "integrity": "sha512-hIXcwrUfwI2dWxrsIRxwKxQ2FJI2/d69DULxBOx3eOtDkMdL1kHg8zHq/y2ImJNa2fcMSppF2T7u3hWnRk1gdg==",
- "dependencies": {
- "classnames": "^2.2.5",
- "prop-types": "^15.5.8",
- "terra-i18n": "^4.42.0"
- },
- "peerDependencies": {
- "react": "^16.8.5",
- "react-dom": "^16.8.5",
- "react-intl": "^2.8.0",
- "terra-theme-provider": "^4.16.0"
- }
- },
- "packages/terra-application/node_modules/terra-base/node_modules/terra-i18n": {
- "version": "4.42.0",
- "resolved": "https://registry.npmjs.org/terra-i18n/-/terra-i18n-4.42.0.tgz",
- "integrity": "sha512-HkJr7nClsMvL9NttL7FGeNziFIJ4Syvwi/rqTHY93ZoVS/7Luu5sk45AwQci4Nnx/jTJ919LW5QaeKP6/KJRvQ==",
- "dependencies": {
- "classnames": "^2.2.5",
- "intl": "^1.2.5",
- "intl-locales-supported": ">=1.8.4 <1.8.12 || ^1.8.13",
- "prop-types": "^15.5.8"
- },
- "peerDependencies": {
- "react": "^16.8.5",
- "react-dom": "^16.8.5",
- "react-intl": "^2.8.0"
+ "react-intl": "5",
+ "terra-application": "2"
}
},
"packages/terra-dev-site": {
"name": "@cerner/terra-dev-site",
- "version": "7.13.0",
+ "version": "8.1.0",
"license": "Apache-2.0",
"dependencies": {
"@cerner/terra-polyfill": "^1.3.0",
@@ -36549,7 +36516,7 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "terra-application": "1",
+ "terra-application": "2",
"webpack": "4 || 5"
}
},
diff --git a/packages/terra-dev-site/package.json b/packages/terra-dev-site/package.json
index fa392e318..bf559ffd1 100644
--- a/packages/terra-dev-site/package.json
+++ b/packages/terra-dev-site/package.json
@@ -1,6 +1,6 @@
{
"name": "@cerner/terra-dev-site",
- "version": "7.13.0",
+ "version": "8.1.0",
"description": "Dynamically builds a react-hash-routed site based on site configuration, navigation configuration and component configuration.",
"author": "Cerner Corporation",
"repository": {
@@ -74,7 +74,7 @@
"peerDependencies": {
"react": "16",
"react-dom": "16",
- "terra-application": "1",
+ "terra-application": "2",
"webpack": "4 || 5"
},
"scripts": {
From e2e39ce7fc3513deed54d004c63d9729dc48620a Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 12:44:47 -0500
Subject: [PATCH 12/34] fix enzyme import
---
jest.enzymeSetup.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jest.enzymeSetup.js b/jest.enzymeSetup.js
index 98fff39c0..fea2b5170 100644
--- a/jest.enzymeSetup.js
+++ b/jest.enzymeSetup.js
@@ -2,7 +2,7 @@
/* eslint-disable import/no-extraneous-dependencies */
/* eslint-disable object-curly-newline */
import Enzyme, { mount, render, shallow } from 'enzyme';
-import { mockIntl, mountWithIntl, renderWithIntl, shallowWithIntl } from 'terra-enzyme-intl';
+import { mockIntl, mountWithIntl, renderWithIntl, shallowWithIntl } from '@cerner/terra-enzyme-intl';
import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({ adapter: new Adapter() });
From 0b8bf4a39273fc7c1f5c8b70296a017047ef66cc Mon Sep 17 00:00:00 2001
From: Saad <38024451+sdadn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 12:51:59 -0500
Subject: [PATCH 13/34] updated snapshots
---
...SelectLogout_called_on_clicking_logout.png | Bin 20931 -> 33257 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/packages/terra-application/tests/wdio/application-navigation/private/__snapshots__/reference/terra-default-theme/en/chrome_large/application-navigation-spec/utilities_display_properly_and_onSelectLogout_called_on_clicking_logout.png b/packages/terra-application/tests/wdio/application-navigation/private/__snapshots__/reference/terra-default-theme/en/chrome_large/application-navigation-spec/utilities_display_properly_and_onSelectLogout_called_on_clicking_logout.png
index 44b123fd1f675845887576ecadc5acd0e5124f61..677c71b0bbd3a5efa857538860a518ea2c1c8cbf 100644
GIT binary patch
literal 33257
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
}
userConfig={{
name: 'user-name',
@@ -42,8 +42,8 @@ describe('UtilityMenu', () => {
it('should render with skip callback', () => {
const mockCallBack = jest.fn();
- const mountComponent = enzymeIntl.mountWithIntl(
- Z;VqIm^Ifq!K9^h-!w?u_PO9{l{2)5Test child
-
+
- test label
-
-
-
- }
- isBlock={false}
- isCompact={false}
- isDisabled={false}
- isIconOnly={false}
- isLeftAligned={false}
- isReversed={false}
- onClick={[MockFunction]}
- text="terraApplication.actionMenu.headerCloseButtonLabel"
- type="button"
- variant="utility"
- />
-
-
-
+
- test label
-
-
-
-
-
-
- }
- >
-
- content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
+exports[`ApplicationBase should render with the preferred browser locale 1`] = `
- content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- content
-
-
- Test child
-
+
`;
exports[`ApplicationErrorBoundary Snapshots should render error view when an error is detected 3`] = `
-
+
-
-
+
+
+
-
+
`;
exports[`ApplicationErrorBoundary Snapshots should render with children 1`] = `
@@ -348,29 +254,41 @@ exports[`ApplicationErrorBoundary Snapshots should render with minimal props 1`]
+
@@ -63,5 +47,5 @@ exports[`ApplicationIntlProvider Snapshots should render an ApplicationIntlConte
Test Component
-
+
`;
diff --git a/packages/terra-application/tests/jest/application-navigation/__snapshots__/ApplicationNavigation.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/__snapshots__/ApplicationNavigation.test.jsx.snap
index 4e0d1b117..fb48bf3af 100644
--- a/packages/terra-application/tests/jest/application-navigation/__snapshots__/ApplicationNavigation.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-navigation/__snapshots__/ApplicationNavigation.test.jsx.snap
@@ -9,7 +9,7 @@ exports[`ApplicationNavigation should render default element 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- terraApplication.errorBoundary.defaultErrorMessage -
-
-
@@ -306,7 +307,7 @@ exports[`ApplicationNavigation should render default element 1`] = `
-
+
-
+
-
+
`;
exports[`Header should render with function callbacks 1`] = `
-
-
-
-
@@ -63,7 +62,7 @@ exports[`DrawerMenuUser should render with large variant 1`] = `
+
`;
diff --git a/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/Header.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/Header.test.jsx.snap
index 8744494ad..95edded34 100644
--- a/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/Header.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/Header.test.jsx.snap
@@ -1,61 +1,45 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Header should render default element 1`] = `
-
+
-
+
-
+
-
+
`;
exports[`Header should render title element 1`] = `
-
-
-
my test hero
}
- menuClosingCallback={[Function]}
onSelectHelp={[Function]}
onSelectLogout={[Function]}
onSelectSettings={[Function]}
@@ -562,14 +561,13 @@ exports[`ApplicationNavigation should render with prop data at medium breakpoint
-
my test hero
}
- menuClosingCallback={[Function]}
navigationItems={
Array [
Object {
@@ -619,7 +617,7 @@ exports[`ApplicationNavigation should render with prop data at medium breakpoint
-
-
my test hero
}
- menuClosingCallback={[Function]}
onSelectHelp={[Function]}
onSelectLogout={[Function]}
onSelectSettings={[Function]}
diff --git a/packages/terra-application/tests/jest/application-navigation/private/common/__snapshots__/PopupMenu.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/private/common/__snapshots__/PopupMenu.test.jsx.snap
index 325abee4e..baa3c3205 100644
--- a/packages/terra-application/tests/jest/application-navigation/private/common/__snapshots__/PopupMenu.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-navigation/private/common/__snapshots__/PopupMenu.test.jsx.snap
@@ -6,7 +6,7 @@ exports[`PopupMenu should render default element 1`] = `
fill={false}
footer={
-
@@ -113,7 +111,7 @@ exports[`DrawerMenuUser should render with small variant 1`] = `
-
-
diff --git a/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/CompactHeader.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/CompactHeader.test.jsx.snap
index 7090a8a96..9f2c492b4 100644
--- a/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/CompactHeader.test.jsx.snap
+++ b/packages/terra-application/tests/jest/application-navigation/private/header/__snapshots__/CompactHeader.test.jsx.snap
@@ -1,62 +1,46 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`CompactHeader should render default element 1`] = `
-
+
+
`;
exports[`CompactHeader should render title element 1`] = `
-
-
-
-
+
-
-
-
-
+
-
+
-
-
-
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- terraApplication.navigation.utilityMenu.headerTitle -
++ terraApplication.navigation.utilityMenu.headerTitle +
+
-
-
-
-
-
+
+
- Terra.actionHeader.maximize.description
-
-
-
-
+
+
- Terra.actionHeader.minimize.description
-
-
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- terraApplication.navigation.utilityMenu.headerTitle -
++ terraApplication.navigation.utilityMenu.headerTitle +
+
-
-
-
-
-
+
+
- Terra.actionHeader.maximize.description
-
-
-
-
+
+
- Terra.actionHeader.minimize.description
-
-
+
+
+
-
+
+
+
+
+
-
-
-
-
+
-
-
+
- my test hero
+
-
+
-
+ my test hero
+
-
-
-
-
-
-
+
+ US
+
+ }
+ src="user-src"
+ variant="default"
+ >
+ 
US
- }
- src="user-src"
- variant="default"
- >
-
-
- US
-
-
-
-
-
-
- user-name
+
+
+
+
- user-detail
-
-
+ user-detail
+
+
-
+
+
+ -
-
-
- +-
my icon - - test-text-2 --+ -- 0 + + my icon +-
- - + test-text-2 +
-
-
+ 0
+
+
+ icon={
+
+
+
+
+
-
-
-
-
-
-
- terraApplication.navigation.utilityMenu.settings
-
-
- 0
+ terraApplication.navigation.utilityMenu.settings
-
-
-
+ 0
+
+
+
+ icon={
+
+
+
+
+
-
-
-
-
-
-
- terraApplication.navigation.utilityMenu.help
-
-
- 0
+ terraApplication.navigation.utilityMenu.help
-
-
-
+ 0
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- terraApplication.navigation.utilityMenu.headerTitle -
++ terraApplication.navigation.utilityMenu.headerTitle +
+
-
-
-
-
-
+
+
- Terra.actionHeader.maximize.description
-
-
-
-
+
+
- Terra.actionHeader.minimize.description
-
-
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
Z;VqIm^Ifq!K9^h-!w?u_PO9{l{2)5