From 363788a2d4aeb25363c6516b1d4e4ff8987db06b Mon Sep 17 00:00:00 2001 From: xeho91 Date: Thu, 6 Jun 2024 23:14:03 +0800 Subject: [PATCH] cleanup --- package.json | 2 +- pnpm-lock.yaml | 6 ++--- src/utils/get-component-name.ts | 18 +++++++------ test/Test.stories.svelte | 12 --------- test/compile.d.ts | 1 - test/compile.ts | 47 --------------------------------- 6 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 test/Test.stories.svelte delete mode 100644 test/compile.d.ts delete mode 100644 test/compile.ts diff --git a/package.json b/package.json index 35bd0983..e321d681 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "dedent": "^1.2.0", "estree-util-to-js": "^2.0.0", "magic-string": "^0.30.1", + "prettier": "^3.3.1", "prettier-plugin-svelte": "^3.2.4", "zimmerframe": "^1.1.2" }, @@ -83,7 +84,6 @@ "eslint": "^7.17.0", "eslint-plugin-storybook": "^0.6.12", "jsdom": "^24.1.0", - "prettier": "^3.3.1", "rimraf": "^5.0.7", "rollup": "^4.18.0", "storybook": "^8.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef9f85bb..4d56d357 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: magic-string: specifier: ^0.30.1 version: 0.30.10 + prettier: + specifier: ^3.3.1 + version: 3.3.1 prettier-plugin-svelte: specifier: ^3.2.4 version: 3.2.4(prettier@3.3.1)(svelte@5.0.0-next.136) @@ -102,9 +105,6 @@ importers: jsdom: specifier: ^24.1.0 version: 24.1.0 - prettier: - specifier: ^3.3.1 - version: 3.3.1 rimraf: specifier: ^5.0.7 version: 5.0.7 diff --git a/src/utils/get-component-name.ts b/src/utils/get-component-name.ts index 242f7f99..834f1915 100644 --- a/src/utils/get-component-name.ts +++ b/src/utils/get-component-name.ts @@ -1,11 +1,13 @@ +// FIXME: Unused module. Verify if it can be freely removed + // Copied from https://github.com/sveltejs/svelte/blob/14ddb87c311ff3280dde0ae44b0a0d864ec26353/packages/svelte/src/compiler/phases/2-analyze/index.js#L57-L69 export function getComponentName(filename: string) { - const parts = filename.split(/[/\\]/); - const basename = parts.pop() as string; - const last_dir = parts.at(-1); - let name = basename.replace('.svelte', ''); - if (name === 'index' && last_dir && last_dir !== 'src') { - name = last_dir; - } - return name[0].toUpperCase() + name.slice(1); + const parts = filename.split(/[/\\]/); + const basename = parts.pop() as string; + const last_dir = parts.at(-1); + let name = basename.replace(".svelte", ""); + if (name === "index" && last_dir && last_dir !== "src") { + name = last_dir; + } + return name[0].toUpperCase() + name.slice(1); } diff --git a/test/Test.stories.svelte b/test/Test.stories.svelte deleted file mode 100644 index 18050e4b..00000000 --- a/test/Test.stories.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -

Story 3 children

-
diff --git a/test/compile.d.ts b/test/compile.d.ts deleted file mode 100644 index df74da78..00000000 --- a/test/compile.d.ts +++ /dev/null @@ -1 +0,0 @@ -export declare function compileFromString(code: string): Promise; diff --git a/test/compile.ts b/test/compile.ts deleted file mode 100644 index 5e0e4b3e..00000000 --- a/test/compile.ts +++ /dev/null @@ -1,47 +0,0 @@ -import pkg from '@storybook/addon-svelte-csf/package.json' with { type: 'json' }; -import { svelte } from '@sveltejs/vite-plugin-svelte'; -import { build } from 'vite'; -import virtual from 'vite-plugin-virtual'; - -export async function compileFromString(code: string): Promise { - const virtualModuleName = 'virtual:stories.svelte'; - const buildOutput = await build({ - configFile: false, - plugins: [ - svelte(), - virtual({ - [virtualModuleName]: code, - }), - ], - build: { - write: false, - minify: false, - reportCompressedSize: false, - sourcemap: false, - rollupOptions: { - input: { - mainModule: virtualModuleName, - }, - external: [pkg.name, 'svelte'], - }, - }, - optimizeDeps: { - exclude: ['svelte'], - }, - }); - - if ('output' in buildOutput) { - const { output } = buildOutput; - const { modules } = output[0]; - const module = modules[`/@virtual:vite-plugin-virtual/${virtualModuleName}`]; - const { code } = module; - - if (!code) { - throw new Error('Failed to get output code from the virtual module'); - } - - return code; - } - - throw new Error("Couldn't get output from vite build"); -}