Skip to content
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
32 changes: 1 addition & 31 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,11 @@
"transform-object-assign",
"transform-flow-strip-types",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime",
["prismjs", {
"languages": [
"csharp",
"css",
"go",
"groovy",
"java",
"javascript",
"kotlin",
"markdown",
"pascal",
"php",
"python",
"rust",
"scala",
"typescript",
"bash",
"cpp",
"haskell",
"cshtml",
"arduino",
"prolog",
"bash",
"sql",
"bison"
],
"theme": "default",
"css": true
}]
"@babel/plugin-transform-runtime"
],
"env": {
"production": {
"plugins": [
"@babel/plugin-transform-react-inline-elements"
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
node-version: ['20']
node-version: ['22', '24']
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
3 changes: 2 additions & 1 deletion bin/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const app = new Express();
app.set('view engine', 'ejs');
app.use(urlPrefix, Express.static(path.join(__dirname, '../public')));

app.get('*', (req, res) => {
// 'splat' is the name of the * wildcard (new in Express 5.x)
app.get('*splat', (req, res) => {
res.render('index', {
html: '',
head: {
Expand Down
9 changes: 7 additions & 2 deletions config/webpack.config-dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@ const gitRevisionPlugin = new GitRevisionPlugin({
});

export default {
devtool: process.env.NODE_ENV === 'development' ? 'eval-source-map' : 'none',
// switch the source map generation when debugging
// note, we used 'eval-source-map' before, but since webpack 5.100, it breaks the build
// (causes 'SyntaxError: redeclaration of function normalize')
// devtool: 'inline-source-map',
devtool: false, // turn it off completely

entry: path.join(__dirname, '..', 'src/client.js'),
output: {
filename: 'bundle.js',
path: path.join(__dirname, '..', 'public'),
publicPath: '/public/',
},
mode: 'development',
mode: process.env.NODE_ENV,
resolve: {
alias: {
moment: 'moment/moment.js',
Expand Down
3 changes: 1 addition & 2 deletions config/webpack.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ export default {
resolve: {
alias: {
moment: 'moment/moment.js',
'react-ace': 'react-ace-bad', // a hack to rid ourselves of ace module in server mode
},
fallback: { 'react-ace-bad': false },
fallback: {},
},
target: 'node',
mode: process.env.NODE_ENV,
Expand Down
3 changes: 1 addition & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export default [{
globals: {
...globals.browser,
...globals.node,
...globals.mocha,
__DEVELOPMENT__: true,
__CLIENT__: true,
__SERVER__: true,
Expand All @@ -61,7 +60,7 @@ export default [{
'import/ignore': ['node_modules', '.less$'],

react: {
version: '18.3.1',
version: '19.2.0',
},
},

Expand Down
135 changes: 52 additions & 83 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,74 +17,59 @@
"build": "npm run clean && npm run build:server && npm run build:client",
"build:test": "npm run clean && npm run build:server && npm run build:client",
"lint": "eslint src",
"test": "mocha --recursive --timeout 2000 --require ./test/setup.js --require mock-local-storage",
"test:mocha": "mocha --recursive --timeout 2000 --require @babel/register --require ./test/setup.js --require mock-local-storage",
"test:watch": "mocha --recursive --timeout 2000 --require @babel/register --require ./test/setup.js --require mock-local-storage --watch --reporter nyan",
"dev": "babel-node bin/dev.js --max-old-space-size=4096",
"start": "node bin/server.mjs",
"deploy": "mkdir -p ./prod && mkdir -p ./prod/etc && cp -rf ./views ./prod && cp -rf ./bin ./prod && cp -n ./etc/env.json.example ./prod/etc/env.json && rm -rf ./prod/public && cp -rf ./public ./prod",
"manageTranslations": "babel-node bin/manageTranslations.js",
"format": "prettier --config .prettierrc --write \"src/**/*.js\""
},
"dependencies": {
"@babel/plugin-transform-react-inline-elements": "^7.25.9",
"@babel/runtime": "^7.26.0",
"@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",
"@babel/plugin-transform-react-inline-elements": "^7.27.1",
"@babel/runtime": "^7.28.4",
"@formatjs/intl-pluralrules": "^5.4.6",
"@formatjs/intl-relativetimeformat": "^11.4.13",
"@fortawesome/fontawesome-free": "^7.1.0",
"@fortawesome/fontawesome-svg-core": "^7.1.0",
"@fortawesome/free-brands-svg-icons": "^7.1.0",
"@fortawesome/free-regular-svg-icons": "^7.1.0",
"@fortawesome/free-solid-svg-icons": "^7.1.0",
"@fortawesome/react-fontawesome": "^3.1.0",
"@iktakahiro/markdown-it-katex": "^4.0.1",
"@reduxjs/toolkit": "^2.5.0",
"admin-lte": "4.0.0-beta3",
"babel-plugin-formatjs": "^10.5.34",
"bluebird": "^3.7.2",
"@reduxjs/toolkit": "^2.9.2",
"admin-lte": "4.0.0-rc4",
"babel-plugin-formatjs": "^10.5.41",
"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.1.0",
"css-loader": "^7.1.2",
"deep-equal": "^2.2.3",
"ejs": "^3.1.10",
"express": "^4.21.2",
"express": "^5.1.0",
"file-saver": "^2.0.5",
"final-form": "^5.0.0",
"flat": "^6.0.1",
"font-awesome-animation": "^1.1.1",
"glob": "^11.0.1",
"global": "^4.4.0",
"glob": "^11.0.3",
"highlight.js": "^11.11.1",
"immutable": "^5.0.3",
"immutable": "^5.1.4",
"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": "^19.0.0",
"react-ace": "^13.0.0",
"react-bootstrap": "2.10.8",
"react": "^19.2.0",
"react-bootstrap": "2.10.10",
"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": "^19.0.0",
"react-dropzone": "^14.3.5",
"react-dom": "^19.2.0",
"react-final-form": "^7.0.0",
"react-height": "^3.0.2",
"react-helmet": "^6.1.0",
"react-immutable-proptypes": "^2.2.0",
"react-intl": "7.1.4",
"react-motion": "^0.5.2",
"react-intl": "7.1.14",
"react-redux": "^9.2.0",
"react-router": "^7.1.3",
"react-router-dom": "^7.1.3",
"react-syntax-highlighter": "^15.6.1",
"react-router": "^7.9.5",
"react-router-dom": "^7.9.5",
"react-toggle": "4.1.3",
"redux": "^5.0.1",
"redux-actions": "^3.0.3",
Expand All @@ -93,80 +78,64 @@
"redux-storage-decorator-filter": "^1.1.8",
"redux-storage-engine-localstorage": "^1.1.4",
"reselect": "^5.1.1",
"serialize-javascript": "^6.0.2",
"statuscode": "0.0.0",
"validator": "^13.12.0",
"viz.js": "^2.1.2"
"validator": "^13.15.20"
},
"devDependencies": {
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.26.5",
"@babel/eslint-plugin": "^7.25.9",
"@babel/node": "^7.26.0",
"@babel/cli": "^7.28.3",
"@babel/core": "^7.28.5",
"@babel/eslint-parser": "^7.28.5",
"@babel/eslint-plugin": "^7.27.1",
"@babel/node": "^7.28.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.5",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.18.0",
"@babel/plugin-transform-runtime": "^7.28.5",
"@babel/preset-env": "^7.28.5",
"@babel/preset-react": "^7.28.5",
"@babel/register": "^7.28.3",
"@eslint/compat": "^1.4.1",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.38.0",
"@formatjs/cli-lib": "^6.6.6",
"async": "^3.2.6",
"babel-loader": "^9.2.1",
"babel-plugin-prismjs": "^2.1.0",
"babel-loader": "^10.0.0",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
"babel-plugin-transform-object-assign": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"babel-regenerator-runtime": "^6.5.0",
"chai": "^5.1.2",
"chai-spies": "^1.1.0",
"colors": "^1.4.0",
"core-js": "^3.40.0",
"css-loader": "^7.1.2",
"css-modules-require-hook": "^4.2.3",
"dotenv": "^16.4.7",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"dotenv": "^17.2.3",
"eslint": "^9.38.0",
"eslint-config-prettier": "^10.1.8",
"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.1",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-n": "^17.23.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react": "^7.37.5",
"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.14.0",
"globals": "^16.4.0",
"image-webpack-loader": "^8.1.0",
"isomorphic-style-loader": "^5.4.0",
"jsdom": "^26.0.0",
"json-loader": "^0.5.7",
"less": "^4.2.2",
"less-loader": "^12.2.0",
"mini-css-extract-plugin": "^2.9.2",
"mocha": "^11.1.0",
"mocha-lcov-reporter": "^1.3.0",
"mock-local-storage": "^1.1.24",
"postcss-loader": "^8.1.1",
"prettier": "^3.4.2",
"less": "^4.4.2",
"less-loader": "^12.3.0",
"mini-css-extract-plugin": "^2.9.4",
"postcss-loader": "^8.2.0",
"prettier": "^3.6.2",
"react-intl-translations-manager": "^5.0.3",
"request": "^2.88.2",
"scroll-behavior": "^0.11.0",
"strip-loader": "^0.1.2",
"style-loader": "^4.0.0",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.97.1",
"terser-webpack-plugin": "^5.3.14",
"webpack": "5.102.1",
"webpack-cli": "^6.0.1",
"webpack-dev-middleware": "^7.4.2",
"webpack-dev-server": "^5.2.0",
"webpack-dev-middleware": "^7.4.5",
"webpack-dev-server": "^5.2.2",
"webpack-isomorphic-tools": "^4.0.0"
},
"packageManager": "yarn@3.2.1"
Expand Down
42 changes: 0 additions & 42 deletions src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,6 @@ import App from './containers/App/index.js';

import 'admin-lte/dist/js/adminlte.js';

// Patch for ACE editor (it has complex loading)
import ace from 'ace-builds';
import 'ace-builds/webpack-resolver.js';
import 'ace-builds/src-noconflict/theme-monokai.js';
import 'ace-builds/src-noconflict/theme-github.js';
import 'ace-builds/src-noconflict/mode-c_cpp.js';
import 'ace-builds/src-noconflict/mode-csharp.js';
import 'ace-builds/src-noconflict/mode-css.js';
import 'ace-builds/src-noconflict/mode-groovy.js';
import 'ace-builds/src-noconflict/mode-html.js';
import 'ace-builds/src-noconflict/mode-kotlin.js';
import 'ace-builds/src-noconflict/mode-java.js';
import 'ace-builds/src-noconflict/mode-javascript.js';
import 'ace-builds/src-noconflict/mode-makefile.js';
import 'ace-builds/src-noconflict/mode-markdown.js';
import 'ace-builds/src-noconflict/mode-pascal.js';
import 'ace-builds/src-noconflict/mode-php.js';
import 'ace-builds/src-noconflict/mode-python.js';
import 'ace-builds/src-noconflict/mode-rust.js';
import 'ace-builds/src-noconflict/mode-scala.js';
import 'ace-builds/src-noconflict/mode-typescript.js';
import 'ace-builds/src-noconflict/keybinding-vim.js';

// override of worker paths, so they load properly
const ACE_CDN_PREFIX = 'https://cdn.jsdelivr.net/npm/ace-builds@1.4.12/src-noconflict/';
ace.config.set('basePath', ACE_CDN_PREFIX);
const KNOWN_ACE_WORKERS = {
base_worker: 'worker-base',
css_worker: 'worker-css',
html_worker: 'worker-html',
javascript_worker: 'worker-javascript',
php_worker: 'worker-php',
xml_worker: 'worker-xml',
};
Object.keys(KNOWN_ACE_WORKERS).forEach(key => {
ace.config.setModuleUrl(`ace/mode/${key}`, `${ACE_CDN_PREFIX}${KNOWN_ACE_WORKERS[key]}.js`);
});

// set Prismjs to manual mode (if present)
window.Prism = window.Prism || {};
window.Prism.manual = true;

// load the initial state form the server - if any
let state;
const ini = window.__INITIAL_STATE__;
Expand Down
Loading