Skip to content

Commit 1440943

Browse files
committed
update jss and jss-nested
1 parent 24bdc6c commit 1440943

File tree

8 files changed

+35
-23
lines changed

8 files changed

+35
-23
lines changed

dist/repl.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/repl.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "repl",
33
"description": "JSS Repl",
4-
"version": "1.0.0",
4+
"version": "1.1.0",
55
"author": {
66
"name": "Oleg Slobodskoi",
77
"email": "[email protected]"
@@ -34,16 +34,17 @@
3434
"es5-shim": "4.3.1",
3535
"eslint": "^2.8.0",
3636
"eslint-config-airbnb": "^8.0.0",
37-
"eslint-plugin-import": "^1.12.0",
3837
"eslint-config-jss": "^1.0.0",
38+
"eslint-plugin-import": "^1.12.0",
3939
"eslint-plugin-jsx-a11y": "^1.5.5",
4040
"eslint-plugin-react": "^5.0.1",
41+
"json-loader": "^0.5.4",
4142
"webpack": "^1.12.2"
4243
},
4344
"dependencies": {
4445
"brace": "^0.7.0",
45-
"jss": "^5.3.0",
46-
"jss-preset-default": "^0.1.0"
46+
"jss": "^5.5.1",
47+
"jss-preset-default": "^0.3.0"
4748
},
4849
"scripts": {
4950
"all": "npm run lint && npm run build",

src/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import ace from 'brace'
22
import 'brace/mode/javascript'
33
import 'brace/mode/css'
44
import 'brace/theme/tomorrow'
5-
import jss from './jss'
5+
import jss, {versions} from './jss'
66
import layout from './layout'
7-
import style from './style'
7+
import {styles} from './theme'
88
import example from './example'
99

1010
function render() {
11-
const sheet = jss.createStyleSheet(style).attach()
11+
const sheet = jss.createStyleSheet(styles).attach()
1212
const div = document.createElement('div')
1313
div.innerHTML = layout({
1414
classes: sheet.classes,
15-
version: jss.version
15+
versions
1616
})
1717
document.body.appendChild(div)
1818

src/jss.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
import {create} from 'jss'
1+
import jss, {create} from 'jss'
22
import preset from 'jss-preset-default'
3+
import {version as presetVersion} from 'jss-preset-default/package.json'
4+
5+
export const versions = {
6+
jss: jss.version,
7+
preset: presetVersion
8+
}
9+
310
export default create(preset())

src/layout.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
export default ({classes, version}) => `
1+
export default ({classes, versions}) => `
22
<div class="${classes.repl}">
33
<header class="${classes.header}">
44
<a href="https://github.com/jsstyles/jss"></a>
55
<section>
66
<h2>JSS Playground</h2>
77
<p>JSS is on the left, CSS on the right. JSS code is a function body.</p>
8-
<p>jss@${version}</p>
8+
<p>jss@${versions.jss} & jss-preset-default@${versions.preset}</p>
99
</section>
1010
</header>
1111
<div class="${classes.sections}">

src/style.js renamed to src/theme.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const logoSize = 70
22
const margin = 10
33

4-
export default {
4+
export const styles = {
55
repl: {
66
fontFamily: 'Verdana',
77
fontSize: '14px',
@@ -25,12 +25,12 @@ export default {
2525
margin,
2626
marginLeft: 0,
2727
flex: 1,
28-
'& h2': {
29-
display: 'inline'
30-
},
31-
'& p': {
32-
margin: 0
33-
}
28+
},
29+
'& h2': {
30+
display: 'inline'
31+
},
32+
'& p': {
33+
margin: 0
3434
}
3535
},
3636
sections: {

webpack.config.js

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ module.exports = {
1616
loader: 'babel-loader',
1717
test: /\.js$/,
1818
exclude: /node_modules/
19+
},
20+
{
21+
test: /\.json$/,
22+
loader: 'json-loader'
1923
}
2024
]
2125
},

0 commit comments

Comments
 (0)