Skip to content

Commit

Permalink
feat: replace edx with openedx namespace for paragon & frontend-build…
Browse files Browse the repository at this point in the history
…, updated respective edx packages
  • Loading branch information
BilalQamar95 committed Mar 28, 2024
1 parent 4367c26 commit 06a4e01
Show file tree
Hide file tree
Showing 69 changed files with 9,077 additions and 10,563 deletions.
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');

const config = createConfig('eslint', {
rules: {
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');

const config = createConfig('jest', {
// setupFilesAfterEnv is used after the jest environment has been loaded. In general this is what you want.
Expand Down
6 changes: 3 additions & 3 deletions module.config.js.example
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ module.exports = {
**********************************************************************************************/

// { moduleName: '@edx/brand', dir: '../brand-openedx' }, // replace with your brand checkout
// { moduleName: '@edx/paragon/scss/core', dir: '../paragon', dist: 'scss/core' },
// { moduleName: '@edx/paragon/icons', dir: '../paragon', dist: 'icons' },
// { moduleName: '@edx/paragon', dir: '../paragon', dist: 'dist' },
// { moduleName: '@openedx/paragon/scss/core', dir: '../paragon', dist: 'scss/core' },
// { moduleName: '@openedx/paragon/icons', dir: '../paragon', dist: 'icons' },
// { moduleName: '@openedx/paragon', dir: '../paragon', dist: 'dist' },
// { moduleName: '@edx/frontend-platform', dir: '../frontend-platform', dist: 'dist' },
],
};
19,457 changes: 8,985 additions & 10,472 deletions package-lock.json

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-edx.org@2.1.2",
"@edx/frontend-lib-special-exams": "^2.29.0",
"@edx/frontend-platform": "5.6.1",
"@edx/paragon": "^21.5.3",
"@edx/react-unit-test-utils": "1.7.1",
"@edx/frontend-lib-special-exams": "^3.0.0",
"@edx/frontend-platform": "7.1.2",
"@edx/react-unit-test-utils": "^2.0.0",
"@edx/tinymce-language-selector": "1.1.0",
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-brands-svg-icons": "5.15.4",
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/react-fontawesome": "0.2.0",
"@openedx/paragon": "^21.11.3",
"@reduxjs/toolkit": "^1.9.7",
"@tanstack/react-query": "^4.29.25",
"@tanstack/react-query-devtools": "^4.35.3",
Expand Down Expand Up @@ -75,24 +75,25 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-build": "12.9.0-alpha.6",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "14.0.0-alpha.1",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "12.1.5",
"@testing-library/user-event": "^14.5.1",
"glob": "7.2.3",
"husky": "7.0.4",
"jest": "^26.6.3",
"ts-jest": "^26.5.6"
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"ts-jest": "^29.1.2"
},
"overrides": {
"@edx/react-unit-test-utils": {
"@edx/frontend-build": "12.9.0-alpha.6"
"@openedx/frontend-build": "14.0.0-alpha.1"
},
"@edx/frontend-lib-special-exams": {
"@edx/frontend-build": "12.9.0-alpha.6",
"@edx/paragon": "^21.5.3"
"@openedx/frontend-build": "14.0.0-alpha.1",
"@openedx/paragon": "^21.5.3"
}
}
}
2 changes: 1 addition & 1 deletion src/components/ActionButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

import { Button, StatefulButton } from '@edx/paragon';
import { Button, StatefulButton } from '@openedx/paragon';

import { MutationStatus } from 'constants/index';

Expand Down
2 changes: 1 addition & 1 deletion src/components/AppContainer/index.jsx
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 { ErrorPage } from '@edx/frontend-platform/react';
import { Spinner } from '@edx/paragon';
import { Spinner } from '@openedx/paragon';

import {
useIsPageDataLoaded,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Assessment/Assessment.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@edx/brand/paragon/variables";
@import "~@edx/paragon/scss/core/core";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.assessment-card {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { Form } from '@edx/paragon';
import { Form } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import { useViewStep } from 'hooks/routing';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Assessment/EditableAssessment/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { Card } from '@edx/paragon';
import { Card } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import { useCriteriaConfig } from 'hooks/assessment';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import { Collapsible } from '@edx/paragon';
import { Collapsible } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';

Expand Down
4 changes: 2 additions & 2 deletions src/components/Assessment/ReadonlyAssessment/Feedback.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 { Collapsible, Icon } from '@edx/paragon';
import { ExpandMore, ExpandLess } from '@edx/paragon/icons';
import { Collapsible, Icon } from '@openedx/paragon';
import { ExpandMore, ExpandLess } from '@openedx/paragon/icons';
import { useIntl } from '@edx/frontend-platform/i18n';

import InfoPopover from 'components/InfoPopover';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ConfirmDialog/index.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 { ActionRow, AlertModal } from '@edx/paragon';
import { ActionRow, AlertModal } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';

import ActionButton from 'components/ActionButton';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/CriterionContainer.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@edx/brand/paragon/variables";
@import "~@edx/paragon/scss/core/core";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.criteria-label {
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/CriterionFeedback.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 { Form } from '@edx/paragon';
import { Form } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import { useViewStep } from 'hooks/routing';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/GradedCriterion.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 { Form, FormControlFeedback } from '@edx/paragon';
import { Form, FormControlFeedback } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';

import messages from './messages';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/RadioCriterion.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 { Form } from '@edx/paragon';
import { Form } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import {
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/ReviewCriterion.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 { Form, FormControlFeedback } from '@edx/paragon';
import { Form, FormControlFeedback } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';

import messages from './messages';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CriterionContainer/index.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 { Form } from '@edx/paragon';
import { Form } from '@openedx/paragon';

import InfoPopover from 'components/InfoPopover';

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

import { Alert, Button } from '@edx/paragon';
import { Info } from '@edx/paragon/icons';
import { Alert, Button } from '@openedx/paragon';
import { Info } from '@openedx/paragon/icons';
import { useIntl } from '@edx/frontend-platform/i18n';

const messageShape = PropTypes.shape({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { Alert, Spinner } from '@edx/paragon';
import { Alert, Spinner } from '@openedx/paragon';

const LoadingBanner = () => (
<Alert variant="info">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
import { pdfjs, Document, Page } from 'react-pdf';
import {
Icon, Form, ActionRow, IconButton,
} from '@edx/paragon';
import { ChevronLeft, ChevronRight } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { ChevronLeft, ChevronRight } from '@openedx/paragon/icons';
import pdfjsWorker from 'pdfjs-dist/build/pdf.worker.min';

import 'react-pdf/dist/esm/Page/TextLayer.css';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "@edx/paragon/scss/core/core";
@import "@openedx/paragon/scss/core/core";

.file-card {
margin: map-get($spacers, 1) 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import { Card, Collapsible } from '@edx/paragon';
import { Card, Collapsible } from '@openedx/paragon';

import './FileCard.scss';

Expand Down
4 changes: 2 additions & 2 deletions src/components/FileUpload/ActionCell.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 { IconButton, Icon } from '@edx/paragon';
import { Delete } from '@edx/paragon/icons';
import { IconButton, Icon } from '@openedx/paragon';
import { Delete } from '@openedx/paragon/icons';
import { useIntl } from '@edx/frontend-platform/i18n';

import { useDeleteFileAction } from 'hooks/actions';
Expand Down
2 changes: 1 addition & 1 deletion src/components/FileUpload/FileDownload.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { useParams } from 'react-router';

import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { StatefulButton, Icon } from '@edx/paragon';
import { StatefulButton, Icon } from '@openedx/paragon';

import { MutationStatus } from 'constants/index';

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

import {
Form, FormLabel, ModalDialog, Button, ActionRow,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl, IntlProvider } from '@edx/frontend-platform/i18n';
import messages from './messages';
import { useUploadConfirmModalHooks } from './hooks';
Expand Down
2 changes: 1 addition & 1 deletion src/components/FileUpload/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import filesize from 'filesize';

import { DataTable, Dropzone } from '@edx/paragon';
import { DataTable, Dropzone } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';

import { nullMethod } from 'utils';
Expand Down
4 changes: 2 additions & 2 deletions src/components/InfoPopover/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
Popover,
Icon,
IconButton,
} from '@edx/paragon';
import { InfoOutline } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { InfoOutline } from '@openedx/paragon/icons';
import { useIntl } from '@edx/frontend-platform/i18n';

import { nullMethod } from 'utils';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ModalActions/index.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 { Skeleton } from '@edx/paragon';
import { Skeleton } from '@openedx/paragon';

import ActionButton from 'components/ActionButton';
import ConfirmDialog from 'components/ConfirmDialog';
Expand Down
4 changes: 2 additions & 2 deletions src/components/ModalContainer.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 { Button, Icon } from '@edx/paragon';
import { Close } from '@edx/paragon/icons';
import { Button, Icon } from '@openedx/paragon';
import { Close } from '@openedx/paragon/icons';
import { OuterExamTimer } from '@edx/frontend-lib-special-exams';

import { useORAConfigData } from 'hooks/app';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ModalContainer.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@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';

.ora-modal-body {
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageRoute.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { AuthenticatedPageRoute } from '@edx/frontend-platform/react';

import { SkeletonTheme } from '@edx/paragon';
import { SkeletonTheme } from '@openedx/paragon';

import ModalContainer from 'components/ModalContainer';
import AppContainer from 'components/AppContainer';
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageRoute.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';

import { shallow } from '@edx/react-unit-test-utils';
import { AuthenticatedPageRoute } from '@edx/frontend-platform/react';
import { SkeletonTheme } from '@edx/paragon';
import { SkeletonTheme } from '@openedx/paragon';

import AppContainer from 'components/AppContainer';
import ModalContainer from 'components/ModalContainer';
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProgressBar/ProgressStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

import { StrictDict } from '@edx/react-unit-test-utils';
import { Nav, Icon } from '@edx/paragon';
import { Nav, Icon } from '@openedx/paragon';
import {
CheckCircle,
Edit,
Error,
Highlight,
Rule,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';

import { stepNames } from 'constants/index';
import { useProgressStepData } from './hooks';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProgressBar/ProgressStep.test.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { shallow } from '@edx/react-unit-test-utils';

import { CheckCircle, Error } from '@edx/paragon/icons';
import { CheckCircle, Error } from '@openedx/paragon/icons';

import { stepNames } from 'constants/index';
import { useProgressStepData } from './hooks';
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProgressBar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

import { useIntl } from '@edx/frontend-platform/i18n';
import { Navbar, Icon } from '@edx/paragon';
import { ArrowDropUpDown, ArrowForwardIos } from '@edx/paragon/icons';
import { Navbar, Icon } from '@openedx/paragon';
import { ArrowDropUpDown, ArrowForwardIos } from '@openedx/paragon/icons';

import {
useAssessmentStepOrder,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProgressBar/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@edx/paragon/scss/core/core';
@import '@openedx/paragon/scss/core/core';

.ora-progress-nav-group {
max-width: $max-width-lg;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Prompt/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';

import { useIntl } from '@edx/frontend-platform/i18n';
import { Collapsible } from '@edx/paragon';
import { Collapsible } from '@openedx/paragon';

import { useActiveStepName, useORAConfigData } from 'hooks/app';
import { useViewStep } from 'hooks/routing';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Rubric/Rubric.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@edx/brand/paragon/variables";
@import "~@edx/paragon/scss/core/core";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.popover.overlay-help-popover {
Expand Down
Loading

0 comments on commit 06a4e01

Please sign in to comment.