diff --git a/.github/workflows/check-http-server.yml b/.github/workflows/check-radicle-httpd.yml similarity index 77% rename from .github/workflows/check-http-server.yml rename to .github/workflows/check-radicle-httpd.yml index 3541559b7..c5b794156 100644 --- a/.github/workflows/check-http-server.yml +++ b/.github/workflows/check-radicle-httpd.yml @@ -1,4 +1,4 @@ -name: check-http-server +name: check-radicle-httpd on: push jobs: @@ -7,13 +7,13 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./http-server + working-directory: ./radicle-httpd steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: - workspaces: http-server -> target + workspaces: radicle-httpd -> target - name: Build run: cargo build --all-features - name: Run tests @@ -23,13 +23,13 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./http-server + working-directory: ./radicle-httpd steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: - workspaces: http-server -> target + workspaces: radicle-httpd -> target - name: Docs run: cargo doc --all --all-features lint: @@ -37,13 +37,13 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./http-server + working-directory: ./radicle-httpd steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: - workspaces: http-server -> target + workspaces: radicle-httpd -> target - name: Run clippy run: cargo clippy --all --tests - name: Check formatting diff --git a/.gitignore b/.gitignore index 2b47c0cde..9c95c307d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ node_modules/ NOTES config/local* -http-server/target -http-server/build/artifacts +radicle-httpd/target +radicle-httpd/build/artifacts # KaTeX files *.min.css diff --git a/eslint.config.js b/eslint.config.js index 847a180ad..37abdf383 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -137,7 +137,7 @@ export default [ "node_modules/**/*", "build/**/*", "public/**/*", - "http-server/**/*", + "radicle-httpd/**/*", ], }, ]; diff --git a/package.json b/package.json index af27987aa..40426c158 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ "build": "vite build && scripts/copy-katex-assets && scripts/install-twemoji-assets", "postinstall": "scripts/copy-katex-assets && scripts/install-twemoji-assets", "check": "scripts/check", - "check:http-server": "cd http-server && cargo clippy --all --tests && cargo fmt --all --check", + "check:radicle-httpd": "cd radicle-httpd && cargo clippy --all --tests && cargo fmt --all --check", "format": "npx prettier '**/*.@(ts|js|svelte|json|css|html|yml)' --write", "test:unit": "TZ='UTC' vitest run", "test:e2e": "NODE_CONFIG_ENV='test' TZ='UTC' playwright test", "test:http-client:unit": "NODE_CONFIG_ENV='test' TZ='UTC' vitest run --config http-client/vite.config.ts --reporter verbose", - "test:http-server": "cd http-server && cargo test --all-features" + "test:radicle-httpd": "cd radicle-httpd && cargo test --all-features" }, "type": "module", "engines": { diff --git a/http-server/Cargo.lock b/radicle-httpd/Cargo.lock similarity index 100% rename from http-server/Cargo.lock rename to radicle-httpd/Cargo.lock diff --git a/http-server/Cargo.toml b/radicle-httpd/Cargo.toml similarity index 100% rename from http-server/Cargo.toml rename to radicle-httpd/Cargo.toml diff --git a/http-server/build.rs b/radicle-httpd/build.rs similarity index 100% rename from http-server/build.rs rename to radicle-httpd/build.rs diff --git a/http-server/build/Dockerfile b/radicle-httpd/build/Dockerfile similarity index 100% rename from http-server/build/Dockerfile rename to radicle-httpd/build/Dockerfile diff --git a/http-server/build/README.md b/radicle-httpd/build/README.md similarity index 100% rename from http-server/build/README.md rename to radicle-httpd/build/README.md diff --git a/http-server/build/TARGETS b/radicle-httpd/build/TARGETS similarity index 100% rename from http-server/build/TARGETS rename to radicle-httpd/build/TARGETS diff --git a/http-server/build/build b/radicle-httpd/build/build similarity index 100% rename from http-server/build/build rename to radicle-httpd/build/build diff --git a/http-server/build/checksums b/radicle-httpd/build/checksums similarity index 100% rename from http-server/build/checksums rename to radicle-httpd/build/checksums diff --git a/http-server/build/config.toml b/radicle-httpd/build/config.toml similarity index 100% rename from http-server/build/config.toml rename to radicle-httpd/build/config.toml diff --git a/http-server/build/macos-sdk-11.3.tar.xz b/radicle-httpd/build/macos-sdk-11.3.tar.xz similarity index 100% rename from http-server/build/macos-sdk-11.3.tar.xz rename to radicle-httpd/build/macos-sdk-11.3.tar.xz diff --git a/http-server/build/tag b/radicle-httpd/build/tag similarity index 100% rename from http-server/build/tag rename to radicle-httpd/build/tag diff --git a/http-server/build/upload b/radicle-httpd/build/upload similarity index 100% rename from http-server/build/upload rename to radicle-httpd/build/upload diff --git a/http-server/build/version b/radicle-httpd/build/version similarity index 100% rename from http-server/build/version rename to radicle-httpd/build/version diff --git a/http-server/radicle-httpd.1.adoc b/radicle-httpd/radicle-httpd.1.adoc similarity index 100% rename from http-server/radicle-httpd.1.adoc rename to radicle-httpd/radicle-httpd.1.adoc diff --git a/http-server/rust-toolchain b/radicle-httpd/rust-toolchain similarity index 100% rename from http-server/rust-toolchain rename to radicle-httpd/rust-toolchain diff --git a/http-server/src/api.rs b/radicle-httpd/src/api.rs similarity index 100% rename from http-server/src/api.rs rename to radicle-httpd/src/api.rs diff --git a/http-server/src/api/auth.rs b/radicle-httpd/src/api/auth.rs similarity index 100% rename from http-server/src/api/auth.rs rename to radicle-httpd/src/api/auth.rs diff --git a/http-server/src/api/error.rs b/radicle-httpd/src/api/error.rs similarity index 100% rename from http-server/src/api/error.rs rename to radicle-httpd/src/api/error.rs diff --git a/http-server/src/api/json.rs b/radicle-httpd/src/api/json.rs similarity index 100% rename from http-server/src/api/json.rs rename to radicle-httpd/src/api/json.rs diff --git a/http-server/src/api/v1.rs b/radicle-httpd/src/api/v1.rs similarity index 100% rename from http-server/src/api/v1.rs rename to radicle-httpd/src/api/v1.rs diff --git a/http-server/src/api/v1/delegates.rs b/radicle-httpd/src/api/v1/delegates.rs similarity index 100% rename from http-server/src/api/v1/delegates.rs rename to radicle-httpd/src/api/v1/delegates.rs diff --git a/http-server/src/api/v1/node.rs b/radicle-httpd/src/api/v1/node.rs similarity index 100% rename from http-server/src/api/v1/node.rs rename to radicle-httpd/src/api/v1/node.rs diff --git a/http-server/src/api/v1/profile.rs b/radicle-httpd/src/api/v1/profile.rs similarity index 100% rename from http-server/src/api/v1/profile.rs rename to radicle-httpd/src/api/v1/profile.rs diff --git a/http-server/src/api/v1/projects.rs b/radicle-httpd/src/api/v1/projects.rs similarity index 100% rename from http-server/src/api/v1/projects.rs rename to radicle-httpd/src/api/v1/projects.rs diff --git a/http-server/src/api/v1/sessions.rs b/radicle-httpd/src/api/v1/sessions.rs similarity index 100% rename from http-server/src/api/v1/sessions.rs rename to radicle-httpd/src/api/v1/sessions.rs diff --git a/http-server/src/api/v1/stats.rs b/radicle-httpd/src/api/v1/stats.rs similarity index 100% rename from http-server/src/api/v1/stats.rs rename to radicle-httpd/src/api/v1/stats.rs diff --git a/http-server/src/axum_extra.rs b/radicle-httpd/src/axum_extra.rs similarity index 100% rename from http-server/src/axum_extra.rs rename to radicle-httpd/src/axum_extra.rs diff --git a/http-server/src/bin/rad-web.rs b/radicle-httpd/src/bin/rad-web.rs similarity index 100% rename from http-server/src/bin/rad-web.rs rename to radicle-httpd/src/bin/rad-web.rs diff --git a/http-server/src/cache.rs b/radicle-httpd/src/cache.rs similarity index 100% rename from http-server/src/cache.rs rename to radicle-httpd/src/cache.rs diff --git a/http-server/src/commands.rs b/radicle-httpd/src/commands.rs similarity index 100% rename from http-server/src/commands.rs rename to radicle-httpd/src/commands.rs diff --git a/http-server/src/commands/web.rs b/radicle-httpd/src/commands/web.rs similarity index 100% rename from http-server/src/commands/web.rs rename to radicle-httpd/src/commands/web.rs diff --git a/http-server/src/error.rs b/radicle-httpd/src/error.rs similarity index 100% rename from http-server/src/error.rs rename to radicle-httpd/src/error.rs diff --git a/http-server/src/git.rs b/radicle-httpd/src/git.rs similarity index 100% rename from http-server/src/git.rs rename to radicle-httpd/src/git.rs diff --git a/http-server/src/lib.rs b/radicle-httpd/src/lib.rs similarity index 100% rename from http-server/src/lib.rs rename to radicle-httpd/src/lib.rs diff --git a/http-server/src/main.rs b/radicle-httpd/src/main.rs similarity index 100% rename from http-server/src/main.rs rename to radicle-httpd/src/main.rs diff --git a/http-server/src/raw.rs b/radicle-httpd/src/raw.rs similarity index 100% rename from http-server/src/raw.rs rename to radicle-httpd/src/raw.rs diff --git a/http-server/src/test.rs b/radicle-httpd/src/test.rs similarity index 100% rename from http-server/src/test.rs rename to radicle-httpd/src/test.rs diff --git a/http-server/src/tracing_extra.rs b/radicle-httpd/src/tracing_extra.rs similarity index 100% rename from http-server/src/tracing_extra.rs rename to radicle-httpd/src/tracing_extra.rs diff --git a/http-server/systemd/radicle-httpd.service b/radicle-httpd/systemd/radicle-httpd.service similarity index 100% rename from http-server/systemd/radicle-httpd.service rename to radicle-httpd/systemd/radicle-httpd.service diff --git a/tsconfig.json b/tsconfig.json index dea35f0ea..f863d22eb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "@tsconfig/svelte/tsconfig.json", "include": ["src", "tests", "http-client", "./*.js", "./*.ts"], - "exclude": ["node_modules/*", "http-server/*"], + "exclude": ["node_modules/*", "radicle-httpd/*"], "compilerOptions": { "noEmit": true, "target": "es2020",