ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove PluginManager.getPackageName

Browse Source
This commit is contained in:
chenos 2023-09-13 14:40:43 +08:00
parent 49e1641b58
commit de8fc8079a
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/server/src/locale/locale.ts
View File

@ -1,7 +1,6 @@
import { Cache, createCache } from '@nocobase/cache'; import { Cache, createCache } from '@nocobase/cache';
import { lodash } from '@nocobase/utils'; import { lodash } from '@nocobase/utils';
import Application from '../application'; import Application from '../application';
import { PluginManager } from '../plugin-manager';
import { getResource } from './resource'; import { getResource } from './resource';
export class Locale { export class Locale {
@ -67,7 +66,14 @@ export class Locale {
const names = this.app.pm.getAliases(); const names = this.app.pm.getAliases();
for (const name of names) { for (const name of names) {
try { try {
const packageName = PluginManager.getPackageName(name); const p = this.app.pm.get(name);
if (!p) {
continue;
}
const packageName = p.options?.packageName;
if (!packageName) {
continue;
}
// this.app.log.debug(`load [${packageName}] locale resource `); // this.app.log.debug(`load [${packageName}] locale resource `);
// this.app.setMaintainingMessage(`load [${packageName}] locale resource `); // this.app.setMaintainingMessage(`load [${packageName}] locale resource `);
const res = getResource(packageName, lang); const res = getResource(packageName, lang);

6
packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/loader.ts
View File

@ -1,4 +1,3 @@
import { PluginManager } from '@nocobase/server';
import { requireModule } from '@nocobase/utils'; import { requireModule } from '@nocobase/utils';
import { merge } from './merge'; import { merge } from './merge';
@ -30,7 +29,10 @@ export const getPluginsSwagger = async (db: any, pluginNames?: string[]) => {
}); });
const swaggers = {}; const swaggers = {};
for (const plugin of plugins) { for (const plugin of plugins) {
const packageName = PluginManager.getPackageName(plugin.get('name')); const packageName = plugin.get('packageName');
if (!packageName) {
continue;
}
const res = loadSwagger(packageName); const res = loadSwagger(packageName);
if (Object.keys(res).length) { if (Object.keys(res).length) {
swaggers[plugin.get('name')] = res; swaggers[plugin.get('name')] = res;

27
packages/plugins/@nocobase/plugin-client/src/server/server.ts
View File

@ -1,4 +1,4 @@
import { Plugin, PluginManager, getExposeUrl } from '@nocobase/server'; import { Plugin } from '@nocobase/server';
import fs from 'fs'; import fs from 'fs';
import { resolve } from 'path'; import { resolve } from 'path';
import { getAntdLocale } from './antd'; import { getAntdLocale } from './antd';
@ -69,7 +69,6 @@ export class ClientPlugin extends Plugin {
}); });
this.app.acl.allow('app', 'getLang'); this.app.acl.allow('app', 'getLang');
this.app.acl.allow('app', 'getInfo'); this.app.acl.allow('app', 'getInfo');
this.app.acl.allow('app', 'getPlugins');
this.app.acl.allow('plugins', '*', 'public'); this.app.acl.allow('plugins', '*', 'public');
this.app.acl.registerSnippet({ this.app.acl.registerSnippet({
name: 'app', name: 'app',
@ -115,30 +114,6 @@ export class ClientPlugin extends Plugin {
}; };
await next(); await next();
}, },
async getPlugins(ctx, next) {
const pm = ctx.db.getRepository('applicationPlugins');
const PLUGIN_CLIENT_ENTRY_FILE = 'dist/client/index.js';
const items = await pm.find({
filter: {
enabled: true,
},
});
ctx.body = items
.map((item) => {
try {
const packageName = PluginManager.getPackageName(item.name);
return {
...item.toJSON(),
packageName,
url: getExposeUrl(packageName, PLUGIN_CLIENT_ENTRY_FILE),
};
} catch {
return false;
}
})
.filter(Boolean);
await next();
},
async clearCache(ctx, next) { async clearCache(ctx, next) {
await ctx.cache.reset(); await ctx.cache.reset();
await next(); await next();