Skip to content

Commit c43b9ea

Browse files
JReinholdJReinhold
committed
Merge branch 'next' of github.com:storybookjs/addon-svelte-csf into post-transform-meta
2 parents f34bbc2 + 76d00ad commit c43b9ea

File tree

89 files changed

+689
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+689
-972
lines changed

‎package.json

+8-17
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@
1313
},
1414
"license": "MIT",
1515
"type": "module",
16-
"imports": {
17-
"#tests/*": {
18-
"development": "./tests/*.ts"
19-
},
20-
"#*": {
21-
"development": "./src/*.ts",
22-
"default": "./dist/*.js"
23-
}
24-
},
2516
"exports": {
2617
".": {
2718
"types": "./dist/index.d.ts",
@@ -44,7 +35,7 @@
4435
"README.md"
4536
],
4637
"scripts": {
47-
"build": "svelte-package --input ./src --types",
38+
"build": "svelte-package --types",
4839
"build-storybook": "storybook build",
4940
"check": "svelte-check",
5041
"chromatic": "chromatic --exit-zero-on-changes",
@@ -54,7 +45,7 @@
5445
"lint": "eslint --cache --cache-location=.cache/eslint --ext .js,.json,.html,.svelte,.ts --report-unused-disable-directives",
5546
"prepublish": "pnpm run clean && pnpm run build",
5647
"release": "pnpm run build && auto shipit",
57-
"start": "concurrently \"pnpm run storybook --quiet\" \"pnpm run build --watch\"",
48+
"start": "pnpm run build && concurrently \"pnpm run build --watch\" \"pnpm run storybook --quiet\"",
5849
"storybook": "storybook dev --port 6006 --no-open",
5950
"test": "vitest run",
6051
"test:watch": "vitest watch"
@@ -87,28 +78,28 @@
8778
"@tsconfig/svelte": "^5.0.4",
8879
"@types/estree": "^1.0.6",
8980
"@types/node": "^20.14.9",
90-
"@vitest/ui": "^1.6.0",
81+
"@vitest/ui": "^2.1.4",
9182
"auto": "^11.1.6",
9283
"chromatic": "^11.16.1",
9384
"concurrently": "^8.2.2",
9485
"eslint": "^7.32.0",
9586
"eslint-plugin-storybook": "^0.8.0",
96-
"jsdom": "^24.1.0",
87+
"happy-dom": "^15.11.4",
9788
"prettier": "^3.3.2",
9889
"prettier-plugin-svelte": "^3.2.5",
9990
"rimraf": "^5.0.7",
100-
"rollup": "^4.18.0",
91+
"rollup": "^4.25.0",
10192
"storybook": "^8.0.0",
10293
"svelte": "^5.0.0",
10394
"svelte-check": "^4.0.5",
10495
"tslib": "^2.6.3",
10596
"type-fest": "^4.20.1",
10697
"typescript": "^5.5.2",
10798
"typescript-svelte-plugin": "^0.3.42",
108-
"vite": "^5.3.2",
109-
"vite-plugin-inspect": "^0.8.4",
99+
"vite": "^5.4.11",
100+
"vite-plugin-inspect": "^0.8.7",
110101
"vite-plugin-virtual": "^0.3.0",
111-
"vitest": "^1.6.0"
102+
"vitest": "^2.1.4"
112103
},
113104
"peerDependencies": {
114105
"@storybook/svelte": "^8.0.0",

‎pnpm-lock.yaml

+326-689
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/compiler/plugins.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import MagicString from 'magic-string';
1414
import { preprocess } from 'svelte/compiler';
1515
import type { Plugin } from 'vite';
1616

17-
import { codemodLegacyNodes } from '#compiler/pre-transform/index';
18-
import { transformStoriesCode } from '#compiler/post-transform/index';
19-
import { getSvelteAST } from '#parser/ast';
20-
import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
21-
import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
17+
import { codemodLegacyNodes } from '$lib/compiler/pre-transform/index.js';
18+
import { transformStoriesCode } from '$lib/compiler/post-transform/index.js';
19+
import { getSvelteAST } from '$lib/parser/ast.js';
20+
import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
21+
import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
2222

2323
export async function preTransformPlugin(): Promise<Plugin> {
2424
const [{ createFilter }, { print }] = await Promise.all([

‎src/compiler/post-transform/appendix/create-export-order.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { print } from 'esrap';
22
import { describe, it } from 'vitest';
33

4-
import { createExportOrderVariable } from './create-export-order';
4+
import { createExportOrderVariable } from './create-export-order.js';
55

66
describe(createExportOrderVariable.name, () => {
77
it('correctly creates a variable with named exports order', ({ expect }) => {

‎src/compiler/post-transform/appendix/create-export-order.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { getStoriesIdentifiers } from '#parser/analyse/story/attributes/identifiers';
2-
import type { ESTreeAST } from '#parser/ast';
1+
import type { getStoriesIdentifiers } from '$lib/parser/analyse/story/attributes/identifiers.js';
2+
import type { ESTreeAST } from '$lib/parser/ast.js';
33

44
interface Params {
55
storyIdentifiers: ReturnType<typeof getStoriesIdentifiers>;

‎src/compiler/post-transform/appendix/create-import.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { print } from 'esrap';
22
import { describe, it } from 'vitest';
33

4-
import { createRuntimeStoriesImport } from './create-import';
4+
import { createRuntimeStoriesImport } from './create-import.js';
55

66
describe(createRuntimeStoriesImport.name, () => {
77
it('creates import correctly', ({ expect }) => {

‎src/compiler/post-transform/appendix/create-import.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pkg from '@storybook/addon-svelte-csf/package.json' with { type: 'json' };
22

3-
import type { ESTreeAST } from '#parser/ast';
3+
import type { ESTreeAST } from '$lib/parser/ast.js';
44

55
/**
66
* The export is defined in the `package.json` export map

‎src/compiler/post-transform/appendix/create-named-export-story.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { print } from 'esrap';
22
import { describe, it } from 'vitest';
33

4-
import { createNamedExportStory } from './create-named-export-story';
5-
import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
4+
import { createNamedExportStory } from './create-named-export-story.js';
5+
import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
66

7-
import type { ESTreeAST } from '#parser/ast';
7+
import type { ESTreeAST } from '$lib/parser/ast.js';
88

99
describe(createNamedExportStory.name, () => {
1010
it('correctly creates a variable with named exports order', ({ expect }) => {

‎src/compiler/post-transform/appendix/create-named-export-story.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
1+
import type { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
22

3-
import type { ESTreeAST } from '#parser/ast';
3+
import type { ESTreeAST } from '$lib/parser/ast.js';
44

55
interface Params {
66
exportName: string;

‎src/compiler/post-transform/appendix/create-variable-from-runtime-stories-call.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { print } from 'esrap';
22
import { describe, it } from 'vitest';
33

4-
import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
4+
import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
55

66
describe(createVariableFromRuntimeStoriesCall.name, () => {
77
it('creates a variable correctly', ({ expect }) => {

‎src/compiler/post-transform/appendix/create-variable-from-runtime-stories-call.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createASTIdentifier, type ESTreeAST } from '#parser/ast';
1+
import { createASTIdentifier, type ESTreeAST } from '$lib/parser/ast.js';
22

33
interface Params {
44
storiesFunctionDeclaration: ESTreeAST.FunctionDeclaration;

‎src/compiler/post-transform/create-appendix.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { print } from 'esrap';
22
import MagicString from 'magic-string';
33

4-
import { createExportOrderVariable } from './appendix/create-export-order';
5-
import { createRuntimeStoriesImport } from './appendix/create-import';
6-
import { createVariableFromRuntimeStoriesCall } from './appendix/create-variable-from-runtime-stories-call';
7-
import { createNamedExportStory } from './appendix/create-named-export-story';
4+
import { createExportOrderVariable } from './appendix/create-export-order.js';
5+
import { createRuntimeStoriesImport } from './appendix/create-import.js';
6+
import { createVariableFromRuntimeStoriesCall } from './appendix/create-variable-from-runtime-stories-call.js';
7+
import { createNamedExportStory } from './appendix/create-named-export-story.js';
88

9-
import { createASTIdentifier, type ESTreeAST } from '../../parser/ast';
10-
import { getStoriesIdentifiers } from '../../parser/analyse/story/attributes/identifiers';
11-
import type { CompiledASTNodes } from '../../parser/extract/compiled/nodes';
12-
import type { SvelteASTNodes } from '../../parser/extract/svelte/nodes';
9+
import { createASTIdentifier, type ESTreeAST } from '$lib/parser/ast.js';
10+
import { getStoriesIdentifiers } from '$lib/parser/analyse/story/attributes/identifiers.js';
11+
import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
12+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
1313

1414
interface Params {
1515
code: MagicString;

‎src/compiler/post-transform/define-meta/index.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { describe, it } from 'vitest';
99

1010
import { transformDefineMeta } from './index';
1111

12-
import { getSvelteAST } from '../../../parser/ast';
13-
import { extractSvelteASTNodes } from '../../../parser/extract/svelte/nodes';
14-
import { extractCompiledASTNodes } from '../../../parser/extract/compiled/nodes';
12+
import { getSvelteAST } from '$lib/parser/ast.js';
13+
import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
14+
import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
1515

1616
const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
1717

‎src/compiler/post-transform/define-meta/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { print } from 'esrap';
22
import type MagicString from 'magic-string';
33

44
import { replaceDefineMetaArgument } from './replace-argument';
5-
import { insertDefineMetaJSDocCommentAsDescription } from './insert-description';
5+
import { insertDefineMetaJSDocCommentAsDescription } from './insert-description.js';
66

7-
import { createASTIdentifier, type ESTreeAST } from '../../../parser/ast';
8-
import type { CompiledASTNodes } from '../../../parser/extract/compiled/nodes';
9-
import type { SvelteASTNodes } from '../../../parser/extract/svelte/nodes';
7+
import { createASTIdentifier, type ESTreeAST } from '$lib/parser/ast.js';
8+
import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
9+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
1010

1111
interface Params {
1212
code: MagicString;

‎src/compiler/post-transform/define-meta/insert-description.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import {
88
getDescriptionPropertyValue,
99
getDocsPropertyValue,
1010
getParametersPropertyValue,
11-
} from '#compiler/post-transform/shared/description';
12-
import { createASTObjectExpression, createASTProperty, type ESTreeAST } from '#parser/ast';
13-
import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
14-
import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
15-
import { getDefineMetaFirstArgumentObjectExpression } from '#parser/extract/svelte/define-meta';
11+
} from '$lib/compiler/post-transform/shared/description.js';
12+
import { createASTObjectExpression, createASTProperty, type ESTreeAST } from '$lib/parser/ast.js';
13+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
14+
import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
15+
import { getDefineMetaFirstArgumentObjectExpression } from '$lib/parser/extract/svelte/define-meta.js';
1616

1717
interface Params {
1818
nodes: {

‎src/compiler/post-transform/index.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { describe, it } from 'vitest';
88

99
import { transformStoriesCode } from '.';
1010

11-
import { getSvelteAST } from '../../parser/ast';
12-
import { extractSvelteASTNodes } from '../../parser/extract/svelte/nodes';
13-
import { extractCompiledASTNodes } from '../../parser/extract/compiled/nodes';
11+
import { getSvelteAST } from '$lib/parser/ast.js';
12+
import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
13+
import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
1414

1515
const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
1616

‎src/compiler/post-transform/index.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type MagicString from 'magic-string';
22

3-
import { transformStory } from './story';
4-
import { transformDefineMeta } from './define-meta';
5-
import { removeExportDefault } from './remove-export-default';
6-
import { createAppendix } from './create-appendix';
3+
import { transformStory } from './story/index.js';
4+
import { transformDefineMeta } from './define-meta/index.js';
5+
import { removeExportDefault } from './remove-export-default.js';
6+
import { createAppendix } from './create-appendix.js';
77

8-
import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
9-
import { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
10-
import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
8+
import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
9+
import { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
10+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
1111

1212
interface Params {
1313
code: MagicString;

‎src/compiler/post-transform/remove-export-default.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import MagicString from 'magic-string';
66
import { parseAst } from 'rollup/parseAst';
77
import { describe, it } from 'vitest';
88

9-
import { removeExportDefault } from './remove-export-default';
9+
import { removeExportDefault } from './remove-export-default.js';
1010

11-
import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
12-
import { StorybookSvelteCSFError } from '#utils/error';
11+
import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
12+
import { StorybookSvelteCSFError } from '$lib/utils/error.js';
1313

1414
const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
1515

‎src/compiler/post-transform/remove-export-default.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { print } from 'esrap';
22
import type MagicString from 'magic-string';
33

4-
import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
4+
import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
55

66
interface Params {
77
code: MagicString;

‎src/compiler/post-transform/shared/description.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { logger } from '@storybook/node-logger';
22
import dedent from 'dedent';
33

4-
import type { ESTreeAST, SvelteAST } from '#parser/ast';
4+
import type { ESTreeAST, SvelteAST } from '$lib/parser/ast.js';
55

6-
import { createASTObjectExpression } from '#parser/ast';
6+
import { createASTObjectExpression } from '$lib/parser/ast.js';
77

88
interface FindPropertyOptions {
99
name: string;

‎src/compiler/post-transform/story/index.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { describe, it } from 'vitest';
99

1010
import { transformStory } from '.';
1111

12-
import { getSvelteAST } from '#parser/ast';
13-
import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
14-
import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
15-
import { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
12+
import { getSvelteAST } from '$lib/parser/ast.js';
13+
import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
14+
import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
15+
import { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
1616

1717
const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
1818

‎src/compiler/post-transform/story/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { print } from 'esrap';
22
import type MagicString from 'magic-string';
33

4-
import { insertStoryHTMLCommentAsDescription } from './insert-description';
5-
import { insertSvelteCSFToStoryParameters } from './insert-svelte-csf';
4+
import { insertStoryHTMLCommentAsDescription } from './insert-description.js';
5+
import { insertSvelteCSFToStoryParameters } from './insert-svelte-csf.js';
66

7-
import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
8-
import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
7+
import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
8+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
99

1010
interface Params {
1111
code: MagicString;

‎src/compiler/post-transform/story/insert-description.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import {
99
getParametersPropertyValue,
1010
getDocsPropertyValue,
1111
getDescriptionPropertyValue,
12-
} from '#compiler/post-transform/shared/description';
13-
import { createASTObjectExpression, createASTProperty } from '#parser/ast';
12+
} from '$lib/compiler/post-transform/shared/description.js';
13+
import { createASTObjectExpression, createASTProperty } from '$lib/parser/ast.js';
1414

15-
import type { ESTreeAST } from '#parser/ast';
16-
import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
17-
import { getStoryPropsObjectExpression } from '#parser/extract/compiled/story';
18-
import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
15+
import type { ESTreeAST } from '$lib/parser/ast.js';
16+
import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
17+
import { getStoryPropsObjectExpression } from '$lib/parser/extract/compiled/story.js';
18+
import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
1919

2020
interface Params {
2121
nodes: {

‎src/compiler/post-transform/story/insert-svelte-csf.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {
22
findPropertyParametersIndex,
33
getParametersPropertyValue,
4-
} from '#compiler/post-transform/shared/description';
4+
} from '$lib/compiler/post-transform/shared/description.js';
55

6-
import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
7-
import { getStoryPropsObjectExpression } from '#parser/extract/compiled/story';
8-
import type { SvelteASTNodes, extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
9-
import { getStoryChildrenRawCode } from '#parser/analyse/story/children';
10-
import { createASTObjectExpression, createASTProperty } from '#parser/ast';
6+
import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
7+
import { getStoryPropsObjectExpression } from '$lib/parser/extract/compiled/story.js';
8+
import type { SvelteASTNodes, extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
9+
import { getStoryChildrenRawCode } from '$lib/parser/analyse/story/children.js';
10+
import { createASTObjectExpression, createASTProperty } from '$lib/parser/ast.js';
1111

1212
interface Params {
1313
nodes: {

‎src/compiler/pre-transform/codemods/component-meta-to-define-meta.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { print } from 'svelte-ast-print';
22
import { describe, it } from 'vitest';
33

4-
import { transformComponentMetaToDefineMeta } from './component-meta-to-define-meta';
4+
import { transformComponentMetaToDefineMeta } from './component-meta-to-define-meta.js';
55

6-
import type { SvelteAST } from '#parser/ast';
7-
import { parseAndExtractSvelteNode } from '#tests/extractor';
6+
import type { SvelteAST } from '$lib/parser/ast.js';
7+
import { parseAndExtractSvelteNode } from '../../../../tests/extractor.js';
88

99
describe(transformComponentMetaToDefineMeta.name, () => {
1010
it('works with a simple example', async ({ expect }) => {

‎src/compiler/pre-transform/codemods/component-meta-to-define-meta.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
createASTExpressionTag,
44
type ESTreeAST,
55
type SvelteAST,
6-
} from '#parser/ast';
6+
} from '$lib/parser/ast.js';
77

88
interface Params {
99
component: SvelteAST.Component;

0 commit comments

Comments
 (0)