From a2a6ff88cbd37c298753872f0adfb15058c76531 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:18:58 +0200 Subject: [PATCH 1/7] fix(plugin-settings-manager): autoReload response --- .../strapi-plugin-settings-manager/admin/src/requirements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-settings-manager/admin/src/requirements.js b/packages/strapi-plugin-settings-manager/admin/src/requirements.js index 0206a853fb..96730be6c0 100644 --- a/packages/strapi-plugin-settings-manager/admin/src/requirements.js +++ b/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', From a1ca701053e25f42e079a8846251a15fd41edd92 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:22:58 +0200 Subject: [PATCH 2/7] fix(content-type-builder): autoReload payload --- .../controllers/ContentTypeBuilder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js index 0e8e7ac4da..67676a631b 100755 --- a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js +++ b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js @@ -188,7 +188,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 }) }); }, From 942cfece7d40026a4543d28841f1e7798f3ecd4c Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:24:39 +0200 Subject: [PATCH 3/7] fix(settings-manager): autoReload payload --- .../controllers/SettingsManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js b/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js index a5f29d7458..247f84551d 100755 --- a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js +++ b/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 }); } }; From 38e71df4ac4639382ba7eb8ce9a69da625633159 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:36:57 +0200 Subject: [PATCH 4/7] doc(frontend-uc): autoReload payload --- docs/3.x.x/en/plugin-development/frontend-use-cases.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/3.x.x/en/plugin-development/frontend-use-cases.md b/docs/3.x.x/en/plugin-development/frontend-use-cases.md index 74d65ad409..2b6f4e723a 100644 --- a/docs/3.x.x/en/plugin-development/frontend-use-cases.md +++ b/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; From bc60bdb76a2950041774ebffb0b540d6bb893064 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:38:30 +0200 Subject: [PATCH 5/7] fix(BlockerComponent): autoReload payload --- .../lib/src/components/BlockerComponent/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js index e0e450d54a..97d0f66893 100644 --- a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js @@ -59,7 +59,7 @@ const renderIde = () => (  "port": 1337,
-  "autoReload": true, +  "autoReload": { enabled: true },
 "proxi": { From 45a60ce044ed7374356d43bd6464f5e5ef48a31d Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 8 Aug 2018 00:42:08 +0200 Subject: [PATCH 6/7] doc(configurations): autoReload object --- docs/3.x.x/en/configurations/configurations.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/3.x.x/en/configurations/configurations.md b/docs/3.x.x/en/configurations/configurations.md index 56a2ba4d51..66e6ab89a5 100644 --- a/docs/3.x.x/en/configurations/configurations.md +++ b/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` From eace470998e8fdcaccabf0c3e7d391fc02bf4a1c Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Wed, 29 Aug 2018 12:14:54 +0200 Subject: [PATCH 7/7] Fix build --- .../lib/src/components/BlockerComponent/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js index 97d0f66893..1826abc4c5 100644 --- a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js @@ -59,7 +59,7 @@ const renderIde = () => (  "port": 1337,
-  "autoReload": { enabled: true }, +  "autoReload": { enabled: true }
 "proxi": {