Skip to content
Snippets Groups Projects
Commit 2c5851a0 authored by clemo's avatar clemo
Browse files

Revert "Merge branch 'dev-module-express' into 'stable-v1'"

This reverts merge request !11
parent ae14900c
No related branches found
No related tags found
2 merge requests!13Dev,!12add express module npm i dbug
Pipeline #
...@@ -32,20 +32,8 @@ export const moduleLoader = function(app, config, ...args) { ...@@ -32,20 +32,8 @@ export const moduleLoader = function(app, config, ...args) {
dbug('require module',m); dbug('require module',m);
routes[m] = require(process.env.PWD + '/modules/' + m + '/route.js').default; routes[m] = require(process.env.PWD + '/modules/' + m + '/route.js').default;
}catch(e){ }catch(e){
if(e.code === 'MODULE_NOT_FOUND'){ dbug('require module from npm',m);
try{ routes[m] = require(m).default;
dbug('require module from npm',m,e);
routes[m] = require(m).default;
}catch(npm_error){
error('module local & npm error:',m,e);
}
}else{
error('module local but error',m,e);
}
} }
} }
app.use((req, res, next) => { app.use((req, res, next) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment