Skip to content

Commit db56594

Browse files
author
pemrouz
committed
feat: should invoke loaded callback
1 parent e0bba34 commit db56594

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

‎dist/index.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,15 @@ function resdir(ripple) {
5959
});
6060
});
6161

62-
(0, _values2.default)(ripple.resources).map(function (res) {
63-
return _is2.default.fn(res.headers.loaded) && res.headers.loaded(ripple, res);
64-
});
62+
(0, _values2.default)(ripple.resources).map(loaded(ripple));
6563

6664
return ripple;
6765
}
6866

6967
var watch = function watch(ripple) {
7068
return function (path) {
7169
return _chokidar2.default.watch(path).on('change', function () {
72-
return register(ripple)(path);
70+
return loaded(ripple)(register(ripple)(path));
7371
});
7472
};
7573
};
@@ -84,8 +82,13 @@ var register = function register(ripple) {
8482
css = isJS && (0, _fs.existsSync)(path.replace('.js', '.css')),
8583
res = _is2.default.obj(body = body.default || body) ? body : css ? { name: name, body: body, headers: { needs: '[css]' } } : { name: name, body: body };
8684

87-
return ripple(res);
85+
return ripple(res), ripple.resources[name];
8886
};
8987
};
9088

91-
var log = require('utilise/log')('[ri/resdir]');
89+
var log = require('utilise/log')('[ri/resdir]'),
90+
loaded = function loaded(ripple) {
91+
return function (res) {
92+
return _is2.default.fn(res.headers.loaded) && res.headers.loaded(ripple, res);
93+
};
94+
};

‎src/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ export default function resdir(ripple, prefix = '.'){
2424
})
2525

2626
values(ripple.resources)
27-
.map(res => is.fn(res.headers.loaded) && res.headers.loaded(ripple, res))
27+
.map(loaded(ripple))
2828

2929
return ripple
3030
}
3131

3232
const watch = ripple => path =>
3333
chokidar.watch(path)
34-
.on('change', () => register(ripple)(path))
34+
.on('change', () => loaded(ripple)(register(ripple)(path)))
3535

3636
const register = ripple => path => {
3737
var last = basename(path)
@@ -44,7 +44,7 @@ const register = ripple => path => {
4444
: css ? { name, body, headers: { needs: '[css]' } }
4545
: { name, body }
4646

47-
return ripple(res)
47+
return ripple(res), ripple.resources[name]
4848
}
4949

5050
import { resolve, basename, extname } from 'path'
@@ -56,4 +56,5 @@ import values from 'utilise/values'
5656
import file from 'utilise/file'
5757
import not from 'utilise/not'
5858
import is from 'utilise/is'
59-
const log = require('utilise/log')('[ri/resdir]')
59+
const log = require('utilise/log')('[ri/resdir]')
60+
, loaded = ripple => res => is.fn(res.headers.loaded) && res.headers.loaded(ripple, res)

0 commit comments

Comments
 (0)