From 5cfe7b906ef16982c1a8d6cd5952bf13cb6fb0cc Mon Sep 17 00:00:00 2001 From: Mateusz Kadlubowski Date: Thu, 5 Sep 2024 11:14:01 +0800 Subject: [PATCH] Revert "Merge branch 'chore-types' into restore-template-component" This reverts commit f4f063076b9ca77b8c5b30d03d29bbf8a1b42c15, reversing changes made to 79b48e70ec39289cbb1a132c78c7a8e971379b02. --- package.json | 1 + pnpm-lock.yaml | 12 ++++++++++++ src/index.test.ts | 2 +- src/index.ts | 2 +- src/indexer/index.ts | 2 +- src/runtime/Story.svelte | 2 +- src/runtime/contexts/extractor.svelte.ts | 2 +- src/runtime/contexts/renderer.svelte.ts | 2 +- src/runtime/contexts/template.svelte.ts | 2 +- src/types.test.ts | 2 +- src/types.ts | 2 +- 11 files changed, 22 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 016b0383..da857804 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "@storybook/csf": "^0.1.11", "@storybook/docs-tools": "^8.0.0", "@storybook/node-logger": "^8.0.0", + "@storybook/types": "^8.0.0", "dedent": "^1.5.3", "es-toolkit": "^1.13.1", "esrap": "^1.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c85c185..94a02dad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@storybook/node-logger': specifier: ^8.0.0 version: 8.2.5(storybook@8.2.5(@babel/preset-env@7.24.8(@babel/core@7.24.9))) + '@storybook/types': + specifier: ^8.0.0 + version: 8.2.5(storybook@8.2.5(@babel/preset-env@7.24.8(@babel/core@7.24.9))) dedent: specifier: ^1.5.3 version: 1.5.3 @@ -1493,6 +1496,11 @@ packages: peerDependencies: storybook: ^8.2.5 + '@storybook/types@8.2.5': + resolution: {integrity: sha512-xrF/+uIFstsGEAM8B67XA/YdTm5uu/8g+7b96qU7WTEf7A+k8wxaB0RQhHvOwz3ZtNModsKX8heIDOMMQlZJew==} + peerDependencies: + storybook: ^8.2.5 + '@sveltejs/package@2.3.2': resolution: {integrity: sha512-6M8/Te7iXRG7SiH92wugqfyoJpuepjn78L433LnXicUeMso9M/N4vdL9DPK3MfTkVVY4klhNRptVqme3p4oZWA==} engines: {node: ^16.14 || >=18} @@ -8212,6 +8220,10 @@ snapshots: dependencies: storybook: 8.2.5(@babel/preset-env@7.24.8(@babel/core@7.24.9)) + '@storybook/types@8.2.5(storybook@8.2.5(@babel/preset-env@7.24.8(@babel/core@7.24.9)))': + dependencies: + storybook: 8.2.5(@babel/preset-env@7.24.8(@babel/core@7.24.9)) + '@sveltejs/package@2.3.2(svelte@5.0.0-next.215)(typescript@5.5.3)': dependencies: chokidar: 3.6.0 diff --git a/src/index.test.ts b/src/index.test.ts index 55592f0c..54a3e4ed 100644 --- a/src/index.test.ts +++ b/src/index.test.ts @@ -1,4 +1,4 @@ -import type { PlayFunctionContext } from 'storybook/internal/types'; +import type { PlayFunctionContext } from '@storybook/types'; import type { ComponentProps, Snippet } from 'svelte'; import type { EmptyObject, Primitive } from 'type-fest'; import { describe, expectTypeOf, it } from 'vitest'; diff --git a/src/index.ts b/src/index.ts index 94708836..35700dff 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import type { Args as BaseArgs } from 'storybook/internal/types'; +import type { Args as BaseArgs } from '@storybook/types'; import type { EmptyObject } from 'type-fest'; import type { diff --git a/src/indexer/index.ts b/src/indexer/index.ts index 5709f214..ffd4ee9c 100644 --- a/src/indexer/index.ts +++ b/src/indexer/index.ts @@ -1,4 +1,4 @@ -import type { IndexInput, Indexer } from 'storybook/internal/types'; +import type { IndexInput, Indexer } from '@storybook/types'; import { parseForIndexer } from '#indexer/parser'; import { diff --git a/src/runtime/Story.svelte b/src/runtime/Story.svelte index 0d91ba1e..44b50e39 100644 --- a/src/runtime/Story.svelte +++ b/src/runtime/Story.svelte @@ -5,7 +5,7 @@ lang="ts" generics="const TOverrideArgs extends Args, const TCmp extends Cmp, TMeta extends Meta" > - import type { Args } from 'storybook/internal/types'; + import type { Args } from '@storybook/types'; import type { Snippet } from 'svelte'; import { useStoriesExtractor } from '#runtime/contexts/extractor.svelte'; diff --git a/src/runtime/contexts/extractor.svelte.ts b/src/runtime/contexts/extractor.svelte.ts index a2960b4a..36e33d33 100644 --- a/src/runtime/contexts/extractor.svelte.ts +++ b/src/runtime/contexts/extractor.svelte.ts @@ -1,4 +1,4 @@ -import type { Args } from 'storybook/internal/types'; +import type { Args } from '@storybook/types'; import { getContext, hasContext, setContext, type ComponentProps } from 'svelte'; import { storyNameToExportName } from '#utils/identifier-utils'; diff --git a/src/runtime/contexts/renderer.svelte.ts b/src/runtime/contexts/renderer.svelte.ts index 6537eb51..067dae07 100644 --- a/src/runtime/contexts/renderer.svelte.ts +++ b/src/runtime/contexts/renderer.svelte.ts @@ -1,7 +1,7 @@ import { getContext, hasContext, setContext } from 'svelte'; import type { Cmp, Meta, StoryAnnotations, StoryContext } from '#types'; -import type { Args } from 'storybook/internal/types'; +import type { Args } from '@storybook/types'; const CONTEXT_KEY = 'storybook-story-renderer-context'; diff --git a/src/runtime/contexts/template.svelte.ts b/src/runtime/contexts/template.svelte.ts index 1c736e6f..aaee9ff7 100644 --- a/src/runtime/contexts/template.svelte.ts +++ b/src/runtime/contexts/template.svelte.ts @@ -1,4 +1,4 @@ -import type { Args } from 'storybook/internal/types'; +import type { Args } from '@storybook/types'; import { getContext, hasContext, setContext, type ComponentProps } from 'svelte'; import type { Cmp, Meta, StoryCmp } from '#types'; diff --git a/src/types.test.ts b/src/types.test.ts index 0e78dd51..d0e98637 100644 --- a/src/types.test.ts +++ b/src/types.test.ts @@ -1,4 +1,4 @@ -import type { PlayFunctionContext } from 'storybook/internal/types'; +import type { PlayFunctionContext } from '@storybook/types'; import type { Component, ComponentProps } from 'svelte'; import { describe, expectTypeOf, it } from 'vitest'; diff --git a/src/types.ts b/src/types.ts index e1fd889f..30e177b2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -4,7 +4,7 @@ import type { StoryAnnotations as BaseStoryAnnotations, StoryContext as BaseStoryContext, WebRenderer, -} from 'storybook/internal/types'; +} from '@storybook/types'; import type { Component, ComponentProps, Snippet } from 'svelte'; import type { Primitive, SetOptional, Simplify } from 'type-fest';