Skip to content

chore: update dependencies and fix captive portal build #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhvrc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

chore: update dependencies and fix captive portal build #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 frontend/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.14.0
26.3.1
41 changes: 19 additions & 22 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,50 +19,47 @@
"@eslint/compat": "^2.1.0",
"@eslint/js": "latest",
"@internationalized/date": "^3.12.2",
"@lucide/svelte": "^1.17.0",
"@lucide/svelte": "^1.21.0",
"@openshock/svelte-core": "workspace:*",
"@playwright/test": "^1.60.0",
"@playwright/test": "^1.61.1",
"@sveltejs/vite-plugin-svelte": "^7.1.2",
"@tailwindcss/vite": "^4.3.0",
"@types/node": "^25.9.2",
"@tailwindcss/vite": "^4.3.1",
"@types/node": "^26.0.1",
"bits-ui": "2.18.1",
"clsx": "^2.1.1",
"core": "workspace:@openshock/svelte-core@*",
"eslint": "^10.4.1",
"eslint": "^10.6.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-compat": "^7.0.2",
"eslint-plugin-svelte": "^3.19.0",
"eslint-plugin-svelte": "^3.20.0",
"flatbuffers": "^25.9.23",
"globals": "^17.6.0",
"prettier": "^3.8.4",
"globals": "^17.7.0",
"prettier": "^3.8.5",
"prettier-plugin-organize-imports": "^4.3.0",
"prettier-plugin-svelte": "^4.1.0",
"prettier-plugin-svelte": "^4.1.1",
"prettier-plugin-tailwindcss": "^0.8.0",
"rollup-plugin-license": "^3.7.1",
"rollup-plugin-visualizer": "^7.0.1",
"svelte": "^5.56.4",
"svelte-check": "^4.6.0",
"svelte-check": "^4.7.1",
"svelte-sonner": "^1.1.1",
"tailwind-merge": "^3.6.0",
"tailwind-variants": "^3.2.2",
"tailwindcss": "^4.3.0",
"turbo": "^2.5.0",
"tailwindcss": "^4.3.1",
"turbo": "^2.10.0",
"tw-animate-css": "^1.4.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.61.0",
"vite": "^8.0.16",
"typescript-eslint": "^8.62.0",
"vite": "^8.1.0",
"vite-plugin-singlefile": "^2.3.3",
"vitest": "^4.1.8"
"vitest": "^4.1.9"
},
"engines": {
"node": ">=24 <25",
"pnpm": ">=10"
"node": "^26",
"pnpm": ">=11"
},
"volta": {
"node": "24.14.0"
},
"packageManager": "pnpm@11.1.2",
"browserslist": [
"> 0.5%, last 2 versions, Firefox ESR, not dead, not op_mini all"
]
],
"packageManager": "pnpm@11.9.0"
}
2 changes: 1 addition & 1 deletion frontend/packages/svelte-core
Open in desktop
Submodule svelte-core updated 263 files
1,985 changes: 1,186 additions & 799 deletions frontend/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions frontend/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ minimumReleaseAge: 4320 # 3 days

minimumReleaseAgeExclude:
- '@openshock/*'
- cookie@0.7.0
- ts-deepmerge@8.0.0

onlyBuiltDependencies:
- '@tailwindcss/oxide'
- esbuild

overrides:
# Force a single svelte version across the workspace. Without this, svelte-core
# can resolve a different patch (e.g. 5.56.3) than the captive-portal root,
# producing two unrelated Snippet types and svelte-check errors.
svelte@>=5.0.0 <5.56.4: ^5.56.4
cookie@<0.7.0: ^0.7.0
ts-deepmerge@<8.0.0: ^8.0.0
4 changes: 2 additions & 2 deletions frontend/src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import Guided from '$lib/views/Guided.svelte';
import Advanced from '$lib/views/Advanced.svelte';
import Success from '$lib/views/Success.svelte';
import { Toaster } from '@openshock/svelte-core/components/ui/sonner/index.ts';
import { initializeColorScheme } from '@openshock/svelte-core/state/color-scheme-state.svelte.ts';
import { Toaster } from '@openshock/svelte-core/ui/sonner';
import { initializeColorScheme } from '@openshock/svelte-core/state/color-scheme-state.svelte';
import { ViewModeStore } from '$lib/stores';
import { closePortal } from '$lib/portalClose';
import { fetchBoardInfo } from '$lib/api';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/lib/WebSocketClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getDeviceHostname } from '$lib/utils/localRedirect';
import { isArrayBuffer, isString } from '@openshock/svelte-core/typeguards/index.ts';
import { isArrayBuffer, isString } from '@openshock/svelte-core/typeguards';
import { toast } from 'svelte-sonner';
import { WebSocketMessageBinaryHandler } from './MessageHandlers';

Expand Down
8 changes: 4 additions & 4 deletions frontend/src/lib/components/AddHiddenNetworkDialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { saveWifiNetwork } from '$lib/api';
import { Button, buttonVariants } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Button, buttonVariants } from '@openshock/svelte-core/ui/button';
import {
Dialog,
DialogContent,
Expand All @@ -9,9 +9,9 @@
DialogHeader,
DialogTitle,
DialogTrigger,
} from '@openshock/svelte-core/components/ui/dialog/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
} from '@openshock/svelte-core/ui/dialog';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';
import { Plus } from '@lucide/svelte';

