From 05cb1406bbceba13f74c7d1ac1f4c1c6fb361a7e Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 25 Dec 2022 15:57:48 +0000 Subject: [PATCH] Fix extension path to make debugging easier in VS Code (#15741) * Fix extension path to make debugginge easier in VScode * Fix linting error --- lib/extension/externalExtension.ts | 4 ++-- lib/util/utils.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/extension/externalExtension.ts b/lib/extension/externalExtension.ts index d7aaf961f..a59c5a273 100644 --- a/lib/extension/externalExtension.ts +++ b/lib/extension/externalExtension.ts @@ -56,7 +56,7 @@ export default class ExternalExtension extends Extension { @bind private async saveExtension(message: KeyValue): Promise { const {name, code} = message; - const ModuleConstructor = utils.loadModuleFromText(code) as typeof Extension; + const ModuleConstructor = utils.loadModuleFromText(code, name) as typeof Extension; await this.loadExtension(ModuleConstructor); const basePath = this.getExtensionsBasePath(); /* istanbul ignore else */ @@ -95,7 +95,7 @@ export default class ExternalExtension extends Extension { private loadUserDefinedExtensions(): void { const extensions = this.getListOfUserDefinedExtensions(); extensions - .map(({code}) => utils.loadModuleFromText(code)) + .map(({code, name}) => utils.loadModuleFromText(code, name)) .map(this.loadExtension); } diff --git a/lib/util/utils.ts b/lib/util/utils.ts index 07479a68d..9d06deef2 100644 --- a/lib/util/utils.ts +++ b/lib/util/utils.ts @@ -134,8 +134,8 @@ function parseJSON(value: string, fallback: string): KeyValue | string { } } -function loadModuleFromText(moduleCode: string): unknown { - const moduleFakePath = path.join(__dirname, 'externally-loaded.js'); +function loadModuleFromText(moduleCode: string, name?: string): unknown { + const moduleFakePath = path.join(__dirname, '..', '..', 'data', 'extension', name || 'externally-loaded.js'); const sandbox = { require: require, module: {},