Skip to content

Commit f9c11f8

Browse files
feat: Add type stubs for frontend-platform/i18n (#1251)
1 parent 376f31e commit f9c11f8

11 files changed

Lines changed: 58 additions & 54 deletions

File tree

src/frontend-platform.d.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// frontend-platform currently doesn't provide types... do it ourselves for i18n module at least.
2+
// We can remove this in the future when we migrate to frontend-shell, or when frontend-platform gets types
3+
// (whichever comes first).
4+
5+
declare module '@edx/frontend-platform/i18n' {
6+
// eslint-disable-next-line import/no-extraneous-dependencies
7+
import { injectIntl as _injectIntl } from 'react-intl';
8+
/** @deprecated Use useIntl() hook instead. */
9+
export const injectIntl: typeof _injectIntl;
10+
/** @deprecated Use useIntl() hook instead. */
11+
export const intlShape: any;
12+
13+
// eslint-disable-next-line import/no-extraneous-dependencies
14+
export {
15+
createIntl,
16+
FormattedDate,
17+
FormattedTime,
18+
FormattedRelativeTime,
19+
FormattedNumber,
20+
FormattedPlural,
21+
FormattedMessage,
22+
defineMessages,
23+
IntlProvider,
24+
useIntl,
25+
} from 'react-intl';
26+
27+
// Other exports from the i18n module:
28+
export const configure: any;
29+
export const getPrimaryLanguageSubtag: (code: string) => string;
30+
export const getLocale: (locale?: string) => string;
31+
export const getMessages: any;
32+
export const isRtl: (locale?: string) => boolean;
33+
export const handleRtl: any;
34+
export const mergeMessages: any;
35+
export const LOCALE_CHANGED: any;
36+
export const LOCALE_TOPIC: any;
37+
export const getCountryList: any;
38+
export const getCountryMessages: any;
39+
export const getLanguageList: any;
40+
export const getLanguageMessages: any;
41+
}

src/library-authoring/add-content/messages.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
import type { defineMessages as defineMessagesType } from 'react-intl';
3-
4-
// frontend-platform currently doesn't provide types... do it ourselves.
5-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
62

73
const messages = defineMessages({
84
collectionButton: {

src/library-authoring/component-info/messages.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
import type { defineMessages as defineMessagesType } from 'react-intl';
3-
4-
// frontend-platform currently doesn't provide types... do it ourselves.
5-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
62

73
const messages = defineMessages({
84
editNameButtonAlt: {

src/library-authoring/components/messages.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
3-
import type { defineMessages as defineMessagesType } from 'react-intl';
4-
5-
// frontend-platform currently doesn't provide types... do it ourselves.
6-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
72

83
const messages = defineMessages({
94
componentCardMenuAlt: {

src/library-authoring/library-info/LibraryInfo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const LibraryInfo = ({ library } : LibraryInfoProps) => {
3333
</span>
3434
<span className="small">
3535
<FormattedDate
36-
value={library.updated}
36+
value={library.updated ?? undefined}
3737
year="numeric"
3838
month="long"
3939
day="2-digit"
@@ -46,7 +46,7 @@ const LibraryInfo = ({ library } : LibraryInfoProps) => {
4646
</span>
4747
<span className="small">
4848
<FormattedDate
49-
value={library.created}
49+
value={library.created ?? undefined}
5050
year="numeric"
5151
month="long"
5252
day="2-digit"

src/library-authoring/library-info/LibraryPublishStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const LibraryPublishStatus = ({ library } : LibraryPublishStatusProps) => {
4646
let isNewResult = false;
4747
let statusMessageResult : string;
4848
let extraStatusMessageResult : string | undefined;
49-
let bodyMessageResult : string | undefined;
49+
let bodyMessageResult : React.ReactNode | undefined;
5050

5151
const buildDate = ((date : string) => (
5252
<b>

src/library-authoring/messages.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
import type { defineMessages as defineMessagesType } from 'react-intl';
3-
4-
// frontend-platform currently doesn't provide types... do it ourselves.
5-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
62

73
const messages = defineMessages({
84
headingSubtitle: {

src/search-manager/messages.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
import type { defineMessages as defineMessagesType } from 'react-intl';
3-
4-
// frontend-platform currently doesn't provide types... do it ourselves.
5-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
62

73
const messages = defineMessages({
84
clearFilters: {

src/search-modal/messages.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { defineMessages as _defineMessages } from '@edx/frontend-platform/i18n';
2-
import type { defineMessages as defineMessagesType } from 'react-intl';
3-
4-
// frontend-platform currently doesn't provide types... do it ourselves.
5-
const defineMessages = _defineMessages as typeof defineMessagesType;
1+
import { defineMessages } from '@edx/frontend-platform/i18n';
62

73
const messages = defineMessages({
84
searchAllCourses: {

src/studio-home/card-item/index.jsx

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable react/require-default-props */
12
import React from 'react';
23
import { useSelector } from 'react-redux';
34
import PropTypes from 'prop-types';
@@ -20,14 +21,14 @@ import { trimSlashes } from './utils';
2021
const CardItem = ({
2122
intl,
2223
displayName,
23-
lmsLink,
24-
rerunLink,
24+
lmsLink = '',
25+
rerunLink = '',
2526
org,
2627
number,
27-
run,
28-
isLibraries,
29-
courseKey,
30-
isPaginated,
28+
run = '',
29+
isLibraries = false,
30+
courseKey = '',
31+
isPaginated = false,
3132
url,
3233
}) => {
3334
const {
@@ -105,15 +106,6 @@ const CardItem = ({
105106
);
106107
};
107108

108-
CardItem.defaultProps = {
109-
isLibraries: false,
110-
isPaginated: false,
111-
courseKey: '',
112-
rerunLink: '',
113-
lmsLink: '',
114-
run: '',
115-
};
116-
117109
CardItem.propTypes = {
118110
intl: intlShape.isRequired,
119111
displayName: PropTypes.string.isRequired,

0 commit comments

Comments
 (0)