@nocobase/cli 0.14.0-alpha.2 → 0.14.0-alpha.4

package/bin/index.js

@@ -4,6 +4,7 @@ const dotenv = require('dotenv');
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const chalk = require('chalk');
+const { genTsConfigPaths } = require('../src/util');
 
 const env = {
   APP_ENV: 'development',
@@ -20,6 +21,7 @@ const env = {
   NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
   PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
   PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',
+  SERVER_TSCONFIG_PATH: './tsconfig.server.json',
 };
 
 if (!process.env.APP_ENV_PATH && process.argv[2] && process.argv[2] === 'test') {
@@ -28,6 +30,8 @@ if (!process.env.APP_ENV_PATH && process.argv[2] && process.argv[2] === 'test')
   }
 }
 
+genTsConfigPaths();
+
 dotenv.config({
   path: resolve(process.cwd(), process.env.APP_ENV_PATH || '.env'),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.14.0-alpha.2",
+  "version": "0.14.0-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.14.0-alpha.2",
+    "@nocobase/app": "0.14.0-alpha.4",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -23,12 +23,12 @@
     "tsx": "^3.12.7"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.14.0-alpha.2"
+    "@nocobase/devtools": "0.14.0-alpha.4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "ea841d4a1e8c37aa77b4fbae6a6a4937e2aa3c0a"
+  "gitHead": "e2aab7863bbdfd76afc7164272b275e868ac59c0"
 }

package/src/commands/build.js

@@ -24,6 +24,7 @@ module.exports = (cli) => {
         });
         if (options.watch) return;
       }
+
       await run('nocobase-build', [
         ...pkgs,
         options.version ? '--version' : '',

package/src/commands/clean.js

@@ -16,5 +16,6 @@ module.exports = (cli) => {
       }
       run('rimraf', ['-rf', './storage/app-dev']);
       run('rimraf', ['-rf', 'packages/*/*/{lib,esm,es,dist,node_modules}']);
+      run('rimraf', ['-rf', 'packages/*/@*/*/{lib,esm,es,dist,node_modules}']);
     });
 };

package/src/commands/dev.js

