Skip to content

Commit 690444a

Browse files
rbjornstadrbjornstad
committed
bump ds-svelte
1 parent 8e6ee2e commit 690444a

23 files changed

+151
-106
lines changed

Diff for: ‎package-lock.json

+60-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"format": "prettier --write ."
1313
},
1414
"devDependencies": {
15-
"@nais/ds-svelte-community": "^0.2.1",
15+
"@nais/ds-svelte-community": "^0.5.2",
16+
"@nais/ds-svelte-community-preprocess-svelte": "^0.5.1",
1617
"@navikt/ds-css": "^4.11.2",
1718
"@sveltejs/adapter-auto": "^2.1.0",
1819
"@sveltejs/adapter-node": "^1.3.1",

Diff for: ‎src/app.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />

Diff for: ‎src/client.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import { HoudiniClient } from '$houdini';
22
import { browser, dev } from '$app/environment';
3-
import { subscription, type SubscriptionClient } from "$houdini/plugins";
3+
import { subscription, type SubscriptionClient } from '$houdini/plugins';
44
import { createClient } from 'graphql-sse';
55
import { updatesConnectionClosed } from '$lib/stores/update_complete';
66

77
const graphqlEndpoint = import.meta.env.VITE_GRAPHQL_ENDPOINT;
88
export default new HoudiniClient({
99
url: browser || !graphqlEndpoint ? '/query' : graphqlEndpoint,
10-
plugins: [subscription(sseSockets)],
10+
plugins: [subscription(sseSockets)]
1111
});
1212

1313
function sseSockets() {
1414
const client = createClient({
15-
url: "/query",
15+
url: '/query',
1616
onMessage: (data) => {
1717
if (dev) {
18-
console.debug("message", data);
18+
console.debug('message', data);
1919
}
2020
},
21-
retryAttempts: 1000,
21+
retryAttempts: 1000
2222
});
2323

2424
return {
@@ -32,21 +32,21 @@ function sseSockets() {
3232
{
3333
query: payload.query,
3434
variables: vars,
35-
operationName: payload.operationName,
35+
operationName: payload.operationName
3636
},
3737
{
3838
next: handlers.next,
3939
error: handlers.error,
4040
complete: () => {
4141
updatesConnectionClosed.set(new Date());
4242
handlers.complete();
43-
},
44-
},
43+
}
44+
}
4545
);
4646

4747
return () => {
4848
unsubscribe();
4949
};
50-
},
50+
}
5151
} as SubscriptionClient;
52-
}
52+
}

Diff for: ‎src/lib/Pagination.svelte

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script lang="ts">
2-
import { ChevronRight, ChevronLeft } from '@nais/ds-svelte-community/icons';
2+
import { PendingValue } from '$houdini';
33
import { Button } from '@nais/ds-svelte-community';
4+
import { ChevronLeftIcon, ChevronRightIcon } from '@nais/ds-svelte-community/icons';
45
import { createEventDispatcher } from 'svelte';
5-
import { PendingValue } from '$houdini';
66
export let totalCount: number | typeof PendingValue;
77
export let pageInfo:
88
| {
@@ -31,7 +31,8 @@
3131
dispatch('previousPage');
3232
}}
3333
disabled={!pageInfo.hasPreviousPage}
34-
><svelte:fragment slot="icon-left"><ChevronLeft aria-label="Previous page" /></svelte:fragment
34+
><svelte:fragment slot="icon-left"
35+
><ChevronLeftIcon aria-label="Previous page" /></svelte:fragment
3536
></Button
3637
>
3738
<span>
@@ -47,7 +48,7 @@
4748
}}
4849
disabled={!pageInfo.hasNextPage}
4950
>
50-
<svelte:fragment slot="icon-left"><ChevronRight aria-label="Next page" /></svelte:fragment
51+
<svelte:fragment slot="icon-left"><ChevronRightIcon aria-label="Next page" /></svelte:fragment
5152
></Button
5253
>
5354
</div>

Diff for: ‎src/lib/SearchResults.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import type { SearchQuery$result } from '$houdini';
33
import { PendingValue } from '$houdini';
4-
import { PersonGroup } from '@nais/ds-svelte-community/icons';
4+
import { PersonGroupIcon } from '@nais/ds-svelte-community/icons';
55
import Logo from '../Logo.svelte';
66
import Loading from './Loading.svelte';
77
@@ -86,7 +86,7 @@
8686
}}
8787
>
8888
<div class="typeIcon">
89-
<PersonGroup height="1.5rem" />
89+
<PersonGroupIcon height="1.5rem" />
9090
<div>Team</div>
9191
</div>
9292
{node.name}</a

