Skip to content

Commit 396ef5f

Browse files
committed
Update package.json
1 parent 31ee7ec commit 396ef5f

File tree

12 files changed

+36
-22
lines changed

12 files changed

+36
-22
lines changed

app/backend.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ if (__DEV__) {
2525
lastHash = stats.hash;
2626
console.info(stats.toString({
2727
cached: false,
28-
colors: true,
28+
colors: true
2929
}));
3030

3131
try {
3232
if (httpServer) httpServer.close();
33-
Object.keys(require.cache).forEach(key => delete require.cache[key]);
33+
delete require.cache[require.resolve('axios')];
34+
delete require.cache[require.resolve(backendBuildPath)];
3435
const app = require(backendBuildPath).default;
3536
httpServer = app.listen(proxyPort);
3637
} catch (e) {
File renamed without changes.

package.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"@fortawesome/fontawesome": "^1.1.5",
3030
"@fortawesome/fontawesome-free-brands": "^5.0.9",
3131
"@fortawesome/fontawesome-free-solid": "^5.0.9",
32-
"@fortawesome/react-fontawesome": "0.0.18",
32+
"@fortawesome/fontawesome-svg-core": "^1.2.0",
33+
"@fortawesome/react-fontawesome": "0.1.0",
3334
"autoprefixer": "latest",
3435
"axios": "latest",
3536
"axios-progress-bar": "^1.1.8",
@@ -52,13 +53,14 @@
5253
"cookie-parser": "^1.4.3",
5354
"copy-webpack-plugin": "^4.0.1",
5455
"css-hot-loader": "^1.3.9",
55-
"css-loader": "^0.28.7",
56-
"eslint": "^4.19.1",
57-
"eslint-config-airbnb": "^16.1.0",
56+
"css-loader": "^1.0.0",
57+
"eslint": "^5.1.0",
58+
"eslint-config-airbnb": "^17.0.0",
5859
"eslint-plugin-import": "^2.11.0",
5960
"eslint-plugin-jsx-a11y": "^6.0.3",
6061
"eslint-plugin-react": "^7.7.0",
6162
"express": "^4.15.4",
63+
"fs-extra": "^6.0.1",
6264
"html-webpack-plugin": "^3.2.0",
6365
"http-proxy-middleware": "^0.18.0",
6466
"imagemin-webpack-plugin": "^2.1.1",
@@ -70,7 +72,7 @@
7072
"postcss-loader": "^2.0.6",
7173
"raw-loader": "^0.5.1",
7274
"react": "^16.3.1",
73-
"react-ace": "^5.10.0",
75+
"react-ace": "^6.1.4",
7476
"react-chartjs-2": "^2.7.0",
7577
"react-dom": "^16.3.1",
7678
"react-input-autosize": "^2.2.1",
@@ -80,18 +82,18 @@
8082
"react-router": "^4.2.0",
8183
"react-router-dom": "^4.2.2",
8284
"react-router-redux": "^4.0.8",
83-
"react-toastify": "^3.4.3",
85+
"react-toastify": "^4.1.0",
8486
"redbox-react": "^1.5.0",
85-
"redux": "^3.7.2",
87+
"redux": "^4.0.0",
8688
"redux-actions": "^2.2.1",
87-
"sass-loader": "^6.0.6",
89+
"sass-loader": "^7.0.3",
8890
"screenfull": "^3.3.2",
89-
"style-loader": "^0.20.3",
91+
"style-loader": "^0.21.0",
9092
"uglifyjs-webpack-plugin": "^1.2.4",
9193
"uuid": "^3.2.1",
9294
"webpack": "^4.5.0",
9395
"webpack-bundle-analyzer": "^2.11.1",
94-
"webpack-cli": "^2.0.14",
96+
"webpack-cli": "^3.0.8",
9597
"webpack-dev-middleware": "^3.1.0",
9698
"webpack-hot-middleware": "^2.19.1",
9799
"webpack-node-externals": "^1.6.0"

src/backend/apis/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Promise from 'bluebird';
22
import axios from 'axios';
3-
import fs from 'fs';
3+
import fs from 'fs-extra';
44
import { githubClientId, githubClientSecret } from '/environment';
55

66
axios.interceptors.request.use(request => {

src/backend/controllers/categories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import express from 'express';
2-
import fs from 'fs';
2+
import fs from 'fs-extra';
33
import path from 'path';
44
import { NotFoundError } from '/common/error';
55
import { exec } from 'child_process';

src/backend/controllers/compilers.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
import Promise from 'bluebird';
22
import express from 'express';
3+
import fs from 'fs-extra';
4+
import uuid from 'uuid';
35
import path from 'path';
46
import { GitHubApi } from '/apis';
57

68
const router = express.Router();
79

8-
const getPath = (...args) => path.resolve(__dirname, '..', 'public', 'libs', ...args);
10+
const getLibPath = (...args) => path.resolve(__dirname, '..', 'public', 'libs', ...args);
11+
const createTempDir = () => {
12+
const dirPath = path.resolve(__dirname, '..', 'public', 'codes', uuid.v4());
13+
fs.mkdirSync(dirPath);
14+
return dirPath;
15+
};
916

1017
const downloadLibs = () => {
1118
GitHubApi.getLatestRelease('algorithm-visualizer', 'tracers').then(release => {
12-
return Promise.each(release.assets, asset => GitHubApi.download(asset.browser_download_url, getPath(asset.name)));
19+
return Promise.each(release.assets, asset => GitHubApi.download(asset.browser_download_url, getLibPath(asset.name)));
1320
});
1421
};
1522
downloadLibs(); // TODO: download again when webhooked
1623

1724
const getJsWorker = (req, res, next) => {
18-
res.sendFile(path.resolve(__dirname, '..', 'tracers', 'languages', 'js', 'build', 'index.js'));
25+
res.sendFile(getLibPath('js.js'));
1926
};
2027

2128
const compileJava = (req, res, next) => {
29+
const dirPath = createTempDir();
30+
fs.writeFileSync(dirPath, req.body);
2231
/* TODO:
2332
1. Write into a source file
2433
2. Execute in Docker
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

src/frontend/components/App/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { connect } from 'react-redux';
33
import Promise from 'bluebird';
4-
import FontAwesomeIcon from '@fortawesome/react-fontawesome';
4+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
55
import faPlus from '@fortawesome/fontawesome-free-solid/faPlus';
66
import { loadProgressBar } from 'axios-progress-bar';
77
import 'axios-progress-bar/dist/nprogress.css';

src/frontend/components/Button/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import FontAwesomeIcon from '@fortawesome/react-fontawesome'
2+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
33
import styles from './stylesheet.scss';
44
import { classes } from '/common/util';
55
import { Link } from 'react-router-dom';

src/frontend/components/ExpandableListItem/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import FontAwesomeIcon from '@fortawesome/react-fontawesome'
2+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
33
import faCaretDown from '@fortawesome/fontawesome-free-solid/faCaretDown';
44
import faCaretRight from '@fortawesome/fontawesome-free-solid/faCaretRight';
55
import styles from './stylesheet.scss';

0 commit comments

Comments
 (0)