Skip to content

Added separate Solid 2 vitest config #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davedbase merged 2 commits into from
May 14, 2026
+49 −8
Merged

Added separate Solid 2 vitest config #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a9f9e
Adding separate testing pacage
davedbase May 14, 2026
8ddb224
Merge branch 'next' into update/v2/vitest-separation
davedbase May 14, 2026
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
32 changes: 27 additions & 5 deletions packages/virtual/vitest.config.ts → configs/vitest.config.solid2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { defineConfig } from "vitest/config";
import type { Plugin } from "vite";
import * as utils from "../scripts/utils/index.js";

function solidBabelPlugin(testSSR: boolean): Plugin {
return {
Expand Down Expand Up @@ -44,6 +45,16 @@ function solidBabelPlugin(testSSR: boolean): Plugin {
};
}

const package_name = utils.getPackageNameFromCWD();

if (package_name == null) {
utils.log_info("Testing ALL packages (Solid 2.0 mode)...");
} else {
utils.log_info("Testing " + package_name + " package (Solid 2.0 mode)...");
}

const from_root = package_name == null;

export default defineConfig(({ mode }) => {
const testSSR = mode === "test:ssr" || mode === "ssr";

Expand All @@ -57,11 +68,22 @@ export default defineConfig(({ mode }) => {
transformMode: {
web: [/\.[jt]sx$/],
},
...(testSSR
? { include: ["test/server.test.{ts,tsx}"] }
: {
include: ["test/*.test.{ts,tsx}"],
exclude: ["test/server.test.{ts,tsx}"],
...(from_root
? // Testing all packages from root
{
...(testSSR && { include: ["packages/*/test/server.test.{ts,tsx}"] }),
...(!testSSR && {
include: ["packages/*/test/*.test.{ts,tsx}"],
exclude: ["packages/*/test/server.test.{ts,tsx}"],
}),
}
: // Testing a single package
{
...(testSSR && { include: ["test/server.test.{ts,tsx}"] }),
...(!testSSR && {
include: ["test/*.test.{ts,tsx}"],
exclude: ["test/server.test.{ts,tsx}"],
}),
}),
},
resolve: {
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"test:client": "vitest -c ./configs/vitest.config.ts",
"test:ssr": "pnpm run test:client --mode ssr",
"test": "pnpm run test:client && pnpm run test:ssr",
"test:client2": "vitest -c ./configs/vitest.config.solid2.ts",
"test:ssr2": "pnpm run test:client2 --mode ssr",
"build": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ./scripts/build.ts",
"new-package": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ./scripts/new-package.ts",
"update-readme": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ./scripts/update-readme.ts",
Expand All @@ -30,6 +32,7 @@
"postinstall": "pnpm update-tsconfigs"
},
"devDependencies": {
"@babel/core": "^7.27.0",
"@changesets/cli": "^2.29.4",
"@nothing-but/node-resolve-ts": "^1.0.1",
"@solidjs/start": "^1.1.4",
Expand All @@ -54,6 +57,7 @@
"typescript": "^5.8.3",
"vinxi": "^0.5.7",
"vite": "^6.3.5",
"babel-preset-solid": "2.0.0-beta.12",
"vite-plugin-solid": "^2.11.6",
"vitest": "^2.1.9"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/virtual/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
"scripts": {
"dev": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ../../scripts/dev.ts",
"build": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ../../scripts/build.ts",
"vitest": "vitest -c vitest.config.ts",
"test": "pnpm run vitest",
"test:ssr": "pnpm run vitest --mode ssr"
"vitest": "vitest -c ../../configs/vitest.config.ts",
"vitest2": "vitest -c ../../configs/vitest.config.solid2.ts",
"test": "pnpm run vitest2",
"test:ssr": "pnpm run vitest2 --mode ssr"
},
"dependencies": {
"@solid-primitives/utils": "workspace:^"
Expand Down
13 changes: 13 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"dev": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ../../scripts/dev.ts",
"build": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ../../scripts/build.ts",
"vitest": "vitest -c ../../configs/vitest.config.ts",
"vitest2": "vitest -c ../../configs/vitest.config.solid2.ts",
"test": "pnpm run vitest",
"test:ssr": "pnpm run vitest --mode ssr"
},
Expand Down