From 37b56ede60a56418aaafe0fb4450a09a4ee7c1b0 Mon Sep 17 00:00:00 2001 From: "Alexis H. Munsayac" Date: Mon, 19 Oct 2026 11:33:53 +0800 Subject: [PATCH 1/2] test: add vitest unit tests for the plugin - Add a root vitest config and a test:unit script, matching the next branch. - Run the unit tests in the vitest workflow. - Exclude test files from the declaration build. Co-Authored-By: Claude Opus 5.5 (1M context) --- .github/workflows/vitest.yml | 3 +++ package.json | 6 ++++-- pnpm-lock.yaml | 37 +++++++++++++++++++++++++++++++++++- tsconfig.json | 2 +- vitest.config.ts | 10 ++++++++++ 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 vitest.config.ts diff --git a/.github/workflows/vitest.yml b/.github/workflows/vitest.yml index fc062d92..aad075ac 100644 --- a/.github/workflows/vitest.yml +++ b/.github/workflows/vitest.yml @@ -27,6 +27,9 @@ jobs: - name: Install project dependencies run: pnpm i + - name: Run unit tests + run: pnpm run test:unit + - name: Install playwright browser working-directory: examples/vite-6 run: pnpm exec playwright install chromium diff --git a/package.json b/package.json index a2662f89..cba7d046 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "prepublishOnly": "pnpm build", "release": "pnpm build && changeset publish", "check": "package-check", - "test": "node scripts/test-examples.ts" + "test": "node scripts/test-examples.ts", + "test:unit": "vitest run" }, "repository": { "type": "git", @@ -68,7 +69,8 @@ "rollup-plugin-cleaner": "^1.0.0", "solid-js": "^1.9.3", "typescript": "^5.2.2", - "vite": "^6.0.0" + "vite": "^6.0.0", + "vitest": "^3.0.7" }, "peerDependencies": { "@testing-library/jest-dom": "^5.16.6 || ^5.17.0 || ^6.0.0 || ^7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eed12c18..23823a84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,6 +90,9 @@ importers: vite: specifier: ^6.0.0 version: 6.0.9(@types/node@18.19.66)(lightningcss@1.32.0) + vitest: + specifier: ^3.0.7 + version: 3.0.7(@types/node@18.19.66)(@vitest/browser@3.0.7)(jsdom@26.0.0(supports-color@8.1.1))(lightningcss@1.32.0)(msw@2.7.3(@types/node@18.19.66)(typescript@5.7.2))(supports-color@8.1.1) examples/vite-3: dependencies: @@ -5968,6 +5971,28 @@ snapshots: '@types/node': 18.19.66 optional: true + '@vitest/browser@3.0.7(@types/node@18.19.66)(playwright@1.50.1)(typescript@5.7.2)(vite@6.0.9(@types/node@18.19.66)(lightningcss@1.32.0))(vitest@3.0.7)': + dependencies: + '@testing-library/dom': 10.4.0 + '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.0) + '@vitest/mocker': 3.0.7(msw@2.7.3(@types/node@18.19.66)(typescript@5.7.2))(vite@6.0.9(@types/node@18.19.66)(lightningcss@1.32.0)) + '@vitest/utils': 3.0.7 + magic-string: 0.30.17 + msw: 2.7.3(@types/node@18.19.66)(typescript@5.7.2) + sirv: 3.0.1 + tinyrainbow: 2.0.0 + vitest: 3.0.7(@types/node@18.19.66)(@vitest/browser@3.0.7)(jsdom@26.0.0(supports-color@8.1.1))(lightningcss@1.32.0)(msw@2.7.3(@types/node@18.19.66)(typescript@5.7.2))(supports-color@8.1.1) + ws: 8.18.1 + optionalDependencies: + playwright: 1.50.1 + transitivePeerDependencies: + - '@types/node' + - bufferutil + - typescript + - utf-8-validate + - vite + optional: true + '@vitest/browser@3.0.7(@types/node@18.19.66)(playwright@1.50.1)(typescript@5.7.2)(vite@6.2.0(@types/node@18.19.66)(lightningcss@1.32.0))(vitest@3.0.7)': dependencies: '@testing-library/dom': 10.4.0 @@ -6038,6 +6063,16 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 + '@vitest/mocker@3.0.7(msw@2.7.3(@types/node@18.19.66)(typescript@5.7.2))(vite@6.0.9(@types/node@18.19.66)(lightningcss@1.32.0))': + dependencies: + '@vitest/spy': 3.0.7 + estree-walker: 3.0.3 + magic-string: 0.30.17 + optionalDependencies: + msw: 2.7.3(@types/node@18.19.66)(typescript@5.7.2) + vite: 6.0.9(@types/node@18.19.66)(lightningcss@1.32.0) + optional: true + '@vitest/mocker@3.0.7(msw@2.7.3(@types/node@18.19.66)(typescript@5.7.2))(vite@6.2.0(@types/node@18.19.66)(lightningcss@1.32.0))': dependencies: '@vitest/spy': 3.0.7 @@ -8040,7 +8075,7 @@ snapshots: why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 18.19.66 - '@vitest/browser': 3.0.7(@types/node@18.19.66)(playwright@1.50.1)(typescript@5.7.2)(vite@6.2.0(@types/node@18.19.66)(lightningcss@1.32.0))(vitest@3.0.7) + '@vitest/browser': 3.0.7(@types/node@18.19.66)(playwright@1.50.1)(typescript@5.7.2)(vite@6.0.9(@types/node@18.19.66)(lightningcss@1.32.0))(vitest@3.0.7) jsdom: 26.0.0(supports-color@8.1.1) transitivePeerDependencies: - jiti diff --git a/tsconfig.json b/tsconfig.json index 70191cbf..9c12304d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "src", "cypress" ], "exclude": [ - "**/*.spec.ts" + "**/*.spec.ts", "**/*.test.ts" ], "compilerOptions": { "target": "ESNext", diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 00000000..2f1a903a --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'vitest/config'; + +// The plugin's own unit tests (`pnpm test:unit`). The example apps under +// examples/* carry their own vitest configs and run through `pnpm test`. +export default defineConfig({ + test: { + include: ['src/**/*.test.ts'], + environment: 'node', + }, +}); From 62e2b759ff21bda4357a0f05aed8d9137e93c7d3 Mon Sep 17 00:00:00 2001 From: "Alexis H. Munsayac" Date: Mon, 19 Oct 2026 11:35:29 +0800 Subject: [PATCH 2/2] fix: dedupe solid-js in production builds - resolve.dedupe was only set while serving, so a dependency with its own nested solid-js copy was bundled twice in production. - Dedupe solid-js in every command. optimizeDeps.include stays dev only. - Add a build test with a nested solid-js copy. Fixes #112 Co-Authored-By: Claude Opus 5.5 (1M context) --- .changeset/dedupe-solid-in-builds.md | 5 +++ src/dedupe.test.ts | 67 ++++++++++++++++++++++++++++ src/index.ts | 9 ++-- 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 .changeset/dedupe-solid-in-builds.md create mode 100644 src/dedupe.test.ts diff --git a/.changeset/dedupe-solid-in-builds.md b/.changeset/dedupe-solid-in-builds.md new file mode 100644 index 00000000..82097e85 --- /dev/null +++ b/.changeset/dedupe-solid-in-builds.md @@ -0,0 +1,5 @@ +--- +'vite-plugin-solid': patch +--- + +Production builds now dedupe `solid-js` the same way dev does. A dependency with its own nested copy of `solid-js` no longer adds a second runtime to the bundle, which broke context lookups (#112). diff --git a/src/dedupe.test.ts b/src/dedupe.test.ts new file mode 100644 index 00000000..0579910e --- /dev/null +++ b/src/dedupe.test.ts @@ -0,0 +1,67 @@ +import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path from 'node:path'; +import { build, type Rollup } from 'vite'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; +import solidPlugin from './index.js'; + +let root: string; + +async function writePackage(dir: string, pkg: Record, files: Record) { + await mkdir(dir, { recursive: true }); + await writeFile(path.join(dir, 'package.json'), JSON.stringify(pkg)); + for (const [name, code] of Object.entries(files)) { + await writeFile(path.join(dir, name), code); + } +} + +beforeAll(async () => { + root = await mkdtemp(path.join(tmpdir(), 'solid-dedupe-')); + const fakeSolid = (copy: string) => + [ + { name: 'solid-js', version: '1.9.0', type: 'module', exports: { '.': './index.js' } }, + { 'index.js': `export const copy = ${JSON.stringify(copy)};\n` }, + ] as const; + await writePackage(path.join(root, 'node_modules/solid-js'), ...fakeSolid('root')); + // A dependency that ships its own nested copy of solid-js. + const lib = path.join(root, 'node_modules/lib'); + await writePackage( + lib, + { name: 'lib', version: '1.0.0', type: 'module', exports: { '.': './index.js' } }, + { 'index.js': "export { copy as libCopy } from 'solid-js';\n" }, + ); + await writePackage(path.join(lib, 'node_modules/solid-js'), ...fakeSolid('nested')); + await writeFile(path.join(root, 'package.json'), JSON.stringify({ name: 'app', type: 'module' })); + await writeFile( + path.join(root, 'entry.js'), + "import { copy } from 'solid-js';\nimport { libCopy } from 'lib';\nexport const copies = [copy, libCopy];\n", + ); +}); + +afterAll(async () => { + await rm(root, { recursive: true, force: true }); +}); + +describe('resolve.dedupe', () => { + // #112: dev deduped solid-js, but production builds bundled the nested copy too. + it('bundles a single solid-js copy in production builds', async () => { + const result = (await build({ + root, + configFile: false, + logLevel: 'silent', + plugins: [solidPlugin()], + build: { + write: false, + minify: false, + rollupOptions: { input: path.join(root, 'entry.js'), preserveEntrySignatures: 'strict' }, + }, + })) as Rollup.RollupOutput | Rollup.RollupOutput[]; + const output = Array.isArray(result) ? result[0] : result; + const code = output.output + .filter((chunk): chunk is Rollup.OutputChunk => chunk.type === 'chunk') + .map((chunk) => chunk.code) + .join('\n'); + expect(code).toContain('"root"'); + expect(code).not.toContain('"nested"'); + }); +}); diff --git a/src/index.ts b/src/index.ts index 82770246..493b6dbf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -237,10 +237,9 @@ export default function solidPlugin(options: Partial = {}): Plugin { }, }); + const solidDeps = ['solid-js', 'solid-js/web', 'solid-js/store', 'solid-js/html', 'solid-js/h']; // fix for bundling dev in production - const nestedDeps = replaceDev - ? ['solid-js', 'solid-js/web', 'solid-js/store', 'solid-js/html', 'solid-js/h'] - : []; + const nestedDeps = replaceDev ? solidDeps : []; const userTest = (userConfig as any).test ?? {}; const test = {} as any; @@ -286,7 +285,9 @@ export default function solidPlugin(options: Partial = {}): Plugin { ...(replaceDev ? ['development'] : []), ...(userConfig.mode === 'test' && !options.ssr ? ['browser'] : []), ], - dedupe: nestedDeps, + // Dedupe in builds too. A dependency that ships its own nested + // solid-js would otherwise add a second runtime to the bundle. #112 + dedupe: solidDeps, alias: [{ find: /^solid-refresh$/, replacement: runtimePublicPath }], }, optimizeDeps: {