Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dev:v4": "pnpm -F v4 dev",
"preview": "pnpm -F docs preview",
"test": "pnpm -F shadcn-svelte test",
"check": "pnpm -F docs check",
"check": "pnpm -F docs check && pnpm -F \"./packages/**\" check",
"lint": "prettier --check . && eslint .",
"format": "prettier --write .",
"preinstall": "npx only-allow pnpm",
Expand Down Expand Up @@ -55,7 +55,7 @@
"prettier-plugin-tailwindcss": "^0.6.11",
"pretty-quick": "^4.1.1",
"svelte": "^5.23.1",
"typescript": "^5.8.2",
"typescript": "^5.8.3",
"typescript-eslint": "^8.26.1"
},
"pnpm": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"tinyexec": "^1.0.1",
"tsup": "^8.4.0",
"type-fest": "^3.13.1",
"typescript": "^5.0.0",
"vitest": "^0.34.6",
"typescript": "^5.8.3",
"vitest": "^3.1.3",
"zod": "3.25.0-beta.20250516T005923"
}
}
22 changes: 12 additions & 10 deletions packages/cli/test/utils/transformers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const mockConfig: Config = {
ui: "./src/lib/components/ui",
lib: "./src/lib",
},
sveltekit: true,
typescript: true,
registry: "https://next.shadcn-svelte.com/registry",
};
Expand Down Expand Up @@ -174,6 +175,7 @@ describe("transformImports with more custom paths", () => {
ui: "./src/ui",
lib: "./src/lib",
},
sveltekit: true,
typescript: true,
registry: "https://next.shadcn-svelte.com/registry",
};
Expand Down Expand Up @@ -386,7 +388,7 @@ describe("updateCssVars", () => {
}`;
const result = transformCss(source, {}, { plugins: ["my-plugin"] });
expect(result).toMatchInlineSnapshot(`
"@plugin \\"my-plugin\\";
"@plugin "my-plugin";
:root {
--primary: old;
}"
Expand All @@ -400,9 +402,9 @@ describe("updateCssVars", () => {
}`;
const result = transformCss(source, {}, { plugins: ["plugin1", "plugin2"] });
expect(result).toMatchInlineSnapshot(`
"@plugin \\"unrelated-plugin\\";
@plugin \\"plugin2\\";
@plugin \\"plugin1\\";
"@plugin "unrelated-plugin";
@plugin "plugin2";
@plugin "plugin1";
:root {
--primary: old;
}"
Expand All @@ -416,7 +418,7 @@ describe("updateCssVars", () => {
}`;
const result = transformCss(source, {}, { plugins: ["plugin1"] });
expect(result).toMatchInlineSnapshot(`
"@plugin \\"plugin1\\";
"@plugin "plugin1";
:root {
--primary: old;
}"
Expand All @@ -430,8 +432,8 @@ describe("updateCssVars", () => {
}`;
const result = transformCss(source, {}, { plugins: ["plugin2"] });
expect(result).toMatchInlineSnapshot(`
"@import \\"tailwindcss\\";
@plugin \\"plugin2\\";
"@import "tailwindcss";
@plugin "plugin2";
:root {
--primary: old;
}"
Expand All @@ -446,9 +448,9 @@ describe("updateCssVars", () => {
}`;
const result = transformCss(source, {}, { plugins: ["plugin3"] });
expect(result).toMatchInlineSnapshot(`
"@plugin \\"plugin1\\";
@plugin \\"plugin2\\";
@plugin \\"plugin3\\";
"@plugin "plugin1";
@plugin "plugin2";
@plugin "plugin3";
:root {
--primary: old;
}"
Expand Down
1,852 changes: 565 additions & 1,287 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions sites/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,13 @@
"tslib": "^2.6.3",
"tsx": "^4.16.2",
"tw-animate-css": "^1.2.4",
"typescript": "~5.5.3",
"typescript": "^5.8.3",
"unified": "^11.0.5",
"unist-builder": "^3.0.1",
"unist-util-visit": "^5.0.0",
"vaul-svelte": "1.0.0-next.7",
"velite": "^0.2.0",
"vite": "^6.2.5",
"vitest": "^2.1.2",
"vite": "^6.3.5",
"zod": "^3.24.4",
"zod4": "npm:zod@3.25.0-beta.20250516T005923"
},
Expand Down
10 changes: 6 additions & 4 deletions sites/docs/src/routes/(app)/blocks/[category]/+page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ import { blockMeta } from "$lib/registry/registry-block-meta.js";
export const prerender = true;

type CachedItem = Omit<RegistryItem, "files"> & {
files: (RegistryItemFile & {
highlightedContent: string;
target: string;
})[];
files: Array<
RegistryItemFile & {
highlightedContent: string;
target: string;
}
>;
};

export const load: PageLoad = async ({ params }) => {
Expand Down
6 changes: 6 additions & 0 deletions sites/docs/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ export default defineConfig({
allow: [veliteDirPath, staticDirPath],
},
},
// temp hack to fix the "missing './v4' specifier for 'zod'" error
resolve: {
alias: {
"zod/v4": path.resolve(__dirname, "node_modules/zod4"),
},
},
});

function writeJsonSchemas() {
Expand Down
7 changes: 5 additions & 2 deletions v4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@
"@sveltejs/kit": "^2.16.0",
"@sveltejs/vite-plugin-svelte": "^5.0.0",
"@tailwindcss/vite": "^4.0.0",
"@tanstack/table-core": "^8.20.5",
"@types/d3-scale": "^4.0.8",
"@types/d3-shape": "^3.1.7",
"@types/lodash.template": "^4.5.3",
"@unovis/svelte": "1.4.3",
"acorn": "^8.13.0",
"bits-ui": "^1.4.6",
"clsx": "^2.1.1",
"d3-scale": "^4.0.2",
"d3-shape": "^3.2.0",
"embla-carousel-autoplay": "8.1.6",
"embla-carousel-svelte": "8.1.6",
"estree-walker": "^3.0.3",
"formsnap": "^2.0.1",
Expand All @@ -45,9 +48,9 @@
"tailwindcss": "^4.0.0",
"tsx": "^4.19.4",
"tw-animate-css": "^1.2.4",
"typescript": "^5.0.0",
"typescript": "^5.8.3",
"vaul-svelte": "1.0.0-next.7",
"vite": "^6.2.5",
"vite": "^6.3.5",
"zod": "^3.24.4"
},
"dependencies": {
Expand Down