chore: Remove /internal/i18n in favor of /i18n

build-tools/tasks/generate-i18n-messages.js

@@ -11,7 +11,6 @@ const { writeFile } = require('../utils/files');
 const namespace = '@cloudscape-design/components';
 
 const destinationDir = path.join(targetPath, 'components/i18n/messages');
-const internalDestinationDir = path.join(targetPath, 'components/internal/i18n/messages');
 const declarationFile = `import { I18nProviderProps } from "../provider";
 declare const messages: I18nProviderProps.Messages;
 export default messages;
@@ -36,21 +35,16 @@ module.exports = function generateI18nMessages() {
     );
     allParsedMessages[locale] = { ...(allParsedMessages[locale] ?? {}), ...parsedMessages };
     const resultFormat = { [namespace]: { [locale]: parsedMessages } };
-
-    for (const directory of [destinationDir, internalDestinationDir]) {
-      writeFile(path.join(directory, `${subset}.${locale}.json`), JSON.stringify(resultFormat));
-      writeFile(path.join(directory, `${subset}.${locale}.d.ts`), declarationFile);
-      writeFile(path.join(directory, `${subset}.${locale}.js`), `export default ${JSON.stringify(resultFormat)}`);
-    }
+    writeFile(path.join(destinationDir, `${subset}.${locale}.json`), JSON.stringify(resultFormat));
+    writeFile(path.join(destinationDir, `${subset}.${locale}.d.ts`), declarationFile);
+    writeFile(path.join(destinationDir, `${subset}.${locale}.js`), `export default ${JSON.stringify(resultFormat)}`);
   }
 
   // Generate a ".all" file containing all locales.
   const resultFormat = { [namespace]: allParsedMessages };
-  for (const directory of [destinationDir, internalDestinationDir]) {
-    writeFile(path.join(directory, `all.all.json`), JSON.stringify(resultFormat));
-    writeFile(path.join(directory, `all.all.d.ts`), declarationFile);
-    writeFile(path.join(directory, `all.all.js`), `export default ${JSON.stringify(resultFormat)}`);
-  }
+  writeFile(path.join(destinationDir, `all.all.json`), JSON.stringify(resultFormat));
+  writeFile(path.join(destinationDir, `all.all.d.ts`), declarationFile);
+  writeFile(path.join(destinationDir, `all.all.js`), `export default ${JSON.stringify(resultFormat)}`);
 
   return Promise.resolve();
 };

build-tools/tasks/package-json.js

@@ -47,16 +47,6 @@ function getComponentsExports() {
     result[`./i18n/messages/${subset}.${locale}.json`] = `./i18n/messages/${subset}.${locale}.json`;
   }
 
-  // i18n beta specific imports (delete after people switch over)
-  result['./internal/i18n'] = './internal/i18n/index.js';
-  result[`./internal/i18n/messages/all.all`] = `./internal/i18n/messages/all.all.js`;
-  result[`./internal/i18n/messages/all.all.json`] = `./internal/i18n/messages/all.all.json`;
-  for (const translationFile of fs.readdirSync('src/i18n/messages')) {
-    const [subset, locale] = translationFile.split('.');
-    result[`./internal/i18n/messages/${subset}.${locale}`] = `./internal/i18n/messages/${subset}.${locale}.js`;
-    result[`./internal/i18n/messages/${subset}.${locale}.json`] = `./internal/i18n/messages/${subset}.${locale}.json`;
-  }
-
   return result;
 }
 

pages/alert/simple.page.tsx

@@ -7,7 +7,7 @@ import ScreenshotArea from '../utils/screenshot-area';
 import SpaceBetween from '~components/space-between';
 import styles from './styles.scss';
 
-import { I18nProvider } from '~components/internal/i18n';
+import { I18nProvider } from '~components/i18n';
 import messages from '~components/i18n/messages/all.all';
 
 export default function AlertScenario() {

pages/property-filter/hooks.page.tsx

@@ -11,7 +11,7 @@ import { allItems, TableItem } from './table.data';
 import { columnDefinitions, i18nStrings, filteringProperties } from './common-props';
 import { useCollection } from '@cloudscape-design/collection-hooks';
 
-import { I18nProvider } from '~components/internal/i18n';
+import { I18nProvider } from '~components/i18n';
 import messages from '~components/i18n/messages/all.all';
 
 export default function () {

src/alert/internal.tsx

@@ -15,7 +15,7 @@ import { AlertProps } from './interfaces';
 import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
 import { useMergeRefs } from '../internal/hooks/use-merge-refs';
 import { SomeRequired } from '../internal/types';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 import { DATA_ATTR_ANALYTICS_ALERT } from '../internal/analytics/selectors';
 
 const typeToIcon: Record<AlertProps.Type, IconProps['name']> = {

src/app-layout/index.tsx

@@ -43,7 +43,7 @@ import { isDevelopment } from '../internal/is-development';
 import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
 
 import RefreshedAppLayout from './visual-refresh';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 import { useSplitPanelFocusControl } from './utils/use-split-panel-focus-control';
 import { useDrawerFocusControl } from './utils/use-drawer-focus-control';
 import { awsuiPluginsInternal } from '../internal/plugins/api';

src/area-chart/__tests__/area-chart-initial-state.test.tsx

@@ -9,7 +9,7 @@ import popoverStyles from '../../../lib/components/popover/styles.css.js';
 import chartWrapperStyles from '../../../lib/components/internal/components/chart-wrapper/styles.css.js';
 import cartesianStyles from '../../../lib/components/internal/components/cartesian-chart/styles.css.js';
 import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 import { cloneDeep } from 'lodash';
 import '../../__a11y__/to-validate-a11y';
 

src/area-chart/elements/use-highlight-details.ts

@@ -3,7 +3,7 @@
 import { useSelector } from '../async-store';
 import { CartesianChartProps } from '../../internal/components/cartesian-chart/interfaces';
 import { ChartSeriesDetailItem } from '../../internal/components/chart-series-details';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
 import { AreaChartProps } from '../interfaces';
 import { ChartModel } from '../model';
 

src/attribute-editor/__tests__/attribute-editor.test.tsx

@@ -7,7 +7,7 @@ import AttributeEditor, { AttributeEditorProps } from '../../../lib/components/a
 import styles from '../../../lib/components/attribute-editor/styles.css.js';
 import liveRegionStyles from '../../../lib/components/internal/components/live-region/styles.css.js';
 import Input from '../../../lib/components/input';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 interface Item {
   key: string;

src/attribute-editor/row.tsx

@@ -12,7 +12,7 @@ import InternalGrid from '../grid/internal';
 import { InternalButton } from '../button/internal';
 import clsx from 'clsx';
 import { useUniqueId } from '../internal/hooks/use-unique-id';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 const Divider = () => <InternalBox className={styles.divider} padding={{ top: 'l' }} />;
 

src/autosuggest/autosuggest-option.tsx

@@ -10,7 +10,7 @@ import { getTestOptionIndexes } from '../internal/components/options-list/utils/
 import styles from './styles.css.js';
 import { AutosuggestItem } from './interfaces';
 import { HighlightType } from '../internal/components/options-list/utils/use-highlight-option';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export interface AutosuggestOptionProps extends BaseComponentProps {
   nativeAttributes?: Record<string, any>;

src/autosuggest/internal.tsx

@@ -26,7 +26,7 @@ import { useAutosuggestLoadMore } from './load-more-controller';
 import { OptionsLoadItemsDetail } from '../internal/components/dropdown/interfaces';
 import AutosuggestInput, { AutosuggestInputRef } from '../internal/components/autosuggest-input';
 import { useFormFieldContext } from '../contexts/form-field';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 import styles from './styles.css.js';
 import { warnOnce } from '@cloudscape-design/component-toolkit/internal';

src/breadcrumb-group/__tests__/breadcrumb-group.test.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { render, act } from '@testing-library/react';
 import styles from '../../../lib/components/breadcrumb-group/styles.css.js';
 import itemStyles from '../../../lib/components/breadcrumb-group/item/styles.css.js';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 import BreadcrumbGroup, { BreadcrumbGroupProps } from '../../../lib/components/breadcrumb-group';
 import createWrapper, { BreadcrumbGroupWrapper } from '../../../lib/components/test-utils/dom';

src/breadcrumb-group/internal.tsx

@@ -15,7 +15,7 @@ import { getBaseProps } from '../internal/base-component';
 import { useMobile } from '../internal/hooks/use-mobile';
 import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
 import { checkSafeUrl } from '../internal/utils/check-safe-url';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 /**
  * Provided for backwards compatibility

src/calendar/internal.tsx

@@ -17,7 +17,7 @@ import { InternalBaseComponentProps } from '../internal/hooks/use-base-component
 import { getBaseDate } from './utils/navigation';
 import { useDateCache } from '../internal/hooks/use-date-cache/index.js';
 import { useUniqueId } from '../internal/hooks/use-unique-id/index.js';
-import { useInternalI18n } from '../internal/i18n/context.js';
+import { useInternalI18n } from '../i18n/context.js';
 
 export type DayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 

src/cards/__tests__/cards.test.tsx

@@ -6,7 +6,7 @@ import Cards, { CardsProps } from '../../../lib/components/cards';
 import { CardsWrapper, PaginationWrapper } from '../../../lib/components/test-utils/dom';
 import { useMobile } from '../../../lib/components/internal/hooks/use-mobile';
 import liveRegionStyles from '../../../lib/components/internal/components/live-region/styles.css.js';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 import styles from '../../../lib/components/cards/styles.css.js';
 
 jest.mock('../../../lib/components/internal/hooks/use-mobile', () => ({

src/cards/index.tsx

@@ -22,7 +22,7 @@ import LiveRegion from '../internal/components/live-region';
 import useMouseDownTarget from '../internal/hooks/use-mouse-down-target';
 import { useMobile } from '../internal/hooks/use-mobile';
 import { supportsStickyPosition } from '../internal/utils/dom';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 import { useContainerQuery } from '@cloudscape-design/component-toolkit';
 import { AnalyticsFunnelSubStep } from '../internal/analytics/components/analytics-funnel';
 

src/code-editor/__tests__/code-editor.test.tsx

@@ -18,7 +18,7 @@ import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
 import liveRegionStyles from '../../../lib/components/internal/components/live-region/styles.css.js';
 import { createWrapper } from '@cloudscape-design/test-utils-core/dom';
 import '../../__a11y__/to-validate-a11y';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 jest.mock('@cloudscape-design/component-toolkit/internal', () => ({
   ...jest.requireActual('@cloudscape-design/component-toolkit/internal'),

src/code-editor/index.tsx

@@ -31,7 +31,7 @@ import useBaseComponent from '../internal/hooks/use-base-component';
 import useForwardFocus from '../internal/hooks/forward-focus';
 import { applyDisplayName } from '../internal/utils/apply-display-name';
 import { useCurrentMode } from '@cloudscape-design/component-toolkit/internal';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 import { StatusBar } from './status-bar';
 import { useFormFieldContext } from '../internal/context/form-field-context';
 import { useVisualRefresh } from '../internal/hooks/use-visual-mode';

src/code-editor/status-bar.tsx

@@ -7,7 +7,7 @@ import LiveRegion from '../internal/components/live-region/index';
 import { TabButton } from './tab-button';
 import { InternalButton } from '../button/internal';
 import { CodeEditorProps } from './interfaces';
-import { useInternalI18n } from '../internal/i18n/context.js';
+import { useInternalI18n } from '../i18n/context.js';
 import { useContainerQuery } from '@cloudscape-design/component-toolkit';
 
 interface StatusBarProps {

src/collection-preferences/__tests__/collection-preferences.test.tsx

@@ -13,7 +13,7 @@ import {
   stripedRowsPreference,
   contentDisplayPreference,
 } from './shared';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 const expectVisibleModal = (wrapper: CollectionPreferencesWrapper, visible = true) => {
   if (visible) {

src/collection-preferences/content-display/index.tsx

@@ -13,7 +13,7 @@ import useDragAndDropReorder from './use-drag-and-drop-reorder';
 import useLiveAnnouncements from './use-live-announcements';
 import Portal from '../../internal/components/portal';
 import ContentDisplayOption from './content-display-option';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
 
 const componentPrefix = 'content-display';
 

src/collection-preferences/index.tsx

@@ -28,7 +28,7 @@ import { applyDisplayName } from '../internal/utils/apply-display-name';
 import useBaseComponent from '../internal/hooks/use-base-component';
 import ContentDisplayPreference from './content-display';
 import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export { CollectionPreferencesProps };
 

src/collection-preferences/utils.tsx

@@ -10,7 +10,7 @@ import InternalSpaceBetween from '../space-between/internal';
 import { useContainerBreakpoints } from '../internal/hooks/container-queries';
 import { CollectionPreferencesProps } from './interfaces';
 import styles from './styles.css.js';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export const copyPreferences = ({
   pageSize,

src/date-picker/index.tsx

@@ -26,7 +26,7 @@ import FocusLock from '../internal/components/focus-lock';
 import { parseDate } from '../internal/utils/date-time';
 import LiveRegion from '../internal/components/live-region';
 import { useFormFieldContext } from '../contexts/form-field.js';
-import { useLocale } from '../internal/i18n/context.js';
+import { useLocale } from '../i18n/context.js';
 
 export { DatePickerProps };
 

src/date-range-picker/__tests__/date-range-picker-absolute.test.tsx

@@ -7,7 +7,7 @@ import DateRangePicker, { DateRangePickerProps } from '../../../lib/components/d
 import { i18nStrings } from './i18n-strings';
 import { isValidRange } from './is-valid-range';
 import '../../__a11y__/to-validate-a11y';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 const defaultProps: DateRangePickerProps = {
   locale: 'en-US',

src/date-range-picker/__tests__/date-range-picker-relative.test.tsx

@@ -10,7 +10,7 @@ import { i18nStrings } from './i18n-strings';
 import { changeMode } from './change-mode';
 import { isValidRange } from './is-valid-range';
 import '../../__a11y__/to-validate-a11y';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 const defaultProps: DateRangePickerProps = {
   locale: 'en-US',

src/date-range-picker/__tests__/date-range-picker.test.tsx

@@ -12,7 +12,7 @@ import { isValidRange } from './is-valid-range';
 import { changeMode } from './change-mode';
 import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
 import styles from '../../../lib/components/date-range-picker/styles.css.js';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
 
 jest.mock('@cloudscape-design/component-toolkit/internal', () => ({
   ...jest.requireActual('@cloudscape-design/component-toolkit/internal'),

src/date-range-picker/calendar/index.tsx

@@ -20,7 +20,7 @@ import { getBaseDate } from '../../calendar/utils/navigation';
 import { useMobile } from '../../internal/hooks/use-mobile/index.js';
 import RangeInputs from './range-inputs.js';
 import { findDateToFocus, findMonthToDisplay } from './utils';
-import { useInternalI18n } from '../../internal/i18n/context.js';
+import { useInternalI18n } from '../../i18n/context.js';
 
 export interface DateRangePickerCalendarProps extends BaseComponentProps {
   value: DateRangePickerProps.PendingAbsoluteValue;

src/date-range-picker/calendar/range-inputs.tsx

@@ -9,7 +9,7 @@ import InternalFormField from '../../form-field/internal';
 import InternalDateInput from '../../date-input/internal';
 import { TimeInputProps } from '../../time-input/interfaces';
 import InternalTimeInput from '../../time-input/internal';
-import { useInternalI18n } from '../../internal/i18n/context.js';
+import { useInternalI18n } from '../../i18n/context.js';
 
 type I18nStrings = Pick<
   RangeCalendarI18nStrings,

src/date-range-picker/dropdown.tsx

@@ -17,7 +17,7 @@ import clsx from 'clsx';
 import InternalAlert from '../alert/internal';
 import LiveRegion from '../internal/components/live-region';
 import { getDefaultMode, joinAbsoluteValue, splitAbsoluteValue } from './utils';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export const VALID_RANGE: DateRangePickerProps.ValidRangeResult = { valid: true };
 

src/date-range-picker/index.tsx

@@ -28,7 +28,7 @@ import { usePrevious } from '../internal/hooks/use-previous/index.js';
 import { useUniqueId } from '../internal/hooks/use-unique-id';
 import { formatDateRange, isIsoDateOnly } from '../internal/utils/date-time';
 import { formatValue } from './utils.js';
-import { useInternalI18n } from '../internal/i18n/context.js';
+import { useInternalI18n } from '../i18n/context.js';
 
 export { DateRangePickerProps };
 

src/date-range-picker/mode-switcher.tsx

@@ -5,7 +5,7 @@ import { DateRangePickerProps } from './interfaces';
 import InternalSegmentedControl from '../segmented-control/internal';
 
 import styles from './styles.css.js';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 interface ModeSwitcherProps extends Pick<DateRangePickerProps, 'i18nStrings'> {
   mode: 'absolute' | 'relative';

src/date-range-picker/relative-range/index.tsx

@@ -11,7 +11,7 @@ import InternalRadioGroup from '../../radio-group/internal';
 import InternalSelect from '../../select/internal';
 import InternalSpaceBetween from '../../space-between/internal';
 import styles from './styles.css.js';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
 
 export interface RelativeRangePickerProps {
   dateOnly: boolean;

src/flashbar/collapsible-flashbar.tsx

@@ -20,7 +20,7 @@ import { useFlashbar } from './common';
 import { throttle } from '../internal/utils/throttle';
 import { scrollElementIntoView } from '../internal/utils/scrollable-containers';
 import { findUpUntil } from '../internal/utils/dom';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export { FlashbarProps };
 

src/flashbar/non-collapsible-flashbar.tsx

@@ -11,7 +11,7 @@ import { getVisualContextClassname } from '../internal/components/visual-context
 
 import styles from './styles.css.js';
 import { useFlashbar } from './common';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 export { FlashbarProps };
 

src/form-field/internal.tsx

@@ -15,7 +15,7 @@ import { getAriaDescribedBy, getGridDefinition, getSlotIds } from './util';
 import styles from './styles.css.js';
 import { InternalFormFieldProps } from './interfaces';
 import { joinStrings } from '../internal/utils/strings';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 import { InfoLinkLabelContext } from '../internal/context/info-link-label-context';
 
 import { FunnelMetrics } from '../internal/analytics';

src/form/internal.tsx

@@ -10,7 +10,7 @@ import styles from './styles.css.js';
 import { FormLayoutProps, FormProps } from './interfaces';
 import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
 import LiveRegion from '../internal/components/live-region';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
 
 import { useFunnel } from '../internal/analytics/hooks/use-funnel';
 import { FunnelMetrics } from '../internal/analytics';