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
2 changes: 1 addition & 1 deletion Dockerfile.otel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM otel/opentelemetry-collector-contrib:0.131.1
FROM otel/opentelemetry-collector-contrib:0.136.0
COPY src/lib/otel/receivers_config.yml /etc/otel/receivers_config.yml
COPY src/lib/otel/production_config.yml /etc/otel/production_config.yml
CMD ["--config", "/etc/otel/production_config.yml", "--config", "/etc/otel/receivers_config.yml"]
2 changes: 1 addition & 1 deletion deployment/development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- ~/.ssh:/root/ssh

otel:
image: otel/opentelemetry-collector-contrib:0.131.0
image: otel/opentelemetry-collector-contrib:0.136.0
ports:
- "6317:6317" # gRPC
- "6318:6318" # HTTP
Expand Down
4,970 changes: 2,227 additions & 2,743 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@
"schema": "src/lib/prisma/schema.prisma"
},
"devDependencies": {
"@auth/core": "^0.37.4",
"@auth/core": "^0.40.0",
"@auth/sveltekit": "^1.7.4",
"@aws-sdk/client-sesv2": "^3.879.0",
"@bull-board/api": "^6.12.0",
"@bull-board/express": "^6.9.0",
"@bull-board/hono": "^6.12.0",
"@bull-board/ui": "^6.12.0",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.31.0",
"@hono/node-server": "^1.17.1",
"@iconify/svelte": "^4.2.0",
"@iconify/svelte": "^5.0.2",
"@inlang/paraglide-js": "^2.2.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0",
Expand All @@ -50,9 +49,8 @@
"@playwright/test": "^1.50.0",
"@sveltejs/adapter-node": "^5.2.12",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^5.0.3",
"@sveltejs/vite-plugin-svelte": "^6.2.1",
"@tailwindcss/vite": "^4.0.6",
"@types/express": "^5.0.0",
"@types/node": "^22.10.10",
"@types/nodemailer": "^7.0.1",
"@typescript-eslint/eslint-plugin": "^8.44.0",
Expand All @@ -61,19 +59,19 @@
"@vvo/tzdb": "^6.159.0",
"@zerodevx/svelte-toast": "^0.9.6",
"bullmq": "^5.52.0",
"commander": "^13.1.0",
"commander": "^14.0.1",
"daisyui": "^5.0.0",
"devalue": "^5.3.2",
"eslint": "^9.31.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-prettier": "^5.5.3",
"eslint-plugin-svelte": "^2.46.1",
"express": "^4.21.2",
"fast-xml-parser": "^5.0.9",
"fuse.js": "^7.0.0",
"globals": "^16.3.0",
"hono": "^4.8.7",
"hono": "^4.9.9",
"nodemailer": "^7.0.6",
"prettier": "^3.6.2",
"prettier-eslint": "^17.0.0-alpha.1",
Expand All @@ -84,16 +82,16 @@
"svelte": "^5.19.2",
"svelte-check": "^4.1.4",
"svelte-flatpickr-plus": "^2.0.6",
"sveltekit-sse": "^0.13.19",
"sveltekit-sse": "^0.14.3",
"sveltekit-superforms": "^2.23.1",
"svelvet": "^10.0.2",
"svelvet": "11.0.5",
"tailwindcss": "^4.0.6",
"ts-node": "^10.9.2",
"tslib": "^2.8.1",
"typescript": "^5.7.3",
"typescript-eslint": "^8.44.0",
"valibot": "^1.0.0-beta.14",
"vite": "^6.0.11",
"vite": "^6.3.6",
"vitest": "^3.0.4",
"xstate": "^5.20.1"
},
Expand All @@ -104,6 +102,7 @@
},
"//": "@auth/core has a peerDep on v6, but it is never used",
"overrides": {
"nodemailer": "^7.0.6"
"nodemailer": "^7.0.6",
"cookie": "^0.7.0"
}
}
7 changes: 4 additions & 3 deletions src/lib/components/OrganizationDropdown.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import type { HTMLSelectAttributes } from 'svelte/elements';
import { org_allOrganizations } from '$lib/paraglide/messages';
import { getLocale } from '$lib/paraglide/runtime';
import { byName } from '$lib/utils/sorting';
Expand All @@ -7,19 +8,19 @@
value: number | null;
className?: string;
allowNull?: boolean;
[key: string]: unknown;
selectProperties?: HTMLSelectAttributes;
}

let {
organizations,
value = $bindable(),
className = '',
allowNull = false,
...rest
selectProperties = {}
}: Props = $props();
</script>

<select class="select select-bordered {className}" bind:value {...rest}>
<select class="select select-bordered {className}" bind:value {...selectProperties}>
{#if allowNull}
<option value={null} selected>{org_allOrganizations()}</option>
{/if}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,17 @@
<OrganizationDropdown
bind:value={$orgActive}
organizations={data.organizations}
onchange={() =>
goto(
localizeUrl(
page.url.pathname.replace(
`/organizations/${page.params.id}`,
`/organizations/${$orgActive}`
selectProperties={{
onchange: () =>
goto(
localizeUrl(
page.url.pathname.replace(
`/organizations/${page.params.id}`,
`/organizations/${$orgActive}`
)
)
)
)}
}}
/>
</h2>
{:else}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@
className={mobileSizing}
organizations={data.organizations}
bind:value={$orgActive}
onchange={() => goto(localizeHref(`/projects/${page.params.filter}/${$orgActive}`))}
selectProperties={{
onchange: () => goto(localizeHref(`/projects/${page.params.filter}/${$orgActive}`))
}}
/>
<Tooltip className="tooltip-bottom {mobileSizing}">
<div class="tooltip-content text-left">
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(authenticated)/users/invite/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<LabeledFormInput key="project_org">
<OrganizationDropdown
className="w-full"
name="organizationId"
selectProperties={{ name: 'organizationId' }}
bind:value={$form.organizationId}
organizations={data.groupsByOrg}
/>
Expand Down
Loading