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.

Sign up for GitHub

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

feat: updated major versions for frontend-platform & paragon #947

Merged
merged 14 commits into from
Aug 2, 2024
Merged

feat: updated major versions for frontend-platform & paragon #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
11dd237
feat: updated major versions for frontend-platform & paragon
BilalQamar95 Jan 29, 2024
4741bd8
Merge branch 'master' into bilalqamar95/frontend-platform-upgrade
BilalQamar95 Feb 20, 2024
4aa9a8b
refactor: updated paragon & frontend-build to openedx scope
BilalQamar95 Feb 20, 2024
a5af849
refactor: updated major versions for both frontend-platform & compone…
BilalQamar95 Feb 20, 2024
30dbfa1
refactor: updated frontend-build version
BilalQamar95 Feb 20, 2024
59628d7
Merge branch 'master' of https://github.com/BilalQamar95/frontend-app…
BilalQamar95 Mar 28, 2024
6625a14
refactor: updated snapshots for failing tests
BilalQamar95 Mar 28, 2024
b74a091
Merge branch 'master' of https://github.com/BilalQamar95/frontend-app…
BilalQamar95 Apr 24, 2024
a17d0db
Merge branch 'master' of https://github.com/BilalQamar95/frontend-app…
BilalQamar95 May 14, 2024
757d2f4
Merge branch 'master' into bilalqamar95/frontend-platform-upgrade
BilalQamar95 Jul 4, 2024
21494e3
Merge branch 'master' into bilalqamar95/frontend-platform-upgrade
BilalQamar95 Jul 30, 2024
5644bb6
feat: major version upgrades for frontend-platform & frontend-build
BilalQamar95 Jul 30, 2024
1c7ad62
fix: updated snapshots for failing tests
BilalQamar95 Jul 30, 2024
2d1d723
fix: resolve Jest exit code 1 error by adjusting worker settings
BilalQamar95 Jul 30, 2024
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
View file
Open in desktop
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 babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('babel');
2 changes: 1 addition & 1 deletion jest.config.js
View file
Open in desktop
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', {
setupFiles: [
Expand Down
17,305 changes: 7,627 additions & 9,678 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
"prepublishOnly": "npm run build",
"start": "fedx-scripts webpack-dev-server --progress",
"debug-test": "node --inspect-brk node_modules/.bin/jest --coverage --runInBand",
"test": "TZ=GMT fedx-scripts jest --coverage --runInBand",
"test": "TZ=GMT fedx-scripts jest --coverage --maxWorkers=2",
"snapshot": "TZ=GMT fedx-scripts jest --updateSnapshot",
"stylelint": "stylelint '**/*.scss'"
},
"license": "AGPL-3.0",
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^6.4.0",
"@edx/frontend-platform": "5.6.1",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^7.1.0",
"@edx/frontend-platform": "^8.0.0",
"@edx/openedx-atlas": "^0.6.0",
"@edx/paragon": "^20.44.0",
"@openedx/paragon": "^21.11.3",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we moving some packages from the edx namespace to openedx?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can view axim-engineering#23 for details. I have also updated the description

"@edx/tinymce-language-selector": "1.1.0",
"@fortawesome/free-regular-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
Expand Down Expand Up @@ -64,7 +64,7 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.2.0",
"@edx/frontend-build": "13.0.14",
"@openedx/frontend-build": "^14.0.14",
"@edx/stylelint-config-edx": "^2.3.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"axios": "0.27.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionButton/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { StatefulButton } from '@edx/paragon';
import { StatefulButton } from '@openedx/paragon';

// Just a tiny wrapper around StatefulButton to provide some good defaults
const ActionButton = ({ className, primary, ...passThroughProps }) => (
Expand Down
2 changes: 1 addition & 1 deletion src/components/Collaborator/index.jsx
View file
Open in desktop
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';
import { Link } from 'react-router-dom';

import sourceInfo from '../../data/actions/sourceInfo';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CollaboratorPage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Helmet } from 'react-helmet';
import { Alert } from '@edx/paragon';
import { Alert } from '@openedx/paragon';

import CollaboratorForm from './CollaboratorForm';
import PageContainer from '../PageContainer';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Collapsible/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import { Collapsible } from '@edx/paragon';
import { Collapsible } from '@openedx/paragon';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faPlus, faMinus } from '@fortawesome/free-solid-svg-icons';

Expand Down
2 changes: 1 addition & 1 deletion src/components/ConfirmationModal/index.jsx
View file
Open in desktop
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, Button, ModalDialog } from '@edx/paragon';
import { ActionRow, Button, ModalDialog } from '@openedx/paragon';

const ConfirmationModal = ({
onSubmit,
Expand Down
Loading
Loading