use decache when resolving config

master
Brad Cornes 2020-04-19 17:31:26 +01:00
parent 37bdf7439d
commit 65abae2abc
4 changed files with 92 additions and 0 deletions

View File

@ -1258,6 +1258,11 @@
"unset-value": "^1.0.0" "unset-value": "^1.0.0"
} }
}, },
"callsite": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
"integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
},
"callsites": { "callsites": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",

View File

@ -12,6 +12,7 @@
"author": "Brad Cornes <hello@bradley.dev>", "author": "Brad Cornes <hello@bradley.dev>",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"callsite": "^1.0.0",
"chokidar": "^3.3.1", "chokidar": "^3.3.1",
"dlv": "^1.1.3", "dlv": "^1.1.3",
"dset": "^2.0.1", "dset": "^2.0.1",

View File

@ -0,0 +1,84 @@
import * as path from 'path' // if module is locally defined we path.resolve it
import callsite from 'callsite'
import Module from 'module'
function find(moduleName) {
if (moduleName[0] === '.') {
var stack = callsite()
for (var i in stack) {
var filename = stack[i].getFileName()
// if (filename !== module.filename) {
moduleName = path.resolve(path.dirname(filename), moduleName)
break
// }
}
}
try {
return __non_webpack_require__.resolve(moduleName)
} catch (e) {
return
}
}
/**
* Removes a module from the cache. We need this to re-load our http_request !
* see: http://stackoverflow.com/a/14801711/1148249
*/
function decache(moduleName) {
moduleName = find(moduleName)
if (!moduleName) {
return
}
// Run over the cache looking for the files
// loaded by the specified module name
searchCache(moduleName, function(mod) {
delete __non_webpack_require__.cache[mod.id]
})
// Remove cached paths to the module.
// Thanks to @bentael for pointing this out.
Object.keys(Module.prototype.constructor._pathCache).forEach(function(
cacheKey
) {
if (cacheKey.indexOf(moduleName) > -1) {
delete Module.prototype.constructor._pathCache[cacheKey]
}
})
}
/**
* Runs over the cache to search for all the cached
* files
*/
function searchCache(moduleName, callback) {
// Resolve the module identified by the specified name
var mod = __non_webpack_require__.resolve(moduleName)
var visited = {}
// Check if the module has been resolved and found within
// the cache no else so #ignore else http://git.io/vtgMI
/* istanbul ignore else */
if (mod && (mod = __non_webpack_require__.cache[mod]) !== undefined) {
// Recursively go over the results
;(function run(current) {
visited[current.id] = true
// Go over each of the module's children and
// run over it
current.children.forEach(function(child) {
// ignore .node files, decachine native modules throws a
// "module did not self-register" error on second require
if (path.extname(child.filename) !== '.node' && !visited[child.id]) {
run(child)
}
})
// Call the specified callback providing the
// found module
callback(current)
})(mod)
}
}
export default decache

View File

@ -1,5 +1,6 @@
import importFrom from 'import-from' import importFrom from 'import-from'
import * as path from 'path' import * as path from 'path'
import decache from './decache'
export default function resolveConfig({ cwd, config }) { export default function resolveConfig({ cwd, config }) {
let resolve = x => x let resolve = x => x
@ -8,6 +9,7 @@ export default function resolveConfig({ cwd, config }) {
if (!cwd) { if (!cwd) {
cwd = path.dirname(config) cwd = path.dirname(config)
} }
decache(config)
config = __non_webpack_require__(config) config = __non_webpack_require__(config)
} }