From 1ad77f49ef7009dd028e0d4f96e15ef80d49001c Mon Sep 17 00:00:00 2001 From: space-nuko <24979496+space-nuko@users.noreply.github.com> Date: Fri, 7 Apr 2023 01:05:02 -0500 Subject: [PATCH] blah --- .gitmodules | 3 ++ package.json | 99 +++++++++++++++++----------------- pnpm-lock.yaml | 68 ++++++++++++++++++----- pnpm-workspace.yaml | 1 + src/lib/components/ComfyApp.ts | 1 + tsconfig.json | 5 +- turbo.json | 13 +++++ vite.config.ts | 5 +- 8 files changed, 131 insertions(+), 64 deletions(-) create mode 100644 turbo.json diff --git a/.gitmodules b/.gitmodules index acb0ba7..ddec2b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = gradio url = https://github.com/gradio-app/gradio branch = v3.24.1 +[submodule "litegraph"] + path = litegraph + url = https://github.com/space-nuko/litegraph.js diff --git a/package.json b/package.json index a6ab605..c1ed4ae 100644 --- a/package.json +++ b/package.json @@ -1,50 +1,53 @@ { - "name": "web2", - "version": "0.0.1", - "private": true, - "scripts": { - "dev": "vite dev", - "build": "vite build", - "preview": "vite preview", - "check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json", - "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch", - "test:unit": "vitest", - "lint": "prettier --plugin-search-dir . --check . && eslint .", - "format": "prettier --plugin-search-dir . --write .", - "svelte-check": "svelte-check", - "build:css": "pollen -c gradio/js/theme/src/pollen.config.cjs && mv src/pollen.css node_modules/@gradio/theme/src" - }, - "devDependencies": { - "@sveltejs/adapter-auto": "^2.0.0", - "@sveltejs/kit": "^1.5.0", - "eslint": "^8.28.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-svelte3": "^4.0.0", - "prettier": "^2.8.0", - "prettier-plugin-svelte": "^2.8.1", - "svelte": "^3.54.0", - "svelte-check": "^3.2.0", - "svelte-dnd-action": "^0.9.22", - "typescript": "^5.0.0", - "vite": "^4.2.0", - "vitest": "^0.25.3" - }, - "type": "module", - "dependencies": { - "@gradio/atoms": "workspace:^0.0.1", - "@gradio/button": "workspace:^0.0.1", - "@gradio/form": "workspace:^0.0.1", - "@gradio/icons": "workspace:^0.0.1", - "@gradio/theme": "workspace:^0.0.1", - "@gradio/utils": "workspace:^0.0.1", - "events": "^3.3.0", - "litegraph.js": "^0.7.12", - "pollen-css": "^4.6.2", - "radix-icons-svelte": "^1.2.1", - "svelte-preprocess": "^5.0.3", - "svelte-splitpanes": "^0.7.13", - "tailwindcss": "^3.0.12", - "typed-emitter": "github:andywer/typed-emitter", - "vite-plugin-full-reload": "^1.0.5" - } + "name": "web2", + "version": "0.0.1", + "private": true, + "scripts": { + "dev": "vite dev", + "build": "vite build", + "preview": "vite preview", + "check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json", + "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch", + "test:unit": "vitest", + "lint": "prettier --plugin-search-dir . --check . && eslint .", + "format": "prettier --plugin-search-dir . --write .", + "svelte-check": "svelte-check", + "build:css": "pollen -c gradio/js/theme/src/pollen.config.cjs && mv src/pollen.css node_modules/@gradio/theme/src" + }, + "devDependencies": { + "@sveltejs/adapter-auto": "^2.0.0", + "@sveltejs/kit": "^1.5.0", + "eslint": "^8.28.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-svelte3": "^4.0.0", + "prettier": "^2.8.0", + "prettier-plugin-svelte": "^2.8.1", + "svelte": "^3.54.0", + "svelte-check": "^3.2.0", + "svelte-dnd-action": "^0.9.22", + "typescript": "^5.0.0", + "vite": "^4.2.0", + "vite-tsconfig-paths": "^4.0.8", + "vitest": "^0.25.3" + }, + "type": "module", + "dependencies": { + "@gradio/atoms": "workspace:*", + "@gradio/button": "workspace:*", + "@gradio/client": "^0.0.1", + "@gradio/form": "workspace:*", + "@gradio/icons": "workspace:*", + "@gradio/theme": "workspace:*", + "@gradio/utils": "workspace:*", + "events": "^3.3.0", + "@litegraph-ts/core": "workspace:*", + "@litegraph-ts/nodes-basic": "workspace:*", + "pollen-css": "^4.6.2", + "radix-icons-svelte": "^1.2.1", + "svelte-preprocess": "^5.0.3", + "svelte-splitpanes": "^0.7.13", + "tailwindcss": "^3.0.12", + "typed-emitter": "github:andywer/typed-emitter", + "vite-plugin-full-reload": "^1.0.5" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 28ee033..5aa7194 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,19 +4,21 @@ importers: .: specifiers: - '@gradio/atoms': workspace:^0.0.1 - '@gradio/button': workspace:^0.0.1 - '@gradio/form': workspace:^0.0.1 - '@gradio/icons': workspace:^0.0.1 - '@gradio/theme': workspace:^0.0.1 - '@gradio/utils': workspace:^0.0.1 + '@gradio/atoms': workspace:* + '@gradio/button': workspace:* + '@gradio/client': ^0.0.1 + '@gradio/form': workspace:* + '@gradio/icons': workspace:* + '@gradio/theme': workspace:* + '@gradio/utils': workspace:* + '@litegraph-ts/core': workspace:* + '@litegraph-ts/nodes-basic': workspace:* '@sveltejs/adapter-auto': ^2.0.0 '@sveltejs/kit': ^1.5.0 eslint: ^8.28.0 eslint-config-prettier: ^8.5.0 eslint-plugin-svelte3: ^4.0.0 events: ^3.3.0 - litegraph.js: ^0.7.12 pollen-css: ^4.6.2 prettier: ^2.8.0 prettier-plugin-svelte: ^2.8.1 @@ -31,16 +33,19 @@ importers: typescript: ^5.0.0 vite: ^4.2.0 vite-plugin-full-reload: ^1.0.5 + vite-tsconfig-paths: ^4.0.8 vitest: ^0.25.3 dependencies: '@gradio/atoms': link:gradio/js/atoms '@gradio/button': link:gradio/js/button + '@gradio/client': 0.0.1 '@gradio/form': link:gradio/js/form '@gradio/icons': link:gradio/js/icons '@gradio/theme': link:gradio/js/theme '@gradio/utils': link:gradio/js/utils + '@litegraph-ts/core': link:litegraph/packages/core + '@litegraph-ts/nodes-basic': link:litegraph/packages/nodes-basic events: 3.3.0 - litegraph.js: 0.7.12 pollen-css: 4.6.2 radix-icons-svelte: 1.2.1 svelte-preprocess: 5.0.3_ex2livsgfbezl6rd73hucsky7y @@ -61,8 +66,17 @@ importers: svelte-dnd-action: 0.9.22_svelte@3.58.0 typescript: 5.0.3 vite: 4.2.1 + vite-tsconfig-paths: 4.0.8_mqt6hr36lqfsnn3kcfure5ceka vitest: 0.25.8 + litegraph/packages/editor: + specifiers: + typescript: ^5.0.3 + vite: ^4.2.1 + dependencies: + typescript: 5.0.3 + vite: 4.2.1 + packages: /@esbuild/android-arm/0.17.15: @@ -278,6 +292,10 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true + /@gradio/client/0.0.1: + resolution: {integrity: sha512-JWa2CRVtr62jtoqBNBHRLwE44HmnvYrUpw7p7S0jJdSpy51IPvG4yoYXrFB7YgsSA7erUoWuz/H3oub6Ja6gwQ==} + dev: false + /@humanwhocodes/config-array/0.11.8: resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} engines: {node: '>=10.10.0'} @@ -1085,10 +1103,6 @@ packages: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: false - /litegraph.js/0.7.12: - resolution: {integrity: sha512-aQUj5jxKtQLzY0+qQ6YmIfa6EOqhI8lXlJPwEpJFFUir893ulVcDt9YIMFA9rwBDg4/HlFyAUGmwktAduebm9Q==} - dev: false - /local-pkg/0.4.3: resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} engines: {node: '>=14'} @@ -1767,6 +1781,19 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false + /tsconfck/2.1.1_typescript@5.0.3: + resolution: {integrity: sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww==} + engines: {node: ^14.13.1 || ^16 || >=18} + hasBin: true + peerDependencies: + typescript: ^4.3.5 || ^5.0.0 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + typescript: 5.0.3 + dev: true + /tslib/2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} dev: false @@ -1821,6 +1848,23 @@ packages: vite: 4.2.1 dev: false + /vite-tsconfig-paths/4.0.8_mqt6hr36lqfsnn3kcfure5ceka: + resolution: {integrity: sha512-p04zH+Ey+NT78571x0pdX7nVRIJSlmKVvYryFglSWOK3Hc72eDL0+JJfbyQiugaIBApJkaEqbBQvqpsFZOSVGg==} + peerDependencies: + vite: '*' + peerDependenciesMeta: + vite: + optional: true + dependencies: + debug: 4.3.4 + globrex: 0.1.2 + tsconfck: 2.1.1_typescript@5.0.3 + vite: 4.2.1 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /vite/4.2.1: resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} engines: {node: ^14.18.0 || >=16.0.0} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 907ea93..d5a678d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,3 @@ packages: - 'gradio/js/*' + - 'litegraph/packages/*' diff --git a/src/lib/components/ComfyApp.ts b/src/lib/components/ComfyApp.ts index eac9ea0..afb9588 100644 --- a/src/lib/components/ComfyApp.ts +++ b/src/lib/components/ComfyApp.ts @@ -32,6 +32,7 @@ export default class ComfyApp { constructor() { this.api = new ComfyAPI(); + this.eventBus. } async setup(): Promise { diff --git a/tsconfig.json b/tsconfig.json index aa43546..fcdfe27 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,14 +2,13 @@ "extends": "./.svelte-kit/tsconfig.json", "exclude": ["node_modules/litegraph.js/src/*"], "compilerOptions": { - "baseUrl": "./src", "typeRoots": [ "types", "../node_modules/@types" ], "paths": { - "$lib": ["../src/lib"], - "$lib/*": ["../src/lib/*"] + "$lib": ["./src/lib"], + "$lib/*": ["./src/lib/*"] } } } diff --git a/turbo.json b/turbo.json new file mode 100644 index 0000000..606e340 --- /dev/null +++ b/turbo.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://turbo.build/schema.json", + "pipeline": { + "dev": { + "cache": false, + "persistent": true + }, + "build": { + "true": false, + "persistent": false + } + } +} diff --git a/vite.config.ts b/vite.config.ts index d55e93d..062c6bc 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,9 +1,12 @@ import { sveltekit } from '@sveltejs/kit/vite'; import { defineConfig } from 'vitest/config'; -import FullReload from 'vite-plugin-full-reload' +import tsconfigPaths from 'vite-tsconfig-paths'; +import FullReload from 'vite-plugin-full-reload'; export default defineConfig({ + clearScreen: false, plugins: [ + tsconfigPaths({loose: true}), sveltekit(), FullReload(["src/**/*.{js,ts,svelte}"]) ],