Skip to content

Commit 5e3ab1d

Browse files
authored
upgrade to shadcn@next (#1730)
* Updated deps * Updated deps * Updated shadui to next * Ran npx svelte-migrate svelte-5 * Updated config * Ran formatting * More svelte 5 changes * Fixed shadcn next issues * fix build * Set the full path to the package lock as the working directory doesn't seem to be picked up
1 parent b5f73ef commit 5e3ab1d

File tree

159 files changed

+2403
-2390
lines changed

Some content is hidden

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

159 files changed

+2403
-2390
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ jobs:
137137
id: cache-node-modules
138138
with:
139139
path: src/Exceptionless.Web/ClientApp/node_modules
140-
key: node-modules-${{ hashFiles('package-lock.json') }}
140+
key: node-modules-${{ hashFiles('src/Exceptionless.Web/ClientApp/package-lock.json') }}
141141

142142
- name: Install Npm Packages
143143
if: steps.cache-node-modules.outputs.cache-hit != 'true'
144-
run: npm ci --force
144+
run: npm ci
145145

146146
- name: Lint Client
147147
run: npm run lint

src/Exceptionless.Web/ClientApp/.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
package-lock.json
33
pnpm-lock.yaml
44
yarn.lock
5+
src/lib/features/shared/components/ui

src/Exceptionless.Web/ClientApp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ You can preview the production build with `npm run preview`.
4242
You can upgrade [shadcn-svelte components](https://www.shadcn-svelte.com/) by running the following command
4343

4444
```bash
45-
npx shadcn-svelte@latest update
45+
npx shadcn-svelte@next update
4646
```

src/Exceptionless.Web/ClientApp/components.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
},
99
"aliases": {
1010
"components": "$comp",
11-
"utils": "$lib/utils"
12-
}
11+
"utils": "$lib/utils",
12+
"ui": "$lib/features/shared/components/ui",
13+
"hooks": "$lib/hooks"
14+
},
15+
"typescript": true,
16+
"registry": "https://next.shadcn-svelte.com/registry"
1317
}

src/Exceptionless.Web/ClientApp/eslint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export default tseslint.config(
3232
{
3333
ignores: ['build/', '.svelte-kit/', 'dist/', 'src/lib/generated/api.ts', 'src/lib/features/shared/components/ui/']
3434
},
35-
3635
{
3736
rules: {
3837
'perfectionist/sort-svelte-attributes': 'off'

src/Exceptionless.Web/ClientApp/package-lock.json

Lines changed: 210 additions & 240 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Exceptionless.Web/ClientApp/package.json

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"upgrade": "ncu -i"
2424
},
2525
"devDependencies": {
26-
"@playwright/test": "^1.48.1",
27-
"@sveltejs/adapter-static": "^3.0.5",
28-
"@sveltejs/kit": "^2.7.2",
26+
"@playwright/test": "^1.48.2",
27+
"@sveltejs/adapter-static": "^3.0.6",
28+
"@sveltejs/kit": "^2.7.3",
2929
"@sveltejs/vite-plugin-svelte": "^4.0.0",
3030
"@types/eslint": "^9.6.1",
31-
"@types/node": "^22.7.9",
31+
"@types/node": "^22.8.2",
3232
"@types/throttle-debounce": "^5.0.2",
3333
"autoprefixer": "^10.4.20",
3434
"cross-env": "^7.0.3",
@@ -41,14 +41,14 @@
4141
"prettier": "^3.3.3",
4242
"prettier-plugin-svelte": "^3.2.7",
4343
"prettier-plugin-tailwindcss": "^0.6.8",
44-
"svelte": "^5.1.0",
44+
"svelte": "^5.1.4",
4545
"svelte-check": "^4.0.5",
4646
"swagger-typescript-api": "^13.0.22",
4747
"tslib": "^2.8.0",
4848
"typescript": "^5.6.3",
49-
"typescript-eslint": "^8.11.0",
49+
"typescript-eslint": "^8.12.2",
5050
"vite": "^5.4.10",
51-
"vitest": "^2.1.3"
51+
"vitest": "^2.1.4"
5252
},
5353
"dependencies": {
5454
"@exceptionless/browser": "^3.1.0",
@@ -58,16 +58,14 @@
5858
"@tanstack/svelte-query-devtools": "https://pkg.pr.new/@tanstack/svelte-query-devtools@ccce0b8",
5959
"@tanstack/svelte-table": "^9.0.0-alpha.10",
6060
"@typeschema/class-validator": "^0.3.0",
61-
"bits-ui": "^0.21.16",
61+
"bits-ui": "^1.0.0-next.32",
6262
"class-validator": "^0.14.1",
6363
"clsx": "^2.1.1",
64-
"cmdk-sv": "^0.0.18",
65-
"formsnap": "^1.0.1",
64+
"formsnap": "^2.0.0-next.0",
6665
"mode-watcher": "^0.4.1",
6766
"oidc-client-ts": "^3.1.0",
6867
"pretty-ms": "^9.1.0",
6968
"runed": "^0.15.3",
70-
"svelte-persisted-store": "^0.11.0",
7169
"svelte-sonner": "^0.3.28",
7270
"svelte-time": "^0.9.0",
7371
"sveltekit-superforms": "^2.20.0",
@@ -77,8 +75,5 @@
7775
"throttle-debounce": "^5.0.2",
7876
"unplugin-icons": "^0.19.3"
7977
},
80-
"overrides": {
81-
"@typeschema/class-validator": "^0.3.0"
82-
},
8378
"type": "module"
8479
}

src/Exceptionless.Web/ClientApp/src/lib/features/events/components/ExtendedDataItem.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
<div class="flex justify-between">
6464
<H4 class="mb-2">{title}</H4>
6565
<div class="flex justify-end gap-x-1">
66-
<Button on:click={onToggleView} variant="outline">Toggle View</Button>
66+
<Button onclick={onToggleView} variant="outline">Toggle View</Button>
6767

6868
<CopyToClipboardButton value={json}></CopyToClipboardButton>
6969

7070
{#if canPromote}
7171
{#if !isPromoted}
72-
<Button on:click={async () => await promote(title)} size="icon" title="Promote to Tab"><ArrowUpIcon /></Button>
72+
<Button onclick={async () => await promote(title)} size="icon" title="Promote to Tab"><ArrowUpIcon /></Button>
7373
{:else}
74-
<Button on:click={async () => await demote(title)} size="icon" title="Demote Tab"><ArrowDownIcon /></Button>
74+
<Button onclick={async () => await demote(title)} size="icon" title="Demote Tab"><ArrowDownIcon /></Button>
7575
{/if}
7676
{/if}
7777
</div>

src/Exceptionless.Web/ClientApp/src/lib/features/events/components/cards/pie-chart-card.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</script>
1010

1111
<Card.Root>
12-
<Card.Title class="p-6 pb-4 text-2xl" tag="h2">{title}</Card.Title>
12+
<Card.Title class="p-6 pb-0 text-2xl" level={2}>{title}</Card.Title>
1313
<Card.Content>
1414
<div class="w-[200px] border">
1515
<svg viewBox="0 0 20 20">

src/Exceptionless.Web/ClientApp/src/lib/features/events/components/table/EventsDataTable.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
let response: FetchClientResponse<EventSummaryModel<SummaryTemplateKeys>[]>;
3131
3232
$effect(() => {
33-
limit = context.limit;
33+
limit = Number(context.limit);
3434
loadData();
3535
});
3636

0 commit comments

Comments
 (0)