From 258b6541f61dc3a9ae64e200680766a11c3dd316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?=
 <weiran.zsd@outlook.com>
Date: Fri, 28 Dec 2018 18:59:07 +0800
Subject: [PATCH] Upgrade: require-uncached renamed to import-fresh (#11066)

---
 lib/config/config-file.js       |  4 ++--
 package.json                    |  2 +-
 tests/lib/config/config-file.js | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/config/config-file.js b/lib/config/config-file.js
index d09b3668846..dde79cb40c8 100644
--- a/lib/config/config-file.js
+++ b/lib/config/config-file.js
@@ -18,7 +18,7 @@ const fs = require("fs"),
     pathIsInside = require("path-is-inside"),
     stripComments = require("strip-json-comments"),
     stringify = require("json-stable-stringify-without-jsonify"),
-    requireUncached = require("require-uncached");
+    importFresh = require("import-fresh");
 
 const debug = require("debug")("eslint:config-file");
 
@@ -156,7 +156,7 @@ function loadLegacyConfigFile(filePath) {
 function loadJSConfigFile(filePath) {
     debug(`Loading JS config file: ${filePath}`);
     try {
-        return requireUncached(filePath);
+        return importFresh(filePath);
     } catch (e) {
         debug(`Error reading JavaScript file: ${filePath}`);
         e.message = `Cannot read config file: ${filePath}\nError: ${e.message}`;
diff --git a/package.json b/package.json
index fe0a0a82664..bf356703ec8 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "glob": "^7.1.2",
     "globals": "^11.7.0",
     "ignore": "^4.0.6",
+    "import-fresh": "^3.0.0",
     "imurmurhash": "^0.1.4",
     "inquirer": "^6.1.0",
     "js-yaml": "^3.12.0",
@@ -66,7 +67,6 @@
     "pluralize": "^7.0.0",
     "progress": "^2.0.0",
     "regexpp": "^2.0.1",
-    "require-uncached": "^1.0.3",
     "semver": "^5.5.1",
     "strip-ansi": "^4.0.0",
     "strip-json-comments": "^2.0.1",
diff --git a/tests/lib/config/config-file.js b/tests/lib/config/config-file.js
index 21fd9458396..944ed84260f 100644
--- a/tests/lib/config/config-file.js
+++ b/tests/lib/config/config-file.js
@@ -181,7 +181,7 @@ describe("ConfigFile", () => {
 
                 // Hacky: need to override isFile for each call for testing
                 "../util/module-resolver": createStubModuleResolver({ "eslint-config-foo": resolvedPath }),
-                "require-uncached"(filename) {
+                "import-fresh"(filename) {
                     return configDeps[filename];
                 }
             };
@@ -265,7 +265,7 @@ describe("ConfigFile", () => {
                 "../util/module-resolver": createStubModuleResolver({
                     "eslint-plugin-test": resolvedPath
                 }),
-                "require-uncached"(filename) {
+                "import-fresh"(filename) {
                     return configDeps[filename];
                 }
             };
@@ -296,7 +296,7 @@ describe("ConfigFile", () => {
                 "../util/module-resolver": createStubModuleResolver({
                     "eslint-plugin-test": resolvedPath
                 }),
-                "require-uncached"(filename) {
+                "import-fresh"(filename) {
                     return configDeps[filename];
                 }
             };
@@ -331,7 +331,7 @@ describe("ConfigFile", () => {
                     "eslint-config-foo": resolvedPaths[0],
                     "eslint-config-bar": resolvedPaths[1]
                 }),
-                "require-uncached"(filename) {
+                "import-fresh"(filename) {
                     return configDeps[filename];
                 }
             };
@@ -932,7 +932,7 @@ describe("ConfigFile", () => {
                 const resolvedPath = path.resolve(PROJECT_PATH, "./node_modules/eslint-plugin-test/index.js");
 
                 const configDeps = {
-                    "require-uncached"(filename) {
+                    "import-fresh"(filename) {
                         return configDeps[filename];
                     }
                 };