Remove direct dependency on express
This commit is contained in:
parent
028e0fb579
commit
3a8ccdac8b
10
index.js
10
index.js
|
@ -6,7 +6,7 @@ var url = require('url');
|
|||
var path = require('path');
|
||||
var urlJoin = require('./lib/url-join');
|
||||
var _defaults = require('lodash.defaults');
|
||||
var express = require('express');
|
||||
var loopback = require('loopback');
|
||||
var swagger = require('./lib/swagger');
|
||||
var SWAGGER_UI_ROOT = path.join(__dirname, 'node_modules',
|
||||
'swagger-ui', 'dist');
|
||||
|
@ -27,7 +27,7 @@ function explorer(loopbackApplication, options) {
|
|||
apiInfo: loopbackApplication.get('apiInfo') || {}
|
||||
});
|
||||
|
||||
var app = express();
|
||||
var app = loopback();
|
||||
|
||||
swagger(loopbackApplication, app, options);
|
||||
|
||||
|
@ -53,12 +53,12 @@ function explorer(loopbackApplication, options) {
|
|||
// In this way one could e.g. make changes to index.html without having
|
||||
// to worry about constantly pulling in JS updates.
|
||||
if (options.swaggerDistRoot) {
|
||||
app.use(express.static(options.swaggerDistRoot));
|
||||
app.use(loopback.static(options.swaggerDistRoot));
|
||||
}
|
||||
// File in node_modules are overridden by a few customizations
|
||||
app.use(express.static(STATIC_ROOT));
|
||||
app.use(loopback.static(STATIC_ROOT));
|
||||
// Swagger UI distribution
|
||||
app.use(express.static(SWAGGER_UI_ROOT));
|
||||
app.use(loopback.static(SWAGGER_UI_ROOT));
|
||||
|
||||
return app;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
"url": "https://github.com/strongloop/loopback-explorer/issues"
|
||||
},
|
||||
"devDependencies": {
|
||||
"loopback": "1.x",
|
||||
"loopback": "1.x || 2.x",
|
||||
"mocha": "~1.20.1",
|
||||
"supertest": "~0.13.0",
|
||||
"chai": "~1.9.1"
|
||||
|
@ -34,7 +34,6 @@
|
|||
"swagger-ui": "~2.0.18",
|
||||
"debug": "~1.0.3",
|
||||
"lodash.clonedeep": "^2.4.1",
|
||||
"lodash.defaults": "^2.4.1",
|
||||
"express": "3.x"
|
||||
"lodash.defaults": "^2.4.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
var url = require('url');
|
||||
var urlJoin = require('../lib/url-join');
|
||||
var loopback = require('loopback');
|
||||
var express = require('express');
|
||||
var swagger = require('../lib/swagger');
|
||||
|
||||
var request = require('supertest');
|
||||
|
@ -109,7 +108,7 @@ describe('swagger definition', function() {
|
|||
function mountSwagger(options, addlOptions) {
|
||||
addlOptions = addlOptions || {};
|
||||
var app = createLoopbackAppWithModel(addlOptions.apiRoot);
|
||||
var swaggerApp = express();
|
||||
var swaggerApp = loopback();
|
||||
swagger(app, swaggerApp, options);
|
||||
app.use(addlOptions.explorerRoot || '/explorer', swaggerApp);
|
||||
return app;
|
||||
|
|
Loading…
Reference in New Issue