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

Commit

Permalink
Merge pull request #155 from openedx/bilalqamar95/jest-v29-upgrade
Browse files Browse the repository at this point in the history
feat: replaced packages @edx/paragon & @edx/frontend-build to use openedx namespace
  • Loading branch information
MichaelRoytman authored Jul 31, 2024
2 parents 7845cb4 + 021adc4 commit f705240
Show file tree
Hide file tree
Showing 10 changed files with 5,744 additions and 6,087 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 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');

const config = createConfig('jest', {
setupFilesAfterEnv: [
Expand Down
11,797 changes: 5,727 additions & 6,070 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"dependencies": {
"@cospired/i18n-iso-languages": "^2.0.2",
"@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.32.0",
"@edx/frontend-component-footer": "14.0.1",
"@edx/frontend-component-header": "5.3.2",
"@edx/frontend-platform": "8.0.0",
"@openedx/paragon": "^21.11.3",
"@fortawesome/fontawesome-svg-core": "^1.2.14",
"@fortawesome/free-brands-svg-icons": "^5.7.2",
"@fortawesome/free-regular-svg-icons": "^5.7.1",
Expand All @@ -54,7 +54,7 @@
"prop-types": "^15.5.10",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-intl": "^5.25.0",
"react-intl": "6.4.7",
"react-redux": "^7.2.9",
"react-router": "^6.15.0",
"react-router-dom": "^6.15.0",
Expand All @@ -70,8 +70,8 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.2.0",
"@edx/frontend-build": "13.0.1",
"@edx/react-unit-test-utils": "1.7.0",
"@openedx/frontend-build": "14.0.3",
"@edx/react-unit-test-utils": "3.0.0",
"@edx/reactifex": "1.0.3",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "12.1.5",
Expand Down
2 changes: 1 addition & 1 deletion src/console/ConsolePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Pagination,
SearchField,
Alert,
} from '@edx/paragon';
} from '@openedx/paragon';

import {
fetchPrograms,
Expand Down
6 changes: 3 additions & 3 deletions src/console/__snapshots__/ConsolePage.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ exports[`ConsolePage renders error when filter returns no programs 1`] = `
class="pgn__searchfield d-flex mt-3"
>
<form
class="d-flex align-items-center w-100"
class="pgn__searchfield-form"
role="search"
>
<label
Expand Down Expand Up @@ -592,7 +592,7 @@ exports[`ConsolePage renders program banners when they are included 1`] = `
class="pgn__searchfield d-flex mt-3"
>
<form
class="d-flex align-items-center w-100"
class="pgn__searchfield-form"
role="search"
>
<label
Expand Down Expand Up @@ -1127,7 +1127,7 @@ exports[`ConsolePage renders programs when there is data passed in 1`] = `
class="pgn__searchfield d-flex mt-3"
>
<form
class="d-flex align-items-center w-100"
class="pgn__searchfield-form"
role="search"
>
<label
Expand Down
2 changes: 1 addition & 1 deletion src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $fa-font-path: "~font-awesome/fonts";

@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 "~@edx/frontend-component-header/dist/index";
Expand Down
2 changes: 1 addition & 1 deletion src/report/reportSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { injectIntl } from '@edx/frontend-platform/i18n';
import { Collapsible, Alert } from '@edx/paragon';
import { Collapsible, Alert } from '@openedx/paragon';

import { fetchReports } from './actions';
import { reportSelector, storeName } from './selectors';
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.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('webpack-dev');

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 { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

const config = createConfig('webpack-prod');

Expand Down

0 comments on commit f705240

Please sign in to comment.