daptontech
diff --git a/‎.github/MAINTAINERS.md
+12 b/‎.github/MAINTAINERS.md
+12
diff --git a/‎.lgtm
-3 b/‎.lgtm
-3
diff --git a/‎.github/CONTRIBUTING.md ‎CONTRIBUTING.md
+11 b/‎.github/CONTRIBUTING.md ‎CONTRIBUTING.md
+11
diff --git a/‎Changelog.md
+68 b/‎Changelog.md
+68
diff --git a/‎MAINTAINERS
-9 b/‎MAINTAINERS
-9
diff --git a/‎README.md
+1 b/‎README.md
+1
diff --git a/‎app/app.js
+25-40 b/‎app/app.js
+25-40
diff --git a/‎app/components/Button/index.js
+3-2 b/‎app/components/Button/index.js
+3-2
diff --git a/‎app/components/Header/A.js
+1-3 b/‎app/components/Header/A.js
+1-3
diff --git a/‎app/components/Header/HeaderLink.js
+2-2 b/‎app/components/Header/HeaderLink.js
+2-2
diff --git a/‎app/components/Header/banner.jpg
-923 KB b/‎app/components/Header/banner.jpg
-923 KB
diff --git a/‎app/components/Img/index.js
+3-2 b/‎app/components/Img/index.js
+3-2
diff --git a/‎app/components/IssueIcon/index.js
+2-1 b/‎app/components/IssueIcon/index.js
+2-1
diff --git a/‎app/components/List/index.js
+5-4 b/‎app/components/List/index.js
+5-4
diff --git a/‎app/components/List/tests/index.test.js
+13-8 b/‎app/components/List/tests/index.test.js
+13-8
diff --git a/‎app/components/ListItem/index.js
+2-1 b/‎app/components/ListItem/index.js
+2-1
diff --git a/‎app/components/LoadingIndicator/Circle.js
+2-1 b/‎app/components/LoadingIndicator/Circle.js
+2-1
@@ -0,0 +1,12 @@
+# Maintainers
+ - mxstbr  		
+ - oliverturner		
+ - justingreenberg		
+ - gihrig		
+ - sedubois		
+ - chaintng		
+ - samit4me		
+ - amilajack		
+ - Dattaya
+ - jwinn
+ - KarandikarMihir
@@ -120,3 +120,14 @@ included in the project:
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project
 owners to license your work under the terms of the [MIT License](https://github.com/react-boilerplate/react-boilerplate/blob/master/LICENSE.md).
+
+# Collaborating guidelines
+You can find the list of all maintainers in [MAINTAINERS.md](./MAINTAINERS.md).
+
+There are few basic rules to ensure high quality of the boilerplate:
+
+ - Before merging, a PR requires at least two approvals from the collaborators unless it's an architectural change, a large feature, etc. If it is, then at least 50% of the core team have to agree to merge it, with every team member having a full veto right. (i.e. every single one can block any PR)
+ - A PR should remain open for at least two days before merging (does not apply for trivial contributions like fixing a typo). This way everyone has enough time to look into it.
+
+
+You are always welcome to discuss and propose improvements to this guideline.
@@ -1,5 +1,73 @@
 # Changelog
 
+## 3.5 September 2017
+
+## News
+
+So, a few things have changed in the JS ecosystem since the original release of React Boilerplate, and there was a discussion in #1776 around the it's future. TLDR; we had two incompatible PRs — one for server-side rendering, and another for react-router v4. The community decided that we would keep our dependencies up to date (upgrade react-router) and establish a clear mission for React Boilerplate:
+
+**React Boilerplate is a rock-solid foundation for crafting large, high-performance enterprise-grade frontend web applications that have advanced/custom requirements.**
+- Static output designed for CDN and edge caches
+- Extreme Developer Ergonomics
+  - Parallelized Tests
+  - DLL manifest in development for blazing rebuilds
+  - Scaffolding tools
+- Pre-baked i18n support
+- Low level tooling that gives developer complete control
+
+We may include SSR in a future version, but for now this is our focus... create-react-app and next.js are doing an awesome job and strongly recommend these projects for most use cases.
+
+### Breaking
+
+- **Upgrade React Router to v4.x.x** (@anuraaga, @Dattaya, et al)
+  - Use React-Loadable for data lifecycle management
+  - Refactor `asyncInjectors`: improve code splitting/saga management
+  - For a complete overview of changes, please see #1746
+
+### Main
+
+- **Upgrade React to v15.6** (@g0ddish)
+- **Upgrade Webpack and related dependencies to v3.x.x** (@KarandikarMihir)
+- **Upgrade `styled-components` to v2.x.x** (@justingreenberg)
+- Replace `babel-preset-hmre` with vanilla Webpack HMR (@Dattaya)
+- Serve Dlls via `add-asset-html-webpack-plugin` (@skidding)
+- Migrate from `React.PropTypes` to `prop-types` (@dennybiasioll
+
+### Other Updates
+
+- Add Stateless Functions to Container generator (@outdooricon)
+- Change development sourcemap style (@samit4me)
+- Create new documentation for dependency updates (@gihrig)
+- Downgrade `sanitize.css` (@Dattaya)
+- Enable rule `react/no-array-index-key` (@carloscuatin)
+- Fix `Intl` polyfill in language generator (@tmf)
+- Handle 204 and 205 HTTP response (@williamdclt)
+- Icon updates and improvements (@samit4me)
+- Import only necessary components for RRv4 (@sorin-davidoi)
+- Improve `<List>` component tests (@chaintng)
+- Improve component tests in demo (@dennybiasiolli)
+- Improve setup to recognize repo before clearing git (@Aftabnack)
+- Make build output less verbose (@KarandikarMihir)
+- Move `onSubmitForm` test into `mapDispatchToProps` test (@tomasfrancisco)
+- NPM script and dependency updates, many fixes (@gihrig)
+- Remove state update in componentWillUpdate (@mawi12345)
+- Remove unused Sinon dependency (@avdeev)
+- Remove route names from `app/routes` (@beardedtim)
+- Rename `store.js` to `configureStore.js` to prevent conflict (@howardya)
+- Separate `dev` and `prod` middleware (@tomazy)
+- Sort ESLint config in `package.json` (@bt)
+- Support OpenType fonts with `.otf` file extension (@kachkaev)
+- Turn `App` into a functional component (@Dattaya)
+- Update FAQ for styles getting overridden (@samit4me)
+- Update the 'tagged template literals' link (@joncass)
+- Use camelcase for reducer and saga key to match selector (@anuraaga)
+- Use correct selector names in tests (@Dattaya)
+- Use local instance of `shelljs` (@KarandikarMihir)
+- Use optimized version of the RBP banner (@tomazy)
+- Use relative path for `manifest.json` (@mrharel)
+
+Many fixes to documentation thanks to @Aftabnack, @auchenberg, @danielrob, @gregoralbrecht, @JonathanMerklin, @marciopuga, @NicholasAnthony, @Skaronator, and @vedatmahir
+
 ## 3.4 January 2017
 
 ### Main
 
@@ -117,6 +117,7 @@ Now you're ready to rumble!
 - [Styling](docs/css): How to work with the CSS tooling
 - [Your app](docs/js): Supercharging your app with Routing, Redux, simple
   asynchronicity helpers, etc.
+- [**Troubleshooting**](docs/general/gotchas.md): Solutions to common problems faced by developers.
 
 ## Supporters
 
 
@@ -12,39 +12,43 @@ import 'babel-polyfill';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
-import { syncHistoryWithStore } from 'react-router-redux';
+import { ConnectedRouter } from 'react-router-redux';
 import FontFaceObserver from 'fontfaceobserver';
-import { useScroll } from 'react-router-scroll';
+import createHistory from 'history/createBrowserHistory';
 import 'sanitize.css/sanitize.css';
 
 // Import root app
 import App from 'containers/App';
 
-// Import selector for `syncHistoryWithStore`
-import { makeSelectLocationState } from 'containers/App/selectors';
-
 // Import Language Provider
 import LanguageProvider from 'containers/LanguageProvider';
 
 // Load the favicon, the manifest.json file and the .htaccess file
 /* eslint-disable import/no-webpack-loader-syntax */
-import '!file-loader?name=[name].[ext]!./favicon.ico';
+import '!file-loader?name=[name].[ext]!./images/favicon.ico';
+import '!file-loader?name=[name].[ext]!./images/icon-72x72.png';
+import '!file-loader?name=[name].[ext]!./images/icon-96x96.png';
+import '!file-loader?name=[name].[ext]!./images/icon-120x120.png';
+import '!file-loader?name=[name].[ext]!./images/icon-128x128.png';
+import '!file-loader?name=[name].[ext]!./images/icon-144x144.png';
+import '!file-loader?name=[name].[ext]!./images/icon-152x152.png';
+import '!file-loader?name=[name].[ext]!./images/icon-167x167.png';
+import '!file-loader?name=[name].[ext]!./images/icon-180x180.png';
+import '!file-loader?name=[name].[ext]!./images/icon-192x192.png';
+import '!file-loader?name=[name].[ext]!./images/icon-384x384.png';
+import '!file-loader?name=[name].[ext]!./images/icon-512x512.png';
 import '!file-loader?name=[name].[ext]!./manifest.json';
 import 'file-loader?name=[name].[ext]!./.htaccess'; // eslint-disable-line import/extensions
 /* eslint-enable import/no-webpack-loader-syntax */
 
-import configureStore from './store';
+import configureStore from './configureStore';
 
 // Import i18n messages
 import { translationMessages } from './i18n';
 
 // Import CSS reset and Global Styles
 import './global-styles';
 
-// Import routes
-import createRoutes from './routes';
-
 // Observe loading of Open Sans (to remove open sans, remove the <link> tag in
 // the index.html file and this observer)
 const openSansObserver = new FontFaceObserver('Open Sans', {});
@@ -57,49 +61,30 @@ openSansObserver.load().then(() => {
 });
 
 // Create redux store with history
-// this uses the singleton browserHistory provided by react-router
-// Optionally, this could be changed to leverage a created history
-// e.g. `const browserHistory = useRouterHistory(createBrowserHistory)();`
 const initialState = {};
-const store = configureStore(initialState, browserHistory);
-
-// Sync history and store, as the react-router-redux reducer
-// is under the non-default key ("routing"), selectLocationState
-// must be provided for resolving how to retrieve the "route" in the state
-const history = syncHistoryWithStore(browserHistory, store, {
-  selectLocationState: makeSelectLocationState(),
-});
-
-// Set up the router, wrapping all Routes in the App component
-const rootRoute = {
-  component: App,
-  childRoutes: createRoutes(store),
-};
+const history = createHistory();
+const store = configureStore(initialState, history);
+const MOUNT_NODE = document.getElementById('app');
 
 const render = (messages) => {
   ReactDOM.render(
     <Provider store={store}>
       <LanguageProvider messages={messages}>
-        <Router
-          history={history}
-          routes={rootRoute}
-          render={
-            // Scroll to top when going to a new page, imitating default browser
-            // behaviour
-            applyRouterMiddleware(useScroll())
-          }
-        />
+        <ConnectedRouter history={history}>
+          <App />
+        </ConnectedRouter>
       </LanguageProvider>
     </Provider>,
-    document.getElementById('app')
+    MOUNT_NODE
   );
 };
 
-// Hot reloadable translation json files
 if (module.hot) {
+  // Hot reloadable React components and translation json files
   // modules.hot.accept does not accept dynamic dependencies,
   // have to be constants at compile-time
-  module.hot.accept('./i18n', () => {
+  module.hot.accept(['./i18n', 'containers/App'], () => {
+    ReactDOM.unmountComponentAtNode(MOUNT_NODE);
     render(translationMessages);
   });
 }
 
@@ -1,12 +1,13 @@
 /**
  *
- * Button.react.js
+ * Button.js
  *
  * A common button, if you pass it a prop "route" it'll render a link to a react-router route
  * otherwise it'll render a link with an onclick
  */
 
-import React, { PropTypes, Children } from 'react';
+import React, { Children } from 'react';
+import PropTypes from 'prop-types';
 
 import A from './A';
 import StyledButton from './StyledButton';
 
@@ -1,8 +1,6 @@
-import styled from 'styled-components';
-
 import NormalA from 'components/A';
 
-const A = styled(NormalA)`
+const A = NormalA.extend`
   padding: 2em 0;
 `;
 
 
@@ -1,4 +1,4 @@
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 
 export default styled(Link)`
@@ -17,7 +17,7 @@ export default styled(Link)`
   font-size: 16px;
   border: 2px solid #41ADDD;
   color: #41ADDD;
-  
+
   &:active {
     background: #41ADDD;
     color: #FFF;
 
@@ -1,11 +1,12 @@
 /**
  *
- * Img.react.js
+ * Img.js
  *
  * Renders an image, enforcing the usage of the alt="" tag
  */
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 function Img(props) {
   return (
 
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 function IssueIcon(props) {
   return (
@@ -13,7 +14,7 @@ function IssueIcon(props) {
 }
 
 IssueIcon.propTypes = {
-  className: React.PropTypes.string,
+  className: PropTypes.string,
 };
 
 export default IssueIcon;
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import Ul from './Ul';
 import Wrapper from './Wrapper';
@@ -9,8 +10,8 @@ function List(props) {
 
   // If we have items, render them
   if (props.items) {
-    content = props.items.map((item, index) => (
-      <ComponentToRender key={`item-${index}`} item={item} />
+    content = props.items.map((item) => (
+      <ComponentToRender key={`item-${item.id}`} item={item} />
     ));
   } else {
     // Otherwise render a single component
@@ -27,8 +28,8 @@ function List(props) {
 }
 
 List.propTypes = {
-  component: React.PropTypes.func.isRequired,
-  items: React.PropTypes.array,
+  component: PropTypes.func.isRequired,
+  items: PropTypes.array,
 };
 
 export default List;
@@ -1,25 +1,30 @@
 import React from 'react';
-import { render } from 'enzyme';
+import { shallow } from 'enzyme';
 
 import ListItem from 'components/ListItem';
 import List from '../index';
 
 describe('<List />', () => {
   it('should render the component if no items are passed', () => {
-    const renderedComponent = render(
+    const renderedComponent = shallow(
       <List component={ListItem} />
     );
     expect(renderedComponent.find(ListItem)).toBeDefined();
   });
 
-  it('should render the items', () => {
+  it('should pass all items props to rendered component', () => {
     const items = [
-      'Hello',
-      'World',
+      { id: 1, name: 'Hello' },
+      { id: 2, name: 'World' },
     ];
-    const renderedComponent = render(
-      <List items={items} component={ListItem} />
+
+    const component = ({ item }) => <ListItem>{item.name}</ListItem>; // eslint-disable-line react/prop-types
+
+    const renderedComponent = shallow(
+      <List items={items} component={component} />
     );
-    expect(renderedComponent.find(items)).toBeDefined();
+    expect(renderedComponent.find(component)).toHaveLength(2);
+    expect(renderedComponent.find(component).at(0).prop('item')).toBe(items[0]);
+    expect(renderedComponent.find(component).at(1).prop('item')).toBe(items[1]);
   });
 });
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import Item from './Item';
 import Wrapper from './Wrapper';
@@ -14,7 +15,7 @@ function ListItem(props) {
 }
 
 ListItem.propTypes = {
-  item: React.PropTypes.any,
+  item: PropTypes.any,
 };
 
 export default ListItem;
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import styled, { keyframes } from 'styled-components';
 
 const circleFadeDelay = keyframes`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`		`- * Button.react.js`
	`3`	`+ * Button.js`
`4`	`4`	`*`
`5`	`5`	`* A common button, if you pass it a prop "route" it'll render a link to a react-router route`
`6`	`6`	`* otherwise it'll render a link with an onclick`
`7`	`7`	`*/`
`8`	`8`
`9`		`-import React, { PropTypes, Children } from 'react';`
	`9`	`+import React, { Children } from 'react';`
	`10`	`+import PropTypes from 'prop-types';`
`10`	`11`
`11`	`12`	`import A from './A';`
`12`	`13`	`import StyledButton from './StyledButton';`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`		`- * Img.react.js`
	`3`	`+ * Img.js`
`4`	`4`	`*`
`5`	`5`	`* Renders an image, enforcing the usage of the alt="" tag`
`6`	`6`	`*/`
`7`	`7`
`8`		`-import React, { PropTypes } from 'react';`
	`8`	`+import React from 'react';`
	`9`	`+import PropTypes from 'prop-types';`
`9`	`10`
`10`	`11`	`function Img(props) {`
`11`	`12`	`return (`