From 9352a690275cbeb573421cf11a2cdf2b4328d1ea Mon Sep 17 00:00:00 2001 From: Simon Ihmig Date: Sun, 19 Jan 2025 16:57:45 +0100 Subject: [PATCH 1/2] Migrate to vitest 3 --- packages/build-utils/package.json | 2 +- packages/cdn/package.json | 2 +- packages/core/package.json | 2 +- packages/solid/package.json | 4 +- packages/solid/vitest.config.ts | 13 +- packages/vite-plugin/package.json | 2 +- packages/wc/package.json | 4 +- packages/wc/vitest.config.ts | 10 +- packages/webpack/package.json | 2 +- pnpm-lock.yaml | 445 +++--------------------------- 10 files changed, 53 insertions(+), 433 deletions(-) diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index 1323ce63f..c3af43b28 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -67,7 +67,7 @@ "rollup": "4.31.0", "typescript": "5.7.3", "typescript-eslint": "8.20.0", - "vitest": "2.1.8" + "vitest": "3.0.2" }, "peerDependencies": {}, "publishConfig": { diff --git a/packages/cdn/package.json b/packages/cdn/package.json index 98e4276c7..c46825192 100644 --- a/packages/cdn/package.json +++ b/packages/cdn/package.json @@ -55,7 +55,7 @@ "prettier": "3.4.2", "typescript": "5.7.3", "typescript-eslint": "8.20.0", - "vitest": "2.1.8" + "vitest": "3.0.2" }, "publishConfig": { "registry": "https://registry.npmjs.org" diff --git a/packages/core/package.json b/packages/core/package.json index ebce27df5..4d35cd331 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -62,7 +62,7 @@ "prettier": "3.4.2", "typescript": "5.7.3", "typescript-eslint": "8.20.0", - "vitest": "2.1.8" + "vitest": "3.0.2" }, "peerDependenciesMeta": { "blurhash": { diff --git a/packages/solid/package.json b/packages/solid/package.json index 6e077fa0f..e2fac74f0 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -58,7 +58,7 @@ "@solidjs/testing-library": "0.8.10", "@tsconfig/strictest": "2.0.5", "@types/node": "22.10.7", - "@vitest/browser": "2.1.8", + "@vitest/browser": "3.0.2", "babel-preset-solid": "1.9.3", "concurrently": "9.1.2", "eslint": "9.18.0", @@ -72,6 +72,6 @@ "typescript": "5.7.3", "typescript-eslint": "8.20.0", "vite-plugin-solid": "2.11.0", - "vitest": "2.1.8" + "vitest": "3.0.2" } } diff --git a/packages/solid/vitest.config.ts b/packages/solid/vitest.config.ts index 6fe3a883c..b17865c7d 100644 --- a/packages/solid/vitest.config.ts +++ b/packages/solid/vitest.config.ts @@ -19,12 +19,13 @@ export default defineConfig(({ mode }) => { browser: { enabled: !testSSR, provider: 'playwright', - name: 'chromium', - providerOptions: { - launch: { - channel: 'chrome', + instances: [ + { + name: 'Chrome', + browser: 'chromium', + launch: { channel: 'chrome' }, }, - }, + ], }, watch: false, isolate: !testSSR, @@ -34,7 +35,6 @@ export default defineConfig(({ mode }) => { SSR: testSSR ? '1' : '', PROD: testSSR ? '1' : '', }, - environment: testSSR ? 'node' : 'jsdom', transformMode: { web: [/\.[jt]sx$/] }, ...(testSSR ? { @@ -44,6 +44,7 @@ export default defineConfig(({ mode }) => { include: ['tests/*.test.{ts,tsx}'], exclude: ['tests/server.test.{ts,tsx}'], }), + ...(testSSR ? { environment: 'node' } : {}), }, resolve: { conditions: testSSR ? ['node'] : ['browser', 'development'], diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json index 984d47ddf..301c62c23 100644 --- a/packages/vite-plugin/package.json +++ b/packages/vite-plugin/package.json @@ -71,7 +71,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.20.0", "vite": "6.0.7", - "vitest": "2.1.8" + "vitest": "3.0.2" }, "peerDependencies": { "vite": "^5.2.0 || ^6.0.0" diff --git a/packages/wc/package.json b/packages/wc/package.json index 2296429ed..7195b898a 100644 --- a/packages/wc/package.json +++ b/packages/wc/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@custom-elements-manifest/analyzer": "0.10.4", "@open-wc/testing-helpers": "3.0.1", - "@vitest/browser": "2.1.8", + "@vitest/browser": "3.0.2", "concurrently": "9.1.2", "eslint": "9.18.0", "eslint-config-prettier": "10.0.1", @@ -58,7 +58,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.20.0", "vite": "6.0.7", - "vitest": "2.1.8" + "vitest": "3.0.2" }, "customElements": "custom-elements.json" } diff --git a/packages/wc/vitest.config.ts b/packages/wc/vitest.config.ts index a7ab35f76..4c1e78403 100644 --- a/packages/wc/vitest.config.ts +++ b/packages/wc/vitest.config.ts @@ -6,12 +6,12 @@ export default defineConfig({ browser: { provider: 'playwright', // or 'webdriverio' enabled: true, - name: 'chromium', // browser name is required - providerOptions: { - launch: { - channel: 'chrome', + instances: [ + { + browser: 'chromium', + launch: { channel: 'chrome' }, }, - }, + ], }, }, }); diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 7d2efc81d..acc872a0f 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -150,7 +150,7 @@ "style-loader": "4.0.0", "typescript": "5.7.3", "typescript-eslint": "8.20.0", - "vitest": "2.1.8", + "vitest": "3.0.2", "webpack": "5.97.1" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5191a700d..d2f5ccd0d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -881,8 +881,8 @@ importers: specifier: 8.20.0 version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/cdn: dependencies: @@ -927,8 +927,8 @@ importers: specifier: 8.20.0 version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/core: devDependencies: @@ -972,8 +972,8 @@ importers: specifier: 8.20.0 version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/ember: dependencies: @@ -1199,8 +1199,8 @@ importers: specifier: 22.10.7 version: 22.10.7 '@vitest/browser': - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))(vitest@2.1.8) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))(vitest@3.0.2) babel-preset-solid: specifier: 1.9.3 version: 1.9.3(@babel/core@7.25.9) @@ -1239,10 +1239,10 @@ importers: version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vite-plugin-solid: specifier: 2.11.0 - version: 2.11.0(solid-js@1.9.4)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) + version: 2.11.0(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@2.1.8)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/svelte: dependencies: @@ -1393,8 +1393,8 @@ importers: specifier: 6.0.7 version: 6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/wc: dependencies: @@ -1418,8 +1418,8 @@ importers: specifier: 3.0.1 version: 3.0.1 '@vitest/browser': - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))(vitest@2.1.8) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))(vitest@3.0.2) concurrently: specifier: 9.1.2 version: 9.1.2 @@ -1454,8 +1454,8 @@ importers: specifier: 6.0.7 version: 6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@2.1.8)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) packages/webpack: dependencies: @@ -1536,8 +1536,8 @@ importers: specifier: 8.20.0 version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vitest: - specifier: 2.1.8 - version: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) + specifier: 3.0.2 + version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) webpack: specifier: 5.97.1 version: 5.97.1 @@ -4539,21 +4539,6 @@ packages: vite: ^5.0.0 || ^6.0.0 vue: ^3.2.25 - '@vitest/browser@2.1.8': - resolution: {integrity: sha512-OWVvEJThRgxlNMYNVLEK/9qVkpRcLvyuKLngIV3Hob01P56NjPHprVBYn+rx4xAJudbM9yrCrywPIEuA3Xyo8A==} - peerDependencies: - playwright: '*' - safaridriver: '*' - vitest: 2.1.8 - webdriverio: '*' - peerDependenciesMeta: - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true - '@vitest/browser@3.0.2': resolution: {integrity: sha512-EVXRQTEmwyCNh6qDXIf/fGWp3YXa3KtsMCOXmlD4Yeq62pJaqJ5+iUIY1XLN7TO2iXatGDdLZYbHbR6YQT4FDw==} peerDependencies: @@ -4569,23 +4554,9 @@ packages: webdriverio: optional: true - '@vitest/expect@2.1.8': - resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==} - '@vitest/expect@3.0.2': resolution: {integrity: sha512-dKSHLBcoZI+3pmP5hiZ7I5grNru2HRtEW8Z5Zp4IXog8QYcxhlox7JUPyIIFWfN53+3HW3KPLIl6nSzUGgKSuQ==} - '@vitest/mocker@2.1.8': - resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==} - peerDependencies: - msw: ^2.4.9 - vite: ^5.0.0 - peerDependenciesMeta: - msw: - optional: true - vite: - optional: true - '@vitest/mocker@3.0.2': resolution: {integrity: sha512-Hr09FoBf0jlwwSyzIF4Xw31OntpO3XtZjkccpcBf8FeVW3tpiyKlkeUzxS/txzHqpUCNIX157NaTySxedyZLvA==} peerDependencies: @@ -4597,33 +4568,18 @@ packages: vite: optional: true - '@vitest/pretty-format@2.1.8': - resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==} - '@vitest/pretty-format@3.0.2': resolution: {integrity: sha512-yBohcBw/T/p0/JRgYD+IYcjCmuHzjC3WLAKsVE4/LwiubzZkE8N49/xIQ/KGQwDRA8PaviF8IRO8JMWMngdVVQ==} - '@vitest/runner@2.1.8': - resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==} - '@vitest/runner@3.0.2': resolution: {integrity: sha512-GHEsWoncrGxWuW8s405fVoDfSLk6RF2LCXp6XhevbtDjdDme1WV/eNmUueDfpY1IX3MJaCRelVCEXsT9cArfEg==} - '@vitest/snapshot@2.1.8': - resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==} - '@vitest/snapshot@3.0.2': resolution: {integrity: sha512-h9s67yD4+g+JoYG0zPCo/cLTabpDqzqNdzMawmNPzDStTiwxwkyYM1v5lWE8gmGv3SVJ2DcxA2NpQJZJv9ym3g==} - '@vitest/spy@2.1.8': - resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==} - '@vitest/spy@3.0.2': resolution: {integrity: sha512-8mI2iUn+PJFMT44e3ISA1R+K6ALVs47W6eriDTfXe6lFqlflID05MB4+rIFhmDSLBj8iBsZkzBYlgSkinxLzSQ==} - '@vitest/utils@2.1.8': - resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==} - '@vitest/utils@3.0.2': resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==} @@ -10830,10 +10786,6 @@ packages: resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==} engines: {node: ^18.0.0 || >=20.0.0} - tinyrainbow@1.2.0: - resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} - engines: {node: '>=14.0.0'} - tinyrainbow@2.0.0: resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} engines: {node: '>=14.0.0'} @@ -11316,11 +11268,6 @@ packages: resolution: {integrity: sha512-jvl2hJ0fyWwfDVQdDDHCJiVxqU4k0A6kFAnljS0kIjrGfhdTvKEWIoj0bcJgMyrKhxNMoZZGmHZsstQgjDIL3g==} hasBin: true - vite-node@2.1.8: - resolution: {integrity: sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - vite-node@3.0.2: resolution: {integrity: sha512-hsEQerBAHvVAbv40m3TFQe/lTEbOp7yDpyqMJqr2Tnd+W58+DEYOt+fluQgekOePcsNBmR77lpVAnIU2Xu4SvQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} @@ -11427,31 +11374,6 @@ packages: postcss: optional: true - vitest@2.1.8: - resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.1.8 - '@vitest/ui': 2.1.8 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - vitest@3.0.2: resolution: {integrity: sha512-5bzaHakQ0hmVVKLhfh/jXf6oETDBtgPo8tQCHYB+wftNgFJ+Hah67IsWc8ivx4vFL025Ow8UiuTf4W57z4izvQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} @@ -15620,40 +15542,20 @@ snapshots: dependencies: '@types/node': 22.10.7 - '@types/ember@4.0.11': - dependencies: - '@types/ember__application': 4.0.11(@babel/core@7.25.9) - '@types/ember__array': 4.0.10 - '@types/ember__component': 4.0.22 - '@types/ember__controller': 4.0.12 - '@types/ember__debug': 4.0.8 - '@types/ember__engine': 4.0.11 - '@types/ember__error': 4.0.6 - '@types/ember__object': 4.0.12 - '@types/ember__polyfills': 4.0.6 - '@types/ember__routing': 4.0.22 - '@types/ember__runloop': 4.0.10 - '@types/ember__service': 4.0.9 - '@types/ember__string': 3.16.3 - '@types/ember__template': 4.0.7 - '@types/ember__test': 4.0.6(@babel/core@7.25.9) - '@types/ember__utils': 4.0.7 - '@types/rsvp': 4.0.9 - '@types/ember@4.0.11(@babel/core@7.25.9)': dependencies: '@types/ember__application': 4.0.11(@babel/core@7.25.9) '@types/ember__array': 4.0.10(@babel/core@7.25.9) '@types/ember__component': 4.0.22(@babel/core@7.25.9) - '@types/ember__controller': 4.0.12 - '@types/ember__debug': 4.0.8 - '@types/ember__engine': 4.0.11 + '@types/ember__controller': 4.0.12(@babel/core@7.25.9) + '@types/ember__debug': 4.0.8(@babel/core@7.25.9) + '@types/ember__engine': 4.0.11(@babel/core@7.25.9) '@types/ember__error': 4.0.6 '@types/ember__object': 4.0.12(@babel/core@7.25.9) '@types/ember__polyfills': 4.0.6 '@types/ember__routing': 4.0.22(@babel/core@7.25.9) '@types/ember__runloop': 4.0.10(@babel/core@7.25.9) - '@types/ember__service': 4.0.9 + '@types/ember__service': 4.0.9(@babel/core@7.25.9) '@types/ember__string': 3.16.3 '@types/ember__template': 4.0.7 '@types/ember__test': 4.0.6(@babel/core@7.25.9) @@ -15666,45 +15568,31 @@ snapshots: '@types/ember__application@4.0.11(@babel/core@7.25.9)': dependencies: '@glimmer/component': 1.1.2(@babel/core@7.25.9) - '@types/ember': 4.0.11 - '@types/ember__engine': 4.0.11 - '@types/ember__object': 4.0.12 + '@types/ember': 4.0.11(@babel/core@7.25.9) + '@types/ember__engine': 4.0.11(@babel/core@7.25.9) + '@types/ember__object': 4.0.12(@babel/core@7.25.9) '@types/ember__owner': 4.0.9 - '@types/ember__routing': 4.0.22 + '@types/ember__routing': 4.0.22(@babel/core@7.25.9) transitivePeerDependencies: - '@babel/core' - supports-color - '@types/ember__array@4.0.10': - dependencies: - '@types/ember': 4.0.11 - '@types/ember__object': 4.0.12 - '@types/ember__array@4.0.10(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) - '@types/ember__object': 4.0.12 + '@types/ember__object': 4.0.12(@babel/core@7.25.9) transitivePeerDependencies: - '@babel/core' - supports-color - '@types/ember__component@4.0.22': - dependencies: - '@types/ember': 4.0.11 - '@types/ember__object': 4.0.12 - '@types/ember__component@4.0.22(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) - '@types/ember__object': 4.0.12 + '@types/ember__object': 4.0.12(@babel/core@7.25.9) transitivePeerDependencies: - '@babel/core' - supports-color - '@types/ember__controller@4.0.12': - dependencies: - '@types/ember__object': 4.0.12 - '@types/ember__controller@4.0.12(@babel/core@7.25.9)': dependencies: '@types/ember__object': 4.0.12(@babel/core@7.25.9) @@ -15712,11 +15600,6 @@ snapshots: - '@babel/core' - supports-color - '@types/ember__debug@4.0.8': - dependencies: - '@types/ember__object': 4.0.12 - '@types/ember__owner': 4.0.9 - '@types/ember__debug@4.0.8(@babel/core@7.25.9)': dependencies: '@types/ember__object': 4.0.12(@babel/core@7.25.9) @@ -15727,11 +15610,6 @@ snapshots: '@types/ember__destroyable@4.0.5': {} - '@types/ember__engine@4.0.11': - dependencies: - '@types/ember__object': 4.0.12 - '@types/ember__owner': 4.0.9 - '@types/ember__engine@4.0.11(@babel/core@7.25.9)': dependencies: '@types/ember__object': 4.0.12(@babel/core@7.25.9) @@ -15759,11 +15637,6 @@ snapshots: - '@babel/core' - supports-color - '@types/ember__object@4.0.12': - dependencies: - '@types/ember': 4.0.11 - '@types/rsvp': 4.0.9 - '@types/ember__object@4.0.12(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) @@ -15776,27 +15649,16 @@ snapshots: '@types/ember__polyfills@4.0.6': {} - '@types/ember__routing@4.0.22': - dependencies: - '@types/ember': 4.0.11 - '@types/ember__controller': 4.0.12 - '@types/ember__object': 4.0.12 - '@types/ember__service': 4.0.9 - '@types/ember__routing@4.0.22(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) - '@types/ember__controller': 4.0.12 - '@types/ember__object': 4.0.12 - '@types/ember__service': 4.0.9 + '@types/ember__controller': 4.0.12(@babel/core@7.25.9) + '@types/ember__object': 4.0.12(@babel/core@7.25.9) + '@types/ember__service': 4.0.9(@babel/core@7.25.9) transitivePeerDependencies: - '@babel/core' - supports-color - '@types/ember__runloop@4.0.10': - dependencies: - '@types/ember': 4.0.11 - '@types/ember__runloop@4.0.10(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) @@ -15804,10 +15666,6 @@ snapshots: - '@babel/core' - supports-color - '@types/ember__service@4.0.9': - dependencies: - '@types/ember__object': 4.0.12 - '@types/ember__service@4.0.9(@babel/core@7.25.9)': dependencies: '@types/ember__object': 4.0.12(@babel/core@7.25.9) @@ -15828,10 +15686,6 @@ snapshots: - '@babel/core' - supports-color - '@types/ember__utils@4.0.7': - dependencies: - '@types/ember': 4.0.11 - '@types/ember__utils@4.0.7(@babel/core@7.25.9)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.9) @@ -16170,70 +16024,6 @@ snapshots: vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) vue: 3.5.13(typescript@5.7.3) - '@vitest/browser@2.1.8(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))(vitest@2.1.8)': - dependencies: - '@testing-library/dom': 10.4.0 - '@testing-library/user-event': 14.6.0(@testing-library/dom@10.4.0) - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) - '@vitest/utils': 2.1.8 - magic-string: 0.30.17 - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - sirv: 3.0.0 - tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@22.10.7)(@vitest/browser@2.1.8)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) - ws: 8.18.0 - optionalDependencies: - playwright: 1.49.1 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - typescript - - utf-8-validate - - vite - - '@vitest/browser@2.1.8(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))(vitest@2.1.8)': - dependencies: - '@testing-library/dom': 10.4.0 - '@testing-library/user-event': 14.6.0(@testing-library/dom@10.4.0) - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) - '@vitest/utils': 2.1.8 - magic-string: 0.30.17 - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - sirv: 3.0.0 - tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@22.10.7)(@vitest/browser@2.1.8)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) - ws: 8.18.0 - optionalDependencies: - playwright: 1.49.1 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - typescript - - utf-8-validate - - vite - - '@vitest/browser@3.0.2(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))(vitest@2.1.8)': - dependencies: - '@testing-library/dom': 10.4.0 - '@testing-library/user-event': 14.6.0(@testing-library/dom@10.4.0) - '@vitest/mocker': 3.0.2(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) - '@vitest/utils': 3.0.2 - magic-string: 0.30.17 - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - sirv: 3.0.0 - tinyrainbow: 2.0.0 - vitest: 2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0) - ws: 8.18.0 - optionalDependencies: - playwright: 1.49.1 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - typescript - - utf-8-validate - - vite - optional: true - '@vitest/browser@3.0.2(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))(vitest@3.0.2)': dependencies: '@testing-library/dom': 10.4.0 @@ -16255,13 +16045,6 @@ snapshots: - utf-8-validate - vite - '@vitest/expect@2.1.8': - dependencies: - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - tinyrainbow: 1.2.0 - '@vitest/expect@3.0.2': dependencies: '@vitest/spy': 3.0.2 @@ -16269,34 +16052,6 @@ snapshots: chai: 5.1.2 tinyrainbow: 2.0.0 - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))': - dependencies: - '@vitest/spy': 2.1.8 - estree-walker: 3.0.3 - magic-string: 0.30.17 - optionalDependencies: - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))': - dependencies: - '@vitest/spy': 2.1.8 - estree-walker: 3.0.3 - magic-string: 0.30.17 - optionalDependencies: - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - vite: 6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2) - - '@vitest/mocker@3.0.2(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))': - dependencies: - '@vitest/spy': 3.0.2 - estree-walker: 3.0.3 - magic-string: 0.30.17 - optionalDependencies: - msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - optional: true - '@vitest/mocker@3.0.2(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))': dependencies: '@vitest/spy': 3.0.2 @@ -16306,50 +16061,25 @@ snapshots: msw: 2.7.0(@types/node@22.10.7)(typescript@5.7.3) vite: 6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2) - '@vitest/pretty-format@2.1.8': - dependencies: - tinyrainbow: 1.2.0 - '@vitest/pretty-format@3.0.2': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@2.1.8': - dependencies: - '@vitest/utils': 2.1.8 - pathe: 1.1.2 - '@vitest/runner@3.0.2': dependencies: '@vitest/utils': 3.0.2 pathe: 2.0.2 - '@vitest/snapshot@2.1.8': - dependencies: - '@vitest/pretty-format': 2.1.8 - magic-string: 0.30.17 - pathe: 1.1.2 - '@vitest/snapshot@3.0.2': dependencies: '@vitest/pretty-format': 3.0.2 magic-string: 0.30.17 pathe: 2.0.2 - '@vitest/spy@2.1.8': - dependencies: - tinyspy: 3.0.2 - '@vitest/spy@3.0.2': dependencies: tinyspy: 3.0.2 - '@vitest/utils@2.1.8': - dependencies: - '@vitest/pretty-format': 2.1.8 - loupe: 3.1.2 - tinyrainbow: 1.2.0 - '@vitest/utils@3.0.2': dependencies: '@vitest/pretty-format': 3.0.2 @@ -24265,8 +23995,6 @@ snapshots: tinypool@1.0.2: {} - tinyrainbow@1.2.0: {} - tinyrainbow@2.0.0: {} tinyspy@3.0.2: {} @@ -24808,24 +24536,6 @@ snapshots: - xml2js - yaml - vite-node@2.1.8(@types/node@22.10.7)(terser@5.37.0): - dependencies: - cac: 6.7.14 - debug: 4.4.0(supports-color@9.4.0) - es-module-lexer: 1.6.0 - pathe: 1.1.2 - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - vite-node@3.0.2(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2): dependencies: cac: 6.7.14 @@ -24847,19 +24557,6 @@ snapshots: - tsx - yaml - vite-plugin-solid@2.11.0(solid-js@1.9.4)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)): - dependencies: - '@babel/core': 7.25.9 - '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.3(@babel/core@7.25.9) - merge-anything: 5.1.7 - solid-js: 1.9.4 - solid-refresh: 0.6.3(solid-js@1.9.4) - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - vitefu: 1.0.5(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) - transitivePeerDependencies: - - supports-color - vite-plugin-solid@2.11.0(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)): dependencies: '@babel/core': 7.25.9 @@ -24895,10 +24592,6 @@ snapshots: terser: 5.37.0 yaml: 1.10.2 - vitefu@1.0.5(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)): - optionalDependencies: - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - vitefu@1.0.5(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)): optionalDependencies: vite: 6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2) @@ -24953,80 +24646,6 @@ snapshots: - typescript - universal-cookie - vitest@2.1.8(@types/node@22.10.7)(@vitest/browser@2.1.8)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.4.0(supports-color@9.4.0) - expect-type: 1.1.0 - magic-string: 0.30.17 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.2 - tinypool: 1.0.2 - tinyrainbow: 1.2.0 - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - vite-node: 2.1.8(@types/node@22.10.7)(terser@5.37.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.7 - '@vitest/browser': 2.1.8(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))(vitest@2.1.8) - jsdom: 25.0.1 - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - vitest@2.1.8(@types/node@22.10.7)(@vitest/browser@3.0.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.4.0(supports-color@9.4.0) - expect-type: 1.1.0 - magic-string: 0.30.17 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.2 - tinypool: 1.0.2 - tinyrainbow: 1.2.0 - vite: 5.4.11(@types/node@22.10.7)(terser@5.37.0) - vite-node: 2.1.8(@types/node@22.10.7)(terser@5.37.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.7 - '@vitest/browser': 3.0.2(@types/node@22.10.7)(playwright@1.49.1)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7)(terser@5.37.0))(vitest@2.1.8) - jsdom: 25.0.1 - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - vitest@3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2): dependencies: '@vitest/expect': 3.0.2 From a2b0a9d74fa5dddd641297718404cf7175889b65 Mon Sep 17 00:00:00 2001 From: Simon Ihmig Date: Sun, 19 Jan 2025 17:24:39 +0100 Subject: [PATCH 2/2] Patch vite-plugin-solid Workaround for https://github.com/solidjs/vite-plugin-solid/issues/170 --- package.json | 3 +++ patches/vite-plugin-solid@2.11.0.patch | 16 ++++++++++++++++ pnpm-lock.yaml | 11 ++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 patches/vite-plugin-solid@2.11.0.patch diff --git a/package.json b/package.json index 1bb4a07ac..cbce2ed30 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,9 @@ "@ember/test-helpers": "^4.0.4" } } + }, + "patchedDependencies": { + "vite-plugin-solid@2.11.0": "patches/vite-plugin-solid@2.11.0.patch" } } } diff --git a/patches/vite-plugin-solid@2.11.0.patch b/patches/vite-plugin-solid@2.11.0.patch new file mode 100644 index 000000000..78b2c3633 --- /dev/null +++ b/patches/vite-plugin-solid@2.11.0.patch @@ -0,0 +1,16 @@ +diff --git a/dist/esm/index.mjs b/dist/esm/index.mjs +index e065926b3da86406660aba987cb8226af9f0f8fd..bca68dfff42867a904d1be10938240ae459a8612 100644 +--- a/dist/esm/index.mjs ++++ b/dist/esm/index.mjs +@@ -102,10 +102,7 @@ function solidPlugin(options = {}) { + include: [...nestedDeps, ...solidPkgsConfig.optimizeDeps.include], + exclude: solidPkgsConfig.optimizeDeps.exclude + }, +- ssr: solidPkgsConfig.ssr, +- ...(test.server ? { +- test +- } : {}) ++ ssr: solidPkgsConfig.ssr + }; + }, + // @ts-ignore This hook only works in Vite 6 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2f5ccd0d..5f0537288 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,11 @@ settings: packageExtensionsChecksum: 9b755308b75bb567ca9eefdf5e153eca +patchedDependencies: + vite-plugin-solid@2.11.0: + hash: 2amjeh7latl6kthk4i6urfsa64 + path: patches/vite-plugin-solid@2.11.0.patch + importers: .: @@ -1239,7 +1244,7 @@ importers: version: 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) vite-plugin-solid: specifier: 2.11.0 - version: 2.11.0(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) + version: 2.11.0(patch_hash=2amjeh7latl6kthk4i6urfsa64)(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) vitest: specifier: 3.0.2 version: 3.0.2(@types/node@22.10.7)(@vitest/browser@3.0.2)(jiti@2.4.2)(jsdom@25.0.1)(msw@2.7.0(@types/node@22.10.7)(typescript@5.7.3))(terser@5.37.0)(yaml@1.10.2) @@ -15385,7 +15390,7 @@ snapshots: source-map-js: 1.2.1 terracotta: 1.0.6(solid-js@1.9.4) tinyglobby: 0.2.10 - vite-plugin-solid: 2.11.0(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) + vite-plugin-solid: 2.11.0(patch_hash=2amjeh7latl6kthk4i6urfsa64)(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)) transitivePeerDependencies: - '@testing-library/jest-dom' - solid-js @@ -24557,7 +24562,7 @@ snapshots: - tsx - yaml - vite-plugin-solid@2.11.0(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)): + vite-plugin-solid@2.11.0(patch_hash=2amjeh7latl6kthk4i6urfsa64)(solid-js@1.9.4)(vite@6.0.7(@types/node@22.10.7)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2)): dependencies: '@babel/core': 7.25.9 '@types/babel__core': 7.20.5