diff --git a/.eslintrc b/.eslintrc index f830fb7..d01c6ee 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,9 +1,12 @@ { "extends": "eslint:recommended", - "ecmaFeatures": { - "jsx": true, - "modules": true, - "spread": true + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "ecmaFeatures": { + "jsx": true, + "spread": true + } }, "env": { "browser": true, @@ -19,6 +22,7 @@ "quotes": [2, "single"], "indent": [2, 2, {"SwitchCase": 1}], "eol-last": 2, - "react/jsx-uses-react": 1 + "react/jsx-uses-react": 1, + "react/jsx-uses-vars": 1 } } \ No newline at end of file diff --git a/demo/package.json b/demo/package.json index cb899b3..ebbd5eb 100644 --- a/demo/package.json +++ b/demo/package.json @@ -11,32 +11,32 @@ "author": "Peter Newnham", "license": "MIT", "devDependencies": { - "autoprefixer": "6.3.1", - "babel-cli": "^6.4.5", - "babel-core": "^6.4.5", - "babel-preset-es2015": "^6.3.13", - "babel-preset-react": "^6.3.13", - "babel-preset-stage-2": "6.3.13", - "css-loader": "0.23.1", - "extract-text-webpack-plugin": "1.0.1", - "html-webpack-plugin": "2.7.1", - "json-loader": "0.5.4", - "node-sass": "3.4.2", - "postcss-loader": "0.8.0", - "react-hot-loader": "1.3.0", - "redux-devtools": "3.0.1", - "sass-loader": "3.1.2", - "style-loader": "0.13.0", - "webpack": "^1.12.12", + "autoprefixer": "^6.3.6", + "babel-cli": "^6.8.0", + "babel-core": "^6.8.0", + "babel-preset-es2015": "^6.6.0", + "babel-preset-react": "^6.5.0", + "babel-preset-stage-2": "^6.5.0", + "css-loader": "^0.23.1", + "extract-text-webpack-plugin": "^1.0.1", + "html-webpack-plugin": "^2.17.0", + "json-loader": "^0.5.4", + "node-sass": "^3.7.0", + "postcss-loader": "^0.9.1", + "react-hot-loader": "^1.3.0", + "redux-devtools": "^3.3.1", + "sass-loader": "^3.2.0", + "style-loader": "^0.13.1", + "webpack": "^1.13.0", "webpack-dev-server": "^1.14.1" }, "dependencies": { - "brace": "0.7.0", - "normalize-scss": "4.0.3", - "react": "0.14.6", - "react-ace": "3.1.0", - "react-dom": "0.14.6", - "react-redux": "4.0.6", - "redux": "3.0.5" + "brace": "^0.8.0", + "normalize-scss": "^4.2.1", + "react": "^15.0.2", + "react-ace": "^3.4.1", + "react-dom": "^15.0.2", + "react-redux": "^4.4.5", + "redux": "^3.5.2" } } diff --git a/demo/src/index.html b/demo/src/index.html index 54978c5..f8ccf09 100644 --- a/demo/src/index.html +++ b/demo/src/index.html @@ -6,5 +6,13 @@
+ \ No newline at end of file diff --git a/demo/src/js/components/Header.js b/demo/src/js/components/Header.js index 9d2eea6..b21b1bb 100644 --- a/demo/src/js/components/Header.js +++ b/demo/src/js/components/Header.js @@ -5,6 +5,12 @@ import 'sass/header'; export default function Header() { return (
+ + + + + View Project on GitHub +

React HTML Parser Demo

); diff --git a/demo/src/sass/header.scss b/demo/src/sass/header.scss index 06aafaf..4b236bc 100644 --- a/demo/src/sass/header.scss +++ b/demo/src/sass/header.scss @@ -1,5 +1,27 @@ +$headerLinkColor: #cc0000; + header { h1 { padding: 0 0 1rem; } + a { + float: right; + text-decoration: none; + color: $headerLinkColor; + line-height: 32px; + svg { + margin-right: 5px; + position: relative; + top: 2px; + #github { + fill: $headerLinkColor; + } + } + &:hover { + color: darken($headerLinkColor, 10%); + #github { + fill: darken($headerLinkColor, 10%); + } + } + } } \ No newline at end of file diff --git a/package.json b/package.json index e2ab1ae..32b05fc 100644 --- a/package.json +++ b/package.json @@ -40,40 +40,38 @@ "author": "Peter Newnham", "license": "MIT", "devDependencies": { - "babel": "^6.3.26", - "babel-cli": "^6.4.0", - "babel-core": "^6.4.0", - "babel-loader": "^6.2.1", - "babel-plugin-transform-object-assign": "^6.3.13", - "babel-preset-es2015": "^6.3.13", - "babel-preset-react": "^6.3.13", - "coveralls": "^2.11.6", - "eslint": "^1.10.3", - "eslint-plugin-react": "3.15.0", - "html-webpack-plugin": "^1.7.0", - "inject-loader": "2.0.1", + "babel": "^6.5.2", + "babel-cli": "^6.8.0", + "babel-core": "^6.8.0", + "babel-loader": "^6.2.4", + "babel-plugin-transform-object-assign": "^6.8.0", + "babel-preset-es2015": "^6.6.0", + "babel-preset-react": "^6.5.0", + "coveralls": "^2.11.9", + "eslint": "^2.10.1", + "eslint-plugin-react": "^5.1.1", + "inject-loader": "^2.0.1", "isparta-loader": "^2.0.0", "jasmine-core": "^2.4.1", "json-loader": "^0.5.4", - "karma": "^0.13.19", - "karma-coverage": "^0.5.3", - "karma-jasmine": "^0.3.6", - "karma-phantomjs-launcher": "^0.2.3", - "karma-phantomjs-shim": "^1.2.0", - "karma-spec-reporter": "0.0.23", + "karma": "^0.13.22", + "karma-coverage": "^1.0.0", + "karma-jasmine": "^1.0.2", + "karma-phantomjs-launcher": "^1.0.0", + "karma-phantomjs-shim": "^1.4.0", + "karma-spec-reporter": "^0.0.26", "karma-webpack": "^1.7.0", - "phantomjs": "^1.9.19", - "react": "^0.14.6", - "react-addons-test-utils": "^0.14.6", - "react-dom": "^0.14.6", - "rimraf": "^2.5.0", - "webpack": "^1.12.11", - "webpack-dev-server": "^1.14.1" + "phantomjs-prebuilt": "^2.1.7", + "react": "^15.0.2", + "react-addons-test-utils": "^15.0.2", + "react-dom": "^15.0.2", + "rimraf": "^2.5.2", + "webpack": "^1.13.0" }, "dependencies": { "htmlparser2": "^3.9.0" }, "peerDependencies": { - "react": "^0.13.0 || ^0.14.0" + "react": "^0.13.0 || ^0.14.0 || ^15.0.0" } }