Merge branch 'v5-with-cra' into language-provider-test-improvement

docs/README.md

@@ -7,7 +7,7 @@
   - [Introduction ](general/introduction.md)
   - [Tool Configuration](general/files.md)
   - [Server Configurations](general/server-configs.md)
-  - [Deployment](general/deployment.md) _(currently Heroku and AWS S3 specific)_
+  - [Deployment](general/deployment.md)
   - [Debugging](general/debugging.md)
   - [FAQ](general/faq.md)
   - [Gotchas](general/gotchas.md)

docs/general/faq.md

@@ -15,6 +15,7 @@
 - [How to keep my project up-to-date with `react-boilerplate`?](#how-to-keep-my-project-up-to-date-with-react-boilerplate)
 - [How to turn off Webpack performance warnings after production build?](#how-to-turn-off-webpack-performance-warnings-after-production-build)
 - [Styles getting overridden?](#styles-getting-overridden)
+- [SSR & Prerendering](#ssr-server-side-rendering--prerendering)
 - [Have another question?](#have-another-question)
 
 ## Where are Babel, Prettier and ESLint configured?
@@ -253,6 +254,14 @@ You can do that inside `containers/App/index.js`.
 
 More information is available in the [official documentation](https://github.com/styled-components/styled-components/blob/master/docs/existing-css.md).
 
+## SSR (Server side rendering) & Prerendering
+
+This boilerplate provides you a `Client Side Rendered(CSR)` application. There have been many requests and attempts to add server-side rendering capabilities, yet, none of them have resulted successfully. You check the issues & pull requests for the details.
+
+`Prerendering` is a method used for leveraging the advantages of SSR such like improved SEO, social media tags, etc... Unlike `SSR`, integrating prerendering to your application is suprisingly straightforward and easy. There are many services you can use for that and the majority of them would work seamlessly.
+
+> Note: Prerendering with `prerender.io` and `react-snap` have already been implemented by the other users and it is working. However, there are more services providing different functionalities.
+
 ## Have another question?
 
 Submit an [issue](https://github.com/react-boilerplate/react-boilerplate/issues),

internals/webpack/webpack.base.babel.js

@@ -116,7 +116,6 @@ module.exports = options => ({
   resolve: {
     modules: ['node_modules', 'app'],
     extensions: ['.js', '.jsx', '.react.js'],
-    mainFields: ['browser', 'jsnext:main', 'main'],
     alias: {
       'react-dom': '@hot-loader/react-dom',
     },