Revert "Use npm to manage litegraph dependency (#45)" (#47)

This reverts commit 4640eaf0ac.
This commit is contained in:
Chenlei Hu
2024-06-20 13:55:36 -04:00
committed by GitHub
parent 4640eaf0ac
commit 3ace859106
31 changed files with 16985 additions and 45 deletions

View File

@@ -1,4 +1,5 @@
import type { LiteGraph, LGraphCanvas } from "comfyui-litegraph";
// @ts-check
/// <reference path="../../src/types/litegraph.d.ts" />
/**
* @typedef { import("./src/scripts/app")["app"] } app
@@ -402,12 +403,12 @@ export const Ez = {
* console.log(saveNode);
* graph.arrange();
* @param { app } app
* @param { boolean } clearGraph
* @param { LG["LiteGraph"] } LiteGraph
* @param { LG["LGraphCanvas"] } LGraphCanvas
* @param { boolean } clearGraph
* @returns { { graph: EzGraph, ez: Record<string, EzNodeFactory> } }
*/
graph(app, LiteGraph, LGraphCanvas, clearGraph = true) {
graph(app, LiteGraph = window["LiteGraph"], LGraphCanvas = window["LGraphCanvas"], clearGraph = true) {
// Always set the active canvas so things work
LGraphCanvas.active_canvas = app.canvas;

View File

@@ -41,12 +41,11 @@ export async function start(config: StartConfig = {}): Promise<StartResult> {
mockApi(config);
const { app } = await import("../../src/scripts/app");
const { LiteGraph, LGraphCanvas } = await import("comfyui-litegraph");
config.preSetup?.(app);
await app.setup();
// @ts-ignore
return { ...Ez.graph(app, LiteGraph, LGraphCanvas), app };
return { ...Ez.graph(app, global["LiteGraph"], global["LGraphCanvas"]), app };
}
/**

View File

@@ -19,11 +19,19 @@ function forEachKey(cb) {
export default {
setup(ctx) {
const lg = fs.readFileSync(path.resolve("./src/lib/litegraph.core.js"), "utf-8");
const globalTemp = {};
(function (console) {
eval(lg);
}).call(globalTemp, nop);
forEachKey((k) => (ctx[k] = globalTemp[k]));
const lg_ext = fs.readFileSync(path.resolve("./src/lib/litegraph.extensions.js"), "utf-8");
eval(lg_ext);
},
teardown(ctx) {
// forEachKey((k) => delete ctx[k]);
forEachKey((k) => delete ctx[k]);
// Clear document after each run
document.getElementsByTagName("html")[0].innerHTML = "";