merge: resolve conflicts with origin/master - keep both local and remote features

This commit is contained in:
2026-06-22 11:40:16 +07:00
424 changed files with 24520 additions and 11731 deletions

View File

@@ -1,13 +1,13 @@
{
"name": "9router-app",
"version": "0.4.80",
"version": "0.5.8",
"description": "9Router web dashboard",
"private": true,
"scripts": {
"dev": "next dev --webpack --port 20128",
"dev": "next dev --webpack --port 20127",
"build": "next build --webpack",
"start": "next start",
"dev:bun": "bun --bun next dev --webpack --port 20128",
"dev:bun": "bun --bun next dev --webpack --port 20127",
"build:bun": "bun --bun next build --webpack",
"start:bun": "bun ./.next/standalone/server.js",
"cli:pack": "npm --prefix cli run pack:cli",
@@ -19,6 +19,7 @@
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@monaco-editor/react": "^4.7.0",
"@next/third-parties": "^16.2.9",
"@tailwindcss/postcss": "^4.3.1",
"@xyflow/react": "^12.10.1",
"bcryptjs": "^3.0.3",