Skip to content

Commit 13f1f01

Browse files
committed
preset update
1 parent 3816896 commit 13f1f01

File tree

4 files changed

+30
-12
lines changed

4 files changed

+30
-12
lines changed

preset.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
const basename = require('path').basename;
12
const debug = require('debug')('css-modules:preset');
23
const dirname = require('path').dirname;
3-
const hook = require('.');
4+
const hook = require('./lib/index');
45
const seekout = require('seekout');
56

6-
debug('→ cmrh.conf.js');
77
const preset = seekout('cmrh.conf.js', dirname(module.parent.filename));
88

9-
if (!preset) {
10-
debug('failure');
11-
hook({});
12-
} else {
13-
debug('success');
9+
if (preset) {
10+
debug(`→ ${basename(preset)}`);
1411
hook(require(preset));
12+
} else {
13+
debug(`→ defaults`);
14+
hook({});
1515
}

test/preset/index.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,33 @@ const detachHook = require('../sugar').detachHook;
22
const dropCache = require('../sugar').dropCache;
33

44
suite('css-modules-require-hook/preset', () => {
5-
setup(() => require('../../preset'));
5+
suite('using cmrh.conf.js file', () => {
6+
test('should return tokens', () => {
7+
const tokens = require('./fixture/oceanic.css');
68

7-
test('should return tokens', () => {
8-
const tokens = require('./fixture/oceanic.css');
9-
assert.deepEqual(tokens, {
10-
color: 'oceanic__color___1sqWL',
9+
assert.deepEqual(tokens, {
10+
color: 'oceanic__color___1sqWL',
11+
});
1112
});
13+
14+
setup(() => require('./js/preset'));
15+
});
16+
17+
suite('using defaults', () => {
18+
test('should return tokens', () => {
19+
const tokens = require('./fixture/oceanic.css');
20+
21+
assert.deepEqual(tokens, {
22+
color: '_test_preset_fixture_oceanic__color',
23+
});
24+
});
25+
26+
setup(() => require('../../preset'));
1227
});
1328

1429
teardown(() => {
1530
detachHook('.css');
31+
dropCache('../preset');
1632
dropCache('./preset/fixture/oceanic.css');
1733
});
1834
});
File renamed without changes.

test/preset/js/preset.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// using cmrh.conf.js in the local directory
2+
require('../../../preset');

0 commit comments

Comments
 (0)