Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
sudo apt-get update
sudo apt-get install --yes libx11-dev libxkbfile-dev

- uses: voidzero-dev/setup-vp@v1
- uses: voidzero-dev/setup-vp@v1.20.0
with:
node-version: 24
cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install --yes libx11-dev libxkbfile-dev
- uses: voidzero-dev/setup-vp@v1
- uses: voidzero-dev/setup-vp@v1.20.0
with:
node-version: ${{ matrix.node-version }}
cache: true
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# vite-plus preview build registry bridge (auto-added by vp)
registry=https://registry-bridge.viteplus.dev/
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
"react-dom": "^19.3.0",
"typescript": "^7.0.2",
"vite": "catalog:",
"vite-plus": "catalog:",
"vitest": "catalog:"
"vite-plus": "catalog:"
},
"engines": {
"node": ">=23.0.0",
Expand Down
3,482 changes: 1,693 additions & 1,789 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

19 changes: 15 additions & 4 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,20 @@ allowBuilds:
blockExoticSubdeps: false
minimumReleaseAgeExclude:
- '@nkzw/*'
- '@voidzero-dev/vite-plus-core@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-darwin-arm64@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-darwin-x64@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-linux-arm64-gnu@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-linux-arm64-musl@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-linux-x64-gnu@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-linux-x64-musl@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-win32-arm64-msvc@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- '@voidzero-dev/vite-plus-win32-x64-msvc@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a'
- vite-plus@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a
catalog:
vite: npm:@voidzero-dev/vite-plus-core@^0.3.1
vite-plus: ^0.3.2
vitest: 5.0.0
vite: npm:@voidzero-dev/vite-plus-core@0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a
vite-plus: 0.0.0-commit.2d331e6bae169462409c1a9d311801d29de7a25a
vitest: 5.0.1
nodeLinker: hoisted
onlyBuiltDependencies:
- '@nkzw/mdx-editor'
Expand All @@ -33,9 +43,10 @@ onlyBuiltDependencies:
- unrs-resolver
overrides:
extract-zip>yauzl: ^3.4.0
vite: 'catalog:'
# Keep Vite+ on the main suite's Vitest version without overriding the Workers suite.
vite-plus>vitest: 'catalog:'
vite@*: 'catalog:'
vitest@*: 'catalog:'
patchedDependencies:
native-keymap@3.3.9: patches/native-keymap@3.3.9.patch
peerDependencyRules:
Expand Down
5 changes: 1 addition & 4 deletions service/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { defineConfig } from 'vite-plus';

export default defineConfig({
pack: {
copy: [],
dts: false,
},
pack: { copy: [], deps: { resolveDepSubpath: true }, dts: false },
});
4 changes: 2 additions & 2 deletions test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"private": true,
"type": "module",
"scripts": {
"test": "vitest run"
"test": "vp test run"
},
"devDependencies": {
"@cloudflare/vitest-plugin": "^1.1.9",
"vitest": "4.1.11"
"vitest": "catalog:"
}
}
2 changes: 1 addition & 1 deletion test/sharing.integration.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="@cloudflare/vitest-plugin/types" />

import { env, SELF } from 'cloudflare:test';
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
import { afterEach, beforeEach, expect, test, vi } from 'vite-plus/test';
import { handleSharingApiRequest, type SharingBucket, type SharingEnv } from '../service/api.ts';
import { hashUploadIntentSecret } from '../service/upload-intent.ts';

Expand Down
6 changes: 5 additions & 1 deletion test/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url';
import { cloudflareTest, readD1Migrations } from '@cloudflare/vitest-plugin';
import { defineConfig } from 'vitest/config';
import { defineConfig } from 'vite-plus';

export default defineConfig({
plugins: [
Expand All @@ -26,6 +26,10 @@ export default defineConfig({
})),
],
test: {
// Vitest v4 compatibility: preserve mock call history.
// Remove after tests no longer rely on calls from setup or earlier tests.
// https://vitest.dev/guide/migration/#clearmocks-is-enabled-by-default
clearMocks: false,
include: ['**/*.integration.ts'],
setupFiles: ['./setup.cloudflare.ts'],
},
Expand Down
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default defineConfig({
{ from: 'fonts', to: 'dist' },
{ from: 'App.css.d.ts', rename: 'styles.css.d.ts', to: 'dist' },
],
deps: { resolveDepSubpath: true },
dts: false,
loader: {
'.svg': 'dataurl',
Expand Down
8 changes: 7 additions & 1 deletion web/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import babel from '@rolldown/plugin-babel';
import { reactCompilerPreset } from '@vitejs/plugin-react';
import { voidReact } from '@void/react/plugin';
import { fate } from 'react-fate/vite';
import type { Plugin } from 'vite';
import type { Plugin } from 'vite-plus';
import { defineConfig, lazyPlugins } from 'vite-plus';
import { voidPlugin } from 'void';

Expand Down Expand Up @@ -54,4 +54,10 @@ export default defineConfig({
dedupe: ['react', 'react-dom'],
},
server: { port: 6002 },
test: {
// Vitest v4 compatibility: preserve mock call history.
// Remove after tests no longer rely on calls from setup or earlier tests.
// https://vitest.dev/guide/migration/#clearmocks-is-enabled-by-default
clearMocks: false,
},
});
Loading