Merge branch 'main' into next

2025-05-05 05:29:26 +08:00 · 2025-04-22 03:34:58 +00:00 · 2025-04-22 03:34:58 +00:00 · 0f83157d60
commit 0f83157d60
parent 3049f35490 8dbe798fca
3 changed files with 2 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -83,6 +83,7 @@
    "ghooks": "^2.0.4",
    "lint-staged": "^13.2.3",
    "patch-package": "^8.0.0",
+    "pm2": "^6.0.5",
    "pretty-format": "^24.0.0",
    "pretty-quick": "^3.1.0",
    "react": "^18.0.0",
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@ -18,7 +18,6 @@
    "fast-glob": "^3.3.1",
    "fs-extra": "^11.1.1",
    "p-all": "3.0.0",
-    "pm2": "^6.0.5",
    "portfinder": "^1.0.28",
    "tar": "^7.4.3",
    "tree-kill": "^1.2.2",
--- a/packages/core/create-nocobase-app/templates/app/package.json.tpl
+++ b/packages/core/create-nocobase-app/templates/app/package.json.tpl
@ -35,6 +35,7 @@
  },
  "dependencies": {
    "@nocobase/cli": "{{{version}}}",
+    "pm2": "^6.0.5",
    {{{dependencies}}}
  },
  "devDependencies": {