From 19d0f17efb517327da5fc6904dbe71eb979231ea Mon Sep 17 00:00:00 2001 From: Jim Laurie Date: Tue, 19 Sep 2017 08:55:38 +0200 Subject: [PATCH] Change autoReload config --- packages/strapi-admin/package.json | 10 +++++----- .../files/config/environments/development/server.json | 4 +++- .../files/config/environments/production/server.json | 4 +++- .../files/config/environments/test/server.json | 4 +++- packages/strapi-plugin-content-manager/package.json | 10 +++++----- packages/strapi-plugin-settings-manager/package.json | 10 +++++----- packages/strapi/bin/strapi-start.js | 2 +- packages/strapi/lib/Strapi.js | 4 ++-- packages/strapi/lib/reload.js | 2 +- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index b7e227b0ab..afa9c17343 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -30,10 +30,10 @@ }, "devDependencies": { "cross-env": "^5.0.5", - "eslint": "^4.6.1", + "eslint": "^4.7.0", "eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb-base": "^11.3.2", - "eslint-config-prettier": "^2.4.0", + "eslint-config-prettier": "^2.5.0", "eslint-import-resolver-webpack": "^0.8.3", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-import": "^2.7.0", @@ -44,10 +44,10 @@ "html-loader": "^0.4.3", "html-webpack-plugin": "^2.22.0", "plop": "^1.8.1", - "prettier": "^1.6.1", - "rimraf": "^2.6.1", + "prettier": "^1.7.0", + "rimraf": "^2.6.2", "strapi-helper-plugin": "3.0.0-alpha.5.5", - "webpack": "^3.5.6" + "webpack": "^3.6.0" }, "author": { "name": "Strapi", diff --git a/packages/strapi-generate-new/files/config/environments/development/server.json b/packages/strapi-generate-new/files/config/environments/development/server.json index e25919c5fa..2c9235833f 100755 --- a/packages/strapi-generate-new/files/config/environments/development/server.json +++ b/packages/strapi-generate-new/files/config/environments/development/server.json @@ -1,7 +1,9 @@ { "host": "localhost", "port": 1337, - "autoReload": true, + "autoReload": { + "enabled": true + }, "cron": { "enabled": false } diff --git a/packages/strapi-generate-new/files/config/environments/production/server.json b/packages/strapi-generate-new/files/config/environments/production/server.json index 69fc2c329a..fd731f3c21 100755 --- a/packages/strapi-generate-new/files/config/environments/production/server.json +++ b/packages/strapi-generate-new/files/config/environments/production/server.json @@ -1,7 +1,9 @@ { "host": "localhost", "port": 1337, - "autoReload": false, + "autoReload": { + "enabled": false + }, "cron": { "enabled": false } diff --git a/packages/strapi-generate-new/files/config/environments/test/server.json b/packages/strapi-generate-new/files/config/environments/test/server.json index e25919c5fa..2c9235833f 100755 --- a/packages/strapi-generate-new/files/config/environments/test/server.json +++ b/packages/strapi-generate-new/files/config/environments/test/server.json @@ -1,7 +1,9 @@ { "host": "localhost", "port": 1337, - "autoReload": true, + "autoReload": { + "enabled": true + }, "cron": { "enabled": false } diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index aa5d9f64d9..1d61f80fb8 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -48,10 +48,10 @@ }, "devDependencies": { "cross-env": "^5.0.5", - "eslint": "^4.6.1", + "eslint": "^4.7.0", "eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb-base": "^11.3.2", - "eslint-config-prettier": "^2.4.0", + "eslint-config-prettier": "^2.5.0", "eslint-import-resolver-webpack": "^0.8.3", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-import": "^2.7.0", @@ -59,9 +59,9 @@ "eslint-plugin-react": "^7.3.0", "eslint-plugin-redux-saga": "^0.4.0", "plop": "^1.8.1", - "prettier": "^1.6.1", - "rimraf": "^2.6.1", + "prettier": "^1.7.0", + "rimraf": "^2.6.2", "strapi-helper-plugin": "3.0.0-alpha.5.5", - "webpack": "^3.5.6" + "webpack": "^3.6.0" } } \ No newline at end of file diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index 02cc3a98e8..15b5f305e5 100644 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -35,10 +35,10 @@ }, "devDependencies": { "cross-env": "^5.0.5", - "eslint": "^4.6.1", + "eslint": "^4.7.0", "eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb-base": "^11.3.2", - "eslint-config-prettier": "^2.4.0", + "eslint-config-prettier": "^2.5.0", "eslint-import-resolver-webpack": "^0.8.3", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-import": "^2.7.0", @@ -46,10 +46,10 @@ "eslint-plugin-react": "^7.3.0", "eslint-plugin-redux-saga": "^0.4.0", "plop": "^1.8.1", - "prettier": "^1.6.1", - "rimraf": "^2.6.1", + "prettier": "^1.7.0", + "rimraf": "^2.6.2", "strapi-helper-plugin": "3.0.0-alpha.5.5", - "webpack": "^3.5.6" + "webpack": "^3.6.0" }, "author": { "name": "Strapi team", diff --git a/packages/strapi/bin/strapi-start.js b/packages/strapi/bin/strapi-start.js index b2e0c8fb89..2af71180d6 100644 --- a/packages/strapi/bin/strapi-start.js +++ b/packages/strapi/bin/strapi-start.js @@ -50,7 +50,7 @@ module.exports = function() { 'server.json' )); - if (process.env.NODE_ENV === 'development' && server.autoReload === true) { + if (process.env.NODE_ENV === 'development' && _.get(server, 'autoReload.enabled') === true) { const restart = path => { if (strapi.reload.isWatching && cluster.isWorker && !strapi.reload.isReloading) { strapi.reload.isReloading = true; diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js index e21229fd6c..d3510c8f86 100644 --- a/packages/strapi/lib/Strapi.js +++ b/packages/strapi/lib/Strapi.js @@ -138,7 +138,7 @@ class Strapi extends EventEmitter { // Destroy server and available connections. this.server.destroy(); - if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload') === true) process.send('stop'); + if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload.enabled') === true) process.send('stop'); // Kill process. process.exit(0); @@ -173,7 +173,7 @@ class Strapi extends EventEmitter { reload() { const reload = function() { - if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload') === true) process.send('reload'); + if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload.enabled') === true) process.send('reload'); }; reload.isReloading = false; diff --git a/packages/strapi/lib/reload.js b/packages/strapi/lib/reload.js index 85c9e57d98..a957855a1f 100644 --- a/packages/strapi/lib/reload.js +++ b/packages/strapi/lib/reload.js @@ -20,7 +20,7 @@ module.exports = function reload() { try { const reload = function() { - if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload') === true) process.send('reload'); + if (cluster.isWorker && process.env.NODE_ENV === 'development' && get(this.config, 'currentEnvironment.server.autoReload.enabled') === true) process.send('reload'); }; reload.isReloading = false;