@nocobase/cli 0.7.7-alpha.1 → 0.8.0-alpha.2

package/bin/index.js

@@ -15,6 +15,7 @@ const env = {
   DB_TIMEZONE: '+00:00',
   DEFAULT_STORAGE_TYPE: 'local',
   LOCAL_STORAGE_DEST: 'storage/uploads',
+  MFSU_AD: 'none',
 };
 
 if (!process.env.APP_ENV_PATH && process.argv[2] && process.argv[2] === 'test') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -23,12 +23,12 @@
     "serve": "^13.0.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.7.7-alpha.1"
+    "@nocobase/devtools": "0.8.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "03b3fe7e826f3bba2b2f178dbed245a941d8eb7b"
 }

package/src/commands/global.js

@@ -1,5 +1,5 @@
 const { Command } = require('commander');
-const { run, isDev, promptForTs } = require('../util');
+const { run, isDev, isProd, promptForTs } = require('../util');
 
 /**
  *
@@ -23,7 +23,7 @@ module.exports = (cli) => {
           `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
           ...process.argv.slice(2),
         ]);
-      } else {
+      } else if (isProd()) {
         run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, ...process.argv.slice(2)]);
       }
     });

package/src/commands/upgrade.js

@@ -15,17 +15,17 @@ module.exports = (cli) => {
     .option('--raw')
     .option('-S|--skip-code-update')
     .action(async (options) => {
-      promptForTs();
-      if (options.skipCodeUpdate) {
-        await runAppCommand('upgrade');
+      if (!hasTsNode()) {
         return;
       }
+      promptForTs();
       if (hasCorePackages()) {
-        await run('yarn', ['install']);
+        // await run('yarn', ['install']);
         await runAppCommand('upgrade');
         return;
       }
-      if (!hasTsNode()) {
+      if (options.skipCodeUpdate) {
+        await runAppCommand('upgrade');
         return;
       }
       const version = await getVersion();

package/src/plugin-generator.js

@@ -34,11 +34,13 @@ 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}/${name}`,
-      packageVersion: packageVersion,
+      packageName: `@${packageName}/plugin-${name}`,
+      packageVersion,
+      nocobaseVersion,
       pascalCaseName: capitalize(camelize(name)),
     };
   }

package/src/util.js

@@ -30,11 +30,26 @@ exports.isDev = function isDev() {
   return exports.hasTsNode();
 };
 
+const isProd = () => {
+  const { APP_PACKAGE_ROOT } = process.env;
+  const file = `./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`;
+  if (!existsSync(resolve(process.cwd(), file))) {
+    console.log('For production environment, please build the code first.');
+    console.log();
+    console.log(chalk.yellow('$ yarn build'));
+    console.log();
+    process.exit(1);
+  }
+  return true;
+};
+
+exports.isProd = isProd;
+
 exports.nodeCheck = () => {
   if (!exports.hasTsNode()) {
     console.log('Please install all dependencies');
     console.log(chalk.yellow('$ yarn install'));
-    process.exit(0);
+    process.exit(1);
   }
 };
 
@@ -100,8 +115,9 @@ exports.runInstall = async () => {
       '-s',
     ];
     await exports.run('ts-node', argv);
-  } else {
-    const argv = [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'install', '-s'];
+  } else if (isProd()) {
+    const file = `./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`;
+    const argv = [file, 'install', '-s'];
     await exports.run('node', argv);
   }
 };
@@ -120,7 +136,7 @@ exports.runAppCommand = async (command, args = []) => {
       ...args,
     ];
     await exports.run('ts-node', argv);
-  } else {
+  } else if (isProd()) {
     const argv = [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, command, ...args];
     await exports.run('node', argv);
   }

package/templates/plugin/package.json.tpl

@@ -2,9 +2,8 @@
   "name": "{{{packageName}}}",
   "version": "{{{packageVersion}}}",
   "main": "lib/server/index.js",
-  "dependencies": {},
-  "peerDependencies": {
-    "@nocobase/server": "*",
-    "@nocobase/test": "*"
+  "devDependencies": {
+    "@nocobase/server": "{{{nocobaseVersion}}}",
+    "@nocobase/test": "{{{nocobaseVersion}}}"
   }
 }

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

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

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

@@ -1,32 +1 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
-
-export class {{{pascalCaseName}}}Plugin extends Plugin {
-  getName(): string {
-    return this.getPackageName(__dirname);
-  }
-
-  beforeLoad() {
-    // TODO
-  }
-
-  async load() {
-    // TODO
-    // Visit: http://localhost:13000/api/test{{{pascalCaseName}}}:getInfo
-    this.app.resource({
-      name: 'test{{{pascalCaseName}}}',
-      actions: {
-        async getInfo(ctx, next) {
-          ctx.body = `Hello {{{name}}}!`;
-          next();
-        },
-      },
-    });
-    this.app.acl.allow('test{{{pascalCaseName}}}', 'getInfo');
-  }
-
-  async install(options: InstallOptions) {
-    // TODO
-  }
-}
-
-export default {{{pascalCaseName}}}Plugin;
+export { default } from './plugin';

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

@@ -0,0 +1,19 @@
+import { InstallOptions, Plugin } from '@nocobase/server';
+
+export class {{{pascalCaseName}}}Plugin extends Plugin {
+  afterAdd() {}
+
+  beforeLoad() {}
+
+  async load() {}
+
+  async install(options?: InstallOptions) {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default {{{pascalCaseName}}}Plugin;

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

@@ -1 +0,0 @@
-// TODO