From 5808ee57e29e599791cda93106010623e394acb3 Mon Sep 17 00:00:00 2001 From: chenos Date: Tue, 15 Apr 2025 22:53:07 +0800 Subject: [PATCH] chore(deps): upgrade some dependencies to latest versions (#6673) * chore(deps): upgrade some dependencies to latest versions * fix: --skip-dev-dependencies * fix: compression --- docker/nocobase/Dockerfile | 2 +- packages/core/cli/package.json | 3 +-- packages/core/create-nocobase-app/package.json | 1 + packages/core/create-nocobase-app/src/cli.js | 1 + packages/core/create-nocobase-app/src/generator.js | 10 +++++++++- .../create-nocobase-app/templates/app/package.json.tpl | 1 + packages/core/database/package.json | 4 ++-- packages/core/devtools/package.json | 2 +- packages/core/server/package.json | 7 ++++--- .../@nocobase/plugin-backup-restore/package.json | 2 +- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/docker/nocobase/Dockerfile b/docker/nocobase/Dockerfile index 5de0d6030a..3fb6bafc89 100644 --- a/docker/nocobase/Dockerfile +++ b/docker/nocobase/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app RUN cd /app \ && yarn config set network-timeout 600000 -g \ - && npx -y create-nocobase-app@${CNA_VERSION} my-nocobase-app -a -e APP_ENV=production \ + && npx -y create-nocobase-app@${CNA_VERSION} my-nocobase-app --skip-dev-dependencies -a -e APP_ENV=production \ && cd /app/my-nocobase-app \ && yarn install --production diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index d4158c9467..b62dca04a3 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -18,9 +18,8 @@ "fast-glob": "^3.3.1", "fs-extra": "^11.1.1", "p-all": "3.0.0", - "pm2": "^5.2.0", + "pm2": "^6.0.5", "portfinder": "^1.0.28", - "serve": "^13.0.2", "tree-kill": "^1.2.2", "tsx": "^4.19.0" }, diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index db383a5c3c..2930f88cfb 100755 --- a/packages/core/create-nocobase-app/package.json +++ b/packages/core/create-nocobase-app/package.json @@ -8,6 +8,7 @@ "axios": "^1.7.0", "chalk": "^4.1.1", "commander": "^9.2.0", + "fs-extra": "^11.3.0", "tar": "6.1.11" }, "bin": { diff --git a/packages/core/create-nocobase-app/src/cli.js b/packages/core/create-nocobase-app/src/cli.js index 09fd152ddc..0fd40eb008 100644 --- a/packages/core/create-nocobase-app/src/cli.js +++ b/packages/core/create-nocobase-app/src/cli.js @@ -19,6 +19,7 @@ const cli = new Command('create-nocobase'); cli .arguments('', 'directory of new NocoBase app') .option('--quickstart', 'quickstart app creation') + .option('--skip-dev-dependencies') .option('-a, --all-db-dialect', 'install all database dialect dependencies') .option('-d, --db-dialect ', 'database dialect, current support sqlite/mysql/postgres', 'sqlite') .option('-e, --env ', 'environment variables write into .env file', concat, []) diff --git a/packages/core/create-nocobase-app/src/generator.js b/packages/core/create-nocobase-app/src/generator.js index 260cbc308f..fc7ef0179d 100644 --- a/packages/core/create-nocobase-app/src/generator.js +++ b/packages/core/create-nocobase-app/src/generator.js @@ -9,7 +9,8 @@ const chalk = require('chalk'); const crypto = require('crypto'); -const { existsSync } = require('fs'); +const { existsSync, promises } = require('fs'); +const fs = require('fs-extra'); const { join, resolve } = require('path'); const { Generator } = require('@umijs/utils'); const { downloadPackageFromNpm, updateJsonFile } = require('./util'); @@ -191,6 +192,13 @@ class AppGenerator extends Generator { this.checkDbEnv(); + const skipDevDependencies = this.args.skipDevDependencies; + if (skipDevDependencies) { + const json = await fs.readJSON(join(this.cwd, 'package.json'), 'utf8'); + delete json['devDependencies']; + await fs.writeJSON(join(this.cwd, 'package.json'), json, { encoding: 'utf8', spaces: 2 }); + } + console.log(''); console.log(chalk.green(`$ cd ${name}`)); console.log(chalk.green(`$ yarn install`)); diff --git a/packages/core/create-nocobase-app/templates/app/package.json.tpl b/packages/core/create-nocobase-app/templates/app/package.json.tpl index 1ed027948e..27bd36a66d 100644 --- a/packages/core/create-nocobase-app/templates/app/package.json.tpl +++ b/packages/core/create-nocobase-app/templates/app/package.json.tpl @@ -28,6 +28,7 @@ "@types/react-dom": "^18.0.0", "react-router-dom": "6.28.1", "react-router": "6.28.1", + "async": "3.2.6", "antd": "5.12.8", "rollup": "4.24.0" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 5b23198f5f..877825dacf 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -20,12 +20,12 @@ "graphlib": "^2.1.8", "lodash": "^4.17.21", "mathjs": "^10.6.1", - "nanoid": "^3.3.6", + "nanoid": "^3.3.11", "node-fetch": "^2.6.7", "node-sql-parser": "^4.18.0", "qs": "^6.11.2", "safe-json-stringify": "^1.2.0", - "semver": "^7.3.7", + "semver": "^7.7.1", "sequelize": "^6.26.0", "umzug": "^3.1.1", "uuid": "^9.0.1" diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index f344afc841..f98ca574a3 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -35,7 +35,7 @@ "react": "^18.0.0", "react-dom": "^18.0.0", "rimraf": "^3.0.0", - "serve": "^13.0.2", + "serve": "^14.2.4", "ts-loader": "^7.0.4", "ts-node": "9.1.1", "ts-node-dev": "1.1.8", diff --git a/packages/core/server/package.json b/packages/core/server/package.json index f21bcde0e3..e9c4a7c2a8 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -45,9 +45,10 @@ "koa-static": "^5.0.0", "lodash": "^4.17.21", "multer": "^1.4.2", - "nanoid": "3.3.4", - "semver": "^7.3.7", - "serve-handler": "^6.1.5", + "nanoid": "^3.3.11", + "semver": "^7.7.1", + "compression": "^1.8.0", + "serve-handler": "^6.1.6", "ws": "^8.13.0", "xpipe": "^1.0.5" }, diff --git a/packages/plugins/@nocobase/plugin-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json index 68017a783f..045ae4e21b 100644 --- a/packages/plugins/@nocobase/plugin-backup-restore/package.json +++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json @@ -27,7 +27,7 @@ "mkdirp": "^1.0.4", "object-path": "^0.11.8", "react": "^18.2.0", - "semver": "^7.5.4", + "semver": "^7.7.1", "tar": "^6.1.13" }, "peerDependencies": {