Skip to content

Pkg upgrade #565

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

Merged
merged 3 commits into from
Jan 22, 2025
Merged

Pkg upgrade #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
261f6b6
Minor upgrades.
krulis-martin Jan 22, 2025
add8b7a
Minor upgrades.
krulis-martin Jan 22, 2025
c4c4e0e
Upgrading to React 19.
krulis-martin Jan 22, 2025
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
64 changes: 32 additions & 32 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,60 +29,60 @@
"dependencies": {
"@babel/plugin-transform-react-inline-elements": "^7.25.9",
"@babel/runtime": "^7.26.0",
"@formatjs/intl-pluralrules": "^5.4.1",
"@formatjs/intl-relativetimeformat": "^11.4.8",
"@fortawesome/fontawesome-free": "^6.7.1",
"@fortawesome/fontawesome-svg-core": "^6.7.1",
"@fortawesome/free-brands-svg-icons": "^6.7.1",
"@fortawesome/free-regular-svg-icons": "^6.7.1",
"@fortawesome/free-solid-svg-icons": "^6.7.1",
"@formatjs/intl-pluralrules": "^5.4.2",
"@formatjs/intl-relativetimeformat": "^11.4.9",
"@fortawesome/fontawesome-free": "^6.7.2",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@iktakahiro/markdown-it-katex": "^4.0.1",
"@reduxjs/toolkit": "^2.5.0",
"admin-lte": "4.0.0-beta2",
"babel-plugin-formatjs": "^10.5.29",
"admin-lte": "4.0.0-beta3",
"babel-plugin-formatjs": "^10.5.34",
"bluebird": "^3.7.2",
"browser-cookies": "^1.2.0",
"buffer": "^6.0.3",
"chai-immutable": "^2.1.0",
"classnames": "^2.5.1",
"cookie-parser": "^1.4.7",
"cross-fetch": "^4.0.0",
"cross-fetch": "^4.1.0",
"css-loader": "^7.1.2",
"deep-equal": "^2.2.3",
"ejs": "^3.1.10",
"express": "^4.21.2",
"file-saver": "^2.0.5",
"flat": "^6.0.1",
"font-awesome-animation": "^1.1.1",
"glob": "^11.0.0",
"glob": "^11.0.1",
"global": "^4.4.0",
"highlight.js": "^11.10.0",
"highlight.js": "^11.11.1",
"immutable": "^5.0.3",
"jwt-decode": "^4.0.0",
"markdown-it": "^14.1.0",
"moment": "^2.30.1",
"pretty-ms": "^9.2.0",
"prismjs": "^1.29.0",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react": "^19.0.0",
"react-ace": "^13.0.0",
"react-bootstrap": "2.10.6",
"react-bootstrap": "2.10.8",
"react-collapse": "^5.1.1",
"react-copy-to-clipboard": "^5.1.0",
"react-datetime": "^3.3.1",
"react-diff-viewer": "^3.1.1",
"react-dom": "^18.3.1",
"react-dom": "^19.0.0",
"react-dropzone": "^14.3.5",
"react-height": "^3.0.2",
"react-helmet": "^6.1.0",
"react-immutable-proptypes": "^2.2.0",
"react-intl": "6.8.9",
"react-intl": "7.1.4",
"react-motion": "^0.5.2",
"react-qr-code": "^2.0.15",
"react-redux": "^9.2.0",
"react-router": "^6.28.0",
"react-router-dom": "^6.28.0",
"react-router": "^7.1.3",
"react-router-dom": "^7.1.3",
"react-syntax-highlighter": "^15.6.1",
"react-toggle": "4.1.3",
"redux": "^5.0.1",
Expand All @@ -101,18 +101,18 @@
"devDependencies": {
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/eslint-parser": "^7.26.5",
"@babel/eslint-plugin": "^7.25.9",
"@babel/node": "^7.26.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.26.3",
"@babel/register": "^7.25.9",
"@eslint/compat": "^1.2.4",
"@eslint/compat": "^1.2.5",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.17.0",
"@formatjs/cli-lib": "^6.6.3",
"@eslint/js": "^9.18.0",
"@formatjs/cli-lib": "^6.6.6",
"async": "^3.2.6",
"babel-loader": "^9.2.1",
"babel-plugin-prismjs": "^2.1.0",
Expand All @@ -125,34 +125,34 @@
"chai": "^5.1.2",
"chai-spies": "^1.1.0",
"colors": "^1.4.0",
"core-js": "^3.39.0",
"core-js": "^3.40.0",
"css-loader": "^7.1.2",
"css-modules-require-hook": "^4.2.3",
"dotenv": "^16.4.7",
"eslint": "^9.16.0",
"eslint-config-prettier": "^9.1.0",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-config-standard": "17.1.0",
"eslint-config-standard-react": "13.0.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-n": "^17.15.0",
"eslint-plugin-n": "^17.15.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-standard": "^5.0.0",
"esm": "^3.2.25",
"fetch-mock": "^12.2.0",
"file-loader": "^6.2.0",
"git-revision-webpack-plugin": "^5.0.0",
"globals": "^15.13.0",
"globals": "^15.14.0",
"image-webpack-loader": "^8.1.0",
"isomorphic-style-loader": "^5.4.0",
"jsdom": "^25.0.1",
"jsdom": "^26.0.0",
"json-loader": "^0.5.7",
"less": "^4.2.1",
"less": "^4.2.2",
"less-loader": "^12.2.0",
"mini-css-extract-plugin": "^2.9.2",
"mocha": "^11.0.1",
"mocha": "^11.1.0",
"mocha-lcov-reporter": "^1.3.0",
"mock-local-storage": "^1.1.24",
"postcss-loader": "^8.1.1",
Expand All @@ -164,7 +164,7 @@
"style-loader": "^4.0.0",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-cli": "^6.0.1",
"webpack-dev-middleware": "^7.4.2",
"webpack-dev-server": "^5.2.0",
"webpack-isomorphic-tools": "^4.0.0"
Expand Down
18 changes: 0 additions & 18 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,6 @@ import 'ace-builds/src-noconflict/mode-scala.js';
import 'ace-builds/src-noconflict/mode-typescript.js';
import 'ace-builds/src-noconflict/keybinding-vim.js';

/*
* This is an ugly hack that deals with deprecated warnings generated in console log by obsolete
* Overlay and OverlayTrigger components.
* TODO FIXME: Remove after upgrading to react-bootstrap 2.0 and AdminLTE 4 (hopefully, the warnings will disapear).
*/
// const consoleError = console.error; // eslint-disable-line no-console
// console.error /* eslint-disable-line no-console */ = (msg, ...rest) => {
// if (typeof msg === 'string') {
// if (msg.startsWith('Warning: findDOMNode is deprecated and will be removed in the next major release.')) {
// return;
// }
// if (msg.includes('Support for defaultProps will be removed')) {
// return;
// }
// }
// consoleError(msg, ...rest);
// };

// override of worker paths, so they load properly
const ACE_CDN_PREFIX = 'https://cdn.jsdelivr.net/npm/[email protected]/src-noconflict/';
ace.config.set('basePath', ACE_CDN_PREFIX);
Expand Down
6 changes: 3 additions & 3 deletions src/components/layout/Footer/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const Footer = ({ version }) => (
defaultMessage="<strong>Version</strong> {version} (<a>changelog</a>)"
values={{
version,
strong: text => <strong>{text}</strong>,
strong: text => <strong key="version">{text}</strong>,
a: caption => (
<a href="https://github.com/ReCodEx/wiki/wiki/Changelog" target="_blank" rel="noreferrer">
<a key="link" href="https://github.com/ReCodEx/wiki/wiki/Changelog" target="_blank" rel="noreferrer">
{caption}
</a>
),
Expand All @@ -24,7 +24,7 @@ const Footer = ({ version }) => (
defaultMessage="Copyright © 2016-{year} <a>ReCodEx</a>. All rights reserved."
values={{
a: caption => (
<a href="https://github.com/recodex" target="_blank" rel="noreferrer">
<a key="link" href="https://github.com/recodex" target="_blank" rel="noreferrer">
{caption}
</a>
),
Expand Down
3 changes: 2 additions & 1 deletion src/locales/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"app.ExercisePrefixIcons.archivedAt": "Archivováno v {archivedAt}.",
"app.ExercisePrefixIcons.isLocked": "Úloha je zamčena autorem a nemůže být zadávána",
"app.ExercisePrefixIcons.isPrivate": "Úloha je soukromá (viditelná pouze autorovi).",
"app.QRCodeDropdown.title": "QR kód s odkazem na aktuální stránku",
"app.acceptGroupInvitation.acceptAndJoin": "Přijmout pozvání do skupiny",
"app.acceptGroupInvitation.alreadyMember": "Již jste členem odpovídající skupiny.",
"app.acceptGroupInvitation.expireAt": "Pozvánka pozbyde platnosti v",
Expand Down Expand Up @@ -2196,4 +2197,4 @@
"recodex-judge-shuffle-all": "Sudí neuspořádaných tokenů a řádků",
"recodex-judge-shuffle-newline": "Sudí neuspořádaných tokenů (ignorující konce řádků)",
"recodex-judge-shuffle-rows": "Sudí neuspořádaných řádků"
}
}
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"app.ExercisePrefixIcons.archivedAt": "Archived at {archivedAt}.",
"app.ExercisePrefixIcons.isLocked": "Exercise is locked by the author and cannot be assigned.",
"app.ExercisePrefixIcons.isPrivate": "Exercise is private (visible only to author).",
"app.QRCodeDropdown.title": "QR code link to current page",
"app.acceptGroupInvitation.acceptAndJoin": "Accept invitation and join the group",
"app.acceptGroupInvitation.alreadyMember": "You are already a member of the corresponding group.",
"app.acceptGroupInvitation.expireAt": "Invitation expires at",
Expand Down
Loading