@nocobase/cli 0.9.4-alpha.2 → 0.10.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.9.4-alpha.2",
+  "version": "0.10.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,21 +8,24 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
+    "@types/fs-extra": "^11.0.1",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "dotenv": "^10.0.0",
     "execa": "^5.1.1",
+    "fast-glob": "^3.2.12",
+    "fs-extra": "^11.1.1",
     "pm2": "^5.2.0",
     "portfinder": "^1.0.28",
     "serve": "^13.0.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.9.4-alpha.2"
+    "@nocobase/devtools": "0.10.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }

package/src/commands/clean.js

@@ -14,6 +14,7 @@ module.exports = (cli) => {
       if (!isDev()) {
         return;
       }
-      run('rimraf', ['-rf', 'packages/*/*/{lib,esm,es,dist}']);
+      run('rimraf', ['-rf', './**/{.umi,.umi-production}']);
+      run('rimraf', ['-rf', 'packages/*/*/{lib,esm,es,dist,node_modules}']);
     });
 };

package/src/commands/doc.js

@@ -1,6 +1,8 @@
 const { Command } = require('commander');
 const { resolve, isAbsolute } = require('path');
 const { run, isDev } = require('../util');
+const fs = require('fs-extra');
+const glob = require('fast-glob');
 
 /**
  *
@@ -9,30 +11,57 @@ const { run, isDev } = require('../util');
 module.exports = (cli) => {
   cli
     .command('doc')
+    .argument('[dev|build|serve]')
+    .argument('[packages]')
     .option('--lang [lang]')
     .allowUnknownOption()
-    .action((options) => {
+    .action((command, pkg, options) => {
       if (!isDev()) {
         return;
       }
-      process.env.DOC_LANG = options.lang || 'en-US';
-      const docThemePath = process.env.DOC_THEME_PATH;
-      if (!docThemePath) {
-        process.env.DUMI_THEME = resolve(process.cwd(), 'packages/core/dumi-theme-nocobase/src');
-      } else {
-        process.env.DUMI_THEME = isAbsolute(docThemePath) ? docThemePath : resolve(process.cwd(), docThemePath);
+
+      // 指定项目目录
+      let cwd = process.cwd();
+      if (command === undefined && pkg === undefined) {
+        command = 'dev';
+      } else if (!['dev', 'build', 'serve'].includes(command) && pkg === undefined) {
+        pkg = command;
+        command = 'dev';
+        cwd = resolve(process.cwd(), 'packages', pkg);
       }
-      // TODO(bug): space replace = not work
-      const index = process.argv.indexOf(`--lang=${options.lang}`);
-      if (index > 0) {
-        process.argv.splice(index, 1);
+      if (pkg !== undefined) {
+        process.env.APP_ROOT = `packages/${pkg}`;
       }
-      const argv = process.argv.slice(3);
-      const argument = argv.shift() || 'dev';
-      if (argument === 'serve') {
-        run('serve', [`${resolve(process.cwd(), 'docs/dist', process.env.DOC_LANG)}`, ...argv]);
+
+      // 删除 tmp 目录
+      const tmpDir = glob.sync(
+        ['.dumi/tmp', '.dumi/tmp-production', 'packages/*/*/.dumi/tmp', 'packages/*/*.dumi/tmp-production'],
+        {
+          cwd: process.cwd(),
+          onlyDirectories: true,
+        },
+      );
+      tmpDir.forEach((dir) => {
+        fs.removeSync(dir);
+      });
+
+      // 设置语言
+      process.env.DOC_LANG = options.lang || 'en-US';
+
+      if (command === 'serve') {
+        // 如果是多语言，则需要进入内部，如果不是多语言，则直接进入 docs/dist
+        let dir = resolve(cwd, 'docs/dist', process.env.DOC_LANG);
+        if (!existsSync(dir)) {
+          dir = resolve(cwd, 'docs/dist');
+        }
+        run('serve', [dir]);
       } else {
-        run('dumi', [argument, ...argv]);
+        run('dumi', [command], {
+          env: {
+            APP_ROOT: process.env.APP_ROOT,
+            DOC_LANG: process.env.DOC_LANG,
+          },
+        });
       }
     });
 };

package/templates/plugin/src/client/index.tsx

@@ -1,5 +1,8 @@
 import React from 'react';
 
-export default React.memo((props) => {
+const CommonMemo = React.memo((props) => {
   return <>{props.children}</>;
 });
+CommonMemo.displayName = 'CommonMemo';
+
+export default CommonMemo;