Skip to content

Commit

Permalink
Merge pull request #114 from edx/mashal-m/replace-edx/paragon-fronten…
Browse files Browse the repository at this point in the history
…d-build

refactor: replace @edx/paragon and @edx/frontend-build
  • Loading branch information
justinhynes authored Feb 28, 2024
2 parents afaa6fa + 65051fd commit 01002a8
Show file tree
Hide file tree
Showing 25 changed files with 2,820 additions and 3,040 deletions.
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', {
// 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' },
],
};
5,792 changes: 2,786 additions & 3,006 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-edx.org@^2.1.2",
"@edx/frontend-component-footer-edx": "6.9.0",
"@edx/frontend-platform": "6.2.0",
"@edx/paragon": "21.5.6",
"@edx/frontend-component-footer-edx": "7.0.0",
"@edx/frontend-platform": "7.1.0",
"@openedx/paragon": "^21.11.3",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-brands-svg-icons": "6.5.1",
"@fortawesome/free-regular-svg-icons": "6.5.1",
Expand All @@ -56,7 +56,7 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-build": "13.0.14",
"@openedx/frontend-build": "13.0.28",
"@edx/reactifex": "^2.1.1",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "^8.0.1",
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-footer-edx/dist/footer";
Expand Down
2 changes: 1 addition & 1 deletion src/skills-builder/ProductTool.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useContext } from 'react';
import {
Container, Stack, Form, Button,
} from '@edx/paragon';
} from '@openedx/paragon';
import { VisibilityFlagsContext } from './visibility-flags-context';
import { setAllFlags } from './visibility-flags-context/data/actions';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Container } from '@edx/paragon';
import { Container } from '@openedx/paragon';
import edXLogo from '../images/edX-logo.svg';
import { VisibilityFlagsContext } from '../visibility-flags-context';
import messages from './messages';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useContext } from 'react';
import {
Button, Container, Stepper, Form, Hyperlink, useMediaQuery, breakpoints,
} from '@edx/paragon';
} from '@openedx/paragon';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from 'react';
import {
Button, Container, Form, Hyperlink, useMediaQuery, breakpoints,
} from '@edx/paragon';
} from '@openedx/paragon';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import {
IconButton, Icon,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { Close } from '@edx/paragon/icons';
import { Close } from '@openedx/paragon/icons';
import { VisibilityFlagsContext } from '../../visibility-flags-context';
import { SkillsBuilderContext } from '../../skills-builder-context';
import { removeCareerInterest } from '../../skills-builder-context/data/actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import {
Stack, Row, Col, Form, Icon,
} from '@edx/paragon';
import { Verified } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { Verified } from '@openedx/paragon/icons';
import CareerInterestCard from './CareerInterestCard';
import { addCareerInterest, clearAllCareerInterests, setExpandedList } from '../../skills-builder-context/data/actions';
import { SkillsBuilderContext } from '../../skills-builder-context';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import {
Stack, Row, Col, Form,
} from '@edx/paragon';
} from '@openedx/paragon';
import { Configure, InstantSearch } from 'react-instantsearch';
import JobTitleInstantSearch from './JobTitleInstantSearch';
import CareerInterestCard from './CareerInterestCard';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from 'react';
import {
Form,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { setGoal } from '../../skills-builder-context/data/actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import {
Form, Icon,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useSearchBox, useInstantSearch } from 'react-instantsearch';
import { Search } from '@edx/paragon/icons';
import { Search } from '@openedx/paragon/icons';

const JobTitleInstantSearch = (props) => {
const { refine } = useSearchBox(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext } from 'react';
import { getConfig } from '@edx/frontend-platform';
import {
Form, Stack,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { InstantSearch } from 'react-instantsearch';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from 'react';
import {
Stack,
} from '@edx/paragon';
} from '@openedx/paragon';
import { VisibilityFlagsContext } from '../../visibility-flags-context';
import GoalSelect from './GoalSelect';
import JobTitleSelect from './JobTitleSelect';
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 { CardGrid } from '@edx/paragon';
import { CardGrid } from '@openedx/paragon';
import RecommendationCard from './RecommendationCard';

const ProductCardGrid = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import {
Button, Icon, Stack, useMediaQuery, breakpoints,
} from '@edx/paragon';
import { KeyboardArrowDown, KeyboardArrowUp } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { KeyboardArrowDown, KeyboardArrowUp } from '@openedx/paragon/icons';
import { useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import {
Card, Chip, Hyperlink,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';
import cardImageCapFallbackSrc from '../../images/card-imagecap-fallback.png';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useContext } from 'react';
import { Stack } from '@edx/paragon';
import { Stack } from '@openedx/paragon';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import ProductCardGrid from './ProductCardGrid';
import ProductTypeBanner from './ProductTypeBanner';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import {
Card, CardDeck, Chip, Stack,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { addCareerInterest } from '../../skills-builder-context/data/actions';
Expand Down
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 {
SelectableBox, Chip, Stack,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import messages from './messages';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import {
Chip, Card, Button,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import { VisibilityFlagsContext } from '../../visibility-flags-context';
import messages from './messages';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import React, {
} from 'react';
import {
Stack, Row, Alert, Spinner,
} from '@edx/paragon';
} from '@openedx/paragon';
import { logError } from '@edx/frontend-platform/logging';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { useIntl } from '@edx/frontend-platform/i18n';
import { ErrorOutline } from '@edx/paragon/icons';
import { ErrorOutline } from '@openedx/paragon/icons';
import { SkillsBuilderContext } from '../../skills-builder-context';
import { VisibilityFlagsContext } from '../../visibility-flags-context';
import RelatedSkillsSelectableBoxSet from './RelatedSkillsSelectableBoxSet';
Expand Down

0 comments on commit 01002a8

Please sign in to comment.