From 59489fc07cc758172a882e2c50406322a7f92bbe Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Mon, 2 Nov 2015 14:17:50 -0800 Subject: [PATCH 1/3] chore(package): update dependencies http://greenkeeper.io/ --- package.json | 100 +++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index ef06329143..f3f08dfb99 100644 --- a/package.json +++ b/package.json @@ -26,46 +26,46 @@ }, "license": "(BSD-3-Clause AND CC-BY-SA-4.0)", "dependencies": { - "accepts": "~1.2.5", - "async": "~0.9.0", - "babel": "5.8.23", - "babel-core": "5.8.23", - "babel-eslint": "4.1.1", - "babel-loader": "5.2.2", + "accepts": "~1.3.0", + "async": "~1.5.0", + "babel": "6.0.15", + "babel-core": "6.0.17", + "babel-eslint": "4.1.3", + "babel-loader": "6.0.1", "bcrypt-nodejs": "~0.0.3", "body-parser": "^1.13.2", "chai-jquery": "~2.0.0", - "cheerio": "~0.18.0", + "cheerio": "~0.19.0", "classnames": "^2.1.2", "clockwork": "~0.1.1", - "compression": "~1.2.1", - "connect-mongo": "~0.7.0", - "cookie-parser": "~1.3.3", - "csso": "~1.3.11", + "compression": "~1.6.0", + "connect-mongo": "~0.8.2", + "cookie-parser": "~1.4.0", + "csso": "~1.4.1", "dateformat": "~1.0.11", - "debug": "~2.1.0", + "debug": "~2.2.0", "dedent": "^0.4.0", - "dotenv": "~0.4.0", - "errorhandler": "~1.3.0", + "dotenv": "~1.2.0", + "errorhandler": "~1.4.2", "es6-map": "^0.1.1", "eslint": "^1.1.0", "eslint-plugin-react": "^3.2.1", - "express": "~4.10.4", + "express": "~4.13.3", "express-flash": "~0.0.2", - "express-session": "~1.9.2", + "express-session": "~1.12.1", "express-state": "^1.2.0", - "express-validator": "~2.8.0", + "express-validator": "~2.18.0", "fetchr": "^0.5.12", - "font-awesome": "~4.3.0", - "forever": "~0.14.1", + "font-awesome": "~4.4.0", + "forever": "~0.15.1", "frameguard": "^0.2.2", - "github-api": "~0.7.0", - "gulp": "~3.8.8", - "gulp-eslint": "~0.9.0", - "gulp-inject": "~1.0.2", + "github-api": "~0.10.6", + "gulp": "~3.9.0", + "gulp-eslint": "~1.0.0", + "gulp-inject": "~3.0.0", "gulp-jsonlint": "^1.1.0", "gulp-less": "^3.0.3", - "gulp-minify-css": "~0.5.1", + "gulp-minify-css": "~1.2.1", "gulp-nodemon": "^2.0.3", "gulp-notify": "^2.2.0", "gulp-plumber": "^1.0.1", @@ -74,10 +74,10 @@ "gulp-rev-replace": "^0.4.2", "gulp-util": "^3.0.6", "gulp-webpack": "^1.5.0", - "helmet": "~0.9.0", - "helmet-csp": "^0.2.3", + "helmet": "~0.14.0", + "helmet-csp": "^0.3.0", "history": "^1.9.0", - "jade": "~1.8.0", + "jade": "~1.11.0", "json-loader": "^0.5.2", "less": "~2.5.1", "lodash": "^3.9.3", @@ -85,63 +85,63 @@ "loopback-boot": "^2.13.0", "loopback-component-passport": "https://github.com/FreeCodeCamp/loopback-component-passport.git#feature/flashfailure", "loopback-connector-mongodb": "^1.10.0", - "lusca": "~1.0.2", + "lusca": "~1.3.0", "method-override": "~2.3.0", "moment": "~2.10.2", "mongodb": "^2.0.33", - "morgan": "~1.5.0", + "morgan": "~1.6.1", "node-libs-browser": "^0.5.2", "node-slack": "0.0.7", "node-uuid": "^1.4.3", - "nodemailer": "~1.3.0", + "nodemailer": "~1.8.0", "normalize-url": "^1.3.1", - "object.assign": "^3.0.0", + "object.assign": "^4.0.3", "passport-facebook": "^2.0.0", - "passport-github": "^0.1.5", + "passport-github": "^1.0.0", "passport-google-oauth2": "^0.1.6", "passport-linkedin-oauth2": "^1.2.1", "passport-local": "^1.0.0", "passport-oauth": "^1.0.0", "passport-twitter": "^1.0.3", - "pmx": "^0.3.16", - "ramda": "~0.10.0", - "react": "^0.13.3", - "react-bootstrap": "~0.23.7", - "react-motion": "~0.1.0", + "pmx": "^0.5.5", + "ramda": "~0.18.0", + "react": "^0.14.2", + "react-bootstrap": "~0.27.3", + "react-motion": "~0.3.1", "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp", "react-router-bootstrap": "^0.19.2", "react-vimeo": "^0.0.3", - "request": "~2.53.0", + "request": "~2.65.0", "rev-del": "^1.0.5", "rx": "^4.0.0", - "sanitize-html": "~1.6.1", + "sanitize-html": "~1.11.1", "sort-keys": "^1.1.1", "source-map-support": "^0.3.2", "store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server", "thundercats": "^3.0.0", "thundercats-react": "^0.3.0", - "twit": "~1.1.20", - "uglify-js": "~2.4.15", + "twit": "~2.1.1", + "uglify-js": "~2.5.0", "url-regex": "^3.0.0", - "validator": "^3.22.1", + "validator": "^4.2.1", "webpack": "^1.9.12", "xss-filters": "^1.2.6", "yui": "~3.18.1" }, "devDependencies": { - "blessed": "~0.0.37", + "blessed": "~0.1.81", "bower-main-files": "~0.0.4", - "browser-sync": "~1.8.1", - "browserify": "^10.2.4", - "chai": "~1.10.0", + "browser-sync": "~2.9.11", + "browserify": "^12.0.1", + "chai": "~3.4.0", "envify": "^3.4.0", - "istanbul": "^0.3.15", + "istanbul": "^0.4.0", "jsonlint": "^1.6.2", - "loopback-explorer": "^1.7.2", + "loopback-explorer": "^2.0.2", "loopback-testing": "^1.1.0", - "mocha": "~2.0.1", + "mocha": "~2.3.3", "multiline": "~1.0.1", - "supertest": "~0.15.0", + "supertest": "~1.1.0", "tap-nyan": "0.0.2", "tape": "^4.2.2", "vinyl-source-stream": "^1.1.0" From f9f89edddf687d91f23ff658558947405ee6cdfa Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 4 Nov 2015 00:46:45 -0800 Subject: [PATCH 2/3] Revert to old babel. Babel is broken --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f3f08dfb99..75db855279 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "dependencies": { "accepts": "~1.3.0", "async": "~1.5.0", - "babel": "6.0.15", - "babel-core": "6.0.17", + "babel": "5.8.29", + "babel-core": "5.8.33", "babel-eslint": "4.1.3", - "babel-loader": "6.0.1", + "babel-loader": "5.3.3", "bcrypt-nodejs": "~0.0.3", "body-parser": "^1.13.2", "chai-jquery": "~2.0.0", @@ -119,7 +119,7 @@ "source-map-support": "^0.3.2", "store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server", "thundercats": "^3.0.0", - "thundercats-react": "^0.3.0", + "thundercats-react": "^0.4.0", "twit": "~2.1.1", "uglify-js": "~2.5.0", "url-regex": "^3.0.0", From 085fc2fe72cc8085292cb47a4c2b8bedce009d42 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 5 Nov 2015 16:41:19 -0800 Subject: [PATCH 3/3] Fix loopback explorer issue --- package.json | 3 ++- server/boot/explorer.js | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 75db855279..537afc32fd 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "lodash": "^3.9.3", "loopback": "^2.22.0", "loopback-boot": "^2.13.0", + "loopback-component-explorer": "^2.1.1", "loopback-component-passport": "https://github.com/FreeCodeCamp/loopback-component-passport.git#feature/flashfailure", "loopback-connector-mongodb": "^1.10.0", "lusca": "~1.3.0", @@ -137,7 +138,7 @@ "envify": "^3.4.0", "istanbul": "^0.4.0", "jsonlint": "^1.6.2", - "loopback-explorer": "^2.0.2", + "loopback-component-explorer": "^2.1.1", "loopback-testing": "^1.1.0", "mocha": "~2.3.3", "multiline": "~1.0.1", diff --git a/server/boot/explorer.js b/server/boot/explorer.js index 955b23573d..4480abecc7 100644 --- a/server/boot/explorer.js +++ b/server/boot/explorer.js @@ -4,27 +4,26 @@ module.exports = function mountLoopBackExplorer(app) { } var explorer; try { - explorer = require('loopback-explorer'); + explorer = require('loopback-component-explorer'); } catch (err) { // Print the message only when the app was started via `app.listen()`. // Do not print any message when the project is used as a component. app.once('started', function() { console.log( - 'Run `npm install loopback-explorer` to enable the LoopBack explorer' + 'Run `npm install loopback-component-explorer` to enable ' + + 'the LoopBack explorer' ); }); return; } var restApiRoot = app.get('restApiRoot'); + var mountPath = '/explorer'; - var explorerApp = explorer(app, { basePath: restApiRoot }); - app.use('/explorer', explorerApp); + explorer(app, { basePath: restApiRoot, mountPath }); app.once('started', function() { var baseUrl = app.get('url').replace(/\/$/, ''); - // express 4.x (loopback 2.x) uses `mountpath` - // express 3.x (loopback 1.x) uses `route` - var explorerPath = explorerApp.mountpath || explorerApp.route; - console.log('Browse your REST API at %s%s', baseUrl, explorerPath); + + console.log('Browse your REST API at %s%s', baseUrl, mountPath); }); };