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.

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: [RGInt-352]update dependencies to work with Design Tokens #4

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
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,3 @@ jobs:
run: npm run test
- name: i18n_extract
run: npm run i18n_extract
- name: Coverage
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
15,499 changes: 10,205 additions & 5,294 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@edx/frontend-lib-content-components",
"version": "1.0.0-semantically-released",
"name": "@raccoongang/frontend-lib-content-components",
"version": "2.5.3-tokens.3",
"description": "A library of high-level components for content handling.",
"main": "dist/index.js",
"publishConfig": {
Expand All @@ -15,7 +15,8 @@
"snapshot": "fedx-scripts jest --updateSnapshot",
"start": "fedx-scripts webpack-dev-server --progress",
"test": "fedx-scripts jest --coverage",
"addXblock": "node addXblock"
"addXblock": "node addXblock",
"replace-variables": "paragon replace-variables -p src -t usage"
},
"files": [
"/dist"
Expand All @@ -27,24 +28,24 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/edx/frontend-lib-content-components.git"
"url": "git+https://github.com/raccoongang/frontend-lib-content-components.git"
},
"author": "edX",
"license": "AGPL-3.0",
"bugs": {
"url": "https://github.com/edx/frontend-lib-content-components/issues"
"url": "https://github.com/raccoongang/frontend-lib-content-components/issues"
},
"browserslist": [
"extends @edx/browserslist-config"
],
"homepage": "https://github.com/edx/frontend-lib-content-components#readme",
"homepage": "https://github.com/raccoongang/frontend-lib-content-components#readme",
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-platform": "8.0.0",
"@edx/react-unit-test-utils": "3.0.0",
"@edx/frontend-platform": "npm:@raccoongang/[email protected]",
"@edx/react-unit-test-utils": "npm:@raccoongang/react-unit-test-utils@2.0.0-tokens.2",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "14.0.3",
"@openedx/paragon": "^22.0.0",
"@openedx/frontend-build": "npm:@raccoongang/[email protected]",
"@openedx/paragon": "23.0.0",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
Expand Down Expand Up @@ -72,6 +73,7 @@
"@dnd-kit/utilities": "^3.2.1",
"@edx/browserslist-config": "^1.1.1",
"@reduxjs/toolkit": "^1.8.1",
"@restart/hooks": "^0.6.2",
"@tinymce/tinymce-react": "^3.14.0",
"babel-polyfill": "6.26.0",
"classnames": "^2.5.1",
Expand Down Expand Up @@ -99,8 +101,8 @@
"xmlchecker": "^0.1.0"
},
"peerDependencies": {
"@edx/frontend-platform": "^7.0.1 || ^8.0.0",
"@openedx/paragon": "^21.5.7 || ^22.0.0",
"@edx/frontend-platform": "^7.0.1 || ^8.0.0 || ^7.1.2-tokens.1",
"@openedx/paragon": ">= ^21.5.7 < 24.0.0",
"prop-types": "^15.5.10",
"react": "^16.14.0 || ^17.0.0",
"react-dom": "^16.14.0 || ^17.0.0"
Expand Down
4 changes: 2 additions & 2 deletions src/editors/__snapshots__/EditorPage.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Editor Page snapshots props besides blockType default to null 1`] = `
<Provider
store={
{
Object {
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
Expand Down Expand Up @@ -32,7 +32,7 @@ exports[`Editor Page snapshots props besides blockType default to null 1`] = `
exports[`Editor Page snapshots rendering correctly with expected Input 1`] = `
<Provider
store={
{
Object {
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
Expand Down
4 changes: 2 additions & 2 deletions src/editors/__snapshots__/VideoSelectorPage.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Video Selector Page snapshots rendering correctly with expected Input 1`] = `
<Provider
store={
{
Object {
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
Expand All @@ -29,7 +29,7 @@ exports[`Video Selector Page snapshots rendering correctly with expected Input 1
exports[`Video Selector Page snapshots rendering with props to null 1`] = `
<Provider
store={
{
Object {
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`EditorContainer component render snapshot: initialized. enable save and
<div
className="editor-container d-flex flex-column position-relative zindex-0"
style={
{
Object {
"minHeight": "100%",
}
}
Expand Down Expand Up @@ -68,8 +68,8 @@ exports[`EditorContainer component render snapshot: initialized. enable save and
disableSave={false}
onCancel={[MockFunction openCancelConfirmModal]}
onSave={
{
"handleSaveClicked": {
Object {
"handleSaveClicked": Object {
"dispatch": [MockFunction react-redux.dispatch],
"getContent": [MockFunction props.getContent],
"returnFunction": [MockFunction props.returnFunction],
Expand All @@ -85,7 +85,7 @@ exports[`EditorContainer component render snapshot: not initialized. disable sav
<div
className="editor-container d-flex flex-column position-relative zindex-0"
style={
{
Object {
"minHeight": "100%",
}
}
Expand Down Expand Up @@ -145,8 +145,8 @@ exports[`EditorContainer component render snapshot: not initialized. disable sav
disableSave={true}
onCancel={[MockFunction openCancelConfirmModal]}
onSave={
{
"handleSaveClicked": {
Object {
"handleSaveClicked": Object {
"dispatch": [MockFunction react-redux.dispatch],
"getContent": [MockFunction props.getContent],
"returnFunction": [MockFunction props.returnFunction],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports[`EditableHeader snapshot snapshot 1`] = `
onKeyDown={[MockFunction args.handleKeyDown]}
placeholder="Title"
style={
{
Object {
"paddingInlineEnd": "calc(1rem + 84px)",
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports[`TitleHeader snapshots initialized 1`] = `
className="d-flex flex-row align-items-center mt-1"
>
<Truncate>
{
Object {
"useSelector": [Function],
}
</Truncate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`AnswerOption render snapshot: renders correct option with feedback 1`]
>
<Checker
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "some feedback",
Expand All @@ -37,15 +37,15 @@ exports[`AnswerOption render snapshot: renders correct option with feedback 1`]
<Body>
<injectIntl(ShimmedIntlComponent)
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "some feedback",
"title": "Answer 1",
}
}
intl={
{
Object {
"formatMessage": [Function],
}
}
Expand Down Expand Up @@ -87,7 +87,7 @@ exports[`AnswerOption render snapshot: renders correct option with numeric input
>
<Checker
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "some feedback",
Expand All @@ -114,15 +114,15 @@ exports[`AnswerOption render snapshot: renders correct option with numeric input
<Body>
<injectIntl(ShimmedIntlComponent)
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "some feedback",
"title": "Answer 1",
}
}
intl={
{
Object {
"formatMessage": [Function],
}
}
Expand Down Expand Up @@ -164,7 +164,7 @@ exports[`AnswerOption render snapshot: renders correct option with numeric input
>
<Checker
answer={
{
Object {
"correct": true,
"id": "A",
"isAnswerRange": true,
Expand Down Expand Up @@ -204,7 +204,7 @@ exports[`AnswerOption render snapshot: renders correct option with numeric input
<Body>
<injectIntl(ShimmedIntlComponent)
answer={
{
Object {
"correct": true,
"id": "A",
"isAnswerRange": true,
Expand All @@ -214,7 +214,7 @@ exports[`AnswerOption render snapshot: renders correct option with numeric input
}
}
intl={
{
Object {
"formatMessage": [Function],
}
}
Expand Down Expand Up @@ -256,7 +256,7 @@ exports[`AnswerOption render snapshot: renders correct option with selected unse
>
<Checker
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "selected feedback",
Expand All @@ -283,7 +283,7 @@ exports[`AnswerOption render snapshot: renders correct option with selected unse
<Body>
<injectIntl(ShimmedIntlComponent)
answer={
{
Object {
"correct": true,
"id": "A",
"selectedFeedback": "selected feedback",
Expand All @@ -292,7 +292,7 @@ exports[`AnswerOption render snapshot: renders correct option with selected unse
}
}
intl={
{
Object {
"formatMessage": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`AnswersContainer render snapshot: numeric problems: answer range/answer
>
<mockAnswerOption
answer={
{
Object {
"correct": true,
"id": "A",
"isAnswerRange": true,
Expand Down Expand Up @@ -110,7 +110,7 @@ exports[`AnswersContainer render snapshot: numeric problems: answer range/answer
>
<mockAnswerOption
answer={
{
Object {
"correct": true,
"id": "A",
"isAnswerRange": false,
Expand All @@ -124,7 +124,7 @@ exports[`AnswersContainer render snapshot: numeric problems: answer range/answer
/>
<mockAnswerOption
answer={
{
Object {
"correct": true,
"id": "B",
"isAnswerRange": false,
Expand Down Expand Up @@ -202,7 +202,7 @@ exports[`AnswersContainer render snapshot: renders correctly with answers 1`] =
>
<mockAnswerOption
answer={
{
Object {
"correct": true,
"id": "a",
"title": "sOMetITlE",
Expand All @@ -213,7 +213,7 @@ exports[`AnswersContainer render snapshot: renders correctly with answers 1`] =
/>
<mockAnswerOption
answer={
{
Object {
"correct": true,
"id": "b",
"title": "sOMetITlE",
Expand Down
Loading