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
12 changes: 10 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"presets": ["es2015", "react", "stage-0"],
"plugins": ["transform-es2015-modules-commonjs", "transform-decorators-legacy"],
"presets": [
"es2015",
"stage-0",
"react"
],
"plugins": [
"transform-es2015-modules-commonjs",
"transform-decorators-legacy",
"react-hot-loader/babel"
],
"env": {
"production": {
"plugins": ["transform-react-remove-prop-types"]
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Unreleased
- Upgrade dependencies
([#54](https://github.com/fs/react-base/pull/54))
- Add Todo Modal test
([#53](https://github.com/fs/react-base/pull/53))
- Add Sign Up Modal test
Expand All @@ -14,13 +16,17 @@
- Upgrade dependencies. Add new stylelint/eslint rules.
([#48](https://github.com/fs/react-base/pull/48))
- Upgrade Node.js to 6.5.x
([#47](https://github.com/fs/react-base/pull/47))
- Prefer camelCase to js files
([#47](https://github.com/fs/react-base/pull/47))
- Add new rules to stylelint config
([#47](https://github.com/fs/react-base/pull/47))
- Upgrade dependencies
([#46](https://github.com/fs/react-base/pull/46))
- Remove functions binding inside jsx
([#46](https://github.com/fs/react-base/pull/46))
- Upgrade Node.js to 6.4.x
([#44](https://github.com/fs/react-base/pull/44))
- Add .gitattributes to avoid merge conflicts
([#44](https://github.com/fs/react-base/pull/44))
- Upgrade dependencies. Simplify environment configs
Expand Down
2 changes: 1 addition & 1 deletion config/webpack_dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {
},
{
test: /\.jsx$/,
loader: 'react-hot!babel'
loader: 'babel'
},
{
test: /\.css$/,
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
},
"license": "MIT",
"engines": {
"node": "6.4.x"
"node": "6.5.x"
},
"dependencies": {
"alt": "~0.18.5",
"alt": "~0.18.6",
"alt-utils": "~1.0.0",
"bootstrap": "~3.3.7",
"classnames": "~2.2.5",
Expand All @@ -35,7 +35,7 @@
"react-addons-css-transition-group": "~15.3.1",
"react-bootstrap": "~0.30.3",
"react-dom": "~15.3.1",
"react-router": "~2.7.0",
"react-router": "~2.8.0",
"whatwg-fetch": "~1.0.0"
},
"devDependencies": {
Expand All @@ -49,20 +49,20 @@
"babel-preset-react": "~6.11.1",
"babel-preset-stage-0": "~6.5.0",
"connect-history-api-fallback": "~1.3.0",
"css-loader": "~0.24.0",
"css-loader": "~0.25.0",
"dotenv": "~2.0.0",
"enzyme": "~2.4.1",
"eslint": "~3.4.0",
"eslint": "~3.5.0",
"eslint-plugin-import": "~1.14.0",
"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.5.0",
"jasmine-core": "~2.5.1",
"json-server": "~0.8.19",
"karma": "~1.2.0",
"karma": "~1.3.0",
"karma-cli": "~1.0.1",
"karma-coverage": "~1.1.1",
"karma-es6-shim": "~1.0.0",
Expand All @@ -74,19 +74,19 @@
"postcss-color-function": "~2.0.1",
"postcss-import": "~8.1.2",
"postcss-inline-comment": "~3.0.0",
"postcss-loader": "~0.11.1",
"postcss-loader": "~0.13.0",
"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",
"react-hot-loader": "~3.0.0-beta.3",
"style-loader": "~0.13.1",
"stylelint": "~7.2.0",
"url-loader": "~0.5.7",
"webpack": "~1.13.2",
"webpack-dev-middleware": "~1.6.1",
"webpack-dev-middleware": "~1.7.0",
"webpack-hot-middleware": "~2.12.2"
}
}