Merge pull request #363 from integer32llc/maint

Maintenance

Author: shepmaster

.travis/compile-frontend.sh

@@ -10,7 +10,7 @@ docker \
     -v $HOME/cache/node/node_modules:/ui/node_modules \
     -v $HOME/cache/node/yarn-cache:/root/.yarn-cache \
     --workdir /ui \
-    node:8.7 \
+    node:10.7 \
     bash -c 'yarn && \
              yarn test:lint && \
              yarn run build:production'

tests/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    capybara (3.2.1)
+    capybara (3.4.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -16,7 +16,7 @@ GEM
     ffi (1.9.25)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     public_suffix (3.0.2)
     rack (2.0.5)
@@ -36,7 +36,7 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     rubyzip (1.2.1)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.13.1)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     webdrivers (3.3.1)

ui/frontend/actions.ts

@@ -32,7 +32,7 @@ const routes = {
   },
 };
 
-type ThunkAction<T = void> = ReduxThunkAction<T, State, {}>;
+type ThunkAction<T = void> = ReduxThunkAction<T, State, {}, Action>;
 
 const createAction = <T extends string, P extends {}>(type: T, props?: P) => (
   Object.assign({ type }, props)
@@ -126,7 +126,7 @@ export const changeMode = (mode: Mode) =>
 export const changeEdition = (edition: Edition) =>
   createAction(ActionType.ChangeEdition, { edition });
 
-export const changeNightlyEdition: ThunkAction = (edition: Edition) => dispatch => {
+export const changeNightlyEdition = (edition: Edition): ThunkAction => dispatch => {
   dispatch(changeChannel(Channel.Nightly));
   dispatch(changeEdition(edition));
 };

ui/frontend/index.tsx

@@ -3,16 +3,17 @@ import 'babel-polyfill';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { applyMiddleware, compose, createStore } from 'redux';
+import { AnyAction, applyMiddleware, compose, createStore } from 'redux';
 import persistState from 'redux-localstorage';
-import thunk from 'redux-thunk';
+import thunk, { ThunkDispatch } from 'redux-thunk';
 import * as url from 'url';
 
-import { gotoPosition, performCratesLoad, performVersionsLoad } from './actions';
+import { Action, gotoPosition, performCratesLoad, performVersionsLoad } from './actions';
 import { configureRustErrors } from './highlighting';
 import { deserialize, serialize } from './local_storage';
 import PageSwitcher from './PageSwitcher';
 import playgroundApp from './reducers';
+import { State } from './reducers';
 import Router from './Router';
 
 const baseUrl = url.resolve(window.location.href, '/');
@@ -23,9 +24,8 @@ const initialState = {
   },
 };
 
-const mw = [thunk];
-const middlewares = applyMiddleware(...mw);
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+const middlewares = applyMiddleware<ThunkDispatch<State, {}, Action>, {}>(thunk);
+const composeEnhancers: typeof compose = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 const enhancers = composeEnhancers(middlewares, persistState(undefined, { serialize, deserialize }));
 const store = createStore(playgroundApp, initialState, enhancers);
 

ui/frontend/package.json

@@ -15,7 +15,7 @@
     "prop-types": "^15.5.10",
     "qs": "^6.4.0",
     "react": "^16.0.0",
-    "react-ace": "^5.4.0",
+    "react-ace": "^6.1.4",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.0.0",
     "react-popper": "^0.9.5",
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@types/react": "^16.0.0",
     "@types/react-dom": "^16.0.0",
-    "autoprefixer": "^8.1.0",
+    "autoprefixer": "^9.0.1",
     "babel-core": "^6.17.0",
     "babel-loader": "^7.0.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -44,7 +44,7 @@
     "basename": "^0.1.2",
     "compression-webpack-plugin": "^1.1.11",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
+    "css-loader": "^1.0.0",
     "glob": "^7.0.5",
     "html-webpack-plugin": "^3.0.0",
     "json-loader": "^0.5.4",
@@ -59,7 +59,10 @@
     "tslint-react": "^3.2.0",
     "typescript": "^2.5.3",
     "webpack": "^4.1.0",
-    "webpack-cli": "^2.0.12"
+    "webpack-cli": "^3.1.0"
+  },
+  "engines": {
+    "node": "^10.7.0"
   },
   "scripts": {
     "test:lint": "tslint --config tslint.json --exclude \"./**/node_modules/**/*\" \"./**/*.ts?(x)\"",