diff --git a/docker/app-mysql/docker-compose.yml b/docker/app-mysql/docker-compose.yml index 778bb9e8d..8dbc052ad 100644 --- a/docker/app-mysql/docker-compose.yml +++ b/docker/app-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.8.0-alpha.5 + image: nocobase/nocobase:0.8.0-alpha.7 networks: - nocobase depends_on: diff --git a/docker/app-postgres/docker-compose.yml b/docker/app-postgres/docker-compose.yml index de7706fc8..ecb3bf840 100644 --- a/docker/app-postgres/docker-compose.yml +++ b/docker/app-postgres/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.8.0-alpha.5 + image: nocobase/nocobase:0.8.0-alpha.7 networks: - nocobase environment: diff --git a/docker/app-sqlite/docker-compose.yml b/docker/app-sqlite/docker-compose.yml index 67e6ca12d..3b9d01489 100644 --- a/docker/app-sqlite/docker-compose.yml +++ b/docker/app-sqlite/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.8.0-alpha.5 + image: nocobase/nocobase:0.8.0-alpha.7 networks: - nocobase environment: diff --git a/lerna.json b/lerna.json index 441810ea5..c31232fe4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/app/client/package.json b/packages/app/client/package.json index 93766a41d..97426a223 100644 --- a/packages/app/client/package.json +++ b/packages/app/client/package.json @@ -1,9 +1,9 @@ { "name": "@nocobase/app-client", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "license": "MIT", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/app/server/package.json b/packages/app/server/package.json index 2038e566d..f448f1dca 100644 --- a/packages/app/server/package.json +++ b/packages/app/server/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/app-server", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "MIT", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/preset-nocobase": "0.8.0-alpha.5" + "@nocobase/preset-nocobase": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index eeed3fbbb..acedca5af 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/acl", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,7 +12,7 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "0.8.0-alpha.5", + "@nocobase/resourcer": "0.8.0-alpha.7", "json-templates": "^4.2.0" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 9664d33e2..9765c4a91 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/actions", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,9 +12,9 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "0.8.0-alpha.5", - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/resourcer": "0.8.0-alpha.5" + "@nocobase/cache": "0.8.0-alpha.7", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/resourcer": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 51fec5030..8de64e3e2 100755 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "Library build tool based on rollup.", "main": "lib/index.js", "bin": { diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json index e88f03eb4..f10352e99 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 128dbb005..22c586cd6 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -23,7 +23,7 @@ "serve": "^13.0.2" }, "devDependencies": { - "@nocobase/devtools": "0.8.0-alpha.5" + "@nocobase/devtools": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/core/cli/src/commands/upgrade.js b/packages/core/cli/src/commands/upgrade.js index 08895779b..2b20a6435 100644 --- a/packages/core/cli/src/commands/upgrade.js +++ b/packages/core/cli/src/commands/upgrade.js @@ -15,10 +15,7 @@ module.exports = (cli) => { .option('--raw') .option('-S|--skip-code-update') .action(async (options) => { - if (!hasTsNode()) { - return; - } - promptForTs(); + if (hasTsNode()) promptForTs(); if (hasCorePackages()) { // await run('yarn', ['install']); await runAppCommand('upgrade'); @@ -28,6 +25,11 @@ module.exports = (cli) => { await runAppCommand('upgrade'); return; } + await runAppCommand('upgrade'); + // If ts-node is not installed, do not do the following + if (!hasTsNode()) { + return; + } const version = await getVersion(); await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']); const clientPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/client/package.json`); diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 7497a0f6f..9ffe28a3c 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "license": "Apache-2.0", "licenses": [ { @@ -19,8 +19,8 @@ "@formily/antd": "2.0.20", "@formily/core": "2.0.20", "@formily/react": "2.0.20", - "@nocobase/sdk": "0.8.0-alpha.5", - "@nocobase/utils": "0.8.0-alpha.5", + "@nocobase/sdk": "0.8.0-alpha.7", + "@nocobase/utils": "0.8.0-alpha.7", "ahooks": "^3.0.5", "antd": "~4.19.5", "axios": "^0.26.1", diff --git a/packages/core/client/src/pm/PluginManagerLink.tsx b/packages/core/client/src/pm/PluginManagerLink.tsx index 5d2aa70be..6e225ce04 100644 --- a/packages/core/client/src/pm/PluginManagerLink.tsx +++ b/packages/core/client/src/pm/PluginManagerLink.tsx @@ -66,10 +66,10 @@ export const SettingsCenterDropdown = () => { title: t('Workflow'), path: 'workflow/workflows', }, - { - title: t('Graph Collections'), - path: 'graph/collections', - }, + // { + // title: t('Graph Collections'), + // path: 'graph/collections', + // }, ]; return ( diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 689202c8d..40aad46a3 100755 --- a/packages/core/create-nocobase-app/package.json +++ b/packages/core/create-nocobase-app/package.json @@ -1,6 +1,6 @@ { "name": "create-nocobase-app", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "src/index.js", "license": "Apache-2.0", "licenses": [ diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 6c3e24a29..b105900ef 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/database", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -12,7 +12,7 @@ } ], "dependencies": { - "@nocobase/utils": "0.8.0-alpha.5", + "@nocobase/utils": "0.8.0-alpha.7", "async-mutex": "^0.3.2", "cron-parser": "4.4.0", "deepmerge": "^4.2.2", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index ebca376ad..a1070474e 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/devtools", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -11,7 +11,7 @@ ], "main": "./src/index.js", "dependencies": { - "@nocobase/build": "0.8.0-alpha.5", + "@nocobase/build": "0.8.0-alpha.7", "@testing-library/react": "^12.1.2", "@types/jest": "^26.0.0", "@types/koa": "^2.13.4", diff --git a/packages/core/dumi-theme-nocobase/package.json b/packages/core/dumi-theme-nocobase/package.json index ac8bff600..da44d896c 100755 --- a/packages/core/dumi-theme-nocobase/package.json +++ b/packages/core/dumi-theme-nocobase/package.json @@ -1,6 +1,6 @@ { "name": "dumi-theme-nocobase", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "private": true, "files": [ "es", diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json index e435311fc..775e210dc 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/resourcer", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -12,7 +12,7 @@ } ], "dependencies": { - "@nocobase/utils": "0.8.0-alpha.5", + "@nocobase/utils": "0.8.0-alpha.7", "deepmerge": "^4.2.2", "koa-compose": "^4.1.0", "lodash": "^4.17.21", diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json index 98e058483..3207e0c9a 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "license": "Apache-2.0", "licenses": [ { diff --git a/packages/core/server/package.json b/packages/core/server/package.json index d5c9b75a5..2de4e1f61 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -14,10 +14,10 @@ "@hapi/topo": "^6.0.0", "@koa/cors": "^3.1.0", "@koa/router": "^9.4.0", - "@nocobase/acl": "0.8.0-alpha.5", - "@nocobase/actions": "0.8.0-alpha.5", - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/resourcer": "0.8.0-alpha.5", + "@nocobase/acl": "0.8.0-alpha.7", + "@nocobase/actions": "0.8.0-alpha.7", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/resourcer": "0.8.0-alpha.7", "chalk": "^4.1.1", "commander": "^9.2.0", "find-package-json": "^1.2.0", diff --git a/packages/core/server/src/plugin-manager/PluginManager.ts b/packages/core/server/src/plugin-manager/PluginManager.ts index d12402f23..2fe2fbe3e 100644 --- a/packages/core/server/src/plugin-manager/PluginManager.ts +++ b/packages/core/server/src/plugin-manager/PluginManager.ts @@ -189,9 +189,17 @@ export class PluginManager { return instance; } - async add(plugin: any, options: any = {}) { + async add(plugin: any, options: any = {}, transaction?: any) { if (Array.isArray(plugin)) { - return Promise.all(plugin.map((p) => this.add(p, options))); + const t = transaction || (await this.app.db.sequelize.transaction()); + try { + const items = await Promise.all(plugin.map((p) => this.add(p, options, t))); + await t.commit(); + return items; + } catch (error) { + await t.rollback(); + throw error; + } } // console.log(`adding ${plugin} plugin`); const packageName = await PluginManager.findPackage(plugin); @@ -201,6 +209,7 @@ export class PluginManager { async: true, }); let model = await this.repository.findOne({ + transaction, filter: { name: plugin }, }); if (model) { @@ -208,6 +217,7 @@ export class PluginManager { } const { enabled, builtIn, installed, ...others } = options; await this.repository.create({ + transaction, values: { name: plugin, version: packageJson.version, diff --git a/packages/core/test/package.json b/packages/core/test/package.json index 78b94f089..2b2c546f9 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -11,7 +11,7 @@ } ], "dependencies": { - "@nocobase/server": "0.8.0-alpha.5", + "@nocobase/server": "0.8.0-alpha.7", "@types/supertest": "^2.0.11", "mockjs": "^1.1.0", "mysql2": "^2.3.3", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index c08d4077e..9caeb3605 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", diff --git a/packages/plugins/acl/package.json b/packages/plugins/acl/package.json index e6006382d..6cc629127 100644 --- a/packages/plugins/acl/package.json +++ b/packages/plugins/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-acl", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,10 +12,10 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/acl": "0.8.0-alpha.5", - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/plugin-users": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/acl": "0.8.0-alpha.7", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/plugin-users": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/plugins/audit-logs/package.json b/packages/plugins/audit-logs/package.json index 39ef312d8..06271394f 100644 --- a/packages/plugins/audit-logs/package.json +++ b/packages/plugins/audit-logs/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-audit-logs", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "./lib/server/index.js", "types": "./lib/server/index.d.ts", "license": "Apache-2.0", @@ -11,11 +11,11 @@ } ], "dependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/china-region/package.json b/packages/plugins/china-region/package.json index da9e5bdd8..4b442a480 100644 --- a/packages/plugins/china-region/package.json +++ b/packages/plugins/china-region/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-china-region", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,12 +10,12 @@ } ], "dependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", "china-division": "^2.4.0" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/client/package.json b/packages/plugins/client/package.json index 776a68cb3..c7a2e6b73 100644 --- a/packages/plugins/client/package.json +++ b/packages/plugins/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-client", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,10 +10,10 @@ } ], "dependencies": { - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/server": "0.8.0-alpha.7" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/collection-manager/package.json b/packages/plugins/collection-manager/package.json index 40c86e08f..3fabe03c9 100644 --- a/packages/plugins/collection-manager/package.json +++ b/packages/plugins/collection-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-collection-manager", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,13 +10,13 @@ } ], "dependencies": { - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/plugin-error-handler": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/plugin-error-handler": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", "sequelize": "^6.9.0" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/error-handler/package.json b/packages/plugins/error-handler/package.json index cfd4a0716..c2c7619c9 100644 --- a/packages/plugins/error-handler/package.json +++ b/packages/plugins/error-handler/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-error-handler", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "description": "", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "types": "./lib/index.d.ts", "dependencies": { "@formily/json-schema": "^2.0.15", - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/server": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/plugins/export/package.json b/packages/plugins/export/package.json index 31f3d7b1f..d2ded8ad4 100644 --- a/packages/plugins/export/package.json +++ b/packages/plugins/export/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-export", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "dependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", "node-xlsx": "^0.16.1" }, "devDependencies": { diff --git a/packages/plugins/file-manager/package.json b/packages/plugins/file-manager/package.json index 6869749ae..844fec365 100644 --- a/packages/plugins/file-manager/package.json +++ b/packages/plugins/file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -11,8 +11,8 @@ ], "dependencies": { "@koa/multer": "^3.0.0", - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", "aws-sdk": "^2.2.32", "cos-nodejs-sdk-v5": "^2.11.14", "koa-static": "^5.0.0", @@ -24,7 +24,7 @@ "multer-s3": "^2.10.0" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5", + "@nocobase/test": "0.8.0-alpha.7", "@types/koa-multer": "^1.0.1", "@types/multer": "^1.4.5" }, diff --git a/packages/plugins/import/package.json b/packages/plugins/import/package.json index 42b62f857..3b8bcb67e 100644 --- a/packages/plugins/import/package.json +++ b/packages/plugins/import/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-import", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,8 +10,8 @@ } ], "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/multi-app-manager/package.json b/packages/plugins/multi-app-manager/package.json index 90a0787a6..96033d1f2 100644 --- a/packages/plugins/multi-app-manager/package.json +++ b/packages/plugins/multi-app-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-multi-app-manager", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,7 +10,7 @@ } ], "dependencies": { - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/server": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/notifications/package.json b/packages/plugins/notifications/package.json index 60c8a5907..17aefe4b7 100644 --- a/packages/plugins/notifications/package.json +++ b/packages/plugins/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "nodemailer": "^6.6.1" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5", + "@nocobase/test": "0.8.0-alpha.7", "@types/nodemailer": "6.4.4", "nodemailer-mock": "^1.5.11" }, diff --git a/packages/plugins/system-settings/package.json b/packages/plugins/system-settings/package.json index bf0eaa12a..29ade18e0 100644 --- a/packages/plugins/system-settings/package.json +++ b/packages/plugins/system-settings/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-system-settings", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,7 +10,7 @@ } ], "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/ui-routes-storage/package.json b/packages/plugins/ui-routes-storage/package.json index ed0657241..8742bb906 100644 --- a/packages/plugins/ui-routes-storage/package.json +++ b/packages/plugins/ui-routes-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-routes-storage", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "flat-to-nested": "^1.1.1" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/ui-schema-storage/package.json b/packages/plugins/ui-schema-storage/package.json index 48e0aa11b..fbb03fc8a 100644 --- a/packages/plugins/ui-schema-storage/package.json +++ b/packages/plugins/ui-schema-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-schema-storage", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -11,7 +11,7 @@ ], "devDependencies": { "@formily/json-schema": "2.0.20", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/plugins/users/package.json b/packages/plugins/users/package.json index 7d10555cf..238d278dc 100644 --- a/packages/plugins/users/package.json +++ b/packages/plugins/users/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-users", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,16 +10,16 @@ } ], "dependencies": { - "@nocobase/actions": "0.8.0-alpha.5", - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/resourcer": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/utils": "0.8.0-alpha.5", + "@nocobase/actions": "0.8.0-alpha.7", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/resourcer": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/utils": "0.8.0-alpha.7", "json-templates": "^4.2.0", "jsonwebtoken": "^8.5.1" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5", + "@nocobase/test": "0.8.0-alpha.7", "@types/jsonwebtoken": "^8.5.8" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" diff --git a/packages/plugins/verification/package.json b/packages/plugins/verification/package.json index 205fc721a..7f8483e7d 100644 --- a/packages/plugins/verification/package.json +++ b/packages/plugins/verification/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-verification", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,13 +13,13 @@ "@alicloud/dysmsapi20170525": "2.0.17", "@alicloud/openapi-client": "0.4.1", "@alicloud/tea-util": "1.4.4", - "@nocobase/actions": "0.8.0-alpha.5", - "@nocobase/resourcer": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/utils": "0.8.0-alpha.5" + "@nocobase/actions": "0.8.0-alpha.7", + "@nocobase/resourcer": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/utils": "0.8.0-alpha.7" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/workflow/package.json b/packages/plugins/workflow/package.json index 44477975f..40bec1007 100644 --- a/packages/plugins/workflow/package.json +++ b/packages/plugins/workflow/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-workflow", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,18 +10,18 @@ } ], "dependencies": { - "@nocobase/actions": "0.8.0-alpha.5", - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/database": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/utils": "0.8.0-alpha.5", + "@nocobase/actions": "0.8.0-alpha.7", + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/database": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/utils": "0.8.0-alpha.7", "classnames": "^2.3.1", "cron-parser": "4.4.0", "json-templates": "^4.2.0", "react-js-cron": "^1.4.0" }, "devDependencies": { - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/test": "0.8.0-alpha.7" }, "gitHead": "b17d1ecae5dd0b9d4e7170dcf9663bb225598990" } diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 6ee1e7fac..8a94c985c 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/preset-nocobase", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "license": "Apache-2.0", "licenses": [ { @@ -11,32 +11,23 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/plugin-acl": "0.8.0-alpha.5", - "@nocobase/plugin-audit-logs": "0.8.0-alpha.5", - "@nocobase/plugin-china-region": "0.8.0-alpha.5", - "@nocobase/plugin-client": "0.8.0-alpha.5", - "@nocobase/plugin-collection-manager": "0.8.0-alpha.5", - "@nocobase/plugin-error-handler": "0.8.0-alpha.5", - "@nocobase/plugin-export": "0.8.0-alpha.5", - "@nocobase/plugin-file-manager": "0.8.0-alpha.5", - "@nocobase/plugin-import": "0.8.0-alpha.5", - "@nocobase/plugin-sample-command": "0.8.0-alpha.5", - "@nocobase/plugin-sample-custom-block": "0.8.0-alpha.5", - "@nocobase/plugin-sample-custom-page": "0.8.0-alpha.5", - "@nocobase/plugin-sample-custom-signup-page": "0.8.0-alpha.5", - "@nocobase/plugin-sample-hello": "0.8.0-alpha.5", - "@nocobase/plugin-sample-ratelimit": "0.8.0-alpha.5", - "@nocobase/plugin-sample-shop-actions": "0.8.0-alpha.5", - "@nocobase/plugin-sample-shop-events": "0.8.0-alpha.5", - "@nocobase/plugin-sample-shop-i18n": "0.8.0-alpha.5", - "@nocobase/plugin-sample-shop-modeling": "0.8.0-alpha.5", - "@nocobase/plugin-system-settings": "0.8.0-alpha.5", - "@nocobase/plugin-ui-routes-storage": "0.8.0-alpha.5", - "@nocobase/plugin-ui-schema-storage": "0.8.0-alpha.5", - "@nocobase/plugin-users": "0.8.0-alpha.5", - "@nocobase/plugin-verification": "0.8.0-alpha.5", - "@nocobase/plugin-workflow": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5" + "@nocobase/plugin-acl": "0.8.0-alpha.7", + "@nocobase/plugin-audit-logs": "0.8.0-alpha.7", + "@nocobase/plugin-china-region": "0.8.0-alpha.7", + "@nocobase/plugin-client": "0.8.0-alpha.7", + "@nocobase/plugin-collection-manager": "0.8.0-alpha.7", + "@nocobase/plugin-error-handler": "0.8.0-alpha.7", + "@nocobase/plugin-export": "0.8.0-alpha.7", + "@nocobase/plugin-file-manager": "0.8.0-alpha.7", + "@nocobase/plugin-import": "0.8.0-alpha.7", + "@nocobase/plugin-sample-hello": "0.8.0-alpha.7", + "@nocobase/plugin-system-settings": "0.8.0-alpha.7", + "@nocobase/plugin-ui-routes-storage": "0.8.0-alpha.7", + "@nocobase/plugin-ui-schema-storage": "0.8.0-alpha.7", + "@nocobase/plugin-users": "0.8.0-alpha.7", + "@nocobase/plugin-verification": "0.8.0-alpha.7", + "@nocobase/plugin-workflow": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7" }, "repository": { "type": "git", diff --git a/packages/presets/nocobase/src/index.ts b/packages/presets/nocobase/src/index.ts index 115b5bc09..72f036e73 100644 --- a/packages/presets/nocobase/src/index.ts +++ b/packages/presets/nocobase/src/index.ts @@ -24,18 +24,7 @@ export class PresetNocoBase extends Plugin { builtIn: true, installed: true, }); - const samples = [ - 'sample-command', - 'sample-custom-block', - 'sample-custom-page', - 'sample-custom-signup-page', - 'sample-hello', - 'sample-ratelimit', - 'sample-shop-actions', - 'sample-shop-events', - 'sample-shop-i18n', - 'sample-shop-modeling', - ]; + const samples = ['sample-hello']; await this.app.pm.add(samples, {}); await this.app.reload(); } diff --git a/packages/samples/command/package.json b/packages/samples/command/package.json index 176a53e77..4158c9eb5 100644 --- a/packages/samples/command/package.json +++ b/packages/samples/command/package.json @@ -1,11 +1,11 @@ { "name": "@nocobase/plugin-sample-command", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*", diff --git a/packages/samples/custom-block/package.json b/packages/samples/custom-block/package.json index 8d9942913..73687e5ef 100644 --- a/packages/samples/custom-block/package.json +++ b/packages/samples/custom-block/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-sample-custom-block", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" } } diff --git a/packages/samples/custom-page/package.json b/packages/samples/custom-page/package.json index f28bbd8de..eda961d90 100644 --- a/packages/samples/custom-page/package.json +++ b/packages/samples/custom-page/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-sample-custom-page", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" } } diff --git a/packages/samples/custom-signup-page/package.json b/packages/samples/custom-signup-page/package.json index 13f3aa353..d8ab30256 100644 --- a/packages/samples/custom-signup-page/package.json +++ b/packages/samples/custom-signup-page/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-sample-custom-signup-page", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" } } diff --git a/packages/samples/hello/package.json b/packages/samples/hello/package.json index a63bea496..77537376a 100644 --- a/packages/samples/hello/package.json +++ b/packages/samples/hello/package.json @@ -1,11 +1,11 @@ { "name": "@nocobase/plugin-sample-hello", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*", diff --git a/packages/samples/ratelimit/package.json b/packages/samples/ratelimit/package.json index 2f4c209b2..04038e1e3 100644 --- a/packages/samples/ratelimit/package.json +++ b/packages/samples/ratelimit/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/plugin-sample-ratelimit", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "dependencies": { "koa-ratelimit": "^5.0.1" }, "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" } } diff --git a/packages/samples/shop-actions/package.json b/packages/samples/shop-actions/package.json index 99dbd8128..835f7e371 100644 --- a/packages/samples/shop-actions/package.json +++ b/packages/samples/shop-actions/package.json @@ -1,11 +1,11 @@ { "name": "@nocobase/plugin-sample-shop-actions", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*", diff --git a/packages/samples/shop-events/package.json b/packages/samples/shop-events/package.json index 6c3f6099f..806fa3829 100644 --- a/packages/samples/shop-events/package.json +++ b/packages/samples/shop-events/package.json @@ -1,11 +1,11 @@ { "name": "@nocobase/plugin-sample-shop-events", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*", diff --git a/packages/samples/shop-i18n/package.json b/packages/samples/shop-i18n/package.json index 2b465cdb5..21d5e39b0 100644 --- a/packages/samples/shop-i18n/package.json +++ b/packages/samples/shop-i18n/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/plugin-sample-shop-i18n", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "dependencies": { "nodejs-snowflake": "2.0.1" }, "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*", diff --git a/packages/samples/shop-modeling/package.json b/packages/samples/shop-modeling/package.json index 9ad7cbfe2..95751b706 100644 --- a/packages/samples/shop-modeling/package.json +++ b/packages/samples/shop-modeling/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/plugin-sample-shop-modeling", - "version": "0.8.0-alpha.5", + "version": "0.8.0-alpha.7", "main": "lib/server/index.js", "dependencies": { "nodejs-snowflake": "2.0.1" }, "devDependencies": { - "@nocobase/client": "0.8.0-alpha.5", - "@nocobase/server": "0.8.0-alpha.5", - "@nocobase/test": "0.8.0-alpha.5" + "@nocobase/client": "0.8.0-alpha.7", + "@nocobase/server": "0.8.0-alpha.7", + "@nocobase/test": "0.8.0-alpha.7" }, "peerDependencies": { "@nocobase/client": "*",