@nocobase/devtools 0.18.0-alpha.8 → 0.19.0-alpha.1

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.18.0-alpha.8",
+  "version": "0.19.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.18.0-alpha.8",
-    "@nocobase/client": "0.18.0-alpha.8",
-    "@nocobase/test": "0.18.0-alpha.8",
+    "@nocobase/build": "0.19.0-alpha.1",
+    "@nocobase/client": "0.19.0-alpha.1",
+    "@nocobase/test": "0.19.0-alpha.1",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",
@@ -49,5 +49,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
+  "gitHead": "64601944412fc4d2e2bd05f4b982118dd28247dc"
 }

package/umiConfig.js

@@ -107,7 +107,13 @@ function resolveNocobasePackagesAlias(config) {
   }
 }
 
+function getNodeModulesPath(packageDir) {
+  const node_modules_dir = path.join(process.cwd(), 'node_modules');
+  return path.join(node_modules_dir, packageDir);
+}
 class IndexGenerator {
+  nocobaseDir = getNodeModulesPath('@nocobase');
+
   constructor(outputPath, pluginsPath) {
     this.outputPath = outputPath;
     this.pluginsPath = pluginsPath;
@@ -189,23 +195,45 @@ export default function devDynamicImport(packageName: string): Promise<any> {
   }
 
   getContent(pluginsPath) {
-    const pluginFolders = glob
-      .sync(['*/package.json', '*/*/package.json'], { cwd: pluginsPath, onlyFiles: true, absolute: true })
-      .map((item) => path.dirname(item));
-    const pluginInfos = pluginFolders
-      .filter((folder) => {
-        const pluginPackageJsonPath = path.join(folder, 'package.json');
-        const pluginSrcClientPath = path.join(folder, 'src', 'client');
-        return fs.existsSync(pluginPackageJsonPath) && fs.existsSync(pluginSrcClientPath);
+    const pluginFolders = glob.sync(['*/package.json', '*/*/package.json'], {
+      cwd: pluginsPath,
+      onlyFiles: true,
+      absolute: true,
+    });
+
+    const storagePluginFolders = glob.sync(['*/package.json', '*/*/package.json'], {
+      cwd: process.env.PLUGIN_STORAGE_PATH,
+      onlyFiles: true,
+      absolute: true,
+    });
+
+    const nocobasePluginFolders = glob
+      .sync(['plugin-*/package.json'], { cwd: this.nocobaseDir, onlyFiles: true, absolute: true })
+      .map((item) => fs.realpathSync(item));
+    const pluginInfos = Array.from(new Set([...pluginFolders, ...storagePluginFolders, ...nocobasePluginFolders]))
+      .filter((item) => {
+        const dirname = path.dirname(item);
+        const clientJs = path.join(dirname, 'client.js');
+        return fs.existsSync(clientJs);
       })
-      .map((folder) => {
-        const pluginPackageJsonPath = path.join(folder, 'package.json');
+      .map((pluginPackageJsonPath) => {
         const pluginPackageJson = require(pluginPackageJsonPath);
-        const pluginSrcClientPath = path
-          .relative(this.packagesPath, path.join(folder, 'src', 'client'))
-          .replaceAll('\\', '/');
-        const pluginFileName = `${path.basename(pluginsPath)}_${path.basename(folder).replaceAll('-', '_')}`;
-        const exportStatement = `export { default } from '${pluginSrcClientPath}';`;
+        const pluginPathArr = pluginPackageJsonPath.replaceAll(path.sep, '/').split('/');
+        const hasNamespace = pluginPathArr[pluginPathArr.length - 3].startsWith('@');
+        const pluginFileName = (hasNamespace
+          ? `${pluginPathArr[pluginPathArr.length - 3].replace('@', '')}_${pluginPathArr[pluginPathArr.length - 2]}`
+          : pluginPathArr[pluginPathArr.length - 2]
+        ).replaceAll('-', '_');
+
+        let exportStatement = '';
+        if (pluginPackageJsonPath.includes('packages')) {
+          const pluginSrcClientPath = path
+            .relative(this.packagesPath, path.join(path.dirname(pluginPackageJsonPath), 'src', 'client'))
+            .replaceAll(path.sep, '/');
+          exportStatement = `export { default } from '${pluginSrcClientPath}';`;
+        } else {
+          exportStatement = `export { default } from '${pluginPackageJson.name}/client';`;
+        }
         return { exportStatement, pluginFileName, packageJsonName: pluginPackageJson.name };
       });