Merge pull request #1712 from strapi/fix/autoReload

Fix auto reload

docs/3.x.x/en/configurations/configurations.md

@@ -335,7 +335,8 @@ Most of the application's configurations are defined by environment. It means th
 
  - `host` (string): Host name. Default value: `localhost`.
  - `port` (integer): Port on which the server should be running. Default value: `1337`.
- - `autoReload` (boolean): Enable or disabled server reload on files update. Default value: depends on the environment.
+ - `autoReload`
+   - `enabled` (boolean): Enable or disabled server reload on files update. Default value: depends on the environment.
  - [`cron`](https://en.wikipedia.org/wiki/Cron)
   - `enabled` (boolean): Enable or disable CRON tasks to schedule jobs at specific dates. Default value: `false`.
  - `admin`

docs/3.x.x/en/plugin-development/frontend-use-cases.md

@@ -346,7 +346,7 @@ const send = require('koa-send');
 
 module.exports = {
   autoReload: async ctx => {
-    ctx.send({ autoReload: _.get(strapi.config.environments, 'development.server.autoReload', false) });
+    ctx.send({ autoReload: _.get(strapi.config.currentEnvironment, 'server.autoReload', { enabled: false }) });
   }
 }
 ```
@@ -374,8 +374,8 @@ import request from 'utils/request';
 const shouldRenderCompo = (plugin) => new Promise((resolve, request) => {
   request('/my-plugin/autoReload')
     .then(response => {
-      // If autoReload is enabled the response is `{ autoReload: true }`
-      plugin.preventComponentRendering = !response.autoReload;
+      // If autoReload is enabled the response is `{ autoReload: { enabled: true } }`
+      plugin.preventComponentRendering = !response.autoReload.enabled;
       // Set the BlockerComponent props
       plugin.blockerComponentProps = {
         blockerComponentTitle: 'my-plugin.blocker.title',
@@ -407,8 +407,8 @@ import MyCustomBlockerComponent from 'components/MyCustomBlockerComponent';
 const shouldRenderCompo = (plugin) => new Promise((resolve, request) => {
   request('/my-plugin/autoReload')
     .then(response => {
-      // If autoReload is enabled the response is `{ autoReload: true }`
-      plugin.preventComponentRendering = !response.autoReload;
+      // If autoReload is enabled the response is `{ autoReload: { enabled: true } }`
+      plugin.preventComponentRendering = !response.autoReload.enabled;
 
       // Tell which component to be rendered instead
       plugin.blockerComponent = MyCustomBlockerComponent;

packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js

@@ -59,7 +59,7 @@ const renderIde = () => (
            "port": 1337,
           <br />
           <span style={{ color: '#006EE7'}}>
-            &nbsp;"autoReload": true,
+            &nbsp;"autoReload": &#123; enabled: true &#125;
           </span>
           <br />
           &nbsp;"proxi": &#123;

packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js

@@ -190,7 +190,7 @@ module.exports = {
 
   autoReload: async ctx => {
     ctx.send({
-      autoReload: _.get(strapi.config.environments, 'development.server.autoReload', false),
+      autoReload: _.get(strapi.config.currentEnvironment, 'server.autoReload', { enabled: false })
     });
   },
 

packages/strapi-plugin-settings-manager/admin/src/requirements.js

@@ -3,7 +3,7 @@ import request from 'utils/request';
 const shouldRenderCompo = (plugin) => new Promise((resolve, reject) => {
   request('/settings-manager/autoReload')
     .then(response => {
-      plugin.preventComponentRendering = !response.autoReload;
+      plugin.preventComponentRendering = !response.autoReload.enabled;
       plugin.blockerComponentProps = {
         blockerComponentTitle: 'components.AutoReloadBlocker.header',
         blockerComponentDescription: 'components.AutoReloadBlocker.description',

packages/strapi-plugin-settings-manager/controllers/SettingsManager.js

@@ -334,8 +334,8 @@ module.exports = {
 
   autoReload: async ctx => {
     ctx.send({
-      autoReload: _.get(strapi.config.environments, 'development.server.autoReload', false),
-      environment: strapi.config.environment,
+      autoReload: _.get(strapi.config.currentEnvironment, 'server.autoReload', { enabled: false }),
+      environment: strapi.config.environment
     });
   }
 };