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

chore(deps): update paragon and frontend-build to openedx scope #818

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig(
'eslint',
Expand Down
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', {
setupFilesAfterEnv: [
Expand Down
26,017 changes: 9,541 additions & 16,476 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"dependencies": {
"@dnd-kit/sortable": "^8.0.0",
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-ai-translations": "^1.4.0",
"@edx/frontend-component-footer": "^12.3.0",
"@edx/frontend-component-header": "^4.7.0",
"@edx/frontend-component-ai-translations": "^2.0.0",
"@edx/frontend-component-footer": "^13.0.2",
"@edx/frontend-component-header": "^5.0.2",
"@edx/frontend-enterprise-hotjar": "^2.0.0",
"@edx/frontend-lib-content-components": "^1.178.2",
"@edx/frontend-platform": "5.6.1",
"@edx/frontend-lib-content-components": "^2.0.0",
"@edx/frontend-platform": "7.0.1",
"@edx/openedx-atlas": "^0.6.0",
"@edx/paragon": "^21.5.6",
"@openedx/paragon": "^21.5.7",
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-brands-svg-icons": "5.15.4",
"@fortawesome/free-regular-svg-icons": "5.15.4",
Expand Down Expand Up @@ -81,15 +81,16 @@
},
"devDependencies": {
"@edx/browserslist-config": "1.2.0",
"@edx/frontend-build": "13.0.5",
"@edx/react-unit-test-utils": "^1.7.0",
"@openedx/frontend-build": "13.0.27",
"@edx/react-unit-test-utils": "^2.0.0",
"@edx/reactifex": "^1.0.3",
"@edx/stylelint-config-edx": "^2.3.0",
"@edx/stylelint-config-edx": "2.3.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was on 2.3.0 due to the package-lock.json, after rebuilding the package lock to cleanly handle the scope changes it updated to 2.3.3 and caused https://github.com/openedx/frontend-app-course-authoring/actions/runs/7746261151/job/21124075247 to fail with errors such as

src/index.scss
  1:9  ✖  Expected ""~@edx/brand/paragon/fonts"" to be "url("~@edx/brand/paragon/fonts")"                                                import-notation

Pinning it to 2.3.0 prevents those errors.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objections. We can deal with that later.

"@edx/typescript-config": "^1.0.1",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^13.2.1",
"axios": "^0.27.2",
"axios-mock-adapter": "1.22.0",
"glob": "7.2.3",
"husky": "7.0.4",
Expand Down
4 changes: 2 additions & 2 deletions src/advanced-settings/AdvancedSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
import { useDispatch, useSelector } from 'react-redux';
import {
Container, Button, Layout, StatefulButton, TransitionReplace,
} from '@edx/paragon';
import { CheckCircle, Info, Warning } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { CheckCircle, Info, Warning } from '@openedx/paragon/icons';
import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import Placeholder from '@edx/frontend-lib-content-components';

Expand Down
2 changes: 1 addition & 1 deletion src/advanced-settings/modal-error/ModalError.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { ActionRow, AlertModal, Button } from '@edx/paragon';
import { ActionRow, AlertModal, Button } from '@openedx/paragon';
import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';

import ModalErrorListItem from './ModalErrorListItem';
Expand Down
4 changes: 2 additions & 2 deletions src/advanced-settings/modal-error/ModalErrorListItem.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Alert, Icon } from '@edx/paragon';
import { Error } from '@edx/paragon/icons';
import { Alert, Icon } from '@openedx/paragon';
import { Error } from '@openedx/paragon/icons';
import { capitalize } from 'lodash';

import { transformKeysToCamelCase } from '../../utils';
Expand Down
4 changes: 2 additions & 2 deletions src/advanced-settings/setting-card/SettingCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
IconButton,
ModalPopup,
useToggle,
} from '@edx/paragon';
import { InfoOutline, Warning } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { InfoOutline, Warning } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { capitalize } from 'lodash';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
Expand Down
2 changes: 1 addition & 1 deletion src/content-tags-drawer/ContentTagsCollapsible.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
ModalPopup,
useToggle,
SearchField,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { useIntl, FormattedMessage } from '@edx/frontend-platform/i18n';
Expand Down
2 changes: 1 addition & 1 deletion src/content-tags-drawer/ContentTagsCollapsibleHelper.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-check
import React from 'react';
import { useCheckboxSetValues } from '@edx/paragon';
import { useCheckboxSetValues } from '@openedx/paragon';
import { cloneDeep } from 'lodash';

import { useContentTaxonomyTagsUpdater } from './data/apiHooks';
Expand Down
2 changes: 1 addition & 1 deletion src/content-tags-drawer/ContentTagsDrawer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Container,
CloseButton,
Spinner,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { useParams } from 'react-router-dom';
import messages from './messages';
Expand Down
4 changes: 2 additions & 2 deletions src/content-tags-drawer/ContentTagsDropDownSelector.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
Icon,
Spinner,
Button,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl, FormattedMessage } from '@edx/frontend-platform/i18n';
import { ArrowDropDown, ArrowDropUp } from '@edx/paragon/icons';
import { ArrowDropDown, ArrowDropUp } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import messages from './messages';
import './ContentTagsDropDownSelector.scss';
Expand Down
4 changes: 2 additions & 2 deletions src/content-tags-drawer/TagBubble.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import {
Chip,
} from '@edx/paragon';
import { Tag, Close } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { Tag, Close } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';