@@ -18,12 +18,13 @@ module.exports = (cli) => {
     .allowUnknownOption()
     .action(async (opts) => {
       promptForTs();
+      const { SERVER_TSCONFIG_PATH } = process.env;
       process.env.IS_DEV_CMD = true;
 
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         run('ts-node', [
           '-P',
-          './tsconfig.server.json',
+          SERVER_TSCONFIG_PATH,
           '-r',
           'tsconfig-paths/register',
           `${APP_PACKAGE_ROOT}/src/index.ts`,
@@ -62,7 +63,7 @@ module.exports = (cli) => {
           'watch',
           '--ignore=./storage/plugins/**',
           '--tsconfig',
-          './tsconfig.server.json',
+          SERVER_TSCONFIG_PATH,
           '-r',
           'tsconfig-paths/register',
           `${APP_PACKAGE_ROOT}/src/index.ts`,

package/src/commands/global.js

@@ -6,7 +6,7 @@ const { run, isDev, isProd, promptForTs } = require('../util');
  * @param {Command} cli
  */
 module.exports = (cli) => {
-  const { APP_PACKAGE_ROOT } = process.env;
+  const { APP_PACKAGE_ROOT, SERVER_TSCONFIG_PATH } = process.env;
   cli
     .allowUnknownOption()
     .option('-h, --help')
@@ -16,7 +16,7 @@ module.exports = (cli) => {
         promptForTs();
         run('tsx', [
           '--tsconfig',
-          './tsconfig.server.json',
+          SERVER_TSCONFIG_PATH,
           '-r',
           'tsconfig-paths/register',
           `${APP_PACKAGE_ROOT}/src/index.ts`,

package/src/commands/start.js

@@ -25,7 +25,7 @@ module.exports = (cli) => {
         promptForTs();
         run('ts-node', [
           '-P',
-          './tsconfig.server.json',
+          process.env.SERVER_TSCONFIG_PATH,
           '-r',
           'tsconfig-paths/register',
           `${APP_PACKAGE_ROOT}/src/index.ts`,

package/src/commands/test.js

@@ -1,5 +1,5 @@
 const { Command } = require('commander');
-const { nodeCheck, runAppCommand, promptForTs } = require('../util');
+const { nodeCheck, runAppCommand, promptForTs, genTsConfigPaths } = require('../util');
 
 /**
  *

package/src/index.js

@@ -0,0 +1,5 @@
+const util = require('./util');
+
+module.exports = {
+  ...util,
+};

package/src/plugin-generator.js

@@ -3,6 +3,7 @@ const { existsSync } = require('fs');
 const { join, resolve } = require('path');
 const { Generator } = require('@umijs/utils');
 const { readFile, writeFile } = require('fs').promises;
+const { genTsConfigPaths } = require('./util');
 
 const execa = require('execa');
 
@@ -46,16 +47,6 @@ class PluginGenerator extends Generator {
     };
   }
 
-  async addTsConfigPaths() {
-    const { name } = this.context;
-    if (name.startsWith('@') && name.split('/')[0] !== '@nocobase') {
-      const target = resolve(process.cwd(), 'tsconfig.json');
-      const content = require(target);
-      content.compilerOptions.paths[name] = [`packages/plugins/${name}/src`];
-      await writeFile(target, JSON.stringify(content, null, 2), 'utf-8');
-    }
-  }
-
   async writing() {
     const { name } = this.context;
     const target = resolve(process.cwd(), 'packages/plugins/', name);
@@ -70,7 +61,7 @@ class PluginGenerator extends Generator {
       path: join(__dirname, '../templates/plugin'),
     });
     console.log('');
-    await this.addTsConfigPaths();
+    genTsConfigPaths();
     execa.sync('yarn', ['install'], { shell: true, stdio: 'inherit' });
     // execa.sync('yarn', ['build', `plugins/${name}`], { shell: true, stdio: 'inherit' });
     console.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);

package/src/util.js

@@ -1,9 +1,10 @@
 const net = require('net');
 const chalk = require('chalk');
 const execa = require('execa');
-const { dirname, resolve } = require('path');
+const fg = require('fast-glob');
+const { dirname, join, resolve } = require('path');
 const { readFile, writeFile } = require('fs').promises;
-const { existsSync, mkdirSync, cpSync } = require('fs');
+const { existsSync, mkdirSync, cpSync, writeFileSync } = require('fs');
 
 exports.isPackageValid = (package) => {
   try {
@@ -102,12 +103,12 @@ exports.postCheck = async (opts) => {
 };
 
 exports.runInstall = async () => {
-  const { APP_PACKAGE_ROOT } = process.env;
+  const { APP_PACKAGE_ROOT, SERVER_TSCONFIG_PATH } = process.env;
 
   if (exports.isDev()) {
     const argv = [
       '--tsconfig',
-      './tsconfig.server.json',
+      SERVER_TSCONFIG_PATH,
       '-r',
       'tsconfig-paths/register',
       `${APP_PACKAGE_ROOT}/src/index.ts`,
@@ -123,12 +124,12 @@ exports.runInstall = async () => {
 };
 
 exports.runAppCommand = async (command, args = []) => {
-  const { APP_PACKAGE_ROOT } = process.env;
+  const { APP_PACKAGE_ROOT, SERVER_TSCONFIG_PATH } = process.env;
 
   if (exports.isDev()) {
     const argv = [
       '--tsconfig',
-      './tsconfig.server.json',
+      SERVER_TSCONFIG_PATH,
       '-r',
       'tsconfig-paths/register',
       `${APP_PACKAGE_ROOT}/src/index.ts`,
@@ -174,3 +175,32 @@ exports.generateAppDir = function generateAppDir() {
     process.env.APP_PACKAGE_ROOT = appPkgPath;
   }
 };
+
+exports.genTsConfigPaths = function genTsConfigPaths() {
+  const cwd = process.cwd();
+  const cwdLength = cwd.length;
+  const paths = {
+    '@@/*': ['.dumi/tmp/*'],
+  };
+  const packages = fg.sync(['packages/*/*/package.json', 'packages/*/*/*/package.json'], {
+    absolute: true,
+    onlyFiles: true,
+  });
+  packages.forEach((packageFile) => {
+    const packageJsonName = require(packageFile).name;
+    const packageDir = dirname(packageFile);
+    const relativePath = packageDir.slice(cwdLength + 1).replace(/\\/, '/');
+    const hasClient = fg.sync(['client', 'client.ts', 'client.tsx', 'client.js', 'client.jsx'], {
+      cwd: join(packageDir, 'src'),
+    }).length;
+    if (hasClient) {
+      paths[`${packageJsonName}/client`] = [`${relativePath}/src/client`];
+    }
+    paths[packageJsonName] = [`${relativePath}/src`];
+  });
+
+  const tsConfigJsonPath = join(cwd, './tsconfig.paths.json');
+  const content = { compilerOptions: { paths } };
+  writeFileSync(tsConfigJsonPath, JSON.stringify(content, null, 2), 'utf-8');
+  return content;
+};