Diff for: ‎src/lib/stores/update_complete.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { writable } from "svelte/store";
1+
import { writable } from 'svelte/store';
22

3-
export const updatesConnectionClosed = writable(new Date());
3+
export const updatesConnectionClosed = writable(new Date());

Diff for: ‎src/routes/Deploys.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
{#each sortTeamDeploys($store.data.user) as deploy}
8484
{#if deploy == PendingValue}
8585
<Tr>
86-
{#each new Array(4) as _}
86+
{#each new Array(4).fill('medium') as size}
8787
<Td>
88-
<Loading />
88+
<Loading {size} />
8989
</Td>
9090
{/each}
9191
</Tr>

Diff for: ‎src/routes/Header.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import SearchResults from '$lib/SearchResults.svelte';
55
import { logEvent } from '$lib/amplitude';
66
import { Search } from '@nais/ds-svelte-community';
7-
import { InformationSquare } from '@nais/ds-svelte-community/icons';
7+
import { InformationSquareIcon } from '@nais/ds-svelte-community/icons';
88
import Logo from '../Logo.svelte';
99
1010
const store = graphql(`
@@ -173,7 +173,7 @@
173173
<ul class="helpText">
174174
<li>
175175
<div class="typeIcon">
176-
<InformationSquare height="1.5rem" />
176+
<InformationSquareIcon height="1.5rem" />
177177
</div>
178178
<div>
179179
You can filter your searches with prefixes. Try one of the following:<br />

Diff for: ‎src/routes/Teams.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
LinkPanelDescription,
99
LinkPanelTitle
1010
} from '@nais/ds-svelte-community';
11-
import { PersonGroup } from '@nais/ds-svelte-community/icons';
11+
import { PersonGroupIcon } from '@nais/ds-svelte-community/icons';
1212
1313
const store = graphql(`
1414
query UserTeams @load {
@@ -46,7 +46,7 @@
4646
{:else}
4747
<Card minWidth="300px">
4848
<h2>
49-
<PersonGroup />
49+
<PersonGroupIcon />
5050
My teams
5151
</h2>
5252
<div class="teams">

Diff for: ‎src/routes/deploys/+page.svelte

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<script lang="ts">
2+
import { PendingValue } from '$houdini';
23
import Card from '$lib/Card.svelte';
34
import DeploymentStatus from '$lib/DeploymentStatus.svelte';
5+
import Loading from '$lib/Loading.svelte';
6+
import Pagination from '$lib/Pagination.svelte';
47
import Time from '$lib/Time.svelte';
58
import { Alert, Button, Table, Tbody, Td, Th, Thead, Tr } from '@nais/ds-svelte-community';
6-
import { Branching } from '@nais/ds-svelte-community/icons';
9+
import { BranchingIcon } from '@nais/ds-svelte-community/icons';
710
import type { PageData } from './$houdini';
8-
import { PendingValue } from '$houdini';
9-
import Loading from '$lib/Loading.svelte';
10-
import Pagination from '$lib/Pagination.svelte';
1111
export let data: PageData;
1212
$: ({ Deploys } = data);
1313
$: deploys = $Deploys.data?.deployments;
@@ -39,8 +39,8 @@
3939
{#each deploys.edges as edge}
4040
{#if edge.node.id === PendingValue}
4141
<Tr>
42-
{#each new Array(6) as _}
43-
<Td><Loading /></Td>
42+
{#each new Array(6).fill('medium') as size}
43+
<Td><Loading {size} /></Td>
4444
{/each}
4545
</Tr>
4646
{:else}
@@ -83,7 +83,8 @@
8383
href="https://github.com/{edge.node.repository}"
8484
as="a"
8585
>
86-
<svelte:fragment slot="icon-left"><Branching /></svelte:fragment>Repo</Button
86+
<svelte:fragment slot="icon-left"><BranchingIcon /></svelte:fragment
87+
>Repo</Button
8788
>
8889
{/if}
8990
</Td>

Diff for: ‎src/routes/team/[team]/(teamTabs)/+page.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
{#if team !== undefined}
3737
{#if team.id === PendingValue}
3838
<Tr>
39-
{#each team.apps.edges as _}
40-
<Td><Loading /></Td>
39+
{#each new Array(team.apps.edges.length).fill('medium') as size}
40+
<Td><Loading {size} /></Td>
4141
{/each}
4242
</Tr>
4343
{:else}

0 commit comments

Comments
 (0)