Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-33179 Ensure relative pathing for "src" folder #19383

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions esp/src/src/ESPSearch.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src/Session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
12 changes: 6 additions & 6 deletions esp/src/src/Utility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions esp/src/src/WsTopology.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Loading