Skip to content

Commit cd9112c

Browse files
committed
Update some things; remove css
1 parent 501362e commit cd9112c

File tree

4 files changed

+1852
-1796
lines changed

4 files changed

+1852
-1796
lines changed

package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,18 @@
1313
},
1414
"repository": "amendable/core",
1515
"dependencies": {
16-
"@amendable/hash": "^0.1.2",
17-
"classnames": "^2.2.6",
18-
"lodash": "^4.17.15",
19-
"stylis": "^3.5.4"
16+
"lodash": "^4.17.15"
2017
},
2118
"devDependencies": {
2219
"@amendable/prettier-config": "^1.0.0",
23-
"@babel/preset-env": "^7.7.7",
24-
"@babel/preset-react": "^7.7.4",
25-
"@babel/runtime": "^7.7.7",
20+
"@babel/preset-env": "^7.8.3",
21+
"@babel/preset-react": "^7.8.3",
22+
"@babel/runtime": "^7.8.3",
2623
"babel-plugin-lodash": "^3.3.4",
27-
"jest": "^24.9.0",
28-
"microbundle": "^0.12.0-next.6",
24+
"jest": "^25.1.0",
25+
"microbundle": "0.12.0-next.6",
2926
"prettier": "^1.19.1",
30-
"rimraf": "^3.0.0"
27+
"rimraf": "^3.0.1"
3128
},
3229
"peerDependencies": {
3330
"react": "^16.8.x"

src/applyResolvers.js

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import _ from 'lodash';
2-
import classNames from 'classnames';
32
import replaceObjectKey from './utils/replaceObjectKey';
4-
import injectGlobalCss from './utils/injectGlobalCss';
53
import isResolverMatch from './isResolverMatch';
64

75
const applyResolvers = ({ resolvers, ...contextRest }, props) => {
@@ -45,38 +43,15 @@ const applyResolvers = ({ resolvers, ...contextRest }, props) => {
4543
const options = _.isFunction(resolver.options) ? resolver.options({ key, value }) : {};
4644

4745
if (resolver.resolve) {
48-
result = replaceObjectKey(result, key, resolver.resolve({ key, value, props: result, options }));
49-
}
50-
51-
if (_.isFunction(resolver.globalCss)) {
52-
injectGlobalCss(resolver.globalCss({
53-
key,
54-
value,
55-
options,
56-
applyResolvers: (props) => (
57-
applyResolvers({ resolvers, ...contextRest }, props)
58-
),
59-
}), true);
60-
} else if (_.isString(resolver.globalCss)) {
61-
injectGlobalCss(resolver.globalCss, true);
62-
}
63-
64-
if (resolver.css) {
65-
const css = _.isFunction(resolver.css) ? resolver.css({
46+
result = replaceObjectKey(result, key, resolver.resolve({
6647
key,
6748
value,
49+
props: result,
6850
options,
6951
applyResolvers: (props) => (
7052
applyResolvers({ resolvers, ...contextRest }, props)
7153
),
72-
}) : resolver.css
73-
const { className } = injectGlobalCss(css, false);
74-
75-
if (className) {
76-
if (!result.className || !result.className.match(new RegExp(`\\b${className}\\b`))) {
77-
result.className = classNames(className, result.className)
78-
}
79-
}
54+
}));
8055
}
8156
});
8257
});

src/utils/injectGlobalCss.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)