From 2dd8e25616b408ee8b999e6a7cf6b5ff5a0491bb Mon Sep 17 00:00:00 2001 From: sealday Date: Wed, 17 Apr 2024 17:01:42 +0800 Subject: [PATCH] fix: plugin add is ok now Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachycode/pulls/751 --- packages/core/cli/package.json | 3 +++ packages/core/cli/rollup.config.js | 1 + packages/core/cli/src/index.ts | 1 + packages/core/server/src/plugin-manager/plugin-manager.ts | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/core/cli/src/index.ts diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index cc50a9763..8d1d45dc3 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -4,6 +4,9 @@ "description": "", "license": "Apache-2.0", "type": "module", + "exports": { + ".": "./dist/index" + }, "bin": { "tachybase": "./bin/cli.js" }, diff --git a/packages/core/cli/rollup.config.js b/packages/core/cli/rollup.config.js index 1eb076cba..a682eaff9 100644 --- a/packages/core/cli/rollup.config.js +++ b/packages/core/cli/rollup.config.js @@ -12,6 +12,7 @@ const pkg = require('./package.json'); const entries = { cli: 'src/cli.ts', + index: 'src/index.ts', }; const external = [ diff --git a/packages/core/cli/src/index.ts b/packages/core/cli/src/index.ts new file mode 100644 index 000000000..26dd9f31e --- /dev/null +++ b/packages/core/cli/src/index.ts @@ -0,0 +1 @@ +export * from './plugin-generator'; diff --git a/packages/core/server/src/plugin-manager/plugin-manager.ts b/packages/core/server/src/plugin-manager/plugin-manager.ts index f19448ac0..e36cd3b6a 100644 --- a/packages/core/server/src/plugin-manager/plugin-manager.ts +++ b/packages/core/server/src/plugin-manager/plugin-manager.ts @@ -1,5 +1,6 @@ import { CleanOptions, Collection, SyncOptions } from '@nocobase/database'; import { importModule, isURL } from '@nocobase/utils'; +import { PluginGenerator } from '@tachybase/cli'; import { fsExists } from '@nocobase/utils/plugin-symlink'; import execa from 'execa'; import fg from 'fast-glob'; @@ -239,7 +240,6 @@ export class PluginManager { if (options?.forceRecreate) { await fs.promises.rm(pluginDir, { recursive: true, force: true }); } - const { PluginGenerator } = require('@nocobase/cli/src/plugin-generator'); const generator = new PluginGenerator({ cwd: process.cwd(), args: {},