Merge branch 'next' into chore-vitest

Author: JReinhold

package.json

@@ -13,15 +13,6 @@
   },
   "license": "MIT",
   "type": "module",
-  "imports": {
-    "#tests/*": {
-      "development": "./tests/*.ts"
-    },
-    "#*": {
-      "development": "./src/*.ts",
-      "default": "./dist/*.js"
-    }
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -44,7 +35,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "svelte-package --input ./src --types",
+    "build": "svelte-package --types",
     "build-storybook": "storybook build",
     "check": "svelte-check",
     "chromatic": "chromatic --exit-zero-on-changes",
@@ -54,7 +45,7 @@
     "lint": "eslint --cache --cache-location=.cache/eslint --ext .js,.json,.html,.svelte,.ts --report-unused-disable-directives",
     "prepublish": "pnpm run clean && pnpm run build",
     "release": "pnpm run build && auto shipit",
-    "start": "concurrently \"pnpm run storybook --quiet\" \"pnpm run build --watch\"",
+    "start": "pnpm run build && concurrently \"pnpm run build --watch\" \"pnpm run storybook --quiet\"",
     "storybook": "storybook dev --port 6006 --no-open",
     "test": "vitest run",
     "test:watch": "vitest watch"
@@ -112,9 +103,9 @@
   },
   "peerDependencies": {
     "@storybook/svelte": "^8.0.0",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0 || ^5.0.0",
     "svelte": "^5.0.0",
-    "vite": "^5.0.0"
+    "vite": "^5.0.0 || ^6.0.0"
   },
   "packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee",
   "publishConfig": {

src/compiler/plugins.ts

@@ -14,11 +14,11 @@ import MagicString from 'magic-string';
 import { preprocess } from 'svelte/compiler';
 import type { Plugin } from 'vite';
 
-import { codemodLegacyNodes } from '#compiler/pre-transform/index';
-import { transformStoriesCode } from '#compiler/post-transform/index';
-import { getSvelteAST } from '#parser/ast';
-import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
+import { codemodLegacyNodes } from '$lib/compiler/pre-transform/index.js';
+import { transformStoriesCode } from '$lib/compiler/post-transform/index.js';
+import { getSvelteAST } from '$lib/parser/ast.js';
+import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
 
 export async function preTransformPlugin(): Promise<Plugin> {
   const [{ createFilter }, { print }] = await Promise.all([
@@ -57,7 +57,7 @@ export async function preTransformPlugin(): Promise<Plugin> {
   };
 }
 
-export async function postTransformPlugin(): Promise<Plugin> {
+export async function transformPlugin(): Promise<Plugin> {
   const [{ createFilter }, { loadSvelteConfig }] = await Promise.all([
     import('vite'),
     import('@sveltejs/vite-plugin-svelte'),
@@ -68,8 +68,7 @@ export async function postTransformPlugin(): Promise<Plugin> {
   const filter = createFilter(include);
 
   return {
-    name: 'storybook:addon-svelte-csf-plugin-post',
-    enforce: 'post',
+    name: 'storybook:addon-svelte-csf',
     async transform(compiledCode, id) {
       if (!filter(id)) return undefined;
 

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

@@ -1,9 +1,9 @@
 import { print } from 'esrap';
 import { describe, it } from 'vitest';
 
-import { createExportDefaultMeta } from './create-export-default';
+import { createExportDefaultMeta } from './create-export-default.js';
 
-import type { ESTreeAST } from '#parser/ast';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 describe(createExportDefaultMeta.name, () => {
   it('creates a new export default correctly', ({ expect }) => {

src/compiler/post-transform/appendix/create-export-default.ts

@@ -1,5 +1,5 @@
-import type { getMetaIdentifier } from '#parser/analyse/define-meta/meta-identifier';
-import type { ESTreeAST } from '#parser/ast';
+import type { getMetaIdentifier } from '$lib/parser/analyse/define-meta/meta-identifier.js';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 interface Params {
   metaIdentifier: ReturnType<typeof getMetaIdentifier>;

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

@@ -1,7 +1,7 @@
 import { print } from 'esrap';
 import { describe, it } from 'vitest';
 
-import { createExportOrderVariable } from './create-export-order';
+import { createExportOrderVariable } from './create-export-order.js';
 
 describe(createExportOrderVariable.name, () => {
   it('correctly creates a variable with named exports order', ({ expect }) => {

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

@@ -1,5 +1,5 @@
-import type { getStoriesIdentifiers } from '#parser/analyse/story/attributes/identifiers';
-import type { ESTreeAST } from '#parser/ast';
+import type { getStoriesIdentifiers } from '$lib/parser/analyse/story/attributes/identifiers.js';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 interface Params {
   storyIdentifiers: ReturnType<typeof getStoriesIdentifiers>;

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

@@ -1,7 +1,7 @@
 import { print } from 'esrap';
 import { describe, it } from 'vitest';
 
-import { createRuntimeStoriesImport } from './create-import';
+import { createRuntimeStoriesImport } from './create-import.js';
 
 describe(createRuntimeStoriesImport.name, () => {
   it('creates import correctly', ({ expect }) => {

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

@@ -1,6 +1,6 @@
 import pkg from '@storybook/addon-svelte-csf/package.json' with { type: 'json' };
 
-import type { ESTreeAST } from '#parser/ast';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 /**
  * The export is defined in the `package.json` export map

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

@@ -1,10 +1,10 @@
 import { print } from 'esrap';
 import { describe, it } from 'vitest';
 
-import { createNamedExportStory } from './create-named-export-story';
-import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
+import { createNamedExportStory } from './create-named-export-story.js';
+import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
 
-import type { ESTreeAST } from '#parser/ast';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 describe(createNamedExportStory.name, () => {
   it('correctly creates a variable with named exports order', ({ expect }) => {

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

@@ -1,6 +1,6 @@
-import type { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
+import type { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
 
-import type { ESTreeAST } from '#parser/ast';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 interface Params {
   exportName: string;

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

@@ -1,7 +1,7 @@
 import { print } from 'esrap';
 import { describe, it } from 'vitest';
 
-import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call';
+import { createVariableFromRuntimeStoriesCall } from './create-variable-from-runtime-stories-call.js';
 
 describe(createVariableFromRuntimeStoriesCall.name, () => {
   it('creates a variable correctly', ({ expect }) => {

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

@@ -1,5 +1,5 @@
-import type { getMetaIdentifier } from '#parser/analyse/define-meta/meta-identifier';
-import type { ESTreeAST } from '#parser/ast';
+import type { getMetaIdentifier } from '$lib/parser/analyse/define-meta/meta-identifier.js';
+import type { ESTreeAST } from '$lib/parser/ast.js';
 
 interface Params {
   storiesFunctionDeclaration: ESTreeAST.FunctionDeclaration;

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

@@ -1,16 +1,16 @@
 import { print } from 'esrap';
 import MagicString from 'magic-string';
 
-import { createExportDefaultMeta } from './appendix/create-export-default';
-import { createExportOrderVariable } from './appendix/create-export-order';
-import { createRuntimeStoriesImport } from './appendix/create-import';
-import { createVariableFromRuntimeStoriesCall } from './appendix/create-variable-from-runtime-stories-call';
-import { createNamedExportStory } from './appendix/create-named-export-story';
+import { createExportDefaultMeta } from './appendix/create-export-default.js';
+import { createExportOrderVariable } from './appendix/create-export-order.js';
+import { createRuntimeStoriesImport } from './appendix/create-import.js';
+import { createVariableFromRuntimeStoriesCall } from './appendix/create-variable-from-runtime-stories-call.js';
+import { createNamedExportStory } from './appendix/create-named-export-story.js';
 
-import { getMetaIdentifier } from '#parser/analyse/define-meta/meta-identifier';
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
-import { getStoriesIdentifiers } from '#parser/analyse/story/attributes/identifiers';
+import { getMetaIdentifier } from '$lib/parser/analyse/define-meta/meta-identifier.js';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import { getStoriesIdentifiers } from '$lib/parser/analyse/story/attributes/identifiers.js';
 
 interface Params {
   code: MagicString;

src/compiler/post-transform/define-meta/destructure-meta.ts

@@ -1,5 +1,5 @@
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { NoDestructuredDefineMetaCallError } from '#utils/error/parser/analyse/define-meta';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { NoDestructuredDefineMetaCallError } from '$lib/utils/error/parser/analyse/define-meta.js';
 
 interface Params {
   nodes: CompiledASTNodes;

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

@@ -9,9 +9,9 @@ import { describe, it } from 'vitest';
 
 import { transformDefineMeta } from '.';
 
-import { getSvelteAST } from '#parser/ast';
-import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
-import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
+import { getSvelteAST } from '$lib/parser/ast.js';
+import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 

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

@@ -1,11 +1,11 @@
 import { print } from 'esrap';
 import type MagicString from 'magic-string';
 
-import { destructureMetaFromDefineMeta } from './destructure-meta';
-import { insertDefineMetaJSDocCommentAsDescription } from './insert-description';
+import { destructureMetaFromDefineMeta } from './destructure-meta.js';
+import { insertDefineMetaJSDocCommentAsDescription } from './insert-description.js';
 
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
 
 interface Params {
   code: MagicString;

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

@@ -8,11 +8,11 @@ import {
   getDescriptionPropertyValue,
   getDocsPropertyValue,
   getParametersPropertyValue,
-} from '#compiler/post-transform/shared/description';
-import { createASTObjectExpression, createASTProperty, type ESTreeAST } from '#parser/ast';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { getDefineMetaFirstArgumentObjectExpression } from '#parser/extract/svelte/define-meta';
+} from '$lib/compiler/post-transform/shared/description.js';
+import { createASTObjectExpression, createASTProperty, type ESTreeAST } from '$lib/parser/ast.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { getDefineMetaFirstArgumentObjectExpression } from '$lib/parser/extract/svelte/define-meta.js';
 
 interface Params {
   nodes: {

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

@@ -8,9 +8,9 @@ import { describe, it } from 'vitest';
 
 import { transformStoriesCode } from '.';
 
-import { getSvelteAST } from '#parser/ast';
-import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
-import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
+import { getSvelteAST } from '$lib/parser/ast.js';
+import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 

src/compiler/post-transform/index.ts

@@ -1,13 +1,13 @@
 import type MagicString from 'magic-string';
 
-import { transformStory } from './story';
-import { transformDefineMeta } from './define-meta';
-import { removeExportDefault } from './remove-export-default';
-import { createAppendix } from './create-appendix';
+import { transformStory } from './story/index.js';
+import { transformDefineMeta } from './define-meta/index.js';
+import { removeExportDefault } from './remove-export-default.js';
+import { createAppendix } from './create-appendix.js';
 
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
 
 interface Params {
   code: MagicString;

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

@@ -6,10 +6,10 @@ import MagicString from 'magic-string';
 import { parseAst } from 'rollup/parseAst';
 import { describe, it } from 'vitest';
 
-import { removeExportDefault } from './remove-export-default';
+import { removeExportDefault } from './remove-export-default.js';
 
-import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { StorybookSvelteCSFError } from '#utils/error';
+import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { StorybookSvelteCSFError } from '$lib/utils/error.js';
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 

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

@@ -1,7 +1,7 @@
 import { print } from 'esrap';
 import type MagicString from 'magic-string';
 
-import type { CompiledASTNodes } from '#parser/extract/compiled/nodes';
+import type { CompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
 
 interface Params {
   code: MagicString;

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

@@ -1,9 +1,9 @@
 import { logger } from '@storybook/node-logger';
 import dedent from 'dedent';
 
-import type { ESTreeAST, SvelteAST } from '#parser/ast';
+import type { ESTreeAST, SvelteAST } from '$lib/parser/ast.js';
 
-import { createASTObjectExpression } from '#parser/ast';
+import { createASTObjectExpression } from '$lib/parser/ast.js';
 
 interface FindPropertyOptions {
   name: string;

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

@@ -9,10 +9,10 @@ import { describe, it } from 'vitest';
 
 import { transformStory } from '.';
 
-import { getSvelteAST } from '#parser/ast';
-import { extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
-import { extractCompiledASTNodes } from '#parser/extract/compiled/nodes';
-import { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
+import { getSvelteAST } from '$lib/parser/ast.js';
+import { extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import { extractCompiledASTNodes } from '$lib/parser/extract/compiled/nodes.js';
+import { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 

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

@@ -1,11 +1,11 @@
 import { print } from 'esrap';
 import type MagicString from 'magic-string';
 
-import { insertStoryHTMLCommentAsDescription } from './insert-description';
-import { insertSvelteCSFToStoryParameters } from './insert-svelte-csf';
+import { insertStoryHTMLCommentAsDescription } from './insert-description.js';
+import { insertSvelteCSFToStoryParameters } from './insert-svelte-csf.js';
 
-import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
+import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
 
 interface Params {
   code: MagicString;

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

@@ -9,13 +9,13 @@ import {
   getParametersPropertyValue,
   getDocsPropertyValue,
   getDescriptionPropertyValue,
-} from '#compiler/post-transform/shared/description';
-import { createASTObjectExpression, createASTProperty } from '#parser/ast';
+} from '$lib/compiler/post-transform/shared/description.js';
+import { createASTObjectExpression, createASTProperty } from '$lib/parser/ast.js';
 
-import type { ESTreeAST } from '#parser/ast';
-import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
-import { getStoryPropsObjectExpression } from '#parser/extract/compiled/story';
-import type { SvelteASTNodes } from '#parser/extract/svelte/nodes';
+import type { ESTreeAST } from '$lib/parser/ast.js';
+import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
+import { getStoryPropsObjectExpression } from '$lib/parser/extract/compiled/story.js';
+import type { SvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
 
 interface Params {
   nodes: {

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

@@ -1,13 +1,13 @@
 import {
   findPropertyParametersIndex,
   getParametersPropertyValue,
-} from '#compiler/post-transform/shared/description';
+} from '$lib/compiler/post-transform/shared/description.js';
 
-import type { extractStoriesNodesFromExportDefaultFn } from '#parser/extract/compiled/stories';
-import { getStoryPropsObjectExpression } from '#parser/extract/compiled/story';
-import type { SvelteASTNodes, extractSvelteASTNodes } from '#parser/extract/svelte/nodes';
-import { getStoryChildrenRawCode } from '#parser/analyse/story/children';
-import { createASTObjectExpression, createASTProperty } from '#parser/ast';
+import type { extractStoriesNodesFromExportDefaultFn } from '$lib/parser/extract/compiled/stories.js';
+import { getStoryPropsObjectExpression } from '$lib/parser/extract/compiled/story.js';
+import type { SvelteASTNodes, extractSvelteASTNodes } from '$lib/parser/extract/svelte/nodes.js';
+import { getStoryChildrenRawCode } from '$lib/parser/analyse/story/children.js';
+import { createASTObjectExpression, createASTProperty } from '$lib/parser/ast.js';
 
 interface Params {
   nodes: {