Merge branch 'master' into travis/github

.travis.yml

@@ -1,7 +1,16 @@
 language: node_js
 node_js:
   - "6"
+env:
+- NODE_ENV=development
+before_install:
+- npm i -g npm
+- npm i -g greenkeeper-lockfile@1
 install:
   - npm install
+before_script:
+  - greenkeeper-lockfile-update
 script:
-  - npm run build
+  - npm run build
+after_script:
+  - greenkeeper-lockfile-upload

package.json

@@ -12,21 +12,26 @@
     "type": "git",
     "url": "git+https://github.com/turt2live/matrix-dimension.git"
   },
+  "greenkeeper": {
+    "ignore": [
+      "@types/node"
+    ]
+  },
   "author": "Travis Ralston",
   "dependencies": {
     "body-parser": "^1.17.2",
     "chalk": "^1.1.3",
-    "config": "^1.25.1",
+    "config": "^1.26.1",
     "db-migrate": "^0.10.0-beta.20",
     "db-migrate-sqlite3": "^0.2.1",
-    "express": "^4.15.2",
-    "js-yaml": "^3.8.2",
+    "express": "^4.15.3",
+    "js-yaml": "^3.8.4",
     "lodash": "^4.17.4",
-    "matrix-js-sdk": "^0.7.10",
+    "matrix-js-sdk": "^0.7.13",
     "moment": "^2.18.1",
     "random-string": "^0.2.0",
     "request": "^2.81.0",
-    "sequelize": "^4.0.0",
+    "sequelize": "^4.2.0",
     "sqlite3": "^3.1.8",
     "winston": "^2.3.1"
   },
@@ -43,12 +48,11 @@
     "@angularclass/hmr": "^1.2.2",
     "@angularclass/hmr-loader": "^3.0.2",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.26",
-    "@types/node": "^7.0.29",
+    "@types/node": "^6.11.0",
     "angular2-modal": "^2.0.3",
     "angular2-template-loader": "^0.6.2",
     "angular2-toaster": "^4.0.0",
     "angular2-ui-switch": "^1.2.0",
-    "autoprefixer": "^7.1.1",
     "awesome-typescript-loader": "^3.1.2",
     "codelyzer": "^3.0.1",
     "copy-webpack-plugin": "^4.0.1",
@@ -76,9 +80,10 @@
     "ts-helpers": "^1.1.2",
     "tslint": "^5.4.3",
     "tslint-loader": "^3.4.3",
-    "typescript": "^2.3.4",
+    "typescript": "^2.4.0",
     "url-loader": "^0.5.8",
-    "webpack": "^2.3.2",
+    "webpack": "^3.0.0",
+    "webpack-dev-server": "^2.5.0",
     "zone.js": "^0.8.12"
   }
 }

postcss.config.js

@@ -2,7 +2,7 @@ module.exports = {
     parser: 'postcss-scss',
     plugins: {
         'postcss-import': {},
-        'postcss-cssnext': {browsers: ['last 2 version']},
+        'postcss-cssnext': {browsers: ['last 2 version'], warnForDuplicates: false},
         'cssnano': {zindex: false}
     }
 };

web/app/shared/scalar.service.ts

@@ -40,7 +40,7 @@ export class ScalarService {
         this.callAction("close_scalar", {});
     }
 
-    private callAction(action, payload) {
+    private callAction(action, payload): Promise<any> {
         let requestKey = randomString({length: 20});
         return new Promise((resolve, reject) => {
             if (!window.opener) {

web/main.ts

@@ -1,7 +1,6 @@
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import { AppModule } from "./app/app.module";
-//noinspection TypeScriptCheckImport
 
 // depending on the env mode, enable prod mode or add debugging modules
 //noinspection TypeScriptUnresolvedVariable

web/polyfills.ts

@@ -1,7 +1,6 @@
 import "core-js/client/shim";
 import "reflect-metadata";
 import "ts-helpers";
-//noinspection TypeScriptUnresolvedFunction
 require('zone.js/dist/zone');
 
 //noinspection TypeScriptUnresolvedVariable

webpack.config.js

@@ -2,7 +2,6 @@ var path = require("path");
 var webpack = require("webpack");
 
 var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
-var autoprefixer = require('autoprefixer');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -122,7 +121,8 @@ module.exports = function () {
     config.devServer = {
         contentBase: './web/public',
         historyApiFallback: true,
-        quiet: false,
+        disableHostCheck: true,
+        quiet: true,
         stats: 'minimal',
         proxy: {
             '/api': {