diff --git a/tests-ui/tests/groupNode.test.js b/tests-ui/tests/groupNode.test.js
index 53a5828d1..76f517456 100644
--- a/tests-ui/tests/groupNode.test.js
+++ b/tests-ui/tests/groupNode.test.js
@@ -432,7 +432,7 @@ describe("group node", () => {
nodes.save,
]);
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
api.dispatchEvent(new CustomEvent("execution_start", {}));
api.dispatchEvent(new CustomEvent("executing", { detail: `${nodes.save.id}` }));
diff --git a/tests-ui/tests/users.test.js b/tests-ui/tests/users.test.js
index 5e0730730..5cb27222f 100644
--- a/tests-ui/tests/users.test.js
+++ b/tests-ui/tests/users.test.js
@@ -22,7 +22,7 @@ describe("users", () => {
describe("multi-user", () => {
function mockAddStylesheet() {
- const utils = require("../../web/scripts/utils");
+ const utils = require("../../dist/scripts/utils");
utils.addStylesheet = jest.fn().mockReturnValue(Promise.resolve());
}
@@ -30,7 +30,7 @@ describe("users", () => {
mockAddStylesheet();
// Wait for "show" to be called
- const { UserSelectionScreen } = require("../../web/scripts/ui/userSelection");
+ const { UserSelectionScreen } = require("../../dist/scripts/ui/userSelection");
let resolve, reject;
const fn = UserSelectionScreen.prototype.show;
const p = new Promise((res, rej) => {
@@ -87,7 +87,7 @@ describe("users", () => {
expect(window.getComputedStyle(menu)?.display).not.toBe("none");
// Ensure settings + templates are saved
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
expect(api.createUser).toHaveBeenCalledTimes(+isCreate);
expect(api.storeSettings).toHaveBeenCalledTimes(+isCreate);
expect(api.storeUserData).toHaveBeenCalledTimes(+isCreate);
@@ -226,7 +226,7 @@ describe("users", () => {
expectNoUserScreen();
// It should store the settings
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
expect(api.storeSettings).toHaveBeenCalledTimes(1);
expect(api.storeUserData).toHaveBeenCalledTimes(1);
expect(api.storeUserData).toHaveBeenCalledWith("comfy.templates.json", null, { stringify: false });
@@ -240,7 +240,7 @@ describe("users", () => {
expectNoUserScreen();
// It should store the settings
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
expect(api.storeSettings).toHaveBeenCalledTimes(0);
expect(api.storeUserData).toHaveBeenCalledTimes(0);
expect(app.isNewUserSession).toBeFalsy();
@@ -264,7 +264,7 @@ describe("users", () => {
expectNoUserScreen();
// It should store the settings
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
expect(api.storeSettings).toHaveBeenCalledTimes(0);
expect(api.storeUserData).toHaveBeenCalledTimes(0);
expect(app.isNewUserSession).toBeFalsy();
@@ -277,7 +277,7 @@ describe("users", () => {
expectNoUserScreen();
// It should store the settings
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
expect(api.storeSettings).toHaveBeenCalledTimes(0);
expect(api.storeUserData).toHaveBeenCalledTimes(0);
expect(app.isNewUserSession).toBeFalsy();
diff --git a/tests-ui/utils/ezgraph.js b/tests-ui/utils/ezgraph.js
index 97be7aa72..a231eec20 100644
--- a/tests-ui/utils/ezgraph.js
+++ b/tests-ui/utils/ezgraph.js
@@ -1,13 +1,13 @@
// @ts-check
-///
+///
/**
- * @typedef { import("../../web/scripts/app")["app"] } app
- * @typedef { import("../../web/types/litegraph") } LG
- * @typedef { import("../../web/types/litegraph").IWidget } IWidget
- * @typedef { import("../../web/types/litegraph").ContextMenuItem } ContextMenuItem
- * @typedef { import("../../web/types/litegraph").INodeInputSlot } INodeInputSlot
- * @typedef { import("../../web/types/litegraph").INodeOutputSlot } INodeOutputSlot
+ * @typedef { import("../../dist/scripts/app")["app"] } app
+ * @typedef { import("../../dist/types/litegraph") } LG
+ * @typedef { import("../../dist/types/litegraph").IWidget } IWidget
+ * @typedef { import("../../dist/types/litegraph").ContextMenuItem } ContextMenuItem
+ * @typedef { import("../../dist/types/litegraph").INodeInputSlot } INodeInputSlot
+ * @typedef { import("../../dist/types/litegraph").INodeOutputSlot } INodeOutputSlot
* @typedef { InstanceType & { widgets?: Array } } LGNode
* @typedef { (...args: EzOutput[] | [...EzOutput[], Record]) => EzNode } EzNodeFactory
*/
diff --git a/tests-ui/utils/index.js b/tests-ui/utils/index.js
index 74b6cf93d..2571c1b69 100644
--- a/tests-ui/utils/index.js
+++ b/tests-ui/utils/index.js
@@ -4,7 +4,7 @@ const lg = require("./litegraph");
const fs = require("fs");
const path = require("path");
-const html = fs.readFileSync(path.resolve(__dirname, "../../web/index.html"))
+const html = fs.readFileSync(path.resolve(__dirname, "../../dist/index.html"))
/**
*
@@ -28,7 +28,7 @@ export async function start(config = {}) {
document.body.innerHTML = html;
mockApi(config);
- const { app } = require("../../web/scripts/app");
+ const { app } = require("../../dist/scripts/app");
config.preSetup?.(app);
await app.setup();
@@ -49,7 +49,7 @@ export async function checkBeforeAndAfterReload(graph, cb) {
* @param { string } name
* @param { Record } input
* @param { (string | string[])[] | Record } output
- * @returns { Record }
+ * @returns { Record }
*/
export function makeNodeDef(name, input, output = {}) {
const nodeDef = {
@@ -120,7 +120,7 @@ export function createDefaultWorkflow(ez, graph) {
}
export async function getNodeDefs() {
- const { api } = require("../../web/scripts/api");
+ const { api } = require("../../dist/scripts/api");
return api.getNodeDefs();
}
diff --git a/tests-ui/utils/litegraph.js b/tests-ui/utils/litegraph.js
index 777f8c3ba..804c92d68 100644
--- a/tests-ui/utils/litegraph.js
+++ b/tests-ui/utils/litegraph.js
@@ -18,14 +18,14 @@ function forEachKey(cb) {
}
export function setup(ctx) {
- const lg = fs.readFileSync(path.resolve("../web/lib/litegraph.core.js"), "utf-8");
+ const lg = fs.readFileSync(path.resolve("../dist/lib/litegraph.core.js"), "utf-8");
const globalTemp = {};
(function (console) {
eval(lg);
}).call(globalTemp, nop);
forEachKey((k) => (ctx[k] = globalTemp[k]));
- require(path.resolve("../web/lib/litegraph.extensions.js"));
+ require(path.resolve("../dist/lib/litegraph.extensions.js"));
}
export function teardown(ctx) {
diff --git a/tests-ui/utils/setup.js b/tests-ui/utils/setup.js
index e46258943..66579256f 100644
--- a/tests-ui/utils/setup.js
+++ b/tests-ui/utils/setup.js
@@ -1,4 +1,4 @@
-require("../../web/scripts/api");
+require("../../dist/scripts/api");
const fs = require("fs");
const path = require("path");
@@ -14,7 +14,7 @@ function* walkSync(dir) {
}
/**
- * @typedef { import("../../web/types/comfy").ComfyObjectInfo } ComfyObjectInfo
+ * @typedef { import("../../dist/types/comfy").ComfyObjectInfo } ComfyObjectInfo
*/
/**
@@ -34,7 +34,7 @@ export function mockApi(config = {}) {
...config,
};
if (!mockExtensions) {
- mockExtensions = Array.from(walkSync(path.resolve("../web/extensions/core")))
+ mockExtensions = Array.from(walkSync(path.resolve("../dist/extensions/core")))
.filter((x) => x.endsWith(".js"))
.map((x) => path.relative(path.resolve("../web"), x));
}
@@ -51,7 +51,7 @@ export function mockApi(config = {}) {
getExtensions: jest.fn(() => mockExtensions),
getNodeDefs: jest.fn(() => mockNodeDefs),
init: jest.fn(),
- apiURL: jest.fn((x) => "../../web/" + x),
+ apiURL: jest.fn((x) => "../../dist/" + x),
createUser: jest.fn((username) => {
if(username in userConfig.users) {
return { status: 400, json: () => "Duplicate" }
@@ -73,7 +73,7 @@ export function mockApi(config = {}) {
userData[file] = data;
}),
};
- jest.mock("../../web/scripts/api", () => ({
+ jest.mock("../../dist/scripts/api", () => ({
get api() {
return mockApi;
},