diff --git a/packages/cli/package.json b/packages/cli/package.json index 60516999d7..632f83a47b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -37,7 +37,6 @@ "test": "pnpm -w build:registry-template && vitest" }, "dependencies": { - "@svecosystem/strip-types": "^0.0.2", "commander": "^13.1.0", "node-fetch-native": "^1.6.4", "postcss": "^8.4.39" @@ -45,6 +44,7 @@ "devDependencies": { "@clack/prompts": "^1.0.0-alpha.0", "@shadcn-svelte/registry": "workspace:*", + "@svecosystem/strip-types": "^0.0.2", "@sveltejs/acorn-typescript": "^1.0.5", "@types/node": "^18.19.22", "@types/semver": "^7.5.8", diff --git a/packages/cli/src/commands/registry/build.ts b/packages/cli/src/commands/registry/build.ts index 57f029e4c4..13cf11cf80 100644 --- a/packages/cli/src/commands/registry/build.ts +++ b/packages/cli/src/commands/registry/build.ts @@ -115,18 +115,6 @@ async function runBuild(options: BuildOptions) { } } - /** - * Transforms registry import aliases into a standardized format. - * - * ``` - * import Button from "$lib/registry/ui/button/index.js" - * ``` - * transforms into: - * ``` - * import Button from "$UI$/button/index.js" - * ``` - */ - for (const item of registry.items) { message(`Building item ${color.cyan(item.name)}`); const singleFile = item.files.length === 1; @@ -137,8 +125,7 @@ async function runBuild(options: BuildOptions) { ]; const toResolve = item.files.map(async (file) => { let content = await fs.readFile(file.path, "utf8"); - registry.aliases ??= {}; - content = transformAliases(registry.aliases, content); + content = transformAliases((registry.aliases ??= {}), content); const name = path.basename(file.path); diff --git a/packages/cli/test/utils/deps-resolver.test.ts b/packages/cli/test/utils/deps-resolver.test.ts index 978f974710..16f987fd9c 100644 --- a/packages/cli/test/utils/deps-resolver.test.ts +++ b/packages/cli/test/utils/deps-resolver.test.ts @@ -2,11 +2,11 @@ import { describe, it, expect, beforeEach, vi } from "vitest"; import { resolveDepsFromImport, IGNORE_DEPS, - type ResolvedDependencies, - ProjectDependencies, resolvePeerVersions, resolveTypeDeps, getFileDependencies, + type ResolvedDependencies, + type ProjectDependencies, } from "../../src/commands/registry/deps-resolver.js"; vi.mock("node:fs"); diff --git a/packages/cli/test/utils/registry.test.ts b/packages/cli/test/utils/registry.test.ts index 1beee1ba52..d0c28899a2 100644 --- a/packages/cli/test/utils/registry.test.ts +++ b/packages/cli/test/utils/registry.test.ts @@ -1,3 +1,4 @@ +import path from "node:path"; import { describe, it, expect, vi, beforeEach } from "vitest"; import { fetch } from "node-fetch-native"; import { @@ -11,7 +12,6 @@ import { } from "../../src/utils/registry/index.js"; import type { Config } from "../../src/utils/get-config.js"; import type { RegistryItem, RegistryIndex } from "@shadcn-svelte/registry"; -import path from "node:path"; import { toPosixPath } from "./test-helpers.js"; vi.mock("node-fetch-native", () => ({ diff --git a/packages/cli/test/utils/resolve-imports.test.ts b/packages/cli/test/utils/resolve-imports.test.ts index 1364a9d7b5..eb04a08ca4 100644 --- a/packages/cli/test/utils/resolve-imports.test.ts +++ b/packages/cli/test/utils/resolve-imports.test.ts @@ -1,7 +1,7 @@ +import path from "node:path"; import { describe, it, expect } from "vitest"; import { resolveImport } from "../../src/utils/resolve-imports.js"; import type { TsConfigResult } from "get-tsconfig"; -import path from "node:path"; import { toPosixPath } from "./test-helpers.js"; describe("resolveImport", () => { diff --git a/packages/cli/test/utils/test-helpers.ts b/packages/cli/test/utils/test-helpers.ts index c0211f711b..0ef22dc5d8 100644 --- a/packages/cli/test/utils/test-helpers.ts +++ b/packages/cli/test/utils/test-helpers.ts @@ -1,4 +1,4 @@ -import { fileURLToPath } from "url"; +import { fileURLToPath } from "node:url"; import { getConfig } from "../../src/utils/get-config"; export function toPosixPath(p: string) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9aa0b01d58..d635bded51 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,9 +68,6 @@ importers: packages/cli: dependencies: - '@svecosystem/strip-types': - specifier: ^0.0.2 - version: 0.0.2 commander: specifier: ^13.1.0 version: 13.1.0 @@ -87,6 +84,9 @@ importers: '@shadcn-svelte/registry': specifier: workspace:* version: link:../registry + '@svecosystem/strip-types': + specifier: ^0.0.2 + version: 0.0.2 '@sveltejs/acorn-typescript': specifier: ^1.0.5 version: 1.0.5(acorn@8.14.1) @@ -317,7 +317,7 @@ importers: version: 8.14.1 bits-ui: specifier: ^1.4.7 - version: 1.4.7(svelte@5.28.2) + version: 1.4.8(svelte@5.28.2) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -510,7 +510,7 @@ importers: version: 8.14.1 bits-ui: specifier: ^1.4.6 - version: 1.4.7(svelte@5.28.2) + version: 1.4.8(svelte@5.28.2) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -2334,12 +2334,6 @@ packages: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} - bits-ui@1.4.7: - resolution: {integrity: sha512-oqfSbgB/2Nc3qwOvohkRzw0nQcUKsNPwthD4uzy9E21wSbhc00RDcZqCJmFrrcW336J+aStM1sITsVGQFjT+iw==} - engines: {node: '>=18', pnpm: '>=8.7.0'} - peerDependencies: - svelte: ^5.11.0 - bits-ui@1.4.8: resolution: {integrity: sha512-j34GsdSsJ+ZBl9h/70VkufvrlEgTKQSZvm80eM5VvuhLJWvpfEpn9+k0FVmtDQl9NSPgEVtI9imYhm8nW9Nj/w==} engines: {node: '>=18', pnpm: '>=8.7.0'} @@ -6930,17 +6924,6 @@ snapshots: dependencies: is-windows: 1.0.2 - bits-ui@1.4.7(svelte@5.28.2): - dependencies: - '@floating-ui/core': 1.7.0 - '@floating-ui/dom': 1.7.0 - '@internationalized/date': 3.5.6 - esm-env: 1.2.2 - runed: 0.23.4(svelte@5.28.2) - svelte: 5.28.2 - svelte-toolbelt: 0.7.1(svelte@5.28.2) - tabbable: 6.2.0 - bits-ui@1.4.8(svelte@5.28.2): dependencies: '@floating-ui/core': 1.7.0