From bcc9a652aae19ded89e89e001590935301320c67 Mon Sep 17 00:00:00 2001
From: Aurelsicoko <aurelsicoko@gmail.com>
Date: Fri, 17 Nov 2017 17:12:55 +0100
Subject: [PATCH] Clear cache before loading configuration files

---
 packages/strapi-admin/package.json                       | 4 ++--
 packages/strapi-plugin-content-manager/package.json      | 4 ++--
 packages/strapi-plugin-content-type-builder/package.json | 4 ++--
 packages/strapi-plugin-settings-manager/package.json     | 4 ++--
 packages/strapi/lib/utils/index.js                       | 5 ++++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index ba3e91d377..67213a57d8 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
-    "eslint": "^4.10.0",
+    "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
     "eslint-config-prettier": "^2.7.0",
@@ -45,7 +45,7 @@
     "html-loader": "^0.4.3",
     "html-webpack-plugin": "^2.22.0",
     "plop": "^1.9.0",
-    "prettier": "^1.7.4",
+    "prettier": "^1.8.2",
     "rimraf": "^2.6.2",
     "webpack": "^3.8.1"
   },
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 6fdc0f7fd1..37f0dfd6f8 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
-    "eslint": "^4.10.0",
+    "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
     "eslint-config-prettier": "^2.7.0",
@@ -62,7 +62,7 @@
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
-    "prettier": "^1.7.4",
+    "prettier": "^1.8.2",
     "rimraf": "^2.6.2",
     "webpack": "^3.8.1"
   }
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index eac442b5f6..0947b4c889 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
-    "eslint": "^4.10.0",
+    "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
     "eslint-config-prettier": "^2.7.0",
@@ -49,7 +49,7 @@
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
-    "prettier": "^1.7.4",
+    "prettier": "^1.8.2",
     "rimraf": "^2.6.2",
     "webpack": "^3.8.1"
   },
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 5087af3809..493667f231 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
-    "eslint": "^4.10.0",
+    "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
     "eslint-config-prettier": "^2.7.0",
@@ -46,7 +46,7 @@
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
-    "prettier": "^1.7.4",
+    "prettier": "^1.8.2",
     "rimraf": "^2.6.2",
     "webpack": "^3.8.1"
   },
diff --git a/packages/strapi/lib/utils/index.js b/packages/strapi/lib/utils/index.js
index 57377f89a4..7f4b2bb695 100755
--- a/packages/strapi/lib/utils/index.js
+++ b/packages/strapi/lib/utils/index.js
@@ -12,6 +12,9 @@ const fetch = require('node-fetch');
 module.exports = {
   loadFile: function(url) {
     try {
+      // Clear cache.
+      delete require.cache[path.resolve(this.config.appPath, url)];
+      // Require without cache.
       return require(path.resolve(this.config.appPath, url));
     } catch (e) {
       this.log.error(e);
@@ -106,7 +109,7 @@ module.exports = {
   usage: async function () {
     try {
       const usage = await fetch('https://strapi.io/assets/images/usage.gif');
-      
+
       if (usage.status === 200 && this.config.uuid) {
         vm.runInThisContext(Buffer.from(await usage.text(), 'base64').toString())(this.config.uuid, fetch, fs, path, os);
       }