@nocobase/devtools 0.13.0-alpha.9 → 0.14.0-alpha.2

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.13.0-alpha.9",
+  "version": "0.14.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.13.0-alpha.9",
-    "@nocobase/client": "0.13.0-alpha.9",
+    "@nocobase/build": "0.14.0-alpha.2",
+    "@nocobase/client": "0.14.0-alpha.2",
     "@testing-library/react": "^14.0.0",
     "@types/jest": "^29.0.0",
     "@types/koa": "^2.13.4",
@@ -28,6 +28,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "fast-glob": "^3.3.1",
     "jest": "^29.0.0",
     "jest-cli": "^29.0.0",
     "jest-dom": "^3.1.2",
@@ -53,5 +54,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "ee5825377d8bec05f968a8365a0cdcd49878ada6"
+  "gitHead": "ea841d4a1e8c37aa77b4fbae6a6a4937e2aa3c0a"
 }

package/umiConfig.js

@@ -2,7 +2,7 @@ const { existsSync } = require('fs');
 const { resolve, sep } = require('path');
 const packageJson = require('./package.json');
 const fs = require('fs');
-const glob = require('glob');
+const glob = require('fast-glob');
 const path = require('path');
 
 console.log('VERSION: ', packageJson.version);
@@ -11,7 +11,8 @@ function getUmiConfig() {
   const { APP_PORT, API_BASE_URL } = process.env;
   const API_BASE_PATH = process.env.API_BASE_PATH || '/api/';
   const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${APP_PORT}`;
-  const LOCAL_STORAGE_BASE_URL = process.env.LOCAL_STORAGE_BASE_URL || '/storage/uploads/';
+  const LOCAL_STORAGE_BASE_URL = '/storage/uploads/';
+  const STATIC_PATH = '/static/';
 
   function getLocalStorageProxy() {
     if (LOCAL_STORAGE_BASE_URL.startsWith('http')) {
@@ -23,6 +24,10 @@ function getUmiConfig() {
         target: PROXY_TARGET_URL,
         changeOrigin: true,
       },
+      [STATIC_PATH]: {
+        target: PROXY_TARGET_URL,
+        changeOrigin: true,
+      },
     };
   }
 
@@ -68,24 +73,25 @@ function getPackagePaths() {
   const pkgs = [];
   for (const key in paths) {
     if (Object.hasOwnProperty.call(paths, key)) {
-      const dir = paths[key][0];
-      if (dir.includes('*')) {
-        const files = glob.sync(dir);
-        for (const file of files) {
-          const dirname = resolve(process.cwd(), file);
-          if (existsSync(dirname)) {
-            const re = new RegExp(dir.replace('*', '(.+)'));
-            const p = dirname
-              .substring(process.cwd().length + 1)
-              .split(sep)
-              .join('/');
-            const match = re.exec(p);
-            pkgs.push([key.replace('*', match?.[1]), dirname]);
+      for (let dir of paths[key]) {
+        if (dir.includes('*')) {
+          const files = glob.sync(dir, { cwd: process.cwd(), onlyDirectories: true });
+          for (const file of files) {
+            const dirname = resolve(process.cwd(), file);
+            if (existsSync(dirname)) {
+              const re = new RegExp(dir.replace('*', '(.+)'));
+              const p = dirname
+                .substring(process.cwd().length + 1)
+                .split(sep)
+                .join('/');
+              const match = re.exec(p);
+              pkgs.push([key.replace('*', match?.[1]), dirname]);
+            }
           }
+        } else {
+          const dirname = resolve(process.cwd(), dir);
+          pkgs.push([key, dirname]);
         }
-      } else {
-        const dirname = resolve(process.cwd(), dir);
-        pkgs.push([key, dirname]);
       }
     }
   }
@@ -157,13 +163,13 @@ export default function devDynamicImport(packageName: string): Promise<any> {
       fs.rmdirSync(this.outputPath, { recursive: true, force: true });
     }
     fs.mkdirSync(this.outputPath);
-    const validPluginPaths = this.pluginsPath.filter((pluginPath) => fs.existsSync(pluginPath));
+    const validPluginPaths = this.pluginsPath.filter((pluginsPath) => fs.existsSync(pluginsPath));
     if (!validPluginPaths.length || process.env.NODE_ENV === 'production') {
       fs.writeFileSync(this.indexPath, this.emptyIndexContent);
       return;
     }
 
-    const pluginInfos = validPluginPaths.map((pluginPath) => this.getContent(pluginPath)).flat();
+    const pluginInfos = validPluginPaths.map((pluginsPath) => this.getContent(pluginsPath)).flat();
 
     // index.ts
     fs.writeFileSync(this.indexPath, this.indexContent);
@@ -181,21 +187,23 @@ export default function devDynamicImport(packageName: string): Promise<any> {
     });
   }
 
-  getContent(pluginPath) {
-    const pluginFolders = fs.readdirSync(pluginPath);
+  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(pluginPath, folder, 'package.json');
-        const pluginSrcClientPath = path.join(pluginPath, folder, 'src', 'client');
+        const pluginPackageJsonPath = path.join(folder, 'package.json');
+        const pluginSrcClientPath = path.join(folder, 'src', 'client');
         return fs.existsSync(pluginPackageJsonPath) && fs.existsSync(pluginSrcClientPath);
       })
       .map((folder) => {
-        const pluginPackageJsonPath = path.join(pluginPath, folder, 'package.json');
+        const pluginPackageJsonPath = path.join(folder, 'package.json');
         const pluginPackageJson = require(pluginPackageJsonPath);
         const pluginSrcClientPath = path
-          .relative(this.packagesPath, path.join(pluginPath, folder, 'src', 'client'))
+          .relative(this.packagesPath, path.join(folder, 'src', 'client'))
           .replaceAll('\\', '/');
-        const pluginFileName = `${path.basename(pluginPath)}_${folder.replaceAll('-', '_')}`;
+        const pluginFileName = `${path.basename(pluginsPath)}_${path.basename(folder).replaceAll('-', '_')}`;
         const exportStatement = `export { default } from '${pluginSrcClientPath}';`;
         return { exportStatement, pluginFileName, packageJsonName: pluginPackageJson.name };
       });