const securityOptions = [
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/GpioPinSelector.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { hubState, usedPins } from '$lib/stores';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { Input } from '@openshock/svelte-core/ui/input';

interface Props {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/lib/components/Layout/Header.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { LightSwitch } from '@openshock/svelte-core/components/index.ts';
import { LightSwitch } from '@openshock/svelte-core/components';
import { ViewModeStore } from '$lib/stores';
</script>

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/WiFiDetailsDialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script lang="ts">
import { WifiAuthMode } from '$lib/_fbs/open-shock/serialization/types/wifi-auth-mode';
import { buttonVariants } from '@openshock/svelte-core/components/ui/button/index.ts';
import { buttonVariants } from '@openshock/svelte-core/ui/button';
import type { WiFiNetworkGroup } from '$lib/types';
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogTrigger,
} from '@openshock/svelte-core/components/ui/dialog/index.ts';
} from '@openshock/svelte-core/ui/dialog';

import { Settings } from '@lucide/svelte';

Expand Down
8 changes: 4 additions & 4 deletions frontend/src/lib/components/WiFiEntry.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
} from '$lib/api';
import WiFiDetailsDialog from '$lib/components/WiFiDetailsDialog.svelte';
import type { WiFiNetworkGroup } from '$lib/types';
import { Button, buttonVariants } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Button, buttonVariants } from '@openshock/svelte-core/ui/button';
import {
Dialog,
DialogContent,
Expand All @@ -18,9 +18,9 @@
DialogHeader,
DialogTitle,
DialogTrigger,
} from '@openshock/svelte-core/components/ui/dialog/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
} from '@openshock/svelte-core/ui/dialog';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';
import {
ArrowRight,
Link,
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/WiFiList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { hubState } from '$lib/stores';
import { startWifiScan, stopWifiScan } from '$lib/api';
import { WifiScanStatus } from '$lib/_fbs/open-shock/serialization/types/wifi-scan-status';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { LoaderCircle, Radar } from '@lucide/svelte';
import { ScrollArea } from '@openshock/svelte-core/components/ui/scroll-area/index.ts';
import { ScrollArea } from '@openshock/svelte-core/ui/scroll-area';
import WiFiEntry from './WiFiEntry.svelte';

let scanStatus = $derived(hubState.wifiScanStatus);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/WiFiManager.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import { hubState } from '$lib/stores';
import { WifiScanStatus } from '$lib/_fbs/open-shock/serialization/types/wifi-scan-status';
import { startWifiScan, stopWifiScan, disconnectWifiNetwork } from '$lib/api';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { ScrollArea } from '@openshock/svelte-core/components/ui/scroll-area/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { ScrollArea } from '@openshock/svelte-core/ui/scroll-area';
import WiFiEntry from '$lib/components/WiFiEntry.svelte';
import AddHiddenNetworkDialog from '$lib/components/AddHiddenNetworkDialog.svelte';
import { LoaderCircle, Radar, Wifi, WifiOff } from '@lucide/svelte';
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/sections/BackendSection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { hubState } from '$lib/stores';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';

let domain = $state(hubState.config?.backend?.domain ?? '');

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/components/sections/OtaSection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
setOtaRequireManualApproval,
checkOtaUpdates,
} from '$lib/api';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';

let otaConfig = $derived(hubState.config?.otaUpdate);

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/components/steps/AccountStep.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import { linkAccount, unlinkAccount } from '$lib/api';
import { hubState } from '$lib/stores';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';
import { CircleCheck, Wifi, WifiOff, Unlink } from '@lucide/svelte';

function isValidLinkCode(str: string) {
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/components/steps/TestStep.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import { WebSocketClient } from '$lib/WebSocketClient';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';
import { Zap } from '@lucide/svelte';
import { Builder as FlatbufferBuilder } from 'flatbuffers';
import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message';
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/views/Advanced.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
setEstopPin,
} from '$lib/api';
import { hubState, ViewModeStore } from '$lib/stores';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Input } from '@openshock/svelte-core/components/ui/input/index.ts';
import { Label } from '@openshock/svelte-core/components/ui/label/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { Input } from '@openshock/svelte-core/ui/input';
import { Label } from '@openshock/svelte-core/ui/label';
import OtaSection from '$lib/components/sections/OtaSection.svelte';
import { CircleCheck, ChevronRight, ArrowLeft } from '@lucide/svelte';

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/views/Guided.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
StepperDescription,
StepperNext,
StepperPrevious,
} from '@openshock/svelte-core/components/stepper/index.ts';
} from '@openshock/svelte-core/stepper';
import PinsStep from '$lib/components/steps/HardwareStep.svelte';
import WiFiStep from '$lib/components/steps/WiFiStep.svelte';
import TestStep from '$lib/components/steps/TestStep.svelte';
import AccountStep from '$lib/components/steps/AccountStep.svelte';
import { hubState, ViewModeStore } from '$lib/stores';
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';

interface Props {
onComplete: () => void;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/lib/views/Landing.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { Button } from '@openshock/svelte-core/components/ui/button/index.ts';
import { Button } from '@openshock/svelte-core/ui/button';
import { ViewModeStore } from '$lib/stores';
import { WandSparkles, Settings } from '@lucide/svelte';
</script>
Expand Down
Loading