Things are mostly working... except the tests

temando · Oct 19, 2017 · b03b210 · b03b210
1 parent 977a4fe
commit b03b210
Show file tree

Hide file tree

Showing 9 changed files with 273 additions and 106 deletions.
diff --git a/package.json b/package.json
@@ -62,33 +62,34 @@
     "copy-to-clipboard": "^3.0.6",
     "fetch-everywhere": "^1.0.5",
     "history": "^4.6.3",
-    "js-yaml": "^3.8.4",
+    "js-yaml": "^3.10.0",
     "json-schema-ref-parser": "^3.1.2",
-    "jss": "^8.1.0",
+    "jss": "^9.0.0",
+    "jss-preset-default": "^4.0.1",
     "lodash": "^4.17.4",
-    "markdown-it": "^8.3.1",
-    "prop-types": "^15.5.8",
-    "qs": "^6.4.0",
-    "react-document-title": "^2.0.2",
-    "react-jss": "^7.0.2",
+    "markdown-it": "^8.4.0",
+    "prop-types": "^15.6.0",
+    "qs": "^6.5.1",
+    "react-document-title": "^2.0.3",
+    "react-jss": "^7.2.0",
     "react-scrollable-anchor": "^0.5.0"
   },
   "peerDependencies": {
     "react": "^15.5.4",
     "react-dom": "^15.5.4"
   },
   "devDependencies": {
-    "babel-core": "^6.25.0",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.0",
     "babel-jest": "^21.0.2",
     "babel-loader": "^7.0.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-babili": "^0.1.4",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-react": "^6.23.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
     "benchmark": "^2.1.4",
     "changelog-verify": "^1.0.4",
     "css-loader": "^0.28.4",
@@ -115,7 +116,6 @@
     "react-test-renderer": "^15.5.4",
     "rimraf": "^2.6.1",
     "style-loader": "^0.18.2",
-    "transform-runtime": "^0.0.0",
     "url-loader": "^0.5.9",
     "version-changelog": "^2.1.0",
     "webpack": "2",

diff --git a/src/components/BodySchema/BodySchema.styles.js b/src/components/BodySchema/BodySchema.styles.js
@@ -22,8 +22,8 @@ export const styles = theme => ({
   },
 
   'subset': {
-    [`& + .${property.classes.property}:not(.${property.classes.last})`]: {
-      [`& .${property.classes.name}::after`]: {
+    [`& + .${property(theme).property}:not(.${property(theme).last})`]: {
+      [`& .${property(theme).name}::after`]: {
         content: '""',
         borderLeft: `1px solid ${theme.borders.default}`,
         position: 'absolute',
@@ -51,11 +51,11 @@ export const styles = theme => ({
       marginLeft: '1rem'
     },
 
-    [`.${property.classes.last} + & > td`]: {
+    [`.${property(theme).last} + & > td`]: {
       paddingTop: 0
     },
 
-    [`.${property.classes.last} + & > td::before`]: {
+    [`.${property(theme).last} + & > td::before`]: {
       borderLeft: 'none'
     }
   },

diff --git a/src/components/Description/Description.styles.js b/src/components/Description/Description.styles.js
@@ -6,7 +6,7 @@ export const styles = theme => ({
     maxWidth: '80rem',
 
     '&$inline': {
-      fontSize: `${sizes.text}`,
+      fontSize: `${theme.sizes.text}`,
       '&, & p': {
         display: 'inline'
       }

diff --git a/src/components/Example/Example.styles.js b/src/components/Example/Example.styles.js
@@ -1,5 +1,3 @@
-import { createSheet } from '../../theme'
-
 export const styles = theme => ({
   'summary': {
     lineHeight: '1.4',

diff --git a/src/components/Navigation/Navigation.styles.js b/src/components/Navigation/Navigation.styles.js
@@ -1,4 +1,5 @@
 import { styles as indicator } from '../Indicator/Indicator.styles'
+import c from 'color'
 
 export const styles = theme => ({
   navigation: {
@@ -11,7 +12,7 @@ export const styles = theme => ({
     boxSizing: 'border-box',
     overflowY: 'auto',
 
-    [`& ${indicator.classes.indicator}`]: {
+    [`& ${indicator(theme).indicator}`]: {
       float: 'right',
       display: 'block',
       marginTop: '5px'

diff --git a/src/components/Property/Property.styles.js b/src/components/Property/Property.styles.js
@@ -1,4 +1,3 @@
-import { theme } from '../../theme'
 import c from 'color'
 
 const lineHeight = '40px'

diff --git a/src/components/Response/Response.styles.js b/src/components/Response/Response.styles.js
@@ -11,7 +11,7 @@ export const styles = theme => ({
     padding: '1rem',
     fontSize: `${theme.sizes.text}`,
 
-    [`& ${indicator.classes.indicator}`]: {
+    [`& ${indicator(theme).indicator}`]: {
       marginRight: '1rem'
     }
   },

diff --git a/src/entries/demo/Demo.styles.js b/src/entries/demo/Demo.styles.js
@@ -8,7 +8,7 @@ const headerColor = `${c(headerBackground).lighten(0.75)}`
 const headerBorder = `${c(headerColor).darken(0.2)}`
 const headerTitleColor = c('#FFF')
 
-export const styles = {
+export const styles = theme => ({
   '@global': {
     'html': {
       fontSize: '62.5%'
@@ -24,18 +24,18 @@ export const styles = {
     fontFamily: '-apple-system,BlinkMacSystemFont,"Segoe UI",Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",helvetica,sans-serif;',
     lineHeight: '1.4',
 
-    // [`& .${Base.classes.base}`]: {
-    //   marginTop: `${headerHeight}`
-    // }
+    [`& .${Base(theme).base}`]: {
+      marginTop: `${headerHeight}`
+    }
   },
 
   dialog: {
-    // [`& .${Overlay.classes.overlay}`]: {
-    //   zIndex: '2',
-    //   transition: 'background 0.5s',
-    //   background: headerBackground,
-    //   paddingTop: '70px'
-    // },
+    [`& .${Overlay(theme).overlay}`]: {
+      zIndex: '2',
+      transition: 'background 0.5s',
+      background: headerBackground,
+      paddingTop: '70px'
+    },
 
     '& textarea': {
       padding: '1rem',
@@ -205,4 +205,4 @@ export const styles = {
       }
     }
   }
-}
+})