update npm packages; update react to 16.4

ivzhh · Jun 26, 2018 · 1b67692 · 1b67692
1 parent 0ed9455
commit 1b67692
Show file tree

Hide file tree

Showing 6 changed files with 1,071 additions and 1,014 deletions.
diff --git a/gdbgui/src/js/GdbApi.jsx b/gdbgui/src/js/GdbApi.jsx
@@ -33,10 +33,13 @@ const GdbApi = {
  const TIMEOUT_MIN = 5;
  /* global io */
  /* global initial_data */
- GdbApi.socket = io.connect(`/gdb_listener`, {
- timeout: TIMEOUT_MIN * 60 * 1000,
- query: `csrf_token=${initial_data.csrf_token}&gdbpid=${initial_data.gdbpid}`
- });
+ GdbApi.socket = io.connect(
+ `/gdb_listener`,
+ {
+ timeout: TIMEOUT_MIN * 60 * 1000,
+ query: `csrf_token=${initial_data.csrf_token}&gdbpid=${initial_data.gdbpid}`
+ }
+ );
 
  GdbApi.socket.on("connect", function() {
  debug_print("connected");

diff --git a/gdbgui/src/js/InferiorProgramInfo.jsx b/gdbgui/src/js/InferiorProgramInfo.jsx
@@ -111,7 +111,7 @@ class InferiorProgramInfo extends React.Component {
  send&nbsp;
  {this.get_dropdown()}
  &nbsp;to&nbsp;
- <div class="btn-group" role="group">
+ <div className="btn-group" role="group">
  {gdb_button}
  {inferior_button}
  </div>

diff --git a/gdbgui/src/js/Links.jsx b/gdbgui/src/js/Links.jsx
@@ -59,7 +59,5 @@ class FrameLink extends React.Component {
  }
 }
 
-module.exports = {
- FileLink: FileLink,
- FrameLink: FrameLink
-};
+export { FileLink };
+export { FrameLink };
diff --git a/gdbgui/static/js/build.js b/gdbgui/static/js/build.js
diff --git a/package.json b/package.json
@@ -3,33 +3,30 @@
  "version": "0.1.0",
  "license": "GPL-3.0",
  "scripts": {
- "build": "webpack --mode production --config webpack.config.js",
- "watch": "webpack --mode development --watch --config webpack.config.js",
+ "start": "BABEL_ENV=development webpack --mode development --watch --config webpack.config.js",
  "test": "jest",
+ "build": "BABEL_ENV=production webpack --mode production --config webpack.config.js",
  "prettier": "prettier ./gdbgui/src/js/** --write"
  },
  "babel": {
  "presets": [
- "es2015",
- "react",
- "stage-0"
+ "react-app"
  ]
  },
  "dependencies": {
  "babel-core": "^6.26.0",
  "babel-eslint": "^8.2.3",
  "babel-loader": "^7.1.4",
- "babel-preset-es2015": "^6.24.1",
- "babel-preset-react": "^6.24.1",
- "babel-preset-stage-0": "^6.24.1",
+ "babel-preset-react-app": "^3.1.1",
+ "babel-runtime": "6.26.0",
  "eslint": "^4.19.1",
  "eslint-loader": "^2.0.0",
  "eslint-plugin-prettier": "^2.6.0",
  "eslint-plugin-react": "^7.7.0",
  "jest": "^21.2.1",
  "prettier": "^1.12.0",
- "react": "^16.3.1",
- "react-dom": "^16.3.1",
+ "react": "^16.4",
+ "react-dom": "^16.4",
  "statorgfc": "^0.1.6",
  "webpack": "^4.5.0",
  "webpack-cli": "^2.0.14"