Skip to content

Commit 6b973cb

Browse files
authored
Bring back default http server wrapper (#460)
1 parent e69ce5b commit 6b973cb

File tree

6 files changed

+14
-19
lines changed

6 files changed

+14
-19
lines changed

packages/micro/README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,15 @@ module.exports = async (req, res) => {
214214
You can use Micro programmatically by requiring Micro directly:
215215

216216
```js
217-
const http = require('http');
218-
const micro = require('micro');
219-
const sleep = require('then-sleep');
217+
const micro = require('micro')
218+
const sleep = require('then-sleep')
220219

221-
const server = new http.Server(
222-
micro(async (req, res) => {
223-
await sleep(500);
224-
return 'Hello world';
225-
})
226-
);
220+
const server = micro(async (req, res) => {
221+
await sleep(500)
222+
return 'Hello world'
223+
})
227224

228-
server.listen(3000);
225+
server.listen(3000)
229226
```
230227

231228
##### micro(fn)

packages/micro/lib/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Native
2+
const http = require('http');
23
const {Stream} = require('stream');
34

45
// Packages
@@ -22,7 +23,7 @@ function readable(stream) {
2223
const {NODE_ENV} = process.env;
2324
const DEV = NODE_ENV === 'development';
2425

25-
const serve = fn => (req, res) => exports.run(req, res, fn);
26+
const serve = fn => new http.Server((req, res) => exports.run(req, res, fn));
2627

2728
module.exports = serve;
2829
exports = serve;

test/_test-utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module.exports = ({http, micro, listen}) => ({
2-
getUrl: fn => listen(new http.Server(micro(fn)))
1+
module.exports = ({ micro, listen }) => ({
2+
getUrl: (fn) => listen(micro(fn)),
33
});

test/development.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
const test = require('ava');
33
const fetch = require('node-fetch');
44
const listen = require('test-listen');
5-
const http = require('http');
65

76
process.env.NODE_ENV = 'development';
87
const micro = require('../packages/micro/lib');
98

10-
const {getUrl} = require('./_test-utils')({http, micro, listen});
9+
const {getUrl} = require('./_test-utils')({micro, listen});
1110

1211
test('send(200, <Object>) is pretty-printed', async t => {
1312
const fn = () => ({woot: 'yes'});

test/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Packages
2-
const http = require('http');
32
const test = require('ava');
43
const fetch = require('node-fetch');
54
const sleep = require('then-sleep');
65
const resumer = require('resumer');
76
const listen = require('test-listen');
87
const micro = require('../packages/micro/lib');
9-
const {getUrl} = require('./_test-utils')({http, micro, listen});
8+
const {getUrl} = require('./_test-utils')({micro, listen});
109

1110
const {send, sendError, buffer, json} = micro;
1211

test/production.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// Packages
2-
const http = require('http');
32
const test = require('ava');
43
const fetch = require('node-fetch');
54
const listen = require('test-listen');
65

76
process.env.NODE_ENV = 'production';
87
const micro = require('../packages/micro');
98

10-
const {getUrl} = require('./_test-utils')({http, micro, listen});
9+
const {getUrl} = require('./_test-utils')({micro, listen});
1110

1211
test.serial('errors are printed in console in production', async t => {
1312
let logged = false;

0 commit comments

Comments
 (0)