Skip to content

Commit

Permalink
Merge branch 'release/1.1.0' [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Gruber committed Feb 20, 2017
2 parents 03ca49a + e587442 commit 6791c63
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 81 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"react/self-closing-comp": 2,
"react/sort-comp": 0,
"react/jsx-no-bind": 1,
"react/require-default-props": 0,

"jsx-a11y/no-static-element-interactions": 0,

Expand Down
10 changes: 5 additions & 5 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"extends": "stylelint-config-standard",
"plugins": [
"stylelint-order"
],
"rules": {
"color-named": "never",
"comment-word-blacklist": ["/^TODO:/"],
"custom-property-no-outside-root": true,
"declaration-block-no-duplicate-properties": true,
"declaration-block-properties-order": [["composes", "content", "display", "position"], { unspecified: "bottom" }],
"order/declaration-block-properties-specified-order": [["composes", "content", "display", "position"], { unspecified: "bottom" }],
"declaration-no-important": true,
"font-family-name-quotes": "always-unless-keyword",
"font-weight-notation": "named-where-possible",
Expand All @@ -21,10 +23,8 @@
"selector-no-vendor-prefix": true,
"selector-pseudo-class-no-unknown": [ true, { ignorePseudoClasses: ["global"] } ],
"selector-pseudo-element-colon-notation": "single",
"selector-root-no-composition": true,
"string-quotes": "single",
"stylelint-disable-reason": "always-after",
"time-no-imperceptible": true,
"time-min-milliseconds": 100,
"unit-whitelist": ["px", "rem", "em", "%", "deg", "s"],
"value-no-vendor-prefix": true
}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#Changelog

###1.1.0
- Greenkeeping
- Move some dependencies into devDependencies where they belong [mochawesome #133](https://github.com/adamgruber/mochawesome/issues/133)

###1.0.8
- Only copy external assets if they do not already exist [mochawesome #76](https://github.com/adamgruber/mochawesome/issues/76)

Expand Down
51 changes: 26 additions & 25 deletions dist/assets/external/app.js

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions dist/assets/inline/app.js

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mochawesome-report-generator",
"version": "1.0.8",
"version": "1.1.0",
"description": "Generates gorgeous HTML reports from mochawesome reporter.",
"scripts": {
"lint": "eslint bin lib src/js src/components/**/*.js src/components/**/*.jsx test/**/*.js test/**/*.jsx",
Expand Down Expand Up @@ -61,22 +61,8 @@
"lines": 95
},
"dependencies": {
"chart.js": "^2.3.0",
"classnames": "^2.2.5",
"fs-extra": "^1.0.0",
"highlight.js": "^9.7.0",
"json-loader": "^0.5.4",
"json-stringify-safe": "^5.0.1",
"lodash": "^4.16.4",
"material-design-icons": "^3.0.1",
"mobx": "^2.6.3",
"mobx-react": "^4.0.0",
"mobx-react-devtools": "^4.2.9",
"mocha": "*",
"moment": "^2.15.1",
"normalize.css": "^5.0.0",
"fs-extra": "^2.0.0",
"opener": "^1.4.2",
"postcss": "^5.2.5",
"react": "^15.3.2",
"react-dom": "^15.3.2",
"yargs": "^6.3.0"
Expand All @@ -86,7 +72,7 @@
"babel-cli": "^6.18.0",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.2.5",
"babel-plugin-istanbul": "^3.0.0",
"babel-plugin-istanbul": "^4.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015": "^6.16.0",
"babel-preset-react": "^6.16.0",
Expand All @@ -95,22 +81,35 @@
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"chai-enzyme": "^0.6.0",
"chart.js": "^2.3.0",
"classnames": "^2.2.5",
"cross-env": "^3.1.3",
"css-loader": "^0.26.0",
"css-modules-require-hook": "^4.0.5",
"enzyme": "^2.5.1",
"eslint": "^3.10.0",
"eslint-config-airbnb": "^13.0.0",
"eslint": "^3.16.0",
"eslint-config-airbnb": "^14.1.0",
"eslint-loader": "^1.6.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.6.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"file-loader": "^0.10.0",
"highlight.js": "^9.7.0",
"jsdom": "^9.8.0",
"json-loader": "^0.5.4",
"less": "^2.7.1",
"less-loader": "^2.2.3",
"lodash": "^4.16.4",
"material-design-icons": "^3.0.1",
"mobx": "^2.6.3",
"mobx-react": "^4.0.0",
"mobx-react-devtools": "^4.2.9",
"mocha": "*",
"moment": "^2.15.1",
"normalize.css": "^5.0.0",
"nyc": "^10.0.0",
"postcss": "^5.2.5",
"postcss-cssnext": "^2.8.0",
"postcss-import": "^9.0.0",
"postcss-loader": "^1.0.0",
Expand All @@ -122,7 +121,8 @@
"sinon": "^1.17.6",
"style-loader": "^0.13.1",
"stylelint": "^7.5.0",
"stylelint-config-standard": "^15.0.0",
"stylelint-config-standard": "^16.0.0",
"stylelint-order": "^0.3.0",
"url-loader": "^0.5.7",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.16.2"
Expand Down
5 changes: 2 additions & 3 deletions src/components/test/context.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ class TestContext extends Component {
className={ cx('image-link') }
onClick={ e => e.stopPropagation() }
rel='noopener noreferrer'
target='_blank'
alt={ title } >
<img src={ linkUrl } className={ cx('image') } role='presentation' />
target='_blank' >
<img src={ linkUrl } className={ cx('image') } alt={ title } />
</a>
);
}
Expand Down

0 comments on commit 6791c63

Please sign in to comment.