From acaa36085b1101b3abb651d5d122f701bfcca3b0 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 15 Mar 2023 18:48:44 +0100 Subject: [PATCH] apply `load` -> `loadConfig` changes to `Oxide` engine CLI --- src/oxide/cli/build/plugin.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/oxide/cli/build/plugin.ts b/src/oxide/cli/build/plugin.ts index 99b3a267b29f..6edc883fad38 100644 --- a/src/oxide/cli/build/plugin.ts +++ b/src/oxide/cli/build/plugin.ts @@ -15,7 +15,8 @@ import { createWatcher } from './watching' import fastGlob from 'fast-glob' import { findAtConfigPath } from '../../../lib/findAtConfigPath' import log from '../../../util/log' -import { load } from '../../../lib/load-config' +import { loadConfig } from '../../../lib/load-config' +import getModuleDependencies from '../../../lib/getModuleDependencies' /** * @@ -142,10 +143,20 @@ let state = { loadConfig(configPath, content) { if (this.watcher && configPath) { - this.refreshConfigDependencies(configPath) + this.refreshConfigDependencies() } - this.configBag = load(configPath) + let config = loadConfig(configPath) + let dependencies = getModuleDependencies(configPath) + this.configBag = { + config, + dependencies, + dispose() { + for (let file of dependencies) { + delete require.cache[require.resolve(file)] + } + }, + } // @ts-ignore this.configBag.config = resolveConfig(this.configBag.config, { content: { files: [] } })