Skip to content

Commit 14dc6c7

Browse files
committed
refactor: split web server packaging layers
1 parent 4df043d commit 14dc6c7

168 files changed

Lines changed: 377 additions & 251 deletions

File tree

Some content is hidden

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

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build]
2+
target-dir = ".build/server/target"

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,18 @@ jobs:
7272
components: rustfmt, clippy
7373
- uses: Swatinem/rust-cache@v2
7474
with:
75-
workspaces: src-tauri -> target
75+
workspaces: apps/server -> .build/server/target
7676
- uses: pnpm/action-setup@v4
7777
- uses: actions/setup-node@v4
7878
with:
7979
node-version: 22
8080
cache: pnpm
8181
- run: pnpm install --frozen-lockfile
8282
- run: pnpm test:cli
83-
- run: cargo fmt --manifest-path src-tauri/Cargo.toml --all --check
84-
- run: cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings
85-
- run: cargo check --manifest-path src-tauri/Cargo.toml
86-
- run: cargo test --manifest-path src-tauri/Cargo.toml
83+
- run: cargo fmt --manifest-path apps/server/Cargo.toml --all --check
84+
- run: cargo clippy --manifest-path apps/server/Cargo.toml --all-targets -- -D warnings
85+
- run: cargo check --manifest-path apps/server/Cargo.toml
86+
- run: cargo test --manifest-path apps/server/Cargo.toml
8787
- run: pnpm pack:local
8888
- run: pnpm test:smoke
8989
- run: npx playwright install --with-deps chromium

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- run: pnpm install --frozen-lockfile
3030
- name: Verify tag matches package version
3131
run: |
32-
VERSION=$(node -e "console.log(require('./packages/coder-studio/package.json').version)")
32+
VERSION=$(node -e "console.log(require('./packages/cli/package.json').version)")
3333
test "v$VERSION" = "$GITHUB_REF_NAME"
3434
- run: pnpm version:check
3535

@@ -68,7 +68,7 @@ jobs:
6868
- uses: dtolnay/rust-toolchain@stable
6969
- uses: Swatinem/rust-cache@v2
7070
with:
71-
workspaces: src-tauri -> target
71+
workspaces: apps/server -> .build/server/target
7272
- uses: pnpm/action-setup@v4
7373
- uses: actions/setup-node@v4
7474
with:
@@ -78,8 +78,8 @@ jobs:
7878
- run: pnpm install --frozen-lockfile
7979
- run: pnpm release:check
8080
- run: node -e "require('fs').mkdirSync('.artifacts', { recursive: true })"
81-
- run: pnpm --dir packages/${{ matrix.package_slug }} pack --pack-destination ../../.artifacts
82-
- run: npm publish packages/${{ matrix.package_slug }} --access public
81+
- run: pnpm --dir .build/stage/npm/${{ matrix.package_slug }} pack --pack-destination ../../../../.artifacts
82+
- run: npm publish .build/stage/npm/${{ matrix.package_slug }} --access public
8383
env:
8484
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
8585
- uses: actions/upload-artifact@v4
@@ -104,8 +104,8 @@ jobs:
104104
- run: pnpm install --frozen-lockfile
105105
- run: pnpm version:check
106106
- run: node -e "require('fs').mkdirSync('.artifacts', { recursive: true })"
107-
- run: pnpm --dir packages/coder-studio pack --pack-destination ../../.artifacts
108-
- run: npm publish packages/coder-studio --access public
107+
- run: pnpm --dir packages/cli pack --pack-destination ../../.artifacts
108+
- run: npm publish packages/cli --access public
109109
env:
110110
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
111111
- uses: actions/upload-artifact@v4

.gitignore

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
node_modules/
33

44
# Build outputs
5-
dist/
6-
.vite/
5+
.build/
76
coverage/
87
*.tsbuildinfo
98

109
# Tauri (Rust)
11-
src-tauri/target/
12-
src-tauri/gen/
10+
apps/server/target/
11+
apps/server/gen/
1312

1413
# Playwright
1514
test-results/
@@ -40,11 +39,3 @@ output
4039
.tmp
4140
.playwright-cli
4241
.artifacts/
43-
packages/coder-studio-linux-x64/bin/coder-studio
44-
packages/coder-studio-linux-x64/dist/
45-
packages/coder-studio-darwin-arm64/bin/coder-studio
46-
packages/coder-studio-darwin-arm64/dist/
47-
packages/coder-studio-darwin-x64/bin/coder-studio
48-
packages/coder-studio-darwin-x64/dist/
49-
packages/coder-studio-win32-x64/bin/coder-studio.exe
50-
packages/coder-studio-win32-x64/dist/

README.en.md

Lines changed: 33 additions & 9 deletions

README.md

Lines changed: 32 additions & 8 deletions
File renamed without changes.

0 commit comments

Comments
 (0)