Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace @edx/paragon and @edx/frontend-build #369

Closed
wants to merge 8 commits into from
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('eslint');
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('jest', {
setupFiles: ['<rootDir>/src/setupTest.js'],
Expand Down
14,154 changes: 6,066 additions & 8,088 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/brand-openedx": "^1.1.0",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^6.4.0",
"@edx/frontend-component-header": "npm:@edx/frontend-component-header-edx@^7.10.3",
"@edx/frontend-enterprise-catalog-search": "5.0.0",
"@edx/frontend-enterprise-hotjar": "2.0.0",
"@edx/frontend-enterprise-utils": "4.0.4",
"@edx/frontend-platform": "5.5.2",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^7.0.0",
"@edx/frontend-component-header": "npm:@edx/frontend-component-header-edx@^8.0.0",
"@edx/frontend-enterprise-catalog-search": "9.0.0",
"@edx/frontend-enterprise-hotjar": "6.0.0",
"@edx/frontend-enterprise-utils": "8.0.0",
"@edx/frontend-platform": "7.1.0",
"@edx/openedx-atlas": "^0.6.0",
"@edx/paragon": "20.46.3",
"@openedx/paragon": "21.13.1",
"algoliasearch": "4.19.1",
"axios": "^1.6.7",
"babel-polyfill": "6.26.0",
Expand Down Expand Up @@ -70,8 +70,8 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.0",
"@edx/frontend-build": "13.0.1",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "13.0.28",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "7.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageWrapper.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Container } from '@edx/paragon';
import { Container } from '@openedx/paragon';
import { Helmet } from 'react-helmet';

import { PAGE_TITLE } from '../constants';
Expand Down
4 changes: 2 additions & 2 deletions src/components/aiCuration/AskXpert.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
Image,
IconButton,
Icon,
} from '@edx/paragon';
import { Close } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { Close } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import edxXPERT from '../../assets/edx-xpert-card-side-image.png';
Expand Down Expand Up @@ -77,7 +77,7 @@
}
};
// we will remove this line after passing the results to the results component
console.log(results);

Check warning on line 80 in src/components/aiCuration/AskXpert.jsx

View workflow job for this annotation

GitHub Actions / build

Unexpected console statement
const cancelSearch = () => {
setDelay(null);
setIsLoading(false);
Expand Down
4 changes: 2 additions & 2 deletions src/components/aiCuration/AskXpertQueryField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {
Form,
Icon,
IconButton,
} from '@edx/paragon';
import { Send } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { Send } from '@openedx/paragon/icons';
import { useState } from 'react';

import PropTypes from 'prop-types';
Expand Down
2 changes: 1 addition & 1 deletion src/components/aiCuration/ProgressBar.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react';
import {
ProgressBar,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';

const LoadingBar = ({ isLoading }) => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/aiCuration/xpertResultCard/XpertResultCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, { useState, useMemo } from 'react';
import PropTypes from 'prop-types';
import {
Icon, Card, Stack, Form, Button, Spinner, Image,
} from '@edx/paragon';
} from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Close } from '@edx/paragon/icons';
import { Close } from '@openedx/paragon/icons';
import askXpretImage from '../../../assets/edx-xpert-card-side-image.png';
import { useXpertResultsWithThreshold } from '../data/hooks';
import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/catalogInfoModal/CatalogInfoModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import {
Image,
ModalDialog,
Icon,
} from '@edx/paragon';
} from '@openedx/paragon';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

import { Launch } from '@edx/paragon/icons';
import { Launch } from '@openedx/paragon/icons';
import messages from './CatalogInfoModal.messages';
import CatalogCourseModalBanner from '../catalogModalBanner/CatalogCourseModalBanner';
import CatalogProgramModalBanner from '../catalogModalBanner/CatalogProgramModalBanner';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from '@edx/paragon';
import { Icon } from '@openedx/paragon';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

import {
Book, BookOpen, EventNote, MoneyOutline,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import messages from './CatalogCourseModalBanner.messages';
import {
checkAvailability,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from '@edx/paragon';
import { Icon } from '@openedx/paragon';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

import { Assignment, BookOpen, MoneyOutline } from '@edx/paragon/icons';
import { Assignment, BookOpen, MoneyOutline } from '@openedx/paragon/icons';
import messages from './CatalogCourseModalBanner.messages';
import { checkSubscriptions } from '../../utils/catalogUtils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { connectStateResults } from 'react-instantsearch-dom';

import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { Alert, CardView, DataTable } from '@edx/paragon';
import { Alert, CardView, DataTable } from '@openedx/paragon';

import {
CONTENT_TYPE_COURSE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from '@edx/frontend-platform/i18n';
import {
Alert, Badge, Button, CardView, DataTable, Skeleton,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';
import React, {
useCallback,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Badge } from '@edx/paragon';
import { Badge } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import PropTypes from 'prop-types';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';

import { Toast, Button, useToggle } from '@edx/paragon';
import { Download } from '@edx/paragon/icons';
import { Toast, Button, useToggle } from '@openedx/paragon';
import { Download } from '@openedx/paragon/icons';

import EnterpriseCatalogApiService from '../../../../data/services/EnterpriseCatalogAPIService';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button } from '@edx/paragon';
import { Button } from '@openedx/paragon';
import PropTypes from 'prop-types';
import React from 'react';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@edx/frontend-enterprise-catalog-search';
import {
breakpoints, Container, SelectableBox, useMediaQuery,
} from '@edx/paragon';
} from '@openedx/paragon';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

import messages from './CatalogSelectionDeck.messages';
Expand Down
2 changes: 1 addition & 1 deletion src/components/courseCard/CourseCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import { Badge, Card } from '@edx/paragon';
import { Badge, Card } from '@openedx/paragon';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import messages from './CourseCard.messages';
import { CONTENT_TYPE_COURSE } from '../../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/components/hero/Hero.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import {
Container, Image, useMediaQuery, breakpoints,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';
import React from 'react';
import LargeHeroImageHiRes from '../../assets/hero-image-144px-hi-res.png';
Expand Down
4 changes: 2 additions & 2 deletions src/components/programCard/ProgramCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

import { Badge, Icon, Card } from '@edx/paragon';
import { Program } from '@edx/paragon/icons';
import { Badge, Icon, Card } from '@openedx/paragon';
import { Program } from '@openedx/paragon/icons';

import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import defaultCardHeader from '@edx/brand/paragon/images/card-imagecap-fallback.png';
Expand Down
2 changes: 1 addition & 1 deletion src/components/subheader/subheader.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container } from '@edx/paragon';
import { Container } from '@openedx/paragon';
import React from 'react';
import PropTypes from 'prop-types';

Expand Down
2 changes: 1 addition & 1 deletion src/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~@edx/brand/paragon/fonts.scss';
@import '~@edx/brand/paragon/variables.scss';
@import '@edx/paragon/scss/core/core.scss';
@import '@openedx/paragon/scss/core/core.scss';
@import '~@edx/brand/paragon/overrides.scss';

@import '~@edx/frontend-component-header/dist/index';
Expand Down
Loading