From ec9ddf051633ba8ce08c95f1ad70f616a96f384f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 8 Jan 2025 10:00:07 +0000 Subject: [PATCH] HPCC-33179 Ensure relative pathing for "src" folder Signed-off-by: Gordon Smith --- esp/src/src/ESPSearch.ts | 8 ++++---- esp/src/src/Session.ts | 2 +- esp/src/src/Utility.ts | 12 ++++++------ esp/src/src/WsTopology.ts | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/esp/src/src/ESPSearch.ts b/esp/src/src/ESPSearch.ts index 357ba2432c5..5991bd39265 100644 --- a/esp/src/src/ESPSearch.ts +++ b/esp/src/src/ESPSearch.ts @@ -1,8 +1,8 @@ import * as Observable from "dojo/store/Observable"; -import * as ESPWorkunit from "src/ESPWorkunit"; -import * as ESPDFUWorkunit from "src/ESPDFUWorkunit"; -import * as ESPLogicalFile from "src/ESPLogicalFile"; -import * as ESPQuery from "src/ESPQuery"; +import * as ESPWorkunit from "./ESPWorkunit"; +import * as ESPDFUWorkunit from "./ESPDFUWorkunit"; +import * as ESPLogicalFile from "./ESPLogicalFile"; +import * as ESPQuery from "./ESPQuery"; import { Memory } from "./store/Memory"; import * as WsWorkunits from "./WsWorkunits"; import * as FileSpray from "./FileSpray"; diff --git a/esp/src/src/Session.ts b/esp/src/src/Session.ts index 10c6fe5e186..eb0afbd70a9 100644 --- a/esp/src/src/Session.ts +++ b/esp/src/src/Session.ts @@ -4,7 +4,7 @@ import * as topic from "dojo/topic"; import { format as d3Format } from "@hpcc-js/common"; import { SMCService } from "@hpcc-js/comms"; import { scopedLogger } from "@hpcc-js/util"; -import { cookieKeyValStore, sessionKeyValStore, userKeyValStore } from "src/KeyValStore"; +import { cookieKeyValStore, sessionKeyValStore, userKeyValStore } from "./KeyValStore"; import { singletonDebounce } from "../src-react/util/throttle"; import { parseSearch, replaceUrl } from "../src-react/util/history"; import { ModernMode } from "./BuildInfo"; diff --git a/esp/src/src/Utility.ts b/esp/src/src/Utility.ts index d17b93257cb..be9e751b388 100644 --- a/esp/src/src/Utility.ts +++ b/esp/src/src/Utility.ts @@ -5,7 +5,7 @@ import * as arrayUtil from "dojo/_base/array"; import * as domConstruct from "dojo/dom-construct"; import * as entities from "dojox/html/entities"; import { darkTheme } from "../src-react/themes"; -import nlsHPCC from "src/nlsHPCC"; +import nlsHPCC from "./nlsHPCC"; declare const dojoConfig; declare const ActiveXObject; @@ -631,7 +631,7 @@ export function resolve(hpccWidget, callback) { require(["hpcc/viz/DojoD3NDChart"], doLoad); break; case "DataPatternsWidget": - require(["src/DataPatternsWidget"], doLoad); + require(["./DataPatternsWidget"], doLoad); break; case "DynamicESDLDefinitionDetailsWidget": require(["hpcc/DynamicESDLDefinitionDetailsWidget"], doLoad); @@ -655,7 +655,7 @@ export function resolve(hpccWidget, callback) { require(["hpcc/ECLPlaygroundWidget"], doLoad); break; case "ECLArchiveWidget": - require(["src/ECLArchiveWidget"], doLoad); + require(["./ECLArchiveWidget"], doLoad); break; case "ECLSourceWidget": require(["hpcc/ECLSourceWidget"], doLoad); @@ -710,13 +710,13 @@ export function resolve(hpccWidget, callback) { require(["hpcc/GraphsLFWidget"], doLoad); break; case "GraphTreeWidget": - require(["src/GraphTreeWidget"], doLoad); + require(["./GraphTreeWidget"], doLoad); break; case "GraphTree7Widget": - require(["src/GraphTree7Widget"], doLoad); + require(["./GraphTree7Widget"], doLoad); break; case "Graph7Widget": - require(["src/Graph7Widget"], doLoad); + require(["./Graph7Widget"], doLoad); break; case "GridDetailsWidget": require(["hpcc/GridDetailsWidget"], doLoad); diff --git a/esp/src/src/WsTopology.ts b/esp/src/src/WsTopology.ts index 6c88185fe2f..b8bc7ff363a 100644 --- a/esp/src/src/WsTopology.ts +++ b/esp/src/src/WsTopology.ts @@ -1,7 +1,7 @@ import { Connection, ResourcesService, Topology } from "@hpcc-js/comms"; import { scopedLogger } from "@hpcc-js/util"; -import { containerized } from "src/BuildInfo"; -import { Memory } from "src/store/Memory"; +import { containerized } from "./BuildInfo"; +import { Memory } from "./store/Memory"; import * as arrayUtil from "dojo/_base/array"; import * as Deferred from "dojo/_base/Deferred"; import * as lang from "dojo/_base/lang";