File tree Expand file tree Collapse file tree 7 files changed +47
-42
lines changed Expand file tree Collapse file tree 7 files changed +47
-42
lines changed Original file line number Diff line number Diff line change @@ -139,10 +139,11 @@ var object = {
139139 ]
140140}
141141
142- var router = jsonServer .router (object) // Express router
143- var server = jsonServer .create () // Express server
142+ var server = jsonServer .create () // Express server
143+
144+ server .use (jsonServer .defaults ) // Default middlewares (logger, public, cors)
145+ server .use (jsonServer .router (object)) // Express router
144146
145- server .use (router)
146147server .listen (3000 )
147148```
148149
Original file line number Diff line number Diff line change @@ -64,8 +64,9 @@ function start(object, filename) {
6464 } else {
6565 var router = jsonServer . router ( object )
6666 }
67- var server = jsonServer . create ( )
6867
68+ var server = jsonServer . create ( )
69+ server . use ( jsonServer . defaults )
6970 server . use ( router )
7071 server . listen ( port , argv . host )
7172}
Original file line number Diff line number Diff line change 1+ var fs = require ( 'fs' )
2+ var logger = require ( 'morgan' )
3+ var cors = require ( 'cors' )
4+ var serveStatic = require ( 'serve-static' )
5+ var errorhandler = require ( 'errorhandler' )
6+
7+ var arr = [ ]
8+
9+ // Logger
10+ arr . push ( logger ( 'dev' , {
11+ skip : function ( req , res ) { return req . path === '/favicon.ico' }
12+ } ) )
13+
14+ // Serve static files
15+ if ( fs . existsSync ( process . cwd ( ) + '/public' ) ) {
16+ arr . push ( serveStatic ( process . cwd ( ) + '/public' ) ) ;
17+ } else {
18+ arr . push ( serveStatic ( __dirname + '/public' ) ) ;
19+ }
20+
21+ // CORS
22+ arr . push ( cors ( { origin : true , credentials : true } ) )
23+
24+ if ( process . env . NODE_ENV === 'development' ) {
25+ // only use in development
26+ arr . push ( errorhandler ( ) )
27+ }
28+
29+ module . exports = arr
Original file line number Diff line number Diff line change 1+ var express = require ( 'express' )
2+
13module . exports = {
2- create : require ( './server' ) ,
4+ create : function ( ) {
5+ var server = express ( )
6+ server . set ( 'json spaces' , 2 )
7+ return server
8+ } ,
9+ defaults : require ( './defaults' ) ,
310 router : require ( './router' )
411}
Original file line number Diff line number Diff line change @@ -176,6 +176,7 @@ module.exports = function(source) {
176176
177177 // Remove dependents documents
178178 var removable = utils . getRemovable ( db . object )
179+ console . log ( removable )
179180
180181 _ ( removable ) . each ( function ( item ) {
181182 db ( item . name ) . remove ( item . id )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -34,8 +34,10 @@ describe('Server', function() {
3434 { id : 'abcd-1234' , url : 'http://example.com' , postId : 1 }
3535 ]
3636
37+ server = jsonServer . create ( )
3738 router = jsonServer . router ( db )
38- server = jsonServer . create ( ) . use ( router )
39+ server . use ( jsonServer . defaults )
40+ server . use ( router )
3941 } )
4042
4143 describe ( 'GET /db' , function ( ) {
You can’t perform that action at this time.
0 commit comments