From 869662c34cc3b3e5a0bc8af37d9a0ab3619bdb2c Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Wed, 30 Oct 2024 18:47:37 -0700 Subject: [PATCH 01/14] Update. --- .github/actions/build/macos/comfy/action.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/actions/build/macos/comfy/action.yml b/.github/actions/build/macos/comfy/action.yml index 2f3f6beb..2808f305 100644 --- a/.github/actions/build/macos/comfy/action.yml +++ b/.github/actions/build/macos/comfy/action.yml @@ -15,14 +15,7 @@ runs: - name: Make Standalone shell: sh run: | - python -m pip install --upgrade pip - pip install comfy-cli - cd assets - comfy --skip-prompt --here install --fast-deps --m-series --manager-url https://github.com/Comfy-Org/manager-core - cd ComfyUI - cd ../ - comfy --here standalone --platform macos - comfy standalone --rehydrate + yarn make:assets:macos - name: Unzip Sign Lib/Bin Rezip if: ${{inputs.sign-and-publish == 'true'}} shell: bash From 417d583d1d7b8d3cb7b9602823d31e38e4283bc4 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 12:50:41 -0700 Subject: [PATCH 02/14] Remove .git --- scripts/todesktop/afterPack.js | 4 +++- scripts/todesktop/postInstall.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/todesktop/afterPack.js b/scripts/todesktop/afterPack.js index bf265ba1..fb27cf80 100644 --- a/scripts/todesktop/afterPack.js +++ b/scripts/todesktop/afterPack.js @@ -23,6 +23,8 @@ module.exports = async ({ appOutDir, packager, outDir }) => { const assetPath = path.join(mainPath, 'app-wrapper', 'app', 'assets'); const resourcePath = path.join(appPath, "Contents", "Resources"); const result = await fs.rm(path.join(assetPath, "ComfyUI", ".git"), { recursive: true, force: true }); + await fs.rm(path.join(assetPath, "ComfyUI", "custom_nodes", "ComfyUI_Manager", ".git"), { recursive: true, force: true }); + await fs.rm(path.join(assetPath, "ComfyUI", "custom_nodes", "DesktopSettingsExtension", ".git"), { recursive: true, force: true }); const result2 = await fs.cp(assetPath, resourcePath, { recursive: true }); } @@ -34,4 +36,4 @@ module.exports = async ({ appOutDir, packager, outDir }) => { const resourcePath = path.join(path.dirname(appPath), "resources"); await fs.cp(assetPath, resourcePath, { recursive: true }); } -} \ No newline at end of file +} diff --git a/scripts/todesktop/postInstall.js b/scripts/todesktop/postInstall.js index 38bab8ad..3c2d0810 100644 --- a/scripts/todesktop/postInstall.js +++ b/scripts/todesktop/postInstall.js @@ -41,4 +41,4 @@ async function postInstall() { } }; -postInstall(); \ No newline at end of file +postInstall(); From 4e3b6af088c76b100aec38a8b8e5062f6aaa0dfa Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 12:58:04 -0700 Subject: [PATCH 03/14] Fix mac. --- .github/actions/build/macos/comfy/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/build/macos/comfy/action.yml b/.github/actions/build/macos/comfy/action.yml index 2808f305..3dc12dd6 100644 --- a/.github/actions/build/macos/comfy/action.yml +++ b/.github/actions/build/macos/comfy/action.yml @@ -15,6 +15,8 @@ runs: - name: Make Standalone shell: sh run: | + pip install --upgrade pip + pip install --upgrade comfy-cli yarn make:assets:macos - name: Unzip Sign Lib/Bin Rezip if: ${{inputs.sign-and-publish == 'true'}} From 47bf872c15fa778d69ce3965411fa59330f06ab8 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 13:13:54 -0700 Subject: [PATCH 04/14] Fix. --- .../build/windows/todesktop/action.yml | 4 +- package.json | 5 +- src/__tests__/unit/main.test.ts | 8 --- src/main.ts | 3 - yarn.lock | 64 ++----------------- 5 files changed, 8 insertions(+), 76 deletions(-) diff --git a/.github/actions/build/windows/todesktop/action.yml b/.github/actions/build/windows/todesktop/action.yml index 93deb95e..4ffbee53 100644 --- a/.github/actions/build/windows/todesktop/action.yml +++ b/.github/actions/build/windows/todesktop/action.yml @@ -18,10 +18,10 @@ runs: with: node-version: '20.x' corepack: true - - run: yarn install --immutable - shell: cmd - run: yarn set version --yarn-path self shell: cmd + - run: yarn install --immutable + shell: cmd - name: Make app shell: powershell env: diff --git a/package.json b/package.json index d32674bc..fea527a5 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@electron/windows-sign": "^1.1.3", "@playwright/test": "^1.47.2", "@sentry/wizard": "^3.30.0", - "@todesktop/cli": "^1.9.7", + "@todesktop/cli": "1.10.0", "@types/adm-zip": "^0.5.5", "@types/electron-squirrel-startup": "^1.0.2", "@types/jest": "^29.5.13", @@ -54,7 +54,6 @@ "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", "@types/tar": "6.1.13", - "@types/ws": "^8.5.12", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", "electron": "31.3.1", @@ -90,8 +89,6 @@ "react-dom": "^18.3.1", "systeminformation": "^5.23.5", "tar": "^7.4.3", - "update-electron-app": "^3.0.0", - "ws": "^8.18.0", "yaml": "^2.6.0" }, "lint-staged": { diff --git a/src/__tests__/unit/main.test.ts b/src/__tests__/unit/main.test.ts index 144348e8..a79d2e41 100644 --- a/src/__tests__/unit/main.test.ts +++ b/src/__tests__/unit/main.test.ts @@ -81,14 +81,6 @@ jest.mock('electron-log/main', () => ({ // Add other methods you might use from electron-log })); -// Mock the update-electron-app module -jest.mock('update-electron-app', () => ({ - updateElectronApp: jest.fn(), - UpdateSourceType: { - StaticStorage: 'StaticStorage', - }, -})); - describe('createWindow', () => { // it('should create a new BrowserWindow with correct options', async () => { // const window = await createWindow('/'); diff --git a/src/main.ts b/src/main.ts index 50ea8674..c1dd45d7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,4 @@ import { spawn, ChildProcess } from 'node:child_process'; -import * as fsPromises from 'node:fs/promises'; import fs from 'fs'; import axios from 'axios'; import path from 'node:path'; @@ -18,7 +17,6 @@ import Store from 'electron-store'; import * as net from 'net'; import { graphics } from 'systeminformation'; import { createModelConfigFiles, readBasePathFromConfig } from './config/extra_model_config'; -import { WebSocketServer } from 'ws'; import { StoreType } from './store'; import todesktop from '@todesktop/runtime'; import { PythonEnvironment } from './pythonEnvironment'; @@ -31,7 +29,6 @@ let isRestarting: boolean = false; // Prevents double restarts TODO(robinhuang): const host = '127.0.0.1'; let port = 8188; let mainWindow: BrowserWindow | null = null; -let wss: WebSocketServer | null; let store: Store | null = null; const messageQueue: Array = []; // Stores mesaages before renderer is ready. let downloadManager: DownloadManager; diff --git a/yarn.lock b/yarn.lock index 44442950..06014a29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2823,9 +2823,9 @@ __metadata: languageName: node linkType: hard -"@todesktop/cli@npm:^1.9.7": - version: 1.9.7 - resolution: "@todesktop/cli@npm:1.9.7" +"@todesktop/cli@npm:1.10.0": + version: 1.10.0 + resolution: "@todesktop/cli@npm:1.10.0" dependencies: "@sentry/node": "npm:^8.35.0" ajv: "npm:^8.11.2" @@ -2872,7 +2872,7 @@ __metadata: xdg-basedir: "npm:^4.0.0" bin: todesktop: dist/cli.js - checksum: 10c0/9cde371bb591a9575ea29218444b102986e9ea9116ab51281be460a773213232d19f5c18a9584394d67dadcae394caf17f3098ce8ba5c19b9b0c6fd3c8466001 + checksum: 10c0/225d04d29cd698741524c2876f6ac25f915198eac47992d43bcf3913f26f4eefbbf556ffec34d93f570463c629ccfbd0bc4754f19487be53fe330d7323c49191 languageName: node linkType: hard @@ -3281,15 +3281,6 @@ __metadata: languageName: node linkType: hard -"@types/ws@npm:^8.5.12": - version: 8.5.12 - resolution: "@types/ws@npm:8.5.12" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/3fd77c9e4e05c24ce42bfc7647f7506b08c40a40fe2aea236ef6d4e96fc7cb4006a81ed1b28ec9c457e177a74a72924f4768b7b4652680b42dfd52bc380e15f9 - languageName: node - linkType: hard - "@types/yargs-parser@npm:*": version: 21.0.3 resolution: "@types/yargs-parser@npm:21.0.3" @@ -4855,7 +4846,7 @@ __metadata: "@sentry/electron": "npm:^5.4.0" "@sentry/vite-plugin": "npm:^2.22.4" "@sentry/wizard": "npm:^3.30.0" - "@todesktop/cli": "npm:^1.9.7" + "@todesktop/cli": "npm:1.10.0" "@todesktop/runtime": "npm:^1.6.4" "@types/adm-zip": "npm:^0.5.5" "@types/electron-squirrel-startup": "npm:^1.0.2" @@ -4864,7 +4855,6 @@ __metadata: "@types/react": "npm:^18.3.4" "@types/react-dom": "npm:^18.3.0" "@types/tar": "npm:6.1.13" - "@types/ws": "npm:^8.5.12" "@typescript-eslint/eslint-plugin": "npm:^5.0.0" "@typescript-eslint/parser": "npm:^5.0.0" adm-zip: "npm:^0.5.15" @@ -4888,9 +4878,7 @@ __metadata: ts-jest: "npm:^29.2.5" ts-node: "npm:^10.0.0" typescript: "npm:~5.5.4" - update-electron-app: "npm:^3.0.0" vite: "npm:^5.0.12" - ws: "npm:^8.18.0" yaml: "npm:^2.6.0" languageName: unknown linkType: soft @@ -6750,15 +6738,6 @@ __metadata: languageName: node linkType: hard -"github-url-to-object@npm:^4.0.4": - version: 4.0.6 - resolution: "github-url-to-object@npm:4.0.6" - dependencies: - is-url: "npm:^1.1.0" - checksum: 10c0/b8ed9b2b93c55657299b7cc5ce9faf4441f143e59f995e126929d18f8fc692fc932d8530da9bde7655f35b29201beacbc17b066b7e26dbcc0dc983f8d3c918cf - languageName: node - linkType: hard - "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -7790,13 +7769,6 @@ __metadata: languageName: node linkType: hard -"is-url@npm:^1.1.0, is-url@npm:^1.2.4": - version: 1.2.4 - resolution: "is-url@npm:1.2.4" - checksum: 10c0/0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3 - languageName: node - linkType: hard - "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -12212,17 +12184,6 @@ __metadata: languageName: node linkType: hard -"update-electron-app@npm:^3.0.0": - version: 3.0.0 - resolution: "update-electron-app@npm:3.0.0" - dependencies: - github-url-to-object: "npm:^4.0.4" - is-url: "npm:^1.2.4" - ms: "npm:^2.1.1" - checksum: 10c0/5e0b9ce8fd2cbcf6ea64d8029f90d90394facf05d86c8dceda5dba79af6e21522ef4f37f212982be781f488d497882529d9b11b91174159f6567a24039c76e6a - languageName: node - linkType: hard - "uri-js@npm:^4.2.2": version: 4.4.1 resolution: "uri-js@npm:4.4.1" @@ -12577,21 +12538,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.18.0": - version: 8.18.0 - resolution: "ws@npm:8.18.0" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06 - languageName: node - linkType: hard - "xcode@npm:3.0.1": version: 3.0.1 resolution: "xcode@npm:3.0.1" From 55bb2fb1d75dd0516634194dd382037e66a4969e Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 13:23:25 -0700 Subject: [PATCH 05/14] Downgrade todesktop cli. --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index fea527a5..a4a59ff9 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@electron/windows-sign": "^1.1.3", "@playwright/test": "^1.47.2", "@sentry/wizard": "^3.30.0", - "@todesktop/cli": "1.10.0", + "@todesktop/cli": "1.9.7", "@types/adm-zip": "^0.5.5", "@types/electron-squirrel-startup": "^1.0.2", "@types/jest": "^29.5.13", diff --git a/yarn.lock b/yarn.lock index 06014a29..8c67b824 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2823,9 +2823,9 @@ __metadata: languageName: node linkType: hard -"@todesktop/cli@npm:1.10.0": - version: 1.10.0 - resolution: "@todesktop/cli@npm:1.10.0" +"@todesktop/cli@npm:1.9.7": + version: 1.9.7 + resolution: "@todesktop/cli@npm:1.9.7" dependencies: "@sentry/node": "npm:^8.35.0" ajv: "npm:^8.11.2" @@ -2872,7 +2872,7 @@ __metadata: xdg-basedir: "npm:^4.0.0" bin: todesktop: dist/cli.js - checksum: 10c0/225d04d29cd698741524c2876f6ac25f915198eac47992d43bcf3913f26f4eefbbf556ffec34d93f570463c629ccfbd0bc4754f19487be53fe330d7323c49191 + checksum: 10c0/9cde371bb591a9575ea29218444b102986e9ea9116ab51281be460a773213232d19f5c18a9584394d67dadcae394caf17f3098ce8ba5c19b9b0c6fd3c8466001 languageName: node linkType: hard @@ -4846,7 +4846,7 @@ __metadata: "@sentry/electron": "npm:^5.4.0" "@sentry/vite-plugin": "npm:^2.22.4" "@sentry/wizard": "npm:^3.30.0" - "@todesktop/cli": "npm:1.10.0" + "@todesktop/cli": "npm:1.9.7" "@todesktop/runtime": "npm:^1.6.4" "@types/adm-zip": "npm:^0.5.5" "@types/electron-squirrel-startup": "npm:^1.0.2" From 1d612d2d82f683361a116d918f594df663c6804f Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 16:08:54 -0700 Subject: [PATCH 06/14] Revert. --- .github/actions/build/windows/todesktop/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/windows/todesktop/action.yml b/.github/actions/build/windows/todesktop/action.yml index 4ffbee53..93deb95e 100644 --- a/.github/actions/build/windows/todesktop/action.yml +++ b/.github/actions/build/windows/todesktop/action.yml @@ -18,10 +18,10 @@ runs: with: node-version: '20.x' corepack: true - - run: yarn set version --yarn-path self - shell: cmd - run: yarn install --immutable shell: cmd + - run: yarn set version --yarn-path self + shell: cmd - name: Make app shell: powershell env: From c2f5f2d915fca92b80ca9a70d203e011a601c630 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 16:14:01 -0700 Subject: [PATCH 07/14] Use ubuntu instead. --- .github/actions/build/windows/todesktop/action.yml | 8 ++++---- .github/workflows/todesktop.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build/windows/todesktop/action.yml b/.github/actions/build/windows/todesktop/action.yml index 93deb95e..7d8974f9 100644 --- a/.github/actions/build/windows/todesktop/action.yml +++ b/.github/actions/build/windows/todesktop/action.yml @@ -1,4 +1,4 @@ -name: Windows Build to ToDesktop +name: Build to ToDesktop description: Will build the project then send the project files to ToDesktop to be compiled into installers. inputs: GITHUB_TOKEN: @@ -19,11 +19,11 @@ runs: node-version: '20.x' corepack: true - run: yarn install --immutable - shell: cmd + shell: bash - run: yarn set version --yarn-path self - shell: cmd + shell: bash - name: Make app - shell: powershell + shell: bash env: PUBLISH: true GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }} diff --git a/.github/workflows/todesktop.yml b/.github/workflows/todesktop.yml index 20f8f194..56b7a8a1 100644 --- a/.github/workflows/todesktop.yml +++ b/.github/workflows/todesktop.yml @@ -5,8 +5,8 @@ on: workflow_call: jobs: - build-windows-debug: - runs-on: windows-latest + build-todesktop: + runs-on: ubuntu-latest steps: - name: Github checkout uses: actions/checkout@v4 From 468298b27507c4793618a73ed51060295f70aebc Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 16:26:56 -0700 Subject: [PATCH 08/14] Use yarn v.4.5.0 --- .yarnrc.yml | 1 + todesktop.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 3186f3f0..55d40e5d 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1 +1,2 @@ nodeLinker: node-modules +yarnPath: .yarn/releases/yarn-4.5.0.cjs diff --git a/todesktop.json b/todesktop.json index 0e175e81..35e8e5de 100644 --- a/todesktop.json +++ b/todesktop.json @@ -2,9 +2,9 @@ "id": "241012ess7yxs0e", "icon": "./assets/UI/Comfy_Logo_x128.png", "schemaVersion": 1, - "uploadSizeLimit": 250, + "uploadSizeLimit": 1000, "appPath": ".", - "appFiles": ["src/**", "scripts/**", "assets/**", "dist/**", ".vite/**", ".yarnrc.yml", ".yarn/**"], + "appFiles": ["src/**", "scripts/**", ".vite/**", ".yarnrc.yml", ".yarn/**"], "extraResources": [{ "from": "./assets" }], "filesForDistribution": ["!assets/**", "!dist/**", "!src/**", "!scripts/**", "!.yarn/**", "!.yarnrc.yml"], "mac": { From d12d3f14fb5b1f7e6ea12adb19c915141251b1d8 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 16:42:02 -0700 Subject: [PATCH 09/14] Update. --- .github/workflows/publish_all.yml | 2 +- .yarnrc.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish_all.yml b/.github/workflows/publish_all.yml index 3c18a499..0308f688 100644 --- a/.github/workflows/publish_all.yml +++ b/.github/workflows/publish_all.yml @@ -5,7 +5,7 @@ on: jobs: build-stage-to-todesktop: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - name: Github checkout uses: actions/checkout@v4 diff --git a/.yarnrc.yml b/.yarnrc.yml index 55d40e5d..3186f3f0 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,2 +1 @@ nodeLinker: node-modules -yarnPath: .yarn/releases/yarn-4.5.0.cjs From e15e70ea648cd3c84f0d304862ebb0873ac6e21f Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 16:45:09 -0700 Subject: [PATCH 10/14] todesktop 1.9.4 --- package.json | 2 +- yarn.lock | 212 ++++++++++++++++++++++++--------------------------- 2 files changed, 99 insertions(+), 115 deletions(-) diff --git a/package.json b/package.json index a4a59ff9..ff7aa332 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@electron/windows-sign": "^1.1.3", "@playwright/test": "^1.47.2", "@sentry/wizard": "^3.30.0", - "@todesktop/cli": "1.9.7", + "@todesktop/cli": "1.9.4", "@types/adm-zip": "^0.5.5", "@types/electron-squirrel-startup": "^1.0.2", "@types/jest": "^29.5.13", diff --git a/yarn.lock b/yarn.lock index 8c67b824..a3f33a07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1716,19 +1716,6 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-express@npm:0.43.0": - version: 0.43.0 - resolution: "@opentelemetry/instrumentation-express@npm:0.43.0" - dependencies: - "@opentelemetry/core": "npm:^1.8.0" - "@opentelemetry/instrumentation": "npm:^0.53.0" - "@opentelemetry/semantic-conventions": "npm:^1.27.0" - peerDependencies: - "@opentelemetry/api": ^1.3.0 - checksum: 10c0/5b2e56e8c6c546103f8e9a69e632bb5b8d992da0a1858cb35f6320f98675df503b1b07a704559d11e29fe47366f98296729b0cccaa543debcfe2072888331b72 - languageName: node - linkType: hard - "@opentelemetry/instrumentation-fastify@npm:0.39.0": version: 0.39.0 resolution: "@opentelemetry/instrumentation-fastify@npm:0.39.0" @@ -1742,19 +1729,6 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-fastify@npm:0.40.0": - version: 0.40.0 - resolution: "@opentelemetry/instrumentation-fastify@npm:0.40.0" - dependencies: - "@opentelemetry/core": "npm:^1.8.0" - "@opentelemetry/instrumentation": "npm:^0.53.0" - "@opentelemetry/semantic-conventions": "npm:^1.27.0" - peerDependencies: - "@opentelemetry/api": ^1.3.0 - checksum: 10c0/2b05562aa8433fae2343c015a7e3c23a3871aaab1a50ddfb8c0974b03c7a0693c27dc4014ebcde61ec53658fc84c4554d6ba1ed1c0212fbcf6423424c07ed1ca - languageName: node - linkType: hard - "@opentelemetry/instrumentation-fs@npm:0.15.0": version: 0.15.0 resolution: "@opentelemetry/instrumentation-fs@npm:0.15.0" @@ -2491,6 +2465,19 @@ __metadata: languageName: node linkType: hard +"@sentry/core@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/core@npm:5.30.0" + dependencies: + "@sentry/hub": "npm:5.30.0" + "@sentry/minimal": "npm:5.30.0" + "@sentry/types": "npm:5.30.0" + "@sentry/utils": "npm:5.30.0" + tslib: "npm:^1.9.3" + checksum: 10c0/6407b9c2a6a56f90c198f5714b3257df24d89d1b4ca6726bd44760d0adabc25798b69fef2c88ccea461c7e79e3c78861aaebfd51fd3cb892aee656c3f7e11801 + languageName: node + linkType: hard + "@sentry/core@npm:7.119.2": version: 7.119.2 resolution: "@sentry/core@npm:7.119.2" @@ -2511,16 +2498,6 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:8.35.0": - version: 8.35.0 - resolution: "@sentry/core@npm:8.35.0" - dependencies: - "@sentry/types": "npm:8.35.0" - "@sentry/utils": "npm:8.35.0" - checksum: 10c0/93f2dd5a08484712d895b110f7f4c364e7cf43aef770a05e089584ec4decf95fac5a6fe255714aa216f1f2ac65b38306138307f9a84235a3090659fa53e4c074 - languageName: node - linkType: hard - "@sentry/electron@npm:^5.4.0": version: 5.6.0 resolution: "@sentry/electron@npm:5.6.0" @@ -2535,6 +2512,17 @@ __metadata: languageName: node linkType: hard +"@sentry/hub@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/hub@npm:5.30.0" + dependencies: + "@sentry/types": "npm:5.30.0" + "@sentry/utils": "npm:5.30.0" + tslib: "npm:^1.9.3" + checksum: 10c0/386c91d06aa44be0465fc11330d748a113e464d41cd562a9e1d222a682cbcb14e697a3e640953e7a0239997ad8a02b223a0df3d9e1d8816cb823fd3613be3e2f + languageName: node + linkType: hard + "@sentry/integrations@npm:7.119.2": version: 7.119.2 resolution: "@sentry/integrations@npm:7.119.2" @@ -2547,6 +2535,17 @@ __metadata: languageName: node linkType: hard +"@sentry/minimal@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/minimal@npm:5.30.0" + dependencies: + "@sentry/hub": "npm:5.30.0" + "@sentry/types": "npm:5.30.0" + tslib: "npm:^1.9.3" + checksum: 10c0/34ec05503de46d01f98c94701475d5d89cc044892c86ccce30e01f62f28344eb23b718e7cf573815e46f30a4ac9da3129bed9b3d20c822938acfb40cbe72437b + languageName: node + linkType: hard + "@sentry/node@npm:8.33.1": version: 8.33.1 resolution: "@sentry/node@npm:8.33.1" @@ -2590,6 +2589,23 @@ __metadata: languageName: node linkType: hard +"@sentry/node@npm:^5.27.2": + version: 5.30.0 + resolution: "@sentry/node@npm:5.30.0" + dependencies: + "@sentry/core": "npm:5.30.0" + "@sentry/hub": "npm:5.30.0" + "@sentry/tracing": "npm:5.30.0" + "@sentry/types": "npm:5.30.0" + "@sentry/utils": "npm:5.30.0" + cookie: "npm:^0.4.1" + https-proxy-agent: "npm:^5.0.0" + lru_map: "npm:^0.3.3" + tslib: "npm:^1.9.3" + checksum: 10c0/c50db7c81ace57cac17692245c2ab3c84a6149183f81d5f2dfd157eaa7b66eb4d6a727dd13a754bb129c96711389eec2944cd94126722ee1d8b11f2b627b830d + languageName: node + linkType: hard + "@sentry/node@npm:^7.69.0": version: 7.119.2 resolution: "@sentry/node@npm:7.119.2" @@ -2603,49 +2619,6 @@ __metadata: languageName: node linkType: hard -"@sentry/node@npm:^8.35.0": - version: 8.35.0 - resolution: "@sentry/node@npm:8.35.0" - dependencies: - "@opentelemetry/api": "npm:^1.9.0" - "@opentelemetry/context-async-hooks": "npm:^1.25.1" - "@opentelemetry/core": "npm:^1.25.1" - "@opentelemetry/instrumentation": "npm:^0.53.0" - "@opentelemetry/instrumentation-amqplib": "npm:^0.42.0" - "@opentelemetry/instrumentation-connect": "npm:0.39.0" - "@opentelemetry/instrumentation-dataloader": "npm:0.12.0" - "@opentelemetry/instrumentation-express": "npm:0.43.0" - "@opentelemetry/instrumentation-fastify": "npm:0.40.0" - "@opentelemetry/instrumentation-fs": "npm:0.15.0" - "@opentelemetry/instrumentation-generic-pool": "npm:0.39.0" - "@opentelemetry/instrumentation-graphql": "npm:0.43.0" - "@opentelemetry/instrumentation-hapi": "npm:0.41.0" - "@opentelemetry/instrumentation-http": "npm:0.53.0" - "@opentelemetry/instrumentation-ioredis": "npm:0.43.0" - "@opentelemetry/instrumentation-kafkajs": "npm:0.3.0" - "@opentelemetry/instrumentation-koa": "npm:0.43.0" - "@opentelemetry/instrumentation-lru-memoizer": "npm:0.40.0" - "@opentelemetry/instrumentation-mongodb": "npm:0.47.0" - "@opentelemetry/instrumentation-mongoose": "npm:0.42.0" - "@opentelemetry/instrumentation-mysql": "npm:0.41.0" - "@opentelemetry/instrumentation-mysql2": "npm:0.41.0" - "@opentelemetry/instrumentation-nestjs-core": "npm:0.40.0" - "@opentelemetry/instrumentation-pg": "npm:0.44.0" - "@opentelemetry/instrumentation-redis-4": "npm:0.42.0" - "@opentelemetry/instrumentation-undici": "npm:0.6.0" - "@opentelemetry/resources": "npm:^1.26.0" - "@opentelemetry/sdk-trace-base": "npm:^1.26.0" - "@opentelemetry/semantic-conventions": "npm:^1.27.0" - "@prisma/instrumentation": "npm:5.19.1" - "@sentry/core": "npm:8.35.0" - "@sentry/opentelemetry": "npm:8.35.0" - "@sentry/types": "npm:8.35.0" - "@sentry/utils": "npm:8.35.0" - import-in-the-middle: "npm:^1.11.2" - checksum: 10c0/cd5baa72209a8f78f3c25ee132cebf3d55b58e6faed1c3f83826796b722a7083504ce037ab886e50861ea5d1a861de6c494bfa1e44baffbb564fa47932939990 - languageName: node - linkType: hard - "@sentry/opentelemetry@npm:8.33.1": version: 8.33.1 resolution: "@sentry/opentelemetry@npm:8.33.1" @@ -2663,20 +2636,23 @@ __metadata: languageName: node linkType: hard -"@sentry/opentelemetry@npm:8.35.0": - version: 8.35.0 - resolution: "@sentry/opentelemetry@npm:8.35.0" +"@sentry/tracing@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/tracing@npm:5.30.0" dependencies: - "@sentry/core": "npm:8.35.0" - "@sentry/types": "npm:8.35.0" - "@sentry/utils": "npm:8.35.0" - peerDependencies: - "@opentelemetry/api": ^1.9.0 - "@opentelemetry/core": ^1.25.1 - "@opentelemetry/instrumentation": ^0.53.0 - "@opentelemetry/sdk-trace-base": ^1.26.0 - "@opentelemetry/semantic-conventions": ^1.27.0 - checksum: 10c0/cbf311abdef13c5114d7be7bddaae7e92111e6ad6e3d0744c32096399fecdc493eae1788c8222ba9f5000a49f57d8b608671cc98c36af29679a6328c1757b919 + "@sentry/hub": "npm:5.30.0" + "@sentry/minimal": "npm:5.30.0" + "@sentry/types": "npm:5.30.0" + "@sentry/utils": "npm:5.30.0" + tslib: "npm:^1.9.3" + checksum: 10c0/46830265bc54a3203d7d9f0d8d9f2f7d9d2c6a977e07ccdae317fa3ea29c388b904b3bef28f7a0ba9c074845d67feab63c6d3c0ddce9aeb275b6c966253fb415 + languageName: node + linkType: hard + +"@sentry/types@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/types@npm:5.30.0" + checksum: 10c0/99c6e55c0a82c8ca95be2e9dbb35f581b29e4ff7af74b23bc62b690de4e35febfa15868184a2303480ef86babd4fea5273cf3b5ddf4a27685b841a72f13a0c88 languageName: node linkType: hard @@ -2694,10 +2670,13 @@ __metadata: languageName: node linkType: hard -"@sentry/types@npm:8.35.0": - version: 8.35.0 - resolution: "@sentry/types@npm:8.35.0" - checksum: 10c0/b28d87ef26d1b889cf7c951a697caf70d9092d84dd1ae777700a0a009da832a8a5c298632dba62fbcb1a3252d011353068c64419e8e952b676f20deca8d03d64 +"@sentry/utils@npm:5.30.0": + version: 5.30.0 + resolution: "@sentry/utils@npm:5.30.0" + dependencies: + "@sentry/types": "npm:5.30.0" + tslib: "npm:^1.9.3" + checksum: 10c0/ca8eebfea7ac7db6d16f6c0b8a66ac62587df12a79ce9d0d8393f4d69880bb8d40d438f9810f7fb107a9880fe0d68bbf797b89cbafd113e89a0829eb06b205f8 languageName: node linkType: hard @@ -2719,15 +2698,6 @@ __metadata: languageName: node linkType: hard -"@sentry/utils@npm:8.35.0": - version: 8.35.0 - resolution: "@sentry/utils@npm:8.35.0" - dependencies: - "@sentry/types": "npm:8.35.0" - checksum: 10c0/5c1178f0000165d6436d98902bc4107fcdae9aa84c23458b4c6b1a89b4734185292fb776427d6ec8e174e7e6c1c32b7c72585bb3ddd3ddd893dd8e5884c50d67 - languageName: node - linkType: hard - "@sentry/vite-plugin@npm:^2.22.4": version: 2.22.6 resolution: "@sentry/vite-plugin@npm:2.22.6" @@ -2823,16 +2793,16 @@ __metadata: languageName: node linkType: hard -"@todesktop/cli@npm:1.9.7": - version: 1.9.7 - resolution: "@todesktop/cli@npm:1.9.7" +"@todesktop/cli@npm:1.9.4": + version: 1.9.4 + resolution: "@todesktop/cli@npm:1.9.4" dependencies: - "@sentry/node": "npm:^8.35.0" + "@sentry/node": "npm:^5.27.2" ajv: "npm:^8.11.2" ajv-formats: "npm:^2.1.1" analytics-node: "npm:^4.0.1" archiver: "npm:^5.2.0" - axios: "npm:^1.7.7" + axios: "npm:^0.21.1" better-ajv-errors: "npm:^1.2.0" bunyan: "npm:^1.8.14" chalk: "npm:^4.1.0" @@ -2872,7 +2842,7 @@ __metadata: xdg-basedir: "npm:^4.0.0" bin: todesktop: dist/cli.js - checksum: 10c0/9cde371bb591a9575ea29218444b102986e9ea9116ab51281be460a773213232d19f5c18a9584394d67dadcae394caf17f3098ce8ba5c19b9b0c6fd3c8466001 + checksum: 10c0/f98c4c517a9d60acc938ae0f3eaa0e49d5e38a1814dd8befcce12c652bcc88c92af23a937149cb5a9f7703487e8a0f53af9be9713aa41bcfb2a7384f34c838ca languageName: node linkType: hard @@ -4846,7 +4816,7 @@ __metadata: "@sentry/electron": "npm:^5.4.0" "@sentry/vite-plugin": "npm:^2.22.4" "@sentry/wizard": "npm:^3.30.0" - "@todesktop/cli": "npm:1.9.7" + "@todesktop/cli": "npm:1.9.4" "@todesktop/runtime": "npm:^1.6.4" "@types/adm-zip": "npm:^0.5.5" "@types/electron-squirrel-startup": "npm:^1.0.2" @@ -5011,6 +4981,13 @@ __metadata: languageName: node linkType: hard +"cookie@npm:^0.4.1": + version: 0.4.2 + resolution: "cookie@npm:0.4.2" + checksum: 10c0/beab41fbd7c20175e3a2799ba948c1dcc71ef69f23fe14eeeff59fc09f50c517b0f77098db87dbb4c55da802f9d86ee86cdc1cd3efd87760341551838d53fca2 + languageName: node + linkType: hard + "cookiejar@npm:^2.1.3": version: 2.1.4 resolution: "cookiejar@npm:2.1.4" @@ -7236,7 +7213,7 @@ __metadata: languageName: node linkType: hard -"import-in-the-middle@npm:^1.11.0, import-in-the-middle@npm:^1.11.2, import-in-the-middle@npm:^1.8.1": +"import-in-the-middle@npm:^1.11.0, import-in-the-middle@npm:^1.8.1": version: 1.11.2 resolution: "import-in-the-middle@npm:1.11.2" dependencies: @@ -8888,6 +8865,13 @@ __metadata: languageName: node linkType: hard +"lru_map@npm:^0.3.3": + version: 0.3.3 + resolution: "lru_map@npm:0.3.3" + checksum: 10c0/d861f14a142a4a74ebf8d3ad57f2e768a5b820db4100ae53eed1a64eb6350912332e6ebc87cb7415ad6d0cd8f3ce6d20beab9a5e6042ccb5996ea0067a220448 + languageName: node + linkType: hard + "magic-string@npm:0.30.8": version: 0.30.8 resolution: "magic-string@npm:0.30.8" @@ -11905,7 +11889,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.11.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"tslib@npm:^1.11.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2 From 8040a2e2aa16733ff33f1cac42483160c413b062 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 31 Oct 2024 17:00:40 -0700 Subject: [PATCH 11/14] Clean up. --- scripts/todesktop/afterPack.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/todesktop/afterPack.js b/scripts/todesktop/afterPack.js index fb27cf80..74b18cbf 100644 --- a/scripts/todesktop/afterPack.js +++ b/scripts/todesktop/afterPack.js @@ -23,8 +23,6 @@ module.exports = async ({ appOutDir, packager, outDir }) => { const assetPath = path.join(mainPath, 'app-wrapper', 'app', 'assets'); const resourcePath = path.join(appPath, "Contents", "Resources"); const result = await fs.rm(path.join(assetPath, "ComfyUI", ".git"), { recursive: true, force: true }); - await fs.rm(path.join(assetPath, "ComfyUI", "custom_nodes", "ComfyUI_Manager", ".git"), { recursive: true, force: true }); - await fs.rm(path.join(assetPath, "ComfyUI", "custom_nodes", "DesktopSettingsExtension", ".git"), { recursive: true, force: true }); const result2 = await fs.cp(assetPath, resourcePath, { recursive: true }); } From f446e2c130e3c6bb3ff1145960a0e82fd163a741 Mon Sep 17 00:00:00 2001 From: Kendal Cormany Date: Thu, 31 Oct 2024 18:09:28 -0700 Subject: [PATCH 12/14] Reverted a few things and delete some more unused items --- .../build/windows/todesktop/action.yml | 6 ++--- .github/workflows/publish_all.yml | 4 ++-- .github/workflows/todesktop.yml | 24 ------------------- todesktop.json | 15 +++--------- 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/todesktop.yml diff --git a/.github/actions/build/windows/todesktop/action.yml b/.github/actions/build/windows/todesktop/action.yml index 7d8974f9..900b4a4f 100644 --- a/.github/actions/build/windows/todesktop/action.yml +++ b/.github/actions/build/windows/todesktop/action.yml @@ -19,11 +19,11 @@ runs: node-version: '20.x' corepack: true - run: yarn install --immutable - shell: bash + shell: cmd - run: yarn set version --yarn-path self - shell: bash + shell: cmd - name: Make app - shell: bash + shell: powershell env: PUBLISH: true GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }} diff --git a/.github/workflows/publish_all.yml b/.github/workflows/publish_all.yml index 0308f688..4a01ab7d 100644 --- a/.github/workflows/publish_all.yml +++ b/.github/workflows/publish_all.yml @@ -1,11 +1,11 @@ -name: Publish All Platforms +name: Publish App to ToDesktop on: workflow_dispatch: jobs: build-stage-to-todesktop: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - name: Github checkout uses: actions/checkout@v4 diff --git a/.github/workflows/todesktop.yml b/.github/workflows/todesktop.yml deleted file mode 100644 index 56b7a8a1..00000000 --- a/.github/workflows/todesktop.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build App And Send ToDesktop - -on: - workflow_dispatch: - workflow_call: - -jobs: - build-todesktop: - runs-on: ubuntu-latest - steps: - - name: Github checkout - uses: actions/checkout@v4 - - name: Declare some variables - run: | - echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV" - shell: bash - - name: Build - uses: ./.github/actions/build/windows/todesktop - with: - build-gpu: 'cpu' - build-targets: '--targets=@electron-forge/maker-zip' - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - TODESKTOP_ACCESS_TOKEN: ${{secrets.TODESKTOP_ACCESS_TOKEN}} - TODESKTOP_EMAIL: ${{secrets.TODESKTOP_EMAIL}} diff --git a/todesktop.json b/todesktop.json index 35e8e5de..cd25e16a 100644 --- a/todesktop.json +++ b/todesktop.json @@ -2,18 +2,9 @@ "id": "241012ess7yxs0e", "icon": "./assets/UI/Comfy_Logo_x128.png", "schemaVersion": 1, - "uploadSizeLimit": 1000, + "uploadSizeLimit": 250, "appPath": ".", - "appFiles": ["src/**", "scripts/**", ".vite/**", ".yarnrc.yml", ".yarn/**"], + "appFiles": ["src/**", "scripts/**", "assets/**", "dist/**", ".vite/**", ".yarnrc.yml", ".yarn/**"], "extraResources": [{ "from": "./assets" }], - "filesForDistribution": ["!assets/**", "!dist/**", "!src/**", "!scripts/**", "!.yarn/**", "!.yarnrc.yml"], - "mac": { - "additionalBinariesToSign": [ - "./assets/output/lib/libpython3.12.dylib", - "./assets/output/lib/python3.12/lib-dynload/_crypt.cpython-312-darwin.so", - "./assets/output/bin/uv", - "./assets/output/bin/uvx", - "./assets/output/bin/python3.12" - ] - } + "filesForDistribution": ["!assets/**", "!dist/**", "!src/**", "!scripts/**", "!.yarn/**", "!.yarnrc.yml"] } From 4cc13ae18d5b1b1d06d02e625e18876a10fde11e Mon Sep 17 00:00:00 2001 From: Kendal Cormany Date: Fri, 1 Nov 2024 11:29:11 -0700 Subject: [PATCH 13/14] Ok Now mac on todesktop is fixed --- package.json | 2 +- scripts/todesktop/afterPack.js | 3 +- scripts/todesktop/postInstall.js | 25 ++- yarn.lock | 277 ++++++++++++++++++++----------- 4 files changed, 198 insertions(+), 109 deletions(-) diff --git a/package.json b/package.json index ff7aa332..d37d3051 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@electron/windows-sign": "^1.1.3", "@playwright/test": "^1.47.2", "@sentry/wizard": "^3.30.0", - "@todesktop/cli": "1.9.4", + "@todesktop/cli": "^1.10.1", "@types/adm-zip": "^0.5.5", "@types/electron-squirrel-startup": "^1.0.2", "@types/jest": "^29.5.13", diff --git a/scripts/todesktop/afterPack.js b/scripts/todesktop/afterPack.js index 74b18cbf..99c63b0c 100644 --- a/scripts/todesktop/afterPack.js +++ b/scripts/todesktop/afterPack.js @@ -23,9 +23,10 @@ module.exports = async ({ appOutDir, packager, outDir }) => { const assetPath = path.join(mainPath, 'app-wrapper', 'app', 'assets'); const resourcePath = path.join(appPath, "Contents", "Resources"); const result = await fs.rm(path.join(assetPath, "ComfyUI", ".git"), { recursive: true, force: true }); + const result3 = await fs.rm(path.join(assetPath, "ComfyUI", "custom_nodes","ComfyUI-Manager",".git"), { recursive: true, force: true }); const result2 = await fs.cp(assetPath, resourcePath, { recursive: true }); } - + if (os.platform() === 'win32') { const appName = packager.appInfo.productFilename; const appPath = path.join(`${appOutDir}`, `${appName}.exe`); diff --git a/scripts/todesktop/postInstall.js b/scripts/todesktop/postInstall.js index 3c2d0810..83f78439 100644 --- a/scripts/todesktop/postInstall.js +++ b/scripts/todesktop/postInstall.js @@ -2,7 +2,6 @@ const { spawnSync } = require("child_process"); const path = require("path"); const os = require('os'); const process = require("process"); -//const fs = require('fs-extra'); async function postInstall() { const firstInstallOnToDesktopServers = @@ -24,17 +23,27 @@ async function postInstall() { if (os.platform() === "darwin") { - const resultUpgradePip = spawnSync(`py`, ['-3.12', '-m', 'pip' ,'install' ,'--upgrade pip'],{shell:true,stdio: 'ignore'}).toString(); - const resultInstallComfyCLI = spawnSync(`py`, ['-3.12 ','-m' ,'pip' ,'install comfy-cli'], {shell:true,stdio: 'ignore'}).toString(); - const resultComfyManagerInstall = spawnSync('yarn run make:assets:macos' ,[''],{shell:true,stdio: 'inherit'}).toString(); + const resultUpgradePip = spawnSync(`python3`, ['-m', 'pip' ,'install' ,'--upgrade pip'],{shell:true,stdio: 'ignore'}); + const resultInstallComfyCLI = spawnSync(`python3`, ['-m' ,'pip' ,'install comfy-cli'], {shell:true,stdio: 'ignore'}); + const resultComfyManagerInstall = spawnSync('yarn run make:assets:macos' ,[''],{shell:true,stdio: 'inherit'}); // Do not delete, useful if there are build issues with mac // TODO: Consider making a global build log as ToDesktop logs can be hit or miss /* - fs.createFileSync('./src/macpip.txt'); - fs.writeFileSync('./src/macpip.txt',JSON.stringify({ - log: result.stdout.toString(), - err:result.stderr.toString() + const fs = require('fs-extra'); + fs.createFileSync('./.vite/macpip.json'); + fs.writeFileSync('./.vite/macpip.json',JSON.stringify({ + upgradeOut: { + log: resultUpgradePip.stdout?.toString(), + err:resultUpgradePip.stderr?.toString()}, + installComfOut: { + log: resultInstallComfyCLI.stdout?.toString(), + err:resultInstallComfyCLI.stderr?.toString() + }, + ComfManInstallOut: { + log: resultComfyManagerInstall.stdout?.toString(), + err:resultComfyManagerInstall.stderr?.toString() + } })); */ console.log("Finish Python & Comfy Install for Mac"); diff --git a/yarn.lock b/yarn.lock index a3f33a07..8cab7a16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1627,7 +1627,16 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.8, @opentelemetry/api@npm:^1.9.0": +"@opentelemetry/api-logs@npm:0.54.0": + version: 0.54.0 + resolution: "@opentelemetry/api-logs@npm:0.54.0" + dependencies: + "@opentelemetry/api": "npm:^1.3.0" + checksum: 10c0/877cf75fb6fe37cae9dde1fe9a38202af4d00246bfe3ac29b8c06da5e6e1818a27cb851a0f2c14b3cb7acdebb85ba847144f8523d84279fbb000e88685e66e3b + languageName: node + linkType: hard + +"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.8, @opentelemetry/api@npm:^1.9.0": version: 1.9.0 resolution: "@opentelemetry/api@npm:1.9.0" checksum: 10c0/9aae2fe6e8a3a3eeb6c1fdef78e1939cf05a0f37f8a4fae4d6bf2e09eb1e06f966ece85805626e01ba5fab48072b94f19b835449e58b6d26720ee19a58298add @@ -1692,6 +1701,20 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation-connect@npm:0.40.0": + version: 0.40.0 + resolution: "@opentelemetry/instrumentation-connect@npm:0.40.0" + dependencies: + "@opentelemetry/core": "npm:^1.8.0" + "@opentelemetry/instrumentation": "npm:^0.54.0" + "@opentelemetry/semantic-conventions": "npm:^1.27.0" + "@types/connect": "npm:3.4.36" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/675fe74aa93cbd2c446687c001c3a2ccaf7a1853aae5c7b840083b40b1f4922d91c6a0f2182e8374798e3c557d871351ffa1da123673ba535f6be0da802c15aa + languageName: node + linkType: hard + "@opentelemetry/instrumentation-dataloader@npm:0.12.0": version: 0.12.0 resolution: "@opentelemetry/instrumentation-dataloader@npm:0.12.0" @@ -1716,6 +1739,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation-express@npm:0.44.0": + version: 0.44.0 + resolution: "@opentelemetry/instrumentation-express@npm:0.44.0" + dependencies: + "@opentelemetry/core": "npm:^1.8.0" + "@opentelemetry/instrumentation": "npm:^0.54.0" + "@opentelemetry/semantic-conventions": "npm:^1.27.0" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/9a6a20b8b3ab18f7751b443003691b720f63e4b1a17315486ce7ece81801c38920d4c42187cc96f70c902285b2ddcafe23d8c14cae749a537925eb8bca47dd1e + languageName: node + linkType: hard + "@opentelemetry/instrumentation-fastify@npm:0.39.0": version: 0.39.0 resolution: "@opentelemetry/instrumentation-fastify@npm:0.39.0" @@ -1729,6 +1765,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation-fastify@npm:0.40.0": + version: 0.40.0 + resolution: "@opentelemetry/instrumentation-fastify@npm:0.40.0" + dependencies: + "@opentelemetry/core": "npm:^1.8.0" + "@opentelemetry/instrumentation": "npm:^0.53.0" + "@opentelemetry/semantic-conventions": "npm:^1.27.0" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/2b05562aa8433fae2343c015a7e3c23a3871aaab1a50ddfb8c0974b03c7a0693c27dc4014ebcde61ec53658fc84c4554d6ba1ed1c0212fbcf6423424c07ed1ca + languageName: node + linkType: hard + "@opentelemetry/instrumentation-fs@npm:0.15.0": version: 0.15.0 resolution: "@opentelemetry/instrumentation-fs@npm:0.15.0" @@ -1741,6 +1790,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation-fs@npm:0.16.0": + version: 0.16.0 + resolution: "@opentelemetry/instrumentation-fs@npm:0.16.0" + dependencies: + "@opentelemetry/core": "npm:^1.8.0" + "@opentelemetry/instrumentation": "npm:^0.54.0" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/3975e12f24a59a9a5f1d7c9816aeb35d5f554756d46255acdbf210aceac2d63cbba3f3f56264fb07bd6ab9317586f872976ec3006f0bc4ed4bf6d20be23e3f51 + languageName: node + linkType: hard + "@opentelemetry/instrumentation-generic-pool@npm:0.39.0": version: 0.39.0 resolution: "@opentelemetry/instrumentation-generic-pool@npm:0.39.0" @@ -1815,6 +1876,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation-kafkajs@npm:0.4.0": + version: 0.4.0 + resolution: "@opentelemetry/instrumentation-kafkajs@npm:0.4.0" + dependencies: + "@opentelemetry/instrumentation": "npm:^0.54.0" + "@opentelemetry/semantic-conventions": "npm:^1.27.0" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/617a6512f0837bb0e48c08404a7fdaff92e93a645b6780708553d4f3e873bfd4b9bd04b50b5d08edde6d1e61bc428966073ee06f947d3cbc4f4e6245788215c4 + languageName: node + linkType: hard + "@opentelemetry/instrumentation-koa@npm:0.43.0": version: 0.43.0 resolution: "@opentelemetry/instrumentation-koa@npm:0.43.0" @@ -1975,6 +2048,22 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/instrumentation@npm:^0.54.0": + version: 0.54.0 + resolution: "@opentelemetry/instrumentation@npm:0.54.0" + dependencies: + "@opentelemetry/api-logs": "npm:0.54.0" + "@types/shimmer": "npm:^1.2.0" + import-in-the-middle: "npm:^1.8.1" + require-in-the-middle: "npm:^7.1.1" + semver: "npm:^7.5.2" + shimmer: "npm:^1.2.1" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10c0/3b80aac8bb64c53c91926b6b19cacea27b98ac3ababa2b36cf02451b168094d0894ef4682ddbd680117c1f748fd0104750a1e0e924f3ef4bcb9e9e1cad37a141 + languageName: node + linkType: hard + "@opentelemetry/redis-common@npm:^0.36.2": version: 0.36.2 resolution: "@opentelemetry/redis-common@npm:0.36.2" @@ -2465,19 +2554,6 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/core@npm:5.30.0" - dependencies: - "@sentry/hub": "npm:5.30.0" - "@sentry/minimal": "npm:5.30.0" - "@sentry/types": "npm:5.30.0" - "@sentry/utils": "npm:5.30.0" - tslib: "npm:^1.9.3" - checksum: 10c0/6407b9c2a6a56f90c198f5714b3257df24d89d1b4ca6726bd44760d0adabc25798b69fef2c88ccea461c7e79e3c78861aaebfd51fd3cb892aee656c3f7e11801 - languageName: node - linkType: hard - "@sentry/core@npm:7.119.2": version: 7.119.2 resolution: "@sentry/core@npm:7.119.2" @@ -2498,6 +2574,16 @@ __metadata: languageName: node linkType: hard +"@sentry/core@npm:8.36.0": + version: 8.36.0 + resolution: "@sentry/core@npm:8.36.0" + dependencies: + "@sentry/types": "npm:8.36.0" + "@sentry/utils": "npm:8.36.0" + checksum: 10c0/1c96b421010a6feb2f5875e7129160667d83199b0607d20ff20f6083bb6f2ffdb02167acd07e7b7856d0c339b1cceb08919f20eab5c424839691edd9a10c52bb + languageName: node + linkType: hard + "@sentry/electron@npm:^5.4.0": version: 5.6.0 resolution: "@sentry/electron@npm:5.6.0" @@ -2512,17 +2598,6 @@ __metadata: languageName: node linkType: hard -"@sentry/hub@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/hub@npm:5.30.0" - dependencies: - "@sentry/types": "npm:5.30.0" - "@sentry/utils": "npm:5.30.0" - tslib: "npm:^1.9.3" - checksum: 10c0/386c91d06aa44be0465fc11330d748a113e464d41cd562a9e1d222a682cbcb14e697a3e640953e7a0239997ad8a02b223a0df3d9e1d8816cb823fd3613be3e2f - languageName: node - linkType: hard - "@sentry/integrations@npm:7.119.2": version: 7.119.2 resolution: "@sentry/integrations@npm:7.119.2" @@ -2535,17 +2610,6 @@ __metadata: languageName: node linkType: hard -"@sentry/minimal@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/minimal@npm:5.30.0" - dependencies: - "@sentry/hub": "npm:5.30.0" - "@sentry/types": "npm:5.30.0" - tslib: "npm:^1.9.3" - checksum: 10c0/34ec05503de46d01f98c94701475d5d89cc044892c86ccce30e01f62f28344eb23b718e7cf573815e46f30a4ac9da3129bed9b3d20c822938acfb40cbe72437b - languageName: node - linkType: hard - "@sentry/node@npm:8.33.1": version: 8.33.1 resolution: "@sentry/node@npm:8.33.1" @@ -2589,23 +2653,6 @@ __metadata: languageName: node linkType: hard -"@sentry/node@npm:^5.27.2": - version: 5.30.0 - resolution: "@sentry/node@npm:5.30.0" - dependencies: - "@sentry/core": "npm:5.30.0" - "@sentry/hub": "npm:5.30.0" - "@sentry/tracing": "npm:5.30.0" - "@sentry/types": "npm:5.30.0" - "@sentry/utils": "npm:5.30.0" - cookie: "npm:^0.4.1" - https-proxy-agent: "npm:^5.0.0" - lru_map: "npm:^0.3.3" - tslib: "npm:^1.9.3" - checksum: 10c0/c50db7c81ace57cac17692245c2ab3c84a6149183f81d5f2dfd157eaa7b66eb4d6a727dd13a754bb129c96711389eec2944cd94126722ee1d8b11f2b627b830d - languageName: node - linkType: hard - "@sentry/node@npm:^7.69.0": version: 7.119.2 resolution: "@sentry/node@npm:7.119.2" @@ -2619,6 +2666,49 @@ __metadata: languageName: node linkType: hard +"@sentry/node@npm:^8.35.0": + version: 8.36.0 + resolution: "@sentry/node@npm:8.36.0" + dependencies: + "@opentelemetry/api": "npm:^1.9.0" + "@opentelemetry/context-async-hooks": "npm:^1.25.1" + "@opentelemetry/core": "npm:^1.25.1" + "@opentelemetry/instrumentation": "npm:^0.53.0" + "@opentelemetry/instrumentation-amqplib": "npm:^0.42.0" + "@opentelemetry/instrumentation-connect": "npm:0.40.0" + "@opentelemetry/instrumentation-dataloader": "npm:0.12.0" + "@opentelemetry/instrumentation-express": "npm:0.44.0" + "@opentelemetry/instrumentation-fastify": "npm:0.40.0" + "@opentelemetry/instrumentation-fs": "npm:0.16.0" + "@opentelemetry/instrumentation-generic-pool": "npm:0.39.0" + "@opentelemetry/instrumentation-graphql": "npm:0.43.0" + "@opentelemetry/instrumentation-hapi": "npm:0.41.0" + "@opentelemetry/instrumentation-http": "npm:0.53.0" + "@opentelemetry/instrumentation-ioredis": "npm:0.43.0" + "@opentelemetry/instrumentation-kafkajs": "npm:0.4.0" + "@opentelemetry/instrumentation-koa": "npm:0.43.0" + "@opentelemetry/instrumentation-lru-memoizer": "npm:0.40.0" + "@opentelemetry/instrumentation-mongodb": "npm:0.47.0" + "@opentelemetry/instrumentation-mongoose": "npm:0.42.0" + "@opentelemetry/instrumentation-mysql": "npm:0.41.0" + "@opentelemetry/instrumentation-mysql2": "npm:0.41.0" + "@opentelemetry/instrumentation-nestjs-core": "npm:0.40.0" + "@opentelemetry/instrumentation-pg": "npm:0.44.0" + "@opentelemetry/instrumentation-redis-4": "npm:0.42.0" + "@opentelemetry/instrumentation-undici": "npm:0.6.0" + "@opentelemetry/resources": "npm:^1.26.0" + "@opentelemetry/sdk-trace-base": "npm:^1.26.0" + "@opentelemetry/semantic-conventions": "npm:^1.27.0" + "@prisma/instrumentation": "npm:5.19.1" + "@sentry/core": "npm:8.36.0" + "@sentry/opentelemetry": "npm:8.36.0" + "@sentry/types": "npm:8.36.0" + "@sentry/utils": "npm:8.36.0" + import-in-the-middle: "npm:^1.11.2" + checksum: 10c0/0d5736e7659749de49c38ab99c4435e9f744622452be8e1021455ee830c317a4f08349bc1599b3c7611e28dc2a3951895de3c6fb5c296b17aa4b2b9dc4a8e74d + languageName: node + linkType: hard + "@sentry/opentelemetry@npm:8.33.1": version: 8.33.1 resolution: "@sentry/opentelemetry@npm:8.33.1" @@ -2636,23 +2726,20 @@ __metadata: languageName: node linkType: hard -"@sentry/tracing@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/tracing@npm:5.30.0" +"@sentry/opentelemetry@npm:8.36.0": + version: 8.36.0 + resolution: "@sentry/opentelemetry@npm:8.36.0" dependencies: - "@sentry/hub": "npm:5.30.0" - "@sentry/minimal": "npm:5.30.0" - "@sentry/types": "npm:5.30.0" - "@sentry/utils": "npm:5.30.0" - tslib: "npm:^1.9.3" - checksum: 10c0/46830265bc54a3203d7d9f0d8d9f2f7d9d2c6a977e07ccdae317fa3ea29c388b904b3bef28f7a0ba9c074845d67feab63c6d3c0ddce9aeb275b6c966253fb415 - languageName: node - linkType: hard - -"@sentry/types@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/types@npm:5.30.0" - checksum: 10c0/99c6e55c0a82c8ca95be2e9dbb35f581b29e4ff7af74b23bc62b690de4e35febfa15868184a2303480ef86babd4fea5273cf3b5ddf4a27685b841a72f13a0c88 + "@sentry/core": "npm:8.36.0" + "@sentry/types": "npm:8.36.0" + "@sentry/utils": "npm:8.36.0" + peerDependencies: + "@opentelemetry/api": ^1.9.0 + "@opentelemetry/core": ^1.25.1 + "@opentelemetry/instrumentation": ^0.53.0 + "@opentelemetry/sdk-trace-base": ^1.26.0 + "@opentelemetry/semantic-conventions": ^1.27.0 + checksum: 10c0/b1344f354265cce60c5e05ce9915a8063b050b3af021246ca2879c7cc90184f011f0318c13521f1f12d0573366aa9e1270551d78f199d084272e50a71f076a86 languageName: node linkType: hard @@ -2670,13 +2757,10 @@ __metadata: languageName: node linkType: hard -"@sentry/utils@npm:5.30.0": - version: 5.30.0 - resolution: "@sentry/utils@npm:5.30.0" - dependencies: - "@sentry/types": "npm:5.30.0" - tslib: "npm:^1.9.3" - checksum: 10c0/ca8eebfea7ac7db6d16f6c0b8a66ac62587df12a79ce9d0d8393f4d69880bb8d40d438f9810f7fb107a9880fe0d68bbf797b89cbafd113e89a0829eb06b205f8 +"@sentry/types@npm:8.36.0": + version: 8.36.0 + resolution: "@sentry/types@npm:8.36.0" + checksum: 10c0/db80242c7c07b014690d41f1099f1748e63459d062d4acfcaa70284ed214e66e2a93ab6da779043547aefd7ba0d52cde17a8126f4b2d52cfbdb5964f85472b8c languageName: node linkType: hard @@ -2698,6 +2782,15 @@ __metadata: languageName: node linkType: hard +"@sentry/utils@npm:8.36.0": + version: 8.36.0 + resolution: "@sentry/utils@npm:8.36.0" + dependencies: + "@sentry/types": "npm:8.36.0" + checksum: 10c0/1dc59538b7ae0e87a15944e61ea0fb0adfdead17bcdf0d2c6fc4e990dd7b352fb42741b7bbf23935045124f0617a9cdd2bbec80647336f402ac9155b6acbd2d5 + languageName: node + linkType: hard + "@sentry/vite-plugin@npm:^2.22.4": version: 2.22.6 resolution: "@sentry/vite-plugin@npm:2.22.6" @@ -2793,16 +2886,16 @@ __metadata: languageName: node linkType: hard -"@todesktop/cli@npm:1.9.4": - version: 1.9.4 - resolution: "@todesktop/cli@npm:1.9.4" +"@todesktop/cli@npm:^1.10.1": + version: 1.10.1 + resolution: "@todesktop/cli@npm:1.10.1" dependencies: - "@sentry/node": "npm:^5.27.2" + "@sentry/node": "npm:^8.35.0" ajv: "npm:^8.11.2" ajv-formats: "npm:^2.1.1" analytics-node: "npm:^4.0.1" archiver: "npm:^5.2.0" - axios: "npm:^0.21.1" + axios: "npm:^1.7.7" better-ajv-errors: "npm:^1.2.0" bunyan: "npm:^1.8.14" chalk: "npm:^4.1.0" @@ -2842,7 +2935,7 @@ __metadata: xdg-basedir: "npm:^4.0.0" bin: todesktop: dist/cli.js - checksum: 10c0/f98c4c517a9d60acc938ae0f3eaa0e49d5e38a1814dd8befcce12c652bcc88c92af23a937149cb5a9f7703487e8a0f53af9be9713aa41bcfb2a7384f34c838ca + checksum: 10c0/5cb532060f5b115c2de997888e11c9eb2580e4cfaf0c8fde19cf83d2a21a0e871441db9227ececf54e6a2328957cb33e40629f09f112b2d60273d1f2e6c4c1f1 languageName: node linkType: hard @@ -4816,7 +4909,7 @@ __metadata: "@sentry/electron": "npm:^5.4.0" "@sentry/vite-plugin": "npm:^2.22.4" "@sentry/wizard": "npm:^3.30.0" - "@todesktop/cli": "npm:1.9.4" + "@todesktop/cli": "npm:^1.10.1" "@todesktop/runtime": "npm:^1.6.4" "@types/adm-zip": "npm:^0.5.5" "@types/electron-squirrel-startup": "npm:^1.0.2" @@ -4981,13 +5074,6 @@ __metadata: languageName: node linkType: hard -"cookie@npm:^0.4.1": - version: 0.4.2 - resolution: "cookie@npm:0.4.2" - checksum: 10c0/beab41fbd7c20175e3a2799ba948c1dcc71ef69f23fe14eeeff59fc09f50c517b0f77098db87dbb4c55da802f9d86ee86cdc1cd3efd87760341551838d53fca2 - languageName: node - linkType: hard - "cookiejar@npm:^2.1.3": version: 2.1.4 resolution: "cookiejar@npm:2.1.4" @@ -7213,7 +7299,7 @@ __metadata: languageName: node linkType: hard -"import-in-the-middle@npm:^1.11.0, import-in-the-middle@npm:^1.8.1": +"import-in-the-middle@npm:^1.11.0, import-in-the-middle@npm:^1.11.2, import-in-the-middle@npm:^1.8.1": version: 1.11.2 resolution: "import-in-the-middle@npm:1.11.2" dependencies: @@ -8865,13 +8951,6 @@ __metadata: languageName: node linkType: hard -"lru_map@npm:^0.3.3": - version: 0.3.3 - resolution: "lru_map@npm:0.3.3" - checksum: 10c0/d861f14a142a4a74ebf8d3ad57f2e768a5b820db4100ae53eed1a64eb6350912332e6ebc87cb7415ad6d0cd8f3ce6d20beab9a5e6042ccb5996ea0067a220448 - languageName: node - linkType: hard - "magic-string@npm:0.30.8": version: 0.30.8 resolution: "magic-string@npm:0.30.8" @@ -11889,7 +11968,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.11.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3": +"tslib@npm:^1.11.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2 From bca962dfe0845cb9683b6c72dd910f6f2fa03c8d Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Fri, 1 Nov 2024 13:38:52 -0700 Subject: [PATCH 14/14] Add node modules to fix local make. --- builder-debug.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-debug.config.ts b/builder-debug.config.ts index 2be6a8b3..4ba3cda7 100644 --- a/builder-debug.config.ts +++ b/builder-debug.config.ts @@ -1,7 +1,7 @@ import { Configuration } from 'electron-builder'; const debugConfig: Configuration = { - files: ['package.json', 'README.md', 'src/**', '.vite/**'], + files: ['package.json', 'README.md', 'src/**', '.vite/**', 'node_modules/**'], extraFiles: [{ from: './assets', to: process.platform === 'darwin' ? './Resources' : './resources' }], beforeBuild: './scripts/preMake.js', win: {