Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Unreleased
- Upgrade dependencies. Add new stylelint/eslint rules.
([#48](https://github.com/fs/react-base/pull/48))
- Upgrade Node.js to 6.5.x
- Prefer camelCase to js files
- Add new rules to stylelint config
Expand Down
3 changes: 2 additions & 1 deletion config/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ module.exports = {
}
}
],
'react/sort-prop-types': 2
'react/sort-prop-types': 2,
'react/style-prop-object': 2
}
};
3 changes: 3 additions & 0 deletions config/stylelint.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {
'color-no-invalid-hex': true,
'declaration-block-no-duplicate-properties': true,
'declaration-block-no-ignored-properties': true,
'declaration-block-no-redundant-longhand-properties': true,
'declaration-block-no-shorthand-property-overrides': true,
'declaration-block-properties-order': postcssCLIConfig['postcss-sorting']['sort-order'][2],
'declaration-block-trailing-semicolon': 'always',
Expand All @@ -24,6 +25,7 @@ module.exports = {
}],
'media-feature-colon-space-after': 'always',
'media-feature-colon-space-before': 'never',
'media-feature-name-no-unknown': true,
'media-feature-name-no-vendor-prefix': true,
'media-feature-no-missing-punctuation': true,
'no-duplicate-selectors': true,
Expand All @@ -35,6 +37,7 @@ module.exports = {
'property-case': 'lower',
'property-no-unknown': true,
'property-no-vendor-prefix': true,
'selector-descendant-combinator-no-non-space': true,
'selector-list-comma-newline-after': 'always',
'selector-no-id': true,
'selector-no-qualifying-type': true,
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"enzyme": "~2.4.1",
"eslint": "~3.4.0",
"eslint-plugin-import": "~1.14.0",
"eslint-plugin-react": "~6.1.2",
"eslint-plugin-react": "~6.2.0",
"express": "~4.14.0",
"extract-text-webpack-plugin": "~1.0.1",
"file-loader": "~0.9.0",
"html-webpack-plugin": "~2.22.0",
"isparta-instrumenter-loader": "~1.0.1",
"jasmine-core": "~2.4.1",
"jasmine-core": "~2.5.0",
"json-server": "~0.8.18",
"karma": "~1.2.0",
"karma-cli": "~1.0.1",
Expand All @@ -69,20 +69,20 @@
"karma-phantomjs-launcher": "~1.0.1",
"karma-webpack": "~1.8.0",
"phantomjs-prebuilt": "~2.1.12",
"postcss-cli": "~2.5.2",
"postcss-cli": "~2.6.0",
"postcss-color-function": "~2.0.1",
"postcss-import": "~8.1.2",
"postcss-inline-comment": "~3.0.0",
"postcss-loader": "~0.11.0",
"postcss-mixins": "~5.0.1",
"postcss-mixins": "~5.2.0",
"postcss-nested": "~1.0.0",
"postcss-pxtorem": "~3.3.1",
"postcss-simple-vars": "~3.0.0",
"postcss-sorting": "~1.6.1",
"react-addons-test-utils": "~15.3.1",
"react-hot-loader": "~1.3.0",
"style-loader": "~0.13.1",
"stylelint": "~7.1.0",
"stylelint": "~7.2.0",
"url-loader": "~0.5.7",
"webpack": "~1.13.2",
"webpack-dev-middleware": "~1.6.1",
Expand Down