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

package/bin/index.js

@@ -15,7 +15,9 @@ const env = {
   DB_TIMEZONE: '+00:00',
   DEFAULT_STORAGE_TYPE: 'local',
   LOCAL_STORAGE_DEST: 'storage/uploads',
+  PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
   MFSU_AD: 'none',
+  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-',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.13.0-alpha.9",
+  "version": "0.14.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,14 +8,14 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.13.0-alpha.9",
+    "@nocobase/app": "0.14.0-alpha.2",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "dotenv": "^10.0.0",
     "execa": "^5.1.1",
-    "fast-glob": "^3.2.12",
+    "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
     "pm2": "^5.2.0",
     "portfinder": "^1.0.28",
@@ -23,12 +23,12 @@
     "tsx": "^3.12.7"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.13.0-alpha.9"
+    "@nocobase/devtools": "0.14.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "ee5825377d8bec05f968a8365a0cdcd49878ada6"
+  "gitHead": "ea841d4a1e8c37aa77b4fbae6a6a4937e2aa3c0a"
 }

package/src/commands/dev.js

@@ -18,6 +18,7 @@ module.exports = (cli) => {
     .allowUnknownOption()
     .action(async (opts) => {
       promptForTs();
+      process.env.IS_DEV_CMD = true;
 
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         run('ts-node', [
@@ -59,6 +60,7 @@ module.exports = (cli) => {
 
         const argv = [
           'watch',
+          '--ignore=./storage/plugins/**',
           '--tsconfig',
           './tsconfig.server.json',
           '-r',

package/src/commands/index.js

@@ -9,6 +9,7 @@ module.exports = (cli) => {
   generateAppDir();
   require('./global')(cli);
   require('./build')(cli);
+  require('./tar')(cli);
   require('./dev')(cli);
   require('./start')(cli);
   require('./test')(cli);

package/src/commands/postinstall.js

@@ -3,6 +3,7 @@ const { run, isDev, isPackageValid } = require('../util');
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
+const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 
 /**
  * @param {Command} cli
@@ -13,6 +14,7 @@ module.exports = (cli) => {
     .command('postinstall')
     .allowUnknownOption()
     .action(async () => {
+      await createStoragePluginsSymlink();
       if (!isDev()) {
         return;
       }

package/src/commands/tar.js

@@ -0,0 +1,27 @@
+const { resolve } = require('path');
+const { Command } = require('commander');
+const { run, nodeCheck, isPackageValid } = require('../util');
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli
+    .command('tar')
+    .allowUnknownOption()
+    .argument('[packages...]')
+    .option('-v, --version', 'print version')
+    .option('-c, --compile', 'compile the @nocobase/build package')
+    .option('-w, --watch', 'watch compile the @nocobase/build package')
+    .action(async (pkgs, options) => {
+      nodeCheck();
+      if (options.compile || options.watch || isPackageValid('@nocobase/build/src/index.ts')) {
+        await run('yarn', ['build', options.watch ? '--watch' : ''], {
+          cwd: resolve(process.cwd(), 'packages/core/build'),
+        });
+        if (options.watch) return;
+      }
+      await run('nocobase-build', [...pkgs, '--only-tar', options.version ? '--version' : '']);
+    });
+};

package/src/plugin-generator.js

@@ -2,7 +2,9 @@ const chalk = require('chalk');
 const { existsSync } = require('fs');
 const { join, resolve } = require('path');
 const { Generator } = require('@umijs/utils');
-const { readFile } = require('fs').promises;
+const { readFile, writeFile } = require('fs').promises;
+
+const execa = require('execa');
 
 function camelize(str) {
   return str.trim().replace(/[-_\s]+(.)?/g, (match, c) => c.toUpperCase());
@@ -33,18 +35,27 @@ class PluginGenerator extends Generator {
 
   async getContext() {
     const { name } = this.context;
-    const packageName = await getProjectName();
     const nocobaseVersion = require('@nocobase/server/package.json').version;
     const packageVersion = await getProjectVersion();
     return {
       ...this.context,
-      packageName: `@${packageName}/plugin-${name}`,
+      packageName: name,
       packageVersion,
       nocobaseVersion,
-      pascalCaseName: capitalize(camelize(name)),
+      pascalCaseName: capitalize(camelize(name.split('/').pop())),
     };
   }
 
+  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);
@@ -59,6 +70,9 @@ class PluginGenerator extends Generator {
       path: join(__dirname, '../templates/plugin'),
     });
     console.log('');
+    await this.addTsConfigPaths();
+    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/templates/plugin/README.md.tpl

@@ -0,0 +1 @@
+# {{{packageName}}}

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

@@ -1,6 +1,6 @@
 import { Plugin } from '@nocobase/client';
 
-export class {{{pascalCaseName}}}Plugin extends Plugin {
+export class {{{pascalCaseName}}}Client extends Plugin {
   async afterAdd() {
     // await this.app.pm.add()
   }
@@ -18,4 +18,4 @@ export class {{{pascalCaseName}}}Plugin extends Plugin {
   }
 }
 
-export default {{{pascalCaseName}}}Plugin;
+export default {{{pascalCaseName}}}Client;

package/templates/plugin/src/server/plugin.ts.tpl

@@ -1,6 +1,6 @@
 import { InstallOptions, Plugin } from '@nocobase/server';
 
-export class {{{pascalCaseName}}}Plugin extends Plugin {
+export class {{{pascalCaseName}}}Server extends Plugin {
   afterAdd() {}
 
   beforeLoad() {}
@@ -16,4 +16,4 @@ export class {{{pascalCaseName}}}Plugin extends Plugin {
   async remove() {}
 }
 
-export default {{{pascalCaseName}}}Plugin;
+export default {{{pascalCaseName}}}Server;