Skip to content

Commit 8e6c84e

Browse files
committed
pnpm workspaces are cool :3
1 parent 9f47470 commit 8e6c84e

23 files changed

Lines changed: 50 additions & 796 deletions

.github/actions/build-frontend/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ runs:
1111
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1212
if: ${{ !inputs.skip-checkout }}
1313
with:
14+
submodules: recursive
1415
sparse-checkout: |
1516
frontend
1617
path: ${{ github.repository }}

.github/workflows/ci-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3535
with:
36+
submodules: recursive
3637
sparse-checkout: |
3738
.github
3839
frontend

.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
steps:
4444
- name: Checkout repository
4545
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
46+
with:
47+
submodules: recursive
4648

4749
# Initializes the CodeQL tools for scanning.
4850
- name: Initialize CodeQL

frontend/.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ yarn.lock
1717
/components.json
1818
/src/lib/_fbs
1919
/src/lib/components/ui
20+
21+
# Workspace packages (e.g. svelte-core submodule) own their own formatting
22+
/packages

frontend/eslint.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ export default defineConfig(
6060
'yarn.lock',
6161
'src/lib/_fbs',
6262
'src/lib/components/ui',
63+
// Workspace packages (e.g. svelte-core submodule) own their own linting
64+
'packages/**',
6365
],
6466
}
6567
);

frontend/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
"private": true,
55
"type": "module",
66
"scripts": {
7-
"build:deps": "turbo run build --filter=./packages/*",
8-
"watch:core": "pnpm --filter @openshock/svelte-core build:watch",
9-
"dev": "pnpm build:deps && vite dev",
10-
"build": "pnpm build:deps && vite build",
7+
"dev": "vite dev",
8+
"build": "vite build",
119
"preview": "vite preview",
12-
"check": "pnpm build:deps && svelte-check --tsconfig ./tsconfig.json",
10+
"check": "svelte-check --tsconfig ./tsconfig.json",
1311
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
1412
"format": "prettier --write .",
1513
"lint": "prettier --check . && eslint .",

frontend/packages/svelte-core

Submodule svelte-core updated 263 files

frontend/pnpm-lock.yaml

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

frontend/src/App.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import Guided from '$lib/views/Guided.svelte';
66
import Advanced from '$lib/views/Advanced.svelte';
77
import Success from '$lib/views/Success.svelte';
8-
import { Toaster } from '@openshock/svelte-core/ui/sonner';
9-
import { initializeColorScheme } from '@openshock/svelte-core/state/color-scheme-state.svelte';
8+
import { Toaster } from '@openshock/svelte-core/components/ui/sonner';
9+
import { initializeColorScheme } from '@openshock/svelte-core/state/color-scheme-state.svelte.js';
1010
import { ViewModeStore } from '$lib/stores';
1111
import { closePortal } from '$lib/portalClose';
1212
import { fetchBoardInfo } from '$lib/api';

frontend/src/lib/components/AddHiddenNetworkDialog.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
import { saveWifiNetwork } from '$lib/api';
3-
import { Button, buttonVariants } from '@openshock/svelte-core/ui/button';
3+
import { Button, buttonVariants } from '@openshock/svelte-core/components/ui/button';
44
import {
55
Dialog,
66
DialogContent,
@@ -9,9 +9,9 @@
99
DialogHeader,
1010
DialogTitle,
1111
DialogTrigger,
12-
} from '@openshock/svelte-core/ui/dialog';
13-
import { Input } from '@openshock/svelte-core/ui/input';
14-
import { Label } from '@openshock/svelte-core/ui/label';
12+
} from '@openshock/svelte-core/components/ui/dialog';
13+
import { Input } from '@openshock/svelte-core/components/ui/input';
14+
import { Label } from '@openshock/svelte-core/components/ui/label';
1515
import { Plus } from '@lucide/svelte';
1616
1717
const securityOptions = [

0 commit comments

Comments
 (0)