Skip to content

Commit be8e497

Browse files
committed
Fix tests
1 parent c4193e7 commit be8e497

File tree

4 files changed

+26
-28
lines changed

4 files changed

+26
-28
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The file system adapter will resolve css files from your local file system and a
4545
import App from './app'; /* React application */
4646
import {Resolver, FileSystemAdapter} from '@mintuz/react-css-loader';
4747
48-
const cssResolver = new Resolver(App, new FileSystemAdapter({
48+
const cssResolver = new Resolver(React.createElement(App), new FileSystemAdapter({
4949
folderPath: `${__dirname}/styles/`,
5050
inline: true,
5151
}));
@@ -72,7 +72,7 @@ console.log(cssString);
7272
import App from './app';
7373
import {Resolver, FileSystemAdapter} from '@mintuz/react-css-loader';
7474
75-
const cssResolver = new Resolver(App, new FileSystemAdapter({
75+
const cssResolver = new Resolver(React.createElement(App), new FileSystemAdapter({
7676
folderPath: `${__dirname}/styles/`,
7777
inline: false,
7878
}));
@@ -97,7 +97,7 @@ If you serve your CSS via a CDN, this is for you. Rather than resolving the CSS
9797
import App from './app';
9898
import {Resolver, CDNAdapter} from '@mintuz/react-css-loader';
9999
100-
const cssResolver = new Resolver(App, new CDNAdapter({
100+
const cssResolver = new Resolver(React.createElement(App), new CDNAdapter({
101101
cdnRoot: 'https://my-cdn.com'
102102
}));
103103

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mintuz/react-css-loader",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"main": "dist/index.js",
55
"private": false,
66
"description": "A React high order component that provides functionality for tree shaking CSS per component",
@@ -33,7 +33,8 @@
3333
"jest": {
3434
"testPathIgnorePatterns": [
3535
".node_modules/",
36-
".dist/"
36+
".dist/",
37+
".examples/"
3738
],
3839
"setupFiles": [
3940
"./jest-setup.js"

src/__test__/index.spec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('Resolver', () => {
3434
};
3535

3636
const resolver = new Resolver(
37-
CustomApp,
37+
React.createElement(CustomApp),
3838
new FileSystemAdapter({
3939
folderPath: __dirname,
4040
inline: false
@@ -51,7 +51,7 @@ describe('Resolver', () => {
5151
describe('FileSystem Adapter', () => {
5252
test('Should return CSS for a single module', async () => {
5353
const resolver = new Resolver(
54-
CSS(buildComponent('MyComponent')),
54+
React.createElement(CSS(buildComponent('MyComponent'))),
5555
new FileSystemAdapter({
5656
folderPath: __dirname,
5757
inline: false
@@ -79,7 +79,7 @@ describe('Resolver', () => {
7979
};
8080

8181
const resolver = new Resolver(
82-
CustomApp,
82+
React.createElement(CustomApp),
8383
new FileSystemAdapter({
8484
folderPath: __dirname,
8585
inline: false
@@ -113,7 +113,7 @@ describe('Resolver', () => {
113113
};
114114

115115
const resolver = new Resolver(
116-
CustomApp,
116+
React.createElement(CustomApp),
117117
new FileSystemAdapter({
118118
folderPath: __dirname,
119119
inline: false
@@ -146,7 +146,7 @@ describe('Resolver', () => {
146146
});
147147

148148
const resolver = new Resolver(
149-
MockComponentOne,
149+
React.createElement(MockComponentOne),
150150
new FileSystemAdapter({
151151
folderPath: __dirname,
152152
inline: false
@@ -181,7 +181,7 @@ describe('Resolver', () => {
181181
};
182182

183183
const resolver = new Resolver(
184-
CustomApp,
184+
React.createElement(CustomApp),
185185
new FileSystemAdapter({
186186
folderPath: __dirname,
187187
inline: false
@@ -208,7 +208,7 @@ describe('Resolver', () => {
208208
};
209209

210210
const resolver = new Resolver(
211-
CustomApp,
211+
React.createElement(CustomApp),
212212
new FileSystemAdapter({
213213
folderPath: __dirname,
214214
inline: true
@@ -238,7 +238,7 @@ describe('Resolver', () => {
238238
};
239239

240240
const resolver = new Resolver(
241-
CustomApp,
241+
React.createElement(CustomApp),
242242
new CDNAdapter({
243243
cdnRoot: 'https://my-cdn.com'
244244
})

src/resolver.js

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@ export default class Resolver {
1010
let styles = [];
1111
let components = [];
1212

13-
return reactTreeWalker(
14-
React.createElement(this.app),
15-
(element, instance) => {
16-
if (instance && instance.getStyles) {
17-
const stylesObject = instance.getStyles();
18-
const alreadyContainStyle = styles.some((e) =>
19-
stylesObject.stylePaths.includes(e)
20-
);
13+
return reactTreeWalker(this.app, (element, instance) => {
14+
if (instance && instance.getStyles) {
15+
const stylesObject = instance.getStyles();
16+
const alreadyContainStyle = styles.some((e) =>
17+
stylesObject.stylePaths.includes(e)
18+
);
2119

22-
if (alreadyContainStyle) {
23-
return;
24-
}
25-
26-
styles = [...styles, ...stylesObject.stylePaths];
27-
components = [...components, stylesObject.componentName];
20+
if (alreadyContainStyle) {
21+
return;
2822
}
23+
24+
styles = [...styles, ...stylesObject.stylePaths];
25+
components = [...components, stylesObject.componentName];
2926
}
30-
).then(() => {
27+
}).then(() => {
3128
return this.adapter.resolve(styles, components);
3229
});
3330
}

0 commit comments

Comments
 (0)