Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,8 +109,6 @@
"@types/react-router-dom": "5.3.3",
"@types/semver": "7.8.0",
"@vitejs/plugin-react": "6.1.0",
"@vitest/browser-playwright": "catalog:",
"@vitest/coverage-v8": "catalog:",
"clsx": "2.1.1",
"concurrently": "10.0.5",
"date-fns": "4.4.0",
Expand All@@ -132,7 +130,6 @@
"vite-plugin-checker": "0.14.5",
"vite-plugin-electron": "1.1.1",
"vite-plus": "0.2.9",
"vitest": "catalog:",
"zustand": "5.0.15"
},
"engines": {
Expand Down
73 changes: 36 additions & 37 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,6 @@ allowBuilds:
unrs-resolver: true
catalog:
electron: '43.2.0'
# Pin the vitest family to the same version note: we need to keep this
# in-sync with vite-plus bundled version.
vitest: &vitest_version '4.1.10'
'@vitest/browser-playwright': *vitest_version
'@vitest/coverage-v8': *vitest_version
minimumReleaseAgeExclude:
- electron-menubar
overrides:
Expand All@@ -24,7 +19,4 @@ overrides:
cross-spawn: '7.0.6'
got: '11.8.6'
electron: 'catalog:'
vitest: 'catalog:'
'@vitest/browser-playwright': 'catalog:'
'@vitest/coverage-v8': 'catalog:'
savePrefix: ''
5 changes: 0 additions & 5 deletions renovate.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,11 +34,6 @@
"matchPackageNames": ["electron"],
"allowedVersions": "<43.3.0"
},
{
"description": "Group vite-plus with vitest and @vitest/** so they land in a single PR and are bumped in lockstep. The vitest family versions are centralized in pnpm-workspace.yaml's catalog (and enforced as overrides) so a mismatched copy can never be installed.",
"matchPackageNames": ["vite-plus", "vitest", "@vitest/**"],
"groupName": "vite-plus / vitest"
},
{
"description": "Group the playwright package with the Playwright container image that the visual regression job runs in. The image ships the browser build that exact release expects, so a mismatch fails to launch Chromium and would strand the committed screenshot baselines.",
"matchPackageNames": ["playwright", "mcr.microsoft.com/playwright"],
Expand Down
2 changes: 1 addition & 1 deletion scripts/visual.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ FILTER="${1:-}"
# below), so run the suite rather than nesting another container.
if [ -n "${GITIFY_VISUAL_IN_CONTAINER:-}" ]; then
# shellcheck disable=SC2086 -- word splitting is intended for the optional flags
exec corepack pnpm exec vitest --project 'browser [visual]' --run ${UPDATE} ${FILTER:+-t "${FILTER}"}
exec corepack pnpm exec vp test --project 'browser [visual]' --run ${UPDATE} ${FILTER:+-t "${FILTER}"}
fi

REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
Expand Down
2 changes: 1 addition & 1 deletion src/main/menu.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { Menu, shell } from 'electron';
import type { Menubar } from 'electron-menubar';
import { autoUpdater } from 'electron-updater';

import type { Mock } from 'vitest';
import type { Mock } from 'vite-plus/test';

import { APPLICATION } from '../shared/constants';
import { isMacOS } from '../shared/platform';
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/routes/routes.visual.test.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { ReactElement } from 'react';

import { page } from 'vitest/browser';
import { page } from 'vite-plus/test/browser';

import { renderRoute, type VisualRenderOptions } from '../__helpers__/visual-utils';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/utils/forges/bitbucket/client.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';

import { mockBitbucketAccount } from '../../../__mocks__/account-mocks';

Expand Down
2 changes: 1 addition & 1 deletion src/renderer/utils/forges/bitbucket/transform.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it } from 'vitest';
import { describe, expect, it } from 'vite-plus/test';

import { mockBitbucketAccount } from '../../../__mocks__/account-mocks';

Expand Down
2 changes: 1 addition & 1 deletion src/renderer/utils/forges/github/flows.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ vi.mock('@octokit/oauth-methods', async () => {
import { createDeviceCode, exchangeDeviceCode, exchangeWebFlowCode } from '@octokit/oauth-methods';
import { RequestError } from '@octokit/request-error';

import type { MockedFunction } from 'vitest';
import type { MockedFunction } from 'vite-plus/test';

import { Constants } from '../../../constants';

Expand Down
2 changes: 1 addition & 1 deletion src/renderer/utils/ui/keyboard.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it } from 'vitest';
import { describe, expect, it } from 'vite-plus/test';

import { getNormalizedKey, shouldIgnoreKeyboardEvent } from './keyboard';

Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"jsx": "react-jsx",
"rootDir": "./src",
"outDir": "./build/",
"types": ["vitest/globals", "vite/client"],
"types": ["vite-plus/test/globals", "vite/client"],

"strict": true,
"esModuleInterop": true,
Expand Down
4 changes: 2 additions & 2 deletions vitest.config.mts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import tailwindcss from '@tailwindcss/vite';
import react from '@vitejs/plugin-react';
import { playwright } from '@vitest/browser-playwright';
import { defaultExclude, defineConfig } from 'vitest/config';
import { defaultExclude, defineConfig } from 'vite-plus';
import { playwright } from 'vite-plus/test/browser-playwright';

// Set a stable timezone before any workers start so that Intl (used by
// @primer/react's RelativeTime component) always formats dates in UTC,
Expand Down