From 5067d4fb73d31e8f1cbed3b05736b1b369acbc98 Mon Sep 17 00:00:00 2001 From: Jed Mao Date: Fri, 18 Sep 2015 11:54:26 -0500 Subject: [PATCH 1/2] Fix microtime --- .travis.yml | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd4530a..a8a2397 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,16 @@ sudo: false +# iojs requires GCC 4.8 +# https://github.com/wadey/node-microtime/issues/34#issuecomment-138529797 +env: + - CXX=g++-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + language: node_js node_js: - iojs diff --git a/package.json b/package.json index 7bc5ed9..f475d12 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "metalsmith-rss": "^1.0.0", "metalsmith-url": "^1.0.0", "metalsmith-watch": "^1.0.1", - "microtime": "^1.2.0", + "microtime": "^1.5.0", "nano-logger": "^1.0.0", "node-libs-browser": "^0.5.0", "normalize.css": "^3.0.3", From ff81dcb5062574828f59046dfbbb5358d6913865 Mon Sep 17 00:00:00 2001 From: Jed Mao Date: Fri, 18 Sep 2015 12:03:26 -0500 Subject: [PATCH 2/2] Fix eslint --- docs/src/modules/SVGIcon/index.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/src/modules/SVGIcon/index.js b/docs/src/modules/SVGIcon/index.js index ec2e41c..b3b6a6d 100644 --- a/docs/src/modules/SVGIcon/index.js +++ b/docs/src/modules/SVGIcon/index.js @@ -28,28 +28,31 @@ const cleanups = { // @styled(styles) export default class SVGIcon extends Component { - static defaultProps = { - component: "span", - classSuffix: "-svg", - cleanup: [], - cleanupExceptions: [], - } - static propTypes = { + className: PropTypes.string, component: PropTypes.oneOfType([ PropTypes.string, PropTypes.func, ]), + classSuffix: PropTypes.string, svg: PropTypes.string.isRequired, fill: PropTypes.string, cleanup: PropTypes.oneOfType([ PropTypes.bool, PropTypes.array, ]), + cleanupExceptions: PropTypes.array, width: PropTypes.string, height: PropTypes.string, } + static defaultProps = { + component: "span", + classSuffix: "-svg", + cleanup: [], + cleanupExceptions: [], + } + static cleanupSvg(svg, cleanup = []) { return Object.keys(cleanups) .filter(key => cleanup.includes(key))