merge: resolve conflicts with origin/master (routes, Caddy ports, scripts)

2026-07-27 15:01:38 +05:30
parent 789d26bb8d 3bfa9ac65e
commit 6da82f0ed8
25 changed files with 2532 additions and 46 deletions
--- a/package.json
+++ b/package.json
@@ -60,7 +60,11 @@
    "docs:update": "bun run scripts/update-docs.ts",
    "subtree": "bun run scripts/subtree.ts",
    "fix": "ultracite fix",
-    "slice1": "vp run -r dev"
+    "slice1": "vp run -r dev",
+    "orb:proof": "bun run scripts/orb-proof.ts",
+    "orb:run": "bun run scripts/orb-project-run.ts",
+    "dev:zopu": "vp run --filter @code/server dev",
+    "dev:zopu:web": "vp run --filter web dev"
  },
  "dependencies": {},
  "devDependencies": {