Merge branch 'feature/remove-express-dep' of github.com:strongloop/loopback-explorer into feature/remove-express-dep

This commit is contained in:
Raymond Feng 2015-03-05 20:50:26 -08:00
commit bc01273ec2
2 changed files with 12 additions and 13 deletions

View File

@ -21,23 +21,22 @@
"url": "https://github.com/strongloop/loopback-explorer/issues" "url": "https://github.com/strongloop/loopback-explorer/issues"
}, },
"devDependencies": { "devDependencies": {
"loopback": "^2.4.1", "loopback": "^2.14.0",
"mocha": "^1.21.5", "mocha": "^2.1.0",
"supertest": "~0.14.0", "supertest": "~0.15.0",
"chai": "^1.9.1" "chai": "^2.1.1"
}, },
"license": { "license": {
"name": "Dual MIT/StrongLoop", "name": "Dual MIT/StrongLoop",
"url": "https://github.com/strongloop/loopback-explorer/blob/master/LICENSE" "url": "https://github.com/strongloop/loopback-explorer/blob/master/LICENSE"
}, },
"dependencies": { "dependencies": {
"cors": "^2.4.2", "cors": "^2.5.3",
"debug": "~1.0.3", "debug": "~2.1.2",
"express": "4.x", "lodash.assign": "^3.0.0",
"lodash.assign": "^2.4.1", "lodash.clonedeep": "^3.0.0",
"lodash.clonedeep": "^2.4.1", "lodash.defaults": "^3.0.0",
"lodash.defaults": "^2.4.1", "lodash.pick": "^3.0.0",
"lodash.pick": "^2.4.1", "swagger-ui": "~2.0.24"
"swagger-ui": "~2.0.18"
} }
} }

View File

@ -349,7 +349,7 @@ describe('swagger definition', function() {
} }
function mountExplorer(app, options) { function mountExplorer(app, options) {
var swaggerApp = express(); var swaggerApp = loopback();
swagger(app, swaggerApp, options); swagger(app, swaggerApp, options);
app.use(app.get('explorerRoot') || '/explorer', swaggerApp); app.use(app.get('explorerRoot') || '/explorer', swaggerApp);
return app; return app;