Legrems/osiris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: npm -> pnpm

Browse Source
This commit is contained in:
Loïc Gremaud 2026-07-17 18:04:30 +02:00
parent c06b184a2d
commit 0de8143aa3
Signed by: Legrems
GPG Key ID: D4620E6DF3E0121D
6 changed files with 3179 additions and 7826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -110,8 +110,8 @@ cron-test: ## Run the reminder job once, reporting what it would send
# --- Frontend -------------------------------------------------------------- # --- Frontend --------------------------------------------------------------
.PHONY: frontend .PHONY: frontend
frontend: ## Install npm dependencies and build the Vue frontend frontend: ## Install frontend dependencies (pnpm) and build the Vue frontend
cd frontend && npm install && npm run build cd frontend && pnpm install && pnpm run build
# Only build when no bundle exists yet: tests render the shell template, which # Only build when no bundle exists yet: tests render the shell template, which
# needs the Vite manifest, but should not pay for a rebuild on every run. # needs the Vite manifest, but should not pay for a rebuild on every run.
@ -120,11 +120,11 @@ frontend/dist/.vite/manifest.json:
.PHONY: front-dev .PHONY: front-dev
front-dev: ## Run the Vite dev server with hot reload (pair with: DJANGO_VITE_DEV=1 make run) front-dev: ## Run the Vite dev server with hot reload (pair with: DJANGO_VITE_DEV=1 make run)
cd frontend && npm run dev cd frontend && pnpm run dev
.PHONY: api-client .PHONY: api-client
api-client: ## Regenerate the typed TS API client (needs 'make run' in another terminal) api-client: ## Regenerate the typed TS API client (needs 'make run' in another terminal)
cd frontend && npm run generate:api cd frontend && pnpm run generate:api
# --- Development ----------------------------------------------------------- # --- Development -----------------------------------------------------------

2
frontend/openapi-ts.config.ts
View File

@ -1,7 +1,7 @@
import { defineConfig } from "@hey-api/openapi-ts"; import { defineConfig } from "@hey-api/openapi-ts";
// Reads the schema from the running dev server: start `make run` first, then // Reads the schema from the running dev server: start `make run` first, then
// `npm run generate:api` (or `make api-client`) after changing tracker/api.py. // `pnpm run generate:api` (or `make api-client`) after changing tracker/api.py.
export default defineConfig({ export default defineConfig({
input: "http://127.0.0.1:8000/api/openapi.json", input: "http://127.0.0.1:8000/api/openapi.json",
output: "src/api", output: "src/api",

7811
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
frontend/package.json
View File

@ -3,6 +3,10 @@
"private": true, "private": true,
"version": "1.0.0", "version": "1.0.0",
"type": "module", "type": "module",
"packageManager": "pnpm@10.33.0",
"pnpm": {
"onlyBuiltDependencies": ["esbuild"]
},
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vue-tsc --noEmit && tsc -p tsconfig.sw.json && vite build", "build": "vue-tsc --noEmit && tsc -p tsconfig.sw.json && vite build",

3176
frontend/pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

4
osiris/settings.py
View File

@ -143,8 +143,8 @@ STATIC_ROOT = BASE_DIR / "static"
STATICFILES_DIRS = [BASE_DIR / "assets", BASE_DIR / "frontend" / "dist"] STATICFILES_DIRS = [BASE_DIR / "assets", BASE_DIR / "frontend" / "dist"]
# The Vue frontend, served through django-vite's template tags. With # The Vue frontend, served through django-vite's template tags. With
# DJANGO_VITE_DEV=1 the tags point at the Vite dev server (npm run dev) for hot # DJANGO_VITE_DEV=1 the tags point at the Vite dev server (make front-dev) for
# reload; otherwise they resolve hashed files from the built manifest. # hot reload; otherwise they resolve hashed files from the built manifest.
DJANGO_VITE = { DJANGO_VITE = {
"default": { "default": {
"dev_mode": os.environ.get("DJANGO_VITE_DEV", "0") == "1", "dev_mode": os.environ.get("DJANGO_VITE_DEV", "0") == "1",