Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simple, robust and performant API #597

Closed
wants to merge 28 commits into from
Closed
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

merge newest master

  • Loading branch information...
rofrischmann
rofrischmann committed Sep 25, 2018
commit 694fc34d1516ec9c2b77d3e5618c93869e81e87c
@@ -12,8 +12,8 @@
"postintall": "yarn setup",
"release": "git pull --rebase && yarn run check && yarn build && lerna publish && yarn docs",
"test": "cross-env BABEL_ENV=commonjs jest",
"coverage": "yarn test -- --coverage",
"watch": "yarn test -- --watch",
"coverage": "yarn test --coverage",
"watch": "yarn test --watch",
"setup": "yarn bootstrap && yarn build"
},
"jest": {
@@ -51,14 +51,14 @@
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-react": "^6.9.0",
"flow-bin": "^0.57.3",
"flow-bin": "^0.81.0",
"gh-pages": "^2.0.0",
"gitbook-cli": "^2.3.0",
"gitbook-plugin-advanced-emoji": "^0.2.2",
"gitbook-plugin-anker-enable": "0.0.4",
"gitbook-plugin-edit-link": "^2.0.2",
"gitbook-plugin-github": "^2.0.0",
"gitbook-plugin-prism": "^2.2.0",
"gitbook-plugin-prism": "^2.4.0",
"gzip-size": "^3.0.0",
"inferno": "^4.0.0",
"inferno-create-element": "^4.0.0",
@@ -9,8 +9,96 @@ Object {
.b:hover {
color: blue
}",
<<<<<<< HEAD
"html": "<div class=\\"Component-button Component a b\\">Hello</div>",
}
=======
<Provider
renderer={
Object {
"_emitChange": [Function],
"_renderStyle": [Function],
"_renderStyleToClassNames": [Function],
"cache": Object {
":hovercolorblue": Object {
"className": "b",
"declaration": "color:blue",
"media": "",
"pseudo": ":hover",
"selector": ".b:hover",
"support": "",
"type": "RULE",
},
"colorred": Object {
"className": "a",
"declaration": "color:red",
"media": "",
"pseudo": "",
"selector": ".a",
"support": "",
"type": "RULE",
},
},
"clear": [Function],
"devMode": false,
"filterClassName": [Function],
"getNextRuleIdentifier": [Function],
"keyframePrefixes": Array [
"-webkit-",
"-moz-",
"",
],
"listeners": Array [],
"mediaQueryOrder": Array [],
"nodes": Object {},
"plugins": Array [],
"renderFont": [Function],
"renderKeyframe": [Function],
"renderRule": [Function],
"renderStatic": [Function],
"ruleOrder": Array [
/\\^:link/,
/\\^:visited/,
/\\^:hover/,
/\\^:focus-within/,
/\\^:focus/,
/\\^:active/,
],
"selectorPrefix": "",
"subscribe": [Function],
"supportQueryOrder": Array [],
"uniqueKeyframeIdentifier": 0,
"uniqueRuleIdentifier": 2,
}
}
>
<Comp>
<FelaComponent
customClass="foo-bar baz"
render={[Function]}
style={
Object {
":hover": Object {
"color": "blue",
},
"color": "red",
}
}
>
<FelaTheme
render={[Function]}
>
<div
className="foo-bar baz a b"
>
Hello
</div>
</FelaTheme>
</FelaComponent>
</Comp>
</Provider>,
]
>>>>>>> master
`;

exports[`Using fe should render inline style as CSS 1`] = `
@@ -22,6 +110,93 @@ Object {
.b:hover {
color: blue
}",
<<<<<<< HEAD
"html": "<div class=\\"a b\\">Hello</div>",
}
=======
<Provider
renderer={
Object {
"_emitChange": [Function],
"_renderStyle": [Function],
"_renderStyleToClassNames": [Function],
"cache": Object {
":hovercolorblue": Object {
"className": "b",
"declaration": "color:blue",
"media": "",
"pseudo": ":hover",
"selector": ".b:hover",
"support": "",
"type": "RULE",
},
"colorred": Object {
"className": "a",
"declaration": "color:red",
"media": "",
"pseudo": "",
"selector": ".a",
"support": "",
"type": "RULE",
},
},
"clear": [Function],
"devMode": false,
"filterClassName": [Function],
"getNextRuleIdentifier": [Function],
"keyframePrefixes": Array [
"-webkit-",
"-moz-",
"",
],
"listeners": Array [],
"mediaQueryOrder": Array [],
"nodes": Object {},
"plugins": Array [],
"renderFont": [Function],
"renderKeyframe": [Function],
"renderRule": [Function],
"renderStatic": [Function],
"ruleOrder": Array [
/\\^:link/,
/\\^:visited/,
/\\^:hover/,
/\\^:focus-within/,
/\\^:focus/,
/\\^:active/,
],
"selectorPrefix": "",
"subscribe": [Function],
"supportQueryOrder": Array [],
"uniqueKeyframeIdentifier": 0,
"uniqueRuleIdentifier": 2,
}
}
>
<Comp>
<FelaComponent
render={[Function]}
style={
Object {
":hover": Object {
"color": "blue",
},
"color": "red",
}
}
>
<FelaTheme
render={[Function]}
>
<div
className="a b"
>
Hello
</div>
</FelaTheme>
</FelaComponent>
</Comp>
</Provider>,
]
>>>>>>> master
`;
@@ -23,5 +23,12 @@
"dependencies": {
"fast-loops": "^1.0.0",
"isobject": "^3.0.1"
<<<<<<< HEAD
=======
},
"devDependencies": {
"fela": "^6.2.2",
"fela-tools": "^5.2.2"
>>>>>>> master
}
}
@@ -20,7 +20,7 @@
"author": "Robin Frischmann",
"license": "MIT",
"dependencies": {
"css-in-js-utils": "^2.0.0",
"css-in-js-utils": "^3.0.0",
"fast-loops": "^1.0.0"
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.