From 259a2981816c6a151d7bd7f4f6e5212abe3160ac Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 28 Aug 2025 11:38:47 +0200 Subject: [PATCH] chore: remove `sweetalert2` from test dependencies (#8495) --- pnpm-lock.yaml | 16 ++++++++-------- test/core/deps/dep-nested-cjs/index.d.ts | 4 ++++ test/core/deps/dep-nested-cjs/index.js | 11 +++++++++++ test/core/deps/dep-nested-cjs/package.json | 5 +++++ test/core/package.json | 2 +- test/core/test/mocking/nested-default.spec.ts | 8 ++++---- 6 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 test/core/deps/dep-nested-cjs/index.d.ts create mode 100644 test/core/deps/dep-nested-cjs/index.js create mode 100644 test/core/deps/dep-nested-cjs/package.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d479a63da..817578be9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1218,6 +1218,9 @@ importers: '@vitest/test-dep-cjs': specifier: file:./deps/dep-cjs version: file:test/core/deps/dep-cjs + '@vitest/test-dep-nested-cjs': + specifier: file:./deps/dep-nested-cjs + version: file:test/core/deps/dep-nested-cjs '@vitest/test-dep1': specifier: file:./deps/dep1 version: file:test/core/deps/dep1 @@ -1251,9 +1254,6 @@ importers: react-18: specifier: npm:react@18.3.1 version: react@18.3.1 - sweetalert2: - specifier: ^11.22.2 - version: 11.22.2 temporal-polyfill: specifier: ~0.3.0 version: 0.3.0 @@ -4296,6 +4296,9 @@ packages: '@vitest/test-dep-conditions@file:test/config/deps/test-dep-conditions': resolution: {directory: test/config/deps/test-dep-conditions, type: directory} + '@vitest/test-dep-nested-cjs@file:test/core/deps/dep-nested-cjs': + resolution: {directory: test/core/deps/dep-nested-cjs, type: directory} + '@vitest/test-dep1@file:test/core/deps/dep1': resolution: {directory: test/core/deps/dep1, type: directory} @@ -8264,9 +8267,6 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - sweetalert2@11.22.2: - resolution: {integrity: sha512-GFQGzw8ZXF23PO79WMAYXLl4zYmLiaKqYJwcp5eBF07wiI5BYPbZtKi2pcvVmfUQK+FqL1risJAMxugcPbGIyg==} - symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} @@ -11965,6 +11965,8 @@ snapshots: dependencies: '@vitest/test-dep-conditions-indirect': file:test/config/deps/test-dep-conditions-indirect + '@vitest/test-dep-nested-cjs@file:test/core/deps/dep-nested-cjs': {} + '@vitest/test-dep1@file:test/core/deps/dep1': {} '@vitest/test-dep2@file:test/core/deps/dep2': @@ -16614,8 +16616,6 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - sweetalert2@11.22.2: {} - symbol-tree@3.2.4: {} sync-child-process@1.0.2: diff --git a/test/core/deps/dep-nested-cjs/index.d.ts b/test/core/deps/dep-nested-cjs/index.d.ts new file mode 100644 index 000000000..23f58d2d4 --- /dev/null +++ b/test/core/deps/dep-nested-cjs/index.d.ts @@ -0,0 +1,4 @@ +declare class Klass { + static clickCancel(): void +} +export default Klass diff --git a/test/core/deps/dep-nested-cjs/index.js b/test/core/deps/dep-nested-cjs/index.js new file mode 100644 index 000000000..ebfa6e37a --- /dev/null +++ b/test/core/deps/dep-nested-cjs/index.js @@ -0,0 +1,11 @@ +if (typeof __vite_ssr_import__ !== 'undefined') { + throw new TypeError('The module should be external') +} + +const Klass = class Klass { + static clickCancel() { + // noop + } +} +Klass.default = Klass +module.exports = Klass diff --git a/test/core/deps/dep-nested-cjs/package.json b/test/core/deps/dep-nested-cjs/package.json new file mode 100644 index 000000000..91e9bf3e1 --- /dev/null +++ b/test/core/deps/dep-nested-cjs/package.json @@ -0,0 +1,5 @@ +{ + "name": "@vitest/test-dep-nested-cjs", + "type": "commonjs", + "main": "./index.js" +} diff --git a/test/core/package.json b/test/core/package.json index 29541085b..6fdd81a44 100644 --- a/test/core/package.json +++ b/test/core/package.json @@ -20,6 +20,7 @@ "@vitest/mocker": "workspace:*", "@vitest/runner": "workspace:*", "@vitest/test-dep-cjs": "file:./deps/dep-cjs", + "@vitest/test-dep-nested-cjs": "file:./deps/dep-nested-cjs", "@vitest/test-dep1": "file:./deps/dep1", "@vitest/test-dep2": "file:./deps/dep2", "@vitest/utils": "workspace:*", @@ -31,7 +32,6 @@ "memfs": "^4.23.0", "react": "^19.1.1", "react-18": "npm:react@18.3.1", - "sweetalert2": "^11.22.2", "temporal-polyfill": "~0.3.0", "tinyrainbow": "catalog:", "tinyspy": "^4.0.3", diff --git a/test/core/test/mocking/nested-default.spec.ts b/test/core/test/mocking/nested-default.spec.ts index ab01165bf..7a3453a6b 100644 --- a/test/core/test/mocking/nested-default.spec.ts +++ b/test/core/test/mocking/nested-default.spec.ts @@ -1,15 +1,15 @@ // @vitest-environment jsdom -import sweetalert from 'sweetalert2' +import nestedCjs from '@vitest/test-dep-nested-cjs' import { expect, test, vi } from 'vitest' // @ts-expect-error mocked module import * as modDefaultCjs from '../../src/mocks/external/default-cjs.cjs' -vi.mock('sweetalert2') +vi.mock('@vitest/test-dep-nested-cjs') vi.mock('../../src/mocks/external/default-cjs.cjs') test('default is mocked', () => { expect(vi.isMockFunction(modDefaultCjs.default.fn)).toBe(true) - expect(vi.isMockFunction(sweetalert)).toBe(true) - expect(vi.isMockFunction(sweetalert.clickCancel)).toBe(true) + expect(vi.isMockFunction(nestedCjs)).toBe(true) + expect(vi.isMockFunction(nestedCjs.clickCancel)).toBe(true) }) -- 2.51.2