Merge branch 'master' into touchbar

README.md

@@ -195,14 +195,14 @@ the URL's valid, it will prompt you to login to your identity provider. If the
 login's successful, you'll see temporary AWS credentials in the UI.
 
 ## Building
-Awsaml is built using [Node.js][] version 4.1.1 and [NPM][] version 2.14.4, so
-make sure you've got a compatible versions installed. Then run NPM to install
+Awsaml is built using [Node][] version 7.4.0 and [Yarn][] version 1.3.2, so
+make sure you've got a compatible versions installed. Then run Yarn to install
 dependencies and build Awsaml.
 
 ~~~bash
 rm -rf node_modules/
-npm install --production
-npm run build
+yarn install --production
+yarn run build
 ~~~
 
 Those commnds will create a "dist" folder with zipped binaries. If you only want
@@ -211,15 +211,15 @@ variable before building.
 
 ~~~bash
 export PLATFORM=linux
-npm run build
+yarn run build
 ~~~
 
 Allowed values for `PLATFORM` are `darwin`, `linux` and `win32`. You can build
 binaries for multiple platforms by using a comma separated list.
 
 ~~~bash
 export PLATFORM=darwin,linux
-npm run build
+yarn run build
 ~~~
 
 ## Setup on OSX with Homebrew
@@ -237,8 +237,8 @@ details.
 [AssumeRoleWithSAML]: http://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithSAML.html
 [releases]: https://github.com/rapid7/awsaml/releases
 [Okta]: https://www.okta.com
-[Node.js]: https://nodejs.org
-[NPM]: https://www.npmjs.com
+[Node]: https://nodejs.org
+[Yarn]: https://yarnpkg.com
 [saml-provider]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html
 [iam-role]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html
 [Homebrew]: http://brew.sh/

package.json

@@ -18,7 +18,7 @@
     "prebuild": "rm -rf dist/",
     "build": "export PLATFORM=${PLATFORM:=darwin,linux,win32}; electron-packager . Awsaml --asar --ignore=node_modules/electron --ignore=test --ignore=dist --out=dist --platform=$PLATFORM --arch=x64 --app-version=${npm_package_version} --app-bundle-id=com.rapid7.awsaml --helper-bundle-id=com.rapid7.awsaml.helper",
     "postbuild": "for platform in `echo $PLATFORM | sed 's/,/ /g'`; do export platform=$platform; npm run zip; done",
-    "zip": "cd dist/Awsaml-${platform}-x64 && zip -q -FS -r ../awsaml-v${npm_package_version}-${platform}-x64.zip .",
+    "zip": "cd dist/Awsaml-${platform}-x64 && zip -q -y -FS -r ../awsaml-v${npm_package_version}-${platform}-x64.zip .",
     "test": "mocha",
     "cover": "rm -Rf coverage/* && istanbul cover _mocha -- -R spec",
     "lint": "eslint *.js views/** lib/** test/**",
@@ -32,19 +32,19 @@
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
-    "body-parser": "1.14.1",
+    "body-parser": "1.18.2",
     "cookie-parser": "1.4.0",
-    "electron": "^1.6.11",
-    "electron-packager": "^8.7.0",
-    "errorhandler": "1.4.2",
-    "express": "4.13.3",
+    "electron": "1.7.9",
+    "electron-packager": "10.1.0",
+    "errorhandler": "1.5.0",
+    "express": "4.16.2",
     "express-react-views": "^0.10.0",
     "express-session": "1.13.0",
     "ini": "1.3.4",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "0.5.1",
     "morgan": "1.6.1",
     "passport": "0.3.0",
-    "passport-saml": "0.13.0",
+    "passport-saml": "0.31.0",
     "react": "^15.1.0",
     "react-dom": "^15.5.4",
     "xmldom": "0.1.19",