diff --git a/package.json b/package.json index 443bbf3a1..b045030f5 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@storybook/core-events": "^7.6.3", "@storybook/react": "^7.6.3", "@storybook/react-vite": "^7.6.3", - "@storybook/testing-library": "^0.2.0", + "@storybook/test": "^7.6.3", "@storybook/theming": "^7.6.3", "@storybook/types": "^7.6.3", "@testing-library/dom": "^9.3.0", diff --git a/packages/clipboard/stories/CopyToClipboard.stories.tsx b/packages/clipboard/stories/CopyToClipboard.stories.tsx index f24cd6f2c..1bcc18cdc 100644 --- a/packages/clipboard/stories/CopyToClipboard.stories.tsx +++ b/packages/clipboard/stories/CopyToClipboard.stories.tsx @@ -1,7 +1,7 @@ import type { CopyToClipboardHandleRef } from '../src/CopyToClipboard'; import type { StoryObj, StoryFn } from '@storybook/react'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { useRef } from 'react'; import { CopyToClipboard } from '../src'; diff --git a/packages/inline-edit/stories/InlineEdit.stories.tsx b/packages/inline-edit/stories/InlineEdit.stories.tsx index 27ba2c7f6..7c2cb9b00 100644 --- a/packages/inline-edit/stories/InlineEdit.stories.tsx +++ b/packages/inline-edit/stories/InlineEdit.stories.tsx @@ -5,7 +5,7 @@ import { CopyToClipboard } from '@launchpad-ui/clipboard'; import { Form, FormField, IconField, TextArea, TextField } from '@launchpad-ui/form'; import { Icon } from '@launchpad-ui/icons'; import { useState } from '@storybook/client-api'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { InlineEdit } from '../src'; diff --git a/packages/menu/stories/Menu.stories.tsx b/packages/menu/stories/Menu.stories.tsx index b2859cce6..9467446b0 100644 --- a/packages/menu/stories/Menu.stories.tsx +++ b/packages/menu/stories/Menu.stories.tsx @@ -1,7 +1,7 @@ import type { StoryObj } from '@storybook/react'; import { Icon } from '@launchpad-ui/icons'; -import { userEvent } from '@storybook/testing-library'; +import { userEvent } from '@storybook/test'; import { Menu, MenuDivider, MenuItem, MenuSearch } from '../src'; diff --git a/packages/modal/stories/Modal.stories.tsx b/packages/modal/stories/Modal.stories.tsx index ffbc7af99..9a5601121 100644 --- a/packages/modal/stories/Modal.stories.tsx +++ b/packages/modal/stories/Modal.stories.tsx @@ -5,7 +5,7 @@ import { Button } from '@launchpad-ui/button'; import { Icon } from '@launchpad-ui/icons'; import { Tooltip } from '@launchpad-ui/tooltip'; import { useState } from '@storybook/client-api'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { useRef } from 'react'; import { REACT_NODE_TYPE_DOCS } from '../../../.storybook/utils'; diff --git a/packages/popover/stories/Popover.stories.tsx b/packages/popover/stories/Popover.stories.tsx index a851acf42..da7280dda 100644 --- a/packages/popover/stories/Popover.stories.tsx +++ b/packages/popover/stories/Popover.stories.tsx @@ -1,7 +1,7 @@ import type { StoryObj, StoryFn } from '@storybook/react'; import { Button } from '@launchpad-ui/button'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { Popover } from '../src'; diff --git a/packages/snackbar/stories/SnackbarCenter.stories.tsx b/packages/snackbar/stories/SnackbarCenter.stories.tsx index c70ca3351..2535de110 100644 --- a/packages/snackbar/stories/SnackbarCenter.stories.tsx +++ b/packages/snackbar/stories/SnackbarCenter.stories.tsx @@ -3,7 +3,7 @@ import type { SnackbarRecord, SnackbarProps } from '../src'; import type { StoryObj } from '@storybook/react'; import { Button } from '@launchpad-ui/button'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { useId, useState } from 'react'; import { SnackbarCenter } from '../src'; diff --git a/packages/toast/stories/ToastCenter.stories.tsx b/packages/toast/stories/ToastCenter.stories.tsx index 357370e7a..cf224c8ad 100644 --- a/packages/toast/stories/ToastCenter.stories.tsx +++ b/packages/toast/stories/ToastCenter.stories.tsx @@ -3,7 +3,7 @@ import type { ToastRecord, ToastProps } from '../src'; import type { StoryObj } from '@storybook/react'; import { Button } from '@launchpad-ui/button'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { useId, useState } from 'react'; import { ToastCenter } from '../src'; diff --git a/packages/tooltip/stories/Tooltip.stories.tsx b/packages/tooltip/stories/Tooltip.stories.tsx index 28bc1f43a..8c42b3d9b 100644 --- a/packages/tooltip/stories/Tooltip.stories.tsx +++ b/packages/tooltip/stories/Tooltip.stories.tsx @@ -1,7 +1,7 @@ import type { StoryObj, StoryFn } from '@storybook/react'; import { Button } from '@launchpad-ui/button'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/test'; import { Tooltip } from '../src'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8846249c9..74ce5a7e9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -77,9 +77,9 @@ importers: '@storybook/react-vite': specifier: ^7.6.3 version: 7.6.3(react-dom@18.2.0)(react@18.2.0)(rollup@3.29.4)(typescript@5.3.2)(vite@5.0.5) - '@storybook/testing-library': - specifier: ^0.2.0 - version: 0.2.2 + '@storybook/test': + specifier: ^7.6.3 + version: 7.6.3(vitest@1.0.1) '@storybook/theming': specifier: ^7.6.3 version: 7.6.3(react-dom@18.2.0)(react@18.2.0) @@ -7376,6 +7376,18 @@ packages: resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==} dev: true + /@storybook/instrumenter@7.6.3: + resolution: {integrity: sha512-U1cbF0tewMQtKeLinQqUM5Mpcz1z5tsKhV9xAJKguvYVxllWvCA6cVxDM5fc66ws2mXpwFDcb82Kx05lMdmEoA==} + dependencies: + '@storybook/channels': 7.6.3 + '@storybook/client-logger': 7.6.3 + '@storybook/core-events': 7.6.3 + '@storybook/global': 5.0.0 + '@storybook/preview-api': 7.6.3 + '@vitest/utils': 0.34.7 + util: 0.12.5 + dev: true + /@storybook/manager-api@7.6.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-soDH7GZuukkhYRGzlw4jhCm5EzjfkuIAtb37/DFplqxuVbvlyJEVzkMUM2KQO7kq0/8GlWPiZ5mn56wagYyhKQ==} dependencies: @@ -7539,12 +7551,26 @@ packages: - supports-color dev: true - /@storybook/testing-library@0.2.2: - resolution: {integrity: sha512-L8sXFJUHmrlyU2BsWWZGuAjv39Jl1uAqUHdxmN42JY15M4+XCMjGlArdCCjDe1wpTSW6USYISA9axjZojgtvnw==} + /@storybook/test@7.6.3(vitest@1.0.1): + resolution: {integrity: sha512-W7rwSign2kM4Oq5RaifSmd9WSKv//QWLQpCpbdn/71hqNmE/SWQdyMLykEZY9RUTfpP6vFHOnWziXhID6Xu3Vg==} dependencies: + '@storybook/client-logger': 7.6.3 + '@storybook/core-events': 7.6.3 + '@storybook/instrumenter': 7.6.3 + '@storybook/preview-api': 7.6.3 '@testing-library/dom': 9.3.3 - '@testing-library/user-event': 14.5.1(@testing-library/dom@9.3.3) - ts-dedent: 2.2.0 + '@testing-library/jest-dom': 6.1.5(vitest@1.0.1) + '@testing-library/user-event': 14.3.0(@testing-library/dom@9.3.3) + '@types/chai': 4.3.11 + '@vitest/expect': 0.34.7 + '@vitest/spy': 0.34.7 + chai: 4.3.10 + util: 0.12.5 + transitivePeerDependencies: + - '@jest/globals' + - '@types/jest' + - jest + - vitest dev: true /@storybook/theming@7.6.3(react-dom@18.2.0)(react@18.2.0): @@ -7772,6 +7798,15 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@testing-library/user-event@14.3.0(@testing-library/dom@9.3.3): + resolution: {integrity: sha512-P02xtBBa8yMaLhK8CzJCIns8rqwnF6FxhR9zs810flHOBXUYCFjLd8Io1rQrAkQRWEmW2PGdZIEdMxf/KLsqFA==} + engines: {node: '>=12', npm: '>=6'} + peerDependencies: + '@testing-library/dom': '>=7.21.4' + dependencies: + '@testing-library/dom': 9.3.3 + dev: true + /@testing-library/user-event@14.5.1(@testing-library/dom@9.3.3): resolution: {integrity: sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==} engines: {node: '>=12', npm: '>=6'} @@ -7843,6 +7878,10 @@ packages: '@types/node': 20.10.3 dev: true + /@types/chai@4.3.11: + resolution: {integrity: sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==} + dev: true + /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: @@ -8563,6 +8602,14 @@ packages: - supports-color dev: true + /@vitest/expect@0.34.7: + resolution: {integrity: sha512-G9iEtwrD6ZQ4MVHZufif9Iqz3eLtuwBBNx971fNAGPaugM7ftAWjQN+ob2zWhtzURp8RK3zGXOxVb01mFo3zAQ==} + dependencies: + '@vitest/spy': 0.34.7 + '@vitest/utils': 0.34.7 + chai: 4.3.10 + dev: true + /@vitest/expect@1.0.1: resolution: {integrity: sha512-3cdrb/eKD/0tygDX75YscuHEHMUJ70u3UoLSq2eqhWks57AyzvsDQbyn53IhZ0tBN7gA8Jj2VhXiOV2lef7thw==} dependencies: @@ -8587,6 +8634,12 @@ packages: pretty-format: 29.7.0 dev: true + /@vitest/spy@0.34.7: + resolution: {integrity: sha512-NMMSzOY2d8L0mcOt4XcliDOS1ISyGlAXuQtERWVOoVHnKwmG+kKhinAiGw3dTtMQWybfa89FG8Ucg9tiC/FhTQ==} + dependencies: + tinyspy: 2.2.0 + dev: true + /@vitest/spy@1.0.1: resolution: {integrity: sha512-yXwm1uKhBVr/5MhVeSmtNqK+0q2RXIchJt8kokEKdrWLtkPeDgdbZ6SjR1VQGZuNdWL6sSBnLayIyVvcS0qLfA==} dependencies: @@ -8608,6 +8661,14 @@ packages: vitest: 1.0.1(@types/node@20.10.3)(@vitest/ui@1.0.1)(jsdom@23.0.1) dev: true + /@vitest/utils@0.34.7: + resolution: {integrity: sha512-ziAavQLpCYS9sLOorGrFFKmy2gnfiNU0ZJ15TsMz/K92NAPS/rp9K4z6AJQQk5Y8adCy4Iwpxy7pQumQ/psnRg==} + dependencies: + diff-sequences: 29.6.3 + loupe: 2.3.7 + pretty-format: 29.7.0 + dev: true + /@vitest/utils@1.0.1: resolution: {integrity: sha512-MGPCHkzXbbAyscrhwGzh8uP1HPrTYLWaj1WTDtWSGrpe2yJWLRN9mF9ooKawr6NMOg9vTBtg2JqWLfuLC7Dknw==} dependencies: diff --git a/test/setup.ts b/test/setup.ts index 20b6ff336..a8c61aa6c 100644 --- a/test/setup.ts +++ b/test/setup.ts @@ -1,4 +1,4 @@ -import '@testing-library/jest-dom/vitest'; +import '@testing-library/jest-dom'; import { configure } from '@testing-library/react'; import { vi } from 'vitest';