Skip to content

Commit f5bff64

Browse files
committed
Feat: move to previous .config instead of .Config.getInstance()
1 parent 9931075 commit f5bff64

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

__tests__/config.ts

+22-23
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
import path from 'path';
22
import fs from 'fs-extra';
3-
import rcs from 'rcs-core';
4-
5-
import Config from '../lib/Config';
3+
import rcsCore from 'rcs-core';
4+
import rcs from '../lib';
65

76
const testFiles = path.join(process.cwd(), '/__tests__/files');
87

98
beforeEach(() => {
10-
rcs.selectorsLibrary.getClassSelector().nameGenerator.setAlphabet('#abcdefghijklmnopqrstuvwxyz');
11-
rcs.selectorsLibrary.getIdSelector().nameGenerator.setAlphabet('#abcdefghijklmnopqrstuvwxyz');
12-
rcs.selectorsLibrary.reset();
13-
rcs.keyframesLibrary.reset();
9+
rcsCore.selectorsLibrary.getClassSelector().nameGenerator.setAlphabet('#abcdefghijklmnopqrstuvwxyz');
10+
rcsCore.selectorsLibrary.getIdSelector().nameGenerator.setAlphabet('#abcdefghijklmnopqrstuvwxyz');
11+
rcsCore.selectorsLibrary.reset();
12+
rcsCore.keyframesLibrary.reset();
1413
});
1514

1615
it('should set the config with package.json', () => {
1716
// include config
18-
Config.getInstance().load();
17+
rcs.config.load();
1918

2019
// include new settings
21-
rcs.selectorsLibrary.set(['.js', '.any-value']);
20+
rcsCore.selectorsLibrary.set(['.js', '.any-value']);
2221

23-
expect(rcs.selectorsLibrary.get('js')).toBe('js');
24-
expect(rcs.selectorsLibrary.get('any-value')).toBe('a');
22+
expect(rcsCore.selectorsLibrary.get('js')).toBe('js');
23+
expect(rcsCore.selectorsLibrary.get('any-value')).toBe('a');
2524
});
2625

2726
it('should set the config with .rcsrc', () => {
@@ -40,26 +39,26 @@ it('should set the config with .rcsrc', () => {
4039
});
4140

4241
// include config
43-
Config.getInstance().load();
42+
rcs.config.load();
4443

4544
// include new settings
46-
rcs.selectorsLibrary.set(['.flexbox', '.any-value']);
45+
rcsCore.selectorsLibrary.set(['.flexbox', '.any-value']);
4746

48-
expect(rcs.selectorsLibrary.get('flexbox')).toBe('flexbox');
49-
expect(rcs.selectorsLibrary.get('any-value')).toBe('a');
47+
expect(rcsCore.selectorsLibrary.get('flexbox')).toBe('flexbox');
48+
expect(rcsCore.selectorsLibrary.get('any-value')).toBe('a');
5049

5150
fs.removeSync(file);
5251
});
5352

5453
it('should set the config with package.json', () => {
5554
// include config
56-
Config.getInstance().load(path.join(testFiles, '/config.json'));
55+
rcs.config.load(path.join(testFiles, '/config.json'));
5756

5857
// include new settings
59-
rcs.selectorsLibrary.set(['.own-file', '.any-value']);
58+
rcsCore.selectorsLibrary.set(['.own-file', '.any-value']);
6059

61-
expect(rcs.selectorsLibrary.get('own-file')).toBe('own-file');
62-
expect(rcs.selectorsLibrary.get('any-value')).toBe('a');
60+
expect(rcsCore.selectorsLibrary.get('own-file')).toBe('own-file');
61+
expect(rcsCore.selectorsLibrary.get('any-value')).toBe('a');
6362
});
6463

6564
it('should load ignored patterns', () => {
@@ -75,11 +74,11 @@ it('should load ignored patterns', () => {
7574
});
7675

7776
// include config
78-
Config.getInstance().load();
77+
rcs.config.load();
7978

80-
expect(Config.getInstance().isIgnored('a.js')).toBe(true);
81-
expect(Config.getInstance().isIgnored('b.min.js')).toBe(true);
82-
expect(Config.getInstance().isIgnored('b.js')).toBe(false);
79+
expect(rcs.config.isIgnored('a.js')).toBe(true);
80+
expect(rcs.config.isIgnored('b.min.js')).toBe(true);
81+
expect(rcs.config.isIgnored('b.js')).toBe(false);
8382

8483
fs.removeSync(file);
8584
});

docs/api/config.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Config
22

3-
**Config.getInstance().load([pathLocation])**
3+
**config.load([pathLocation])**
44

55
> All available configs [here](#rcs-config)
66
@@ -14,7 +14,7 @@ Example:
1414
```js
1515
const rcs = require('rename-css-selectors');
1616

17-
rcs.Config.getInstance().load();
17+
rcs.config.load();
1818
```
1919

2020
## RCS config
@@ -24,7 +24,6 @@ rcs.Config.getInstance().load();
2424
- [Example](#example)
2525
- [Exclude](#exclude-classes-and-ids)
2626
- [Ignore](#ignore-files)
27-
- [Include from other projects](#include-renamed-classes-from-other-project)
2827

2928
### Example
3029

lib/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ export default {
2828
generate: generateMapping,
2929
load: loadMapping,
3030
},
31-
Config,
31+
config: Config.getInstance(),
3232
};

0 commit comments

Comments
 (0)