Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

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

Merged
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 import/no-extraneous-dependencies: ["error", {"peerDependencies": false}] */
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = 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');

module.exports = createConfig('jest', {
setupFiles: [
Expand Down
8,820 changes: 3,740 additions & 5,080 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
},
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-footer": "12.2.0",
"@edx/frontend-component-header": "4.6.0",
"@edx/frontend-platform": "5.5.4",
"@edx/paragon": "^20.44.0",
"@edx/frontend-component-footer": "13.0.2",
"@edx/frontend-component-header": "5.0.2",
"@edx/frontend-platform": "7.1.0",
Comment on lines +34 to +36
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these imports supposed to stay @edx?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks @brian-smith-tcril. Any chance we could merge this pull request?

cc: @zubair-ce07

Copy link
Contributor

Choose a reason for hiding this comment

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

On it.

"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@openedx/paragon": "^22.0.0",
"@stripe/react-stripe-js": "^1.10.0",
"@stripe/stripe-js": "^1.36.0",
"axios": "^0.27.2",
Expand Down Expand Up @@ -70,8 +70,8 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.2.0",
"@edx/frontend-build": "13.0.1",
"@edx/reactifex": "^2.1.0",
"@openedx/frontend-build": "13.0.27",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.5",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
Expand Down
2 changes: 1 addition & 1 deletion src/feedback/AlertMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useCallback } from 'react';
import PropTypes from 'prop-types';
import { Alert } from '@edx/paragon';
import { Alert } from '@openedx/paragon';
import { ALERT_TYPES, MESSAGE_TYPES } from './data/constants';

// Put in a message type, get an alert type.
Expand Down
2 changes: 1 addition & 1 deletion src/feedback/FallbackErrorMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';

const FallbackErrorMessage = () => (
<FormattedMessage
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { messages as paragonMessages } from '@edx/paragon';
import { messages as paragonMessages } from '@openedx/paragon';
import { messages as headerMessages } from '@edx/frontend-component-header';
import { messages as footerMessages } from '@edx/frontend-component-footer';

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";
@import "~@edx/brand/paragon/variables";
@import "~@edx/paragon/scss/core/core";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

@import './payment/index.scss';
Expand Down
2 changes: 1 addition & 1 deletion src/payment/AlertCodeMessages.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 { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';
import LocalizedPrice from './cart/LocalizedPrice';

// eslint-disable-next-line import/prefer-default-export
Expand Down
2 changes: 1 addition & 1 deletion src/payment/EmptyCartMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';

const EmptyCartMessage = () => (
<div className="card">
Expand Down
2 changes: 1 addition & 1 deletion src/payment/cart/Cart.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 { connect } from 'react-redux';
import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { Collapsible } from '@edx/paragon';
import { Collapsible } from '@openedx/paragon';

import messages from './Cart.messages';
import { cartSelector, currencyDisclaimerSelector } from '../data/selectors';
Expand Down
2 changes: 1 addition & 1 deletion src/payment/cart/CouponForm.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Button, Form } from '@edx/paragon';
import { Button, Form } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';

Expand Down
2 changes: 1 addition & 1 deletion src/payment/cart/UpdateQuantityForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { StatefulButton, Form } from '@edx/paragon';
import { StatefulButton, Form } from '@openedx/paragon';

import { updateQuantity } from '../data/actions';
import { updateQuantityFormSelector } from '../data/selectors';
Expand Down
2 changes: 1 addition & 1 deletion src/payment/checkout/FreeCheckoutOrderButton.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 { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';
import { getConfig } from '@edx/frontend-platform';

const FreeCheckoutOrderButton = ({ onClick }) => (
Expand Down
2 changes: 1 addition & 1 deletion src/payment/checkout/payment-form/PlaceOrderButton.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 { injectIntl, FormattedMessage } from '@edx/frontend-platform/i18n';
import { StatefulButton } from '@edx/paragon';
import { StatefulButton } from '@openedx/paragon';

const PlaceOrderButton = ({
showLoadingButton, onSubmitButtonClick, disabled, isProcessing,
Expand Down
2 changes: 1 addition & 1 deletion src/subscription/alerts/ErrorMessages.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// import FallbackErrorMessage from '../../feedback/FallbackErrorMessage';
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { Hyperlink } from '@edx/paragon';
import { Hyperlink } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';

// eslint-disable-next-line import/prefer-default-export
Expand Down
2 changes: 1 addition & 1 deletion src/subscription/checkout/skeleton/CheckoutSkeleton.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Skeleton } from '@edx/paragon';
import { Skeleton } from '@openedx/paragon';

const CheckoutSkeleton = () => (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from '@edx/frontend-platform/i18n';
import { useSelector } from 'react-redux';

import { StatefulButton, Icon } from '@edx/paragon';
import { Check as CheckIcon } from '@edx/paragon/icons';
import { StatefulButton, Icon } from '@openedx/paragon';
import { Check as CheckIcon } from '@openedx/paragon/icons';
import { subscriptionStatusSelector } from '../../data/status/selectors';

const SubscriptionSubmitButton = ({
Expand Down
4 changes: 2 additions & 2 deletions src/subscription/confirmation-modal/ConfirmationModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';

import {
ModalDialog, ActionRow, Button, Hyperlink,
} from '@edx/paragon';
} from '@openedx/paragon';
import { useSelector } from 'react-redux';
import { ArrowForward } from '@edx/paragon/icons';
import { ArrowForward } from '@openedx/paragon/icons';
import { getConfig } from '@edx/frontend-platform';
import { useIntl, FormattedMessage } from '@edx/frontend-platform/i18n';

Expand Down
2 changes: 1 addition & 1 deletion src/subscription/details/content/SubscriptionContent.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 { FormattedMessage } from '@edx/frontend-platform/i18n';
import { Badge } from '@edx/paragon';
import { Badge } from '@openedx/paragon';
import { ProgramType } from '../program-type/ProgramType';

const SubscriptionContent = ({ children, details }) => (
Expand Down
2 changes: 1 addition & 1 deletion src/subscription/details/legal/SubscriptionLegal.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 { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Skeleton } from '@edx/paragon';
import { Skeleton } from '@openedx/paragon';
import { FormattedMessage } from '@edx/frontend-platform/i18n';

const SubscriptionDetailsSkeleton = () => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { logError } from '@edx/frontend-platform/logging';

import {
ModalDialog,
} from '@edx/paragon';
} from '@openedx/paragon';
import {
PaymentElement,
} from '@stripe/react-stripe-js';
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev-stage.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getBaseConfig } = require('@edx/frontend-build');
const { getBaseConfig } = require('@openedx/frontend-build');

/**
* We customize the plugins here for the following reasons:
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getBaseConfig } = require('@edx/frontend-build');
const { getBaseConfig } = require('@openedx/frontend-build');
// NOTE: This version of html-webpack-plugin must be the same major version as the one in
// frontend-build to avoid potential issues.

Expand Down
Loading