diff --git a/.github/workflows/benchmark-templates.yml b/.github/workflows/benchmark-templates.yml index 313fd9081..2e50c3c54 100644 --- a/.github/workflows/benchmark-templates.yml +++ b/.github/workflows/benchmark-templates.yml @@ -25,5 +25,5 @@ jobs: - uses: actions/setup-node@v7 with: package-manager-cache: false - node-version: 22 + node-version-file: .nvmrc - run: node scripts/benchmark-templates.mjs validate diff --git a/.github/workflows/build-bootstrap-python.yml b/.github/workflows/build-bootstrap-python.yml index 4800949ca..7b2c0cb00 100644 --- a/.github/workflows/build-bootstrap-python.yml +++ b/.github/workflows/build-bootstrap-python.yml @@ -37,7 +37,7 @@ jobs: uses: actions/setup-node@v7 with: package-manager-cache: false - node-version: '20' + node-version-file: .nvmrc - name: Build bootstrap Python run: node scripts/build-bootstrap-python.mjs --platform ${{ matrix.platform }} --output bootstrap-python diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index b05aea7e4..9ffe63357 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -49,7 +49,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc cache: pnpm - name: Validate ToDesktop credentials diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad4c06dc9..0000b799c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc cache: pnpm - name: Install dependencies @@ -83,7 +83,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc - name: Require a version bump when the contract changes env: @@ -163,7 +163,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc cache: pnpm - name: Install dependencies diff --git a/.github/workflows/lifecycle.yml b/.github/workflows/lifecycle.yml index cf4439246..662ca0b4f 100644 --- a/.github/workflows/lifecycle.yml +++ b/.github/workflows/lifecycle.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc cache: pnpm - name: Install dependencies diff --git a/.github/workflows/publish-bridge-types.yml b/.github/workflows/publish-bridge-types.yml index e13c4949d..db512845b 100644 --- a/.github/workflows/publish-bridge-types.yml +++ b/.github/workflows/publish-bridge-types.yml @@ -82,7 +82,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 26 + node-version-file: .nvmrc package-manager-cache: false registry-url: https://registry.npmjs.org diff --git a/.github/workflows/release-from-pr-label.yml b/.github/workflows/release-from-pr-label.yml index b29b97cc5..6f840f96a 100644 --- a/.github/workflows/release-from-pr-label.yml +++ b/.github/workflows/release-from-pr-label.yml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc - name: Detect package.json version change from pull request files id: version diff --git a/.github/workflows/starter-templates.yml b/.github/workflows/starter-templates.yml index 9360cdbe9..2a010dba9 100644 --- a/.github/workflows/starter-templates.yml +++ b/.github/workflows/starter-templates.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-node@v7 with: package-manager-cache: false - node-version: 22 + node-version-file: .nvmrc - run: node scripts/starter-templates.mjs validate - name: guardrails hold @@ -68,7 +68,7 @@ jobs: - uses: actions/setup-node@v7 with: package-manager-cache: false - node-version: 22 + node-version-file: .nvmrc - name: authenticate to GCS uses: google-github-actions/auth@v2 diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 8cfae0fff..a668c690a 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -58,7 +58,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v7 with: - node-version: 22 + node-version-file: .nvmrc - name: Configure Git author run: | diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..229b3ce85 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +24.22.3 diff --git a/README.md b/README.md index e3a6ec91f..874577cfd 100644 --- a/README.md +++ b/README.md @@ -89,19 +89,19 @@ Contributions are welcome. The app is an [Electron](https://www.electronjs.org/) ### Prerequisites -- [**Node.js**](https://nodejs.org/) v22 LTS or later +- [**Node.js**](https://nodejs.org/) 24 LTS (the version in `.nvmrc`) - [**pnpm**](https://pnpm.io/) v10 or later (via Corepack) -```bash -nvm install 22 && nvm use 22 # recommended — https://github.com/nvm-sh/nvm -corepack enable # enables pnpm (bundled with Node) -``` +Development, CI and ToDesktop builds all use the Node version in `.nvmrc`, which is the same major as the Node runtime bundled with Electron. ### Setup ```bash git clone https://github.com/Comfy-Org/Comfy-Desktop.git cd Comfy-Desktop +nvm install # installs the Node version in .nvmrc — https://github.com/nvm-sh/nvm +nvm use +corepack enable # enables pnpm (bundled with Node) pnpm run init ``` diff --git a/package.json b/package.json index 0f6098187..4264602a4 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "SEE LICENSE IN LICENSE", "homepage": "https://github.com/Comfy-Org/Comfy-Desktop", "engines": { - "node": ">=22", + "node": ">=24.13.0", "pnpm": ">=10" }, "packageManager": "pnpm@10.28.1", @@ -97,7 +97,7 @@ "@playwright/test": "^1.58.2", "@tailwindcss/vite": "^4.1.8", "@tanstack/vue-virtual": "^3.13.48", - "@types/node": "^22.19.1", + "@types/node": "^24.19.2", "@types/semver": "^7.7.1", "@vitejs/plugin-vue": "^6.0.2", "@vitest/browser-playwright": "^4.1.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d32ce583..733e8994d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,7 +62,7 @@ importers: version: 1.3.0-alpha.1(@vueuse/core@14.4.0(vue@3.5.44(typescript@5.9.3)))(@vueuse/integrations@14.4.0(axios@1.13.6)(fuse.js@7.5.0)(vue@3.5.44(typescript@5.9.3)))(reka-ui@2.11.0(vue@3.5.44(typescript@5.9.3)))(tailwindcss@4.2.1)(typescript@5.9.3)(vue-component-type-helpers@3.3.13)(vue@3.5.44(typescript@5.9.3)) '@datadog/datadog-ci': specifier: ^5.9.0 - version: 5.9.0(@types/node@22.19.12) + version: 5.9.0(@types/node@24.19.2) '@electron/rebuild': specifier: ^3.7.2 version: 3.7.2 @@ -77,22 +77,22 @@ importers: version: 1.58.2 '@tailwindcss/vite': specifier: ^4.1.8 - version: 4.2.1(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + version: 4.2.1(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) '@tanstack/vue-virtual': specifier: ^3.13.48 version: 3.13.48(vue@3.5.44(typescript@5.9.3)) '@types/node': - specifier: ^22.19.1 - version: 22.19.12 + specifier: ^24.19.2 + version: 24.19.2 '@types/semver': specifier: ^7.7.1 version: 7.7.1 '@vitejs/plugin-vue': specifier: ^6.0.2 - version: 6.0.4(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vue@3.5.44(typescript@5.9.3)) + version: 6.0.4(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vue@3.5.44(typescript@5.9.3)) '@vitest/browser-playwright': specifier: ^4.1.12 - version: 4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) + version: 4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 @@ -107,7 +107,7 @@ importers: version: 26.8.1(electron-builder-squirrel-windows@26.8.1) electron-vite: specifier: ^5.0.0 - version: 5.0.0(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + version: 5.0.0(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) eslint: specifier: ^10.0.1 version: 10.0.2(jiti@2.6.1) @@ -155,10 +155,10 @@ importers: version: 8.56.1(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3) vite: specifier: ^7.3.1 - version: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + version: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) vitest: specifier: ^4.1.12 - version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.19.12)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@24.19.2)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) vue: specifier: ^3.5.44 version: 3.5.44(typescript@5.9.3) @@ -1302,11 +1302,8 @@ packages: '@types/ms@2.1.0': resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} - '@types/node@22.19.12': - resolution: {integrity: sha512-0QEp0aPJYSyf6RrTjDB7HlKgNMTY+V2C7ESTaVt6G9gQ0rPLzTGz7OF2NXTLR5vcy7HJEtIUsyWLsfX0kTqJBA==} - - '@types/node@24.10.14': - resolution: {integrity: sha512-OowOUbD1lBCOFIPOZ8xnMIhgqA4sCutMiYOmPHL1PTLt5+y1XA+g2+yC9OOyz8p+deMZqPZLxfMjYIfrKsPeFg==} + '@types/node@24.19.2': + resolution: {integrity: sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==} '@types/plist@3.0.5': resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==} @@ -3864,11 +3861,8 @@ packages: resolution: {integrity: sha512-8iAasVS4wUx0gPLjH8Xtz2PeDzTSiy8QiLGu2DT3X5GU+egFEQhpnbtkehbAwjvDcxIERmCYcysiODFmE3Ud0Q==} engines: {node: '>=18'} - undici-types@6.21.0: - resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} - - undici-types@7.16.0: - resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} + undici-types@7.24.6: + resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} unique-filename@2.0.1: resolution: {integrity: sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==} @@ -4309,7 +4303,7 @@ snapshots: '@datadog/browser-core': 6.28.1 '@datadog/browser-rum-core': 6.28.1 - '@datadog/datadog-ci-base@5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12)': + '@datadog/datadog-ci-base@5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2)': dependencies: '@antfu/install-pkg': 1.1.0 '@types/datadog-metrics': 0.6.1 @@ -4323,7 +4317,7 @@ snapshots: fast-xml-parser: 5.4.2 form-data: 4.0.5 glob: 13.0.6 - inquirer: 8.2.7(@types/node@22.19.12) + inquirer: 8.2.7(@types/node@24.19.2) jest-diff: 30.2.0 js-yaml: 4.1.1 jszip: 3.10.1 @@ -4348,7 +4342,7 @@ snapshots: '@datadog/datadog-ci-plugin-coverage@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) axios: 1.13.6(debug@4.4.3) chalk: 3.0.0 fast-xml-parser: 5.4.2 @@ -4361,7 +4355,7 @@ snapshots: '@datadog/datadog-ci-plugin-deployment@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) axios: 1.13.6(debug@4.4.3) chalk: 3.0.0 simple-git: 3.16.0 @@ -4371,7 +4365,7 @@ snapshots: '@datadog/datadog-ci-plugin-dora@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) axios: 1.13.6(debug@4.4.3) chalk: 3.0.0 simple-git: 3.16.0 @@ -4381,7 +4375,7 @@ snapshots: '@datadog/datadog-ci-plugin-gate@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) '@types/uuid': 9.0.8 axios: 1.13.6(debug@4.4.3) chalk: 3.0.0 @@ -4391,7 +4385,7 @@ snapshots: '@datadog/datadog-ci-plugin-junit@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) axios: 1.13.6(debug@4.4.3) chalk: 3.0.0 fast-xml-parser: 5.4.2 @@ -4403,7 +4397,7 @@ snapshots: '@datadog/datadog-ci-plugin-sarif@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) ajv: 8.18.0 ajv-formats: 3.0.1(ajv@8.18.0) axios: 1.13.6(debug@4.4.3) @@ -4418,7 +4412,7 @@ snapshots: '@datadog/datadog-ci-plugin-sbom@5.9.0(@datadog/datadog-ci-base@5.9.0)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) ajv: 8.18.0 ajv-formats: 3.0.1(ajv@8.18.0) axios: 1.13.6(debug@4.4.3) @@ -4430,9 +4424,9 @@ snapshots: - debug - supports-color - '@datadog/datadog-ci@5.9.0(@types/node@22.19.12)': + '@datadog/datadog-ci@5.9.0(@types/node@24.19.2)': dependencies: - '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@22.19.12) + '@datadog/datadog-ci-base': 5.9.0(@datadog/datadog-ci-plugin-coverage@5.9.0)(@datadog/datadog-ci-plugin-deployment@5.9.0)(@datadog/datadog-ci-plugin-dora@5.9.0)(@datadog/datadog-ci-plugin-gate@5.9.0)(@datadog/datadog-ci-plugin-junit@5.9.0)(@datadog/datadog-ci-plugin-sarif@5.9.0)(@datadog/datadog-ci-plugin-sbom@5.9.0)(@types/node@24.19.2) '@datadog/datadog-ci-plugin-coverage': 5.9.0(@datadog/datadog-ci-base@5.9.0) '@datadog/datadog-ci-plugin-deployment': 5.9.0(@datadog/datadog-ci-base@5.9.0) '@datadog/datadog-ci-plugin-dora': 5.9.0(@datadog/datadog-ci-base@5.9.0) @@ -4845,12 +4839,12 @@ snapshots: '@iconify/types': 2.0.0 import-meta-resolve: 4.2.0 - '@inquirer/external-editor@1.0.3(@types/node@22.19.12)': + '@inquirer/external-editor@1.0.3(@types/node@24.19.2)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 '@internationalized/date@3.12.4': dependencies: @@ -5147,12 +5141,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.2.1 '@tailwindcss/oxide-win32-x64-msvc': 4.2.1 - '@tailwindcss/vite@4.2.1(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))': + '@tailwindcss/vite@4.2.1(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))': dependencies: '@tailwindcss/node': 4.2.1 '@tailwindcss/oxide': 4.2.1 tailwindcss: 4.2.1 - vite: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + vite: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) '@tanstack/virtual-core@3.19.7': {} @@ -5190,7 +5184,7 @@ snapshots: dependencies: '@types/http-cache-semantics': 4.2.0 '@types/keyv': 3.1.4 - '@types/node': 22.19.12 + '@types/node': 24.19.2 '@types/responselike': 1.0.3 '@types/chai@5.2.3': @@ -5212,7 +5206,7 @@ snapshots: '@types/fs-extra@9.0.13': dependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 '@types/http-cache-semantics@4.2.0': {} @@ -5220,27 +5214,23 @@ snapshots: '@types/keyv@3.1.4': dependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 '@types/ms@2.1.0': {} - '@types/node@22.19.12': + '@types/node@24.19.2': dependencies: - undici-types: 6.21.0 - - '@types/node@24.10.14': - dependencies: - undici-types: 7.16.0 + undici-types: 7.24.6 '@types/plist@3.0.5': dependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 xmlbuilder: 15.1.1 optional: true '@types/responselike@1.0.3': dependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 '@types/semver@7.7.1': {} @@ -5256,7 +5246,7 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 optional: true '@typescript-eslint/eslint-plugin@8.56.1(@typescript-eslint/parser@8.56.1(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)': @@ -5350,35 +5340,35 @@ snapshots: '@typescript-eslint/types': 8.56.1 eslint-visitor-keys: 5.0.1 - '@vitejs/plugin-vue@6.0.4(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vue@3.5.44(typescript@5.9.3))': + '@vitejs/plugin-vue@6.0.4(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vue@3.5.44(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + vite: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) vue: 3.5.44(typescript@5.9.3) - '@vitest/browser-playwright@4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12)': + '@vitest/browser-playwright@4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12)': dependencies: - '@vitest/browser': 4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) - '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + '@vitest/browser': 4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) + '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) playwright: 1.58.2 tinyrainbow: 3.2.0 - vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.19.12)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@24.19.2)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/browser@4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12)': + '@vitest/browser@4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12)': dependencies: '@blazediff/core': 1.9.1 - '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) '@vitest/utils': 4.1.12 magic-string: 0.30.21 pngjs: 7.0.0 sirv: 3.0.2 tinyrainbow: 3.2.0 - vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.19.12)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@24.19.2)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) ws: 8.22.2 transitivePeerDependencies: - bufferutil @@ -5395,13 +5385,13 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.2.0 - '@vitest/mocker@4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))': + '@vitest/mocker@4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.12 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + vite: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) '@vitest/pretty-format@4.1.12': dependencies: @@ -6233,7 +6223,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron-vite@5.0.0(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)): + electron-vite@5.0.0(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.0 '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0) @@ -6241,7 +6231,7 @@ snapshots: esbuild: 0.25.12 magic-string: 0.30.21 picocolors: 1.1.1 - vite: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + vite: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) transitivePeerDependencies: - supports-color @@ -6260,7 +6250,7 @@ snapshots: electron@40.4.1: dependencies: '@electron/get': 2.0.3 - '@types/node': 24.10.14 + '@types/node': 24.19.2 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -6901,9 +6891,9 @@ snapshots: ini@1.3.8: {} - inquirer@8.2.7(@types/node@22.19.12): + inquirer@8.2.7(@types/node@24.19.2): dependencies: - '@inquirer/external-editor': 1.0.3(@types/node@22.19.12) + '@inquirer/external-editor': 1.0.3(@types/node@24.19.2) ansi-escapes: 4.3.2 chalk: 4.1.2 cli-cursor: 3.1.0 @@ -8071,9 +8061,7 @@ snapshots: uint8array-extras@1.6.0: {} - undici-types@6.21.0: {} - - undici-types@7.16.0: {} + undici-types@7.24.6: {} unique-filename@2.0.1: dependencies: @@ -8120,7 +8108,7 @@ snapshots: extsprintf: 1.4.1 optional: true - vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0): + vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0): dependencies: esbuild: 0.27.3 fdir: 6.5.0(picomatch@4.0.3) @@ -8129,16 +8117,16 @@ snapshots: rollup: 4.59.0 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 22.19.12 + '@types/node': 24.19.2 fsevents: 2.3.3 jiti: 2.6.1 lightningcss: 1.31.1 yaml: 2.9.0 - vitest@4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.19.12)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)): + vitest@4.1.12(@opentelemetry/api@1.9.1)(@types/node@24.19.2)(@vitest/browser-playwright@4.1.12)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.12 - '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) + '@vitest/mocker': 4.1.12(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.12 '@vitest/runner': 4.1.12 '@vitest/snapshot': 4.1.12 @@ -8155,12 +8143,12 @@ snapshots: tinyexec: 1.3.1 tinyglobby: 0.2.15 tinyrainbow: 3.2.0 - vite: 7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) + vite: 7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 - '@types/node': 22.19.12 - '@vitest/browser-playwright': 4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@22.19.12)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) + '@types/node': 24.19.2 + '@vitest/browser-playwright': 4.1.12(playwright@1.58.2)(vite@7.3.1(@types/node@24.19.2)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.9.0))(vitest@4.1.12) transitivePeerDependencies: - msw diff --git a/src/main/lib/deviceId.test.ts b/src/main/lib/deviceId.test.ts index ee8f61cad..73aedb85c 100644 --- a/src/main/lib/deviceId.test.ts +++ b/src/main/lib/deviceId.test.ts @@ -77,7 +77,10 @@ describe('deviceId', () => { mockMachineIdFiles = {} setPlatform('linux') const realReadFileSync = fs.readFileSync - vi.spyOn(fs, 'readFileSync').mockImplementation(((file: fs.PathOrFileDescriptor, options) => { + vi.spyOn(fs, 'readFileSync').mockImplementation((( + file: fs.PathOrFileDescriptor, + options: Parameters[1] + ) => { if (file === ETC_MACHINE_ID || file === DBUS_MACHINE_ID) { const contents = mockMachineIdFiles[file] if (contents === undefined) throw Object.assign(new Error('ENOENT'), { code: 'ENOENT' }) diff --git a/src/main/lib/nodeVersionPin.test.ts b/src/main/lib/nodeVersionPin.test.ts new file mode 100644 index 000000000..b406b48a5 --- /dev/null +++ b/src/main/lib/nodeVersionPin.test.ts @@ -0,0 +1,90 @@ +import fs from 'fs' +import path from 'path' +import { parse } from 'yaml' +import { describe, expect, it } from 'vitest' + +interface WorkflowStep { + uses?: string + with?: Record +} + +interface Workflow { + jobs?: Record +} + +interface PackageManifest { + engines?: { node?: string } + devDependencies?: Record +} + +const repoRoot = process.cwd() +const workflowsDir = path.join(repoRoot, '.github', 'workflows') + +function readRepoFile(...segments: string[]): string { + return fs.readFileSync(path.join(repoRoot, ...segments), 'utf-8') +} + +function pinnedNodeVersion(): string { + return readRepoFile('.nvmrc').trim() +} + +function majorOf(version: string): string { + return version.replace(/^[^\d]*/, '').split('.')[0] ?? '' +} + +function packageManifest(): PackageManifest { + return JSON.parse(readRepoFile('package.json')) as PackageManifest +} + +function setupNodeSteps(): { file: string; step: WorkflowStep }[] { + return fs + .readdirSync(workflowsDir) + .filter((file) => file.endsWith('.yml')) + .flatMap((file) => { + const workflow = parse(readRepoFile('.github', 'workflows', file)) as Workflow + return Object.values(workflow.jobs ?? {}).flatMap((job) => + (job.steps ?? []) + .filter((step) => step.uses?.startsWith('actions/setup-node@')) + .map((step) => ({ file, step })) + ) + }) +} + +describe('Node version pin', () => { + it('pins an exact Node version in .nvmrc', () => { + expect(pinnedNodeVersion()).toMatch(/^\d+\.\d+\.\d+$/) + }) + + it('builds ToDesktop releases on the .nvmrc version', () => { + const todesktop = JSON.parse(readRepoFile('todesktop.json')) as { nodeVersion?: string } + + expect(todesktop.nodeVersion).toBe(pinnedNodeVersion()) + }) + + it('sets up Node from .nvmrc in every workflow', () => { + const steps = setupNodeSteps() + expect(steps.length).toBeGreaterThan(0) + + const offPin = steps + .filter( + ({ step }) => + step.with?.['node-version-file'] !== '.nvmrc' || 'node-version' in (step.with ?? {}) + ) + .map(({ file }) => file) + + expect(offPin).toEqual([]) + }) + + it('declares an engines floor on the pinned Node major', () => { + const floor = packageManifest().engines?.node ?? '' + + expect(floor.startsWith('>=')).toBe(true) + expect(majorOf(floor)).toBe(majorOf(pinnedNodeVersion())) + }) + + it('type-checks against the pinned Node major', () => { + const nodeTypes = packageManifest().devDependencies?.['@types/node'] ?? '' + + expect(majorOf(nodeTypes)).toBe(majorOf(pinnedNodeVersion())) + }) +}) diff --git a/todesktop.json b/todesktop.json index c365ffa07..af7762c16 100644 --- a/todesktop.json +++ b/todesktop.json @@ -13,6 +13,7 @@ "appId": "com.todesktop.241012ess7yxs0e", "icon": "./assets/Comfy_Logo_x512.png", "packageManager": "pnpm", + "nodeVersion": "24.22.3", "pnpmVersion": "10.28.1", "packageJson": { "extends": "package.json",