import TagOutlineIcon from './TagOutlineIcon';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/CourseOutline.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
Layout,
Row,
TransitionReplace,
} from '@edx/paragon';
} from '@openedx/paragon';
import { Helmet } from 'react-helmet';
import {
Add as IconAdd,
CheckCircle as CheckCircleIcon,
Warning as WarningIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import { useSelector } from 'react-redux';
import { DraggableList } from '@edx/frontend-lib-content-components';
import { arrayMove } from '@dnd-kit/sortable';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/card-header/CardHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {
Hyperlink,
Icon,
IconButton,
} from '@edx/paragon';
} from '@openedx/paragon';
import {
MoreVert as MoveVertIcon,
EditOutline as EditIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';

import { useEscapeClick } from '../../hooks';
import { ITEM_BADGE_STATUS } from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/card-header/StatusBadge.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from '@edx/paragon';
import { Icon } from '@openedx/paragon';

const StatusBadge = ({
text,
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/card-header/TitleButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import {
OverlayTrigger,
Tooltip,
Truncate,
} from '@edx/paragon';
} from '@openedx/paragon';
import {
ArrowDropDown as ArrowDownIcon,
ArrowDropUp as ArrowUpIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import messages from './messages';

const TitleButton = ({
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/card-header/TitleLink.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
import { Button, Truncate } from '@edx/paragon';
import { Button, Truncate } from '@openedx/paragon';

const TitleLink = ({
title,
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/configure-modal/AdvancedTab.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import moment from 'moment';
import { Alert, Form, Hyperlink } from '@edx/paragon';
import { Alert, Form, Hyperlink } from '@openedx/paragon';
import {
Warning as WarningIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import { FormattedMessage, injectIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/configure-modal/BasicTab.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Stack, Form } from '@edx/paragon';
import { Stack, Form } from '@openedx/paragon';
import { FormattedMessage, injectIntl, useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';
import { DatepickerControl, DATEPICKER_TYPES } from '../../generic/datepicker-control';
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/configure-modal/ConfigureModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Form,
Tab,
Tabs,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useSelector } from 'react-redux';
import { Formik } from 'formik';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/configure-modal/PrereqSettings.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Form } from '@edx/paragon';
import { Form } from '@openedx/paragon';
import { FormattedMessage, injectIntl, useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/configure-modal/UnitTab.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Alert, Form } from '@edx/paragon';
import { Alert, Form } from '@openedx/paragon';
import {
FormattedMessage, injectIntl, useIntl,
} from '@edx/frontend-platform/i18n';
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/configure-modal/VisibilityTab.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Alert, Form } from '@edx/paragon';
import { Alert, Form } from '@openedx/paragon';
import { FormattedMessage, injectIntl, useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';
import { COURSE_BLOCK_NAMES } from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/delete-modal/DeleteModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ActionRow,
Button,
AlertModal,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useSelector } from 'react-redux';
import { useIntl } from '@edx/frontend-platform/i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Col, Row } from '@edx/paragon';
import { Col, Row } from '@openedx/paragon';
import { SortableItem } from '@edx/frontend-lib-content-components';

const ConditionalSortableElement = ({
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/empty-placeholder/EmptyPlaceholder.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Add as IconAdd } from '@edx/paragon/icons/es5';
import { Button, OverlayTrigger, Tooltip } from '@edx/paragon';
import { Add as IconAdd } from '@openedx/paragon/icons/es5';
import { Button, OverlayTrigger, Tooltip } from '@openedx/paragon';

import messages from './messages';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { useIntl } from '@edx/frontend-platform/i18n';
import {
ActionRow, AlertModal, Button, Hyperlink,
} from '@edx/paragon';
} from '@openedx/paragon';

import messages from './messages';
import { useHelpUrls } from '../../help-urls/hooks';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/header-navigations/HeaderNavigations.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Button, OverlayTrigger, Tooltip } from '@edx/paragon';
import { Button, OverlayTrigger, Tooltip } from '@openedx/paragon';
import {
Add as IconAdd,
ArrowDropDown as ArrowDownIcon,
ArrowDropUp as ArrowUpIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';

import messages from './messages';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/highlights-modal/HighlightsModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Button,
ActionRow,
Hyperlink,
} from '@edx/paragon';
} from '@openedx/paragon';
import { Formik } from 'formik';
import { useSelector } from 'react-redux';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/hooks.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';
import { useToggle } from '@edx/paragon';
import { useToggle } from '@openedx/paragon';
import { getConfig } from '@edx/frontend-platform';

import { RequestStatus } from '../data/constants';
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/outline-sidebar/OutlineSidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import { HelpSidebar } from '../../generic/help-sidebar';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/page-alerts/PageAlerts.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
Campaign as CampaignIcon,
InfoOutline as InfoOutlineIcon,
Warning as WarningIcon,
} from '@edx/paragon/icons';
import { Alert, Button, Hyperlink } from '@edx/paragon';
} from '@openedx/paragon/icons';
import { Alert, Button, Hyperlink } from '@openedx/paragon';

import { RequestStatus } from '../../data/constants';
import AlertMessage from '../../generic/alert-message';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/page-alerts/PageAlerts.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ describe('<PageAlerts />', () => {
});

it('renders null when no alerts are present', () => {
const { container } = renderComponent();
expect(container).toBeEmptyDOMElement();
const { queryByTestId } = renderComponent();
expect(queryByTestId('browser-router')).toBeEmptyDOMElement();
Copy link
Contributor Author

@brian-smith-tcril brian-smith-tcril Feb 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of openedx/frontend-platform#615, the AppProvider used in renderComponent includes

<div data-testid="browser-router">

and the OptionalReduxProvider in the AppProvider includes

<div data-testid="redux-provider">

so instead of the whole container being an empty DOM element, it is

<div data-testid="redux-provider"><div data-testid="browser-router"></div></div>

This just updates the test to ensure nothing is rendered inside those divs that are always rendered

});

it('renders configuration alerts', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/paste-button/PasteButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
import { useSelector } from 'react-redux';
import {
Hyperlink, Icon, Button, OverlayTrigger,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import {
FileCopy as PasteIcon,
Question as QuestionIcon,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import { getInitialUserClipboard } from '../data/selectors';
import messages from './messages';

Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/publish-modal/PublishModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ModalDialog,
Button,
ActionRow,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useSelector } from 'react-redux';

import { getCurrentItem } from '../data/selectors';
Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/section-card/SectionCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import React, {
import PropTypes from 'prop-types';
import { useDispatch } from 'react-redux';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Bubble, Button, useToggle } from '@edx/paragon';
import { Add as IconAdd } from '@edx/paragon/icons';
import { Bubble, Button, useToggle } from '@openedx/paragon';
import { Add as IconAdd } from '@openedx/paragon/icons';
import classNames from 'classnames';

import { setCurrentItem, setCurrentSection } from '../data/slice';
Expand Down
Loading
Loading