@nocobase/cli 0.8.0-alpha.9 → 0.8.1-alpha.3

package/bin/index.js

@@ -16,6 +16,7 @@ const env = {
   DEFAULT_STORAGE_TYPE: 'local',
   LOCAL_STORAGE_DEST: 'storage/uploads',
   MFSU_AD: 'none',
+  PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
 };
 
 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.8.0-alpha.9",
+  "version": "0.8.1-alpha.3",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -23,12 +23,12 @@
     "serve": "^13.0.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.8.0-alpha.9"
+    "@nocobase/devtools": "0.8.1-alpha.3"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }

package/src/commands/dev.js

@@ -18,6 +18,7 @@ module.exports = (cli) => {
     .allowUnknownOption()
     .action(async (opts) => {
       promptForTs();
+
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         run('ts-node', [
           '-P',
@@ -29,15 +30,22 @@ module.exports = (cli) => {
         ]);
         return;
       }
+
       const { port, client, server } = opts;
+
       if (port) {
         process.env.APP_PORT = opts.port;
       }
+
       const { APP_PORT } = process.env;
+
       let clientPort = APP_PORT;
       let serverPort;
+
       nodeCheck();
+
       await postCheck(opts);
+
       if (server) {
         serverPort = APP_PORT;
       } else if (!server && !client) {
@@ -45,10 +53,11 @@ module.exports = (cli) => {
           port: 1 * clientPort + 1,
         });
       }
+
       await runAppCommand('install', ['--silent']);
-      if (opts.dbSync) {
-        await runAppCommand('db:sync');
-      }
+      // if (opts.dbSync) {
+      //   await runAppCommand('db:sync');
+      // }
       if (server || !client) {
         console.log('starting server', serverPort);
         const argv = [
@@ -61,6 +70,9 @@ module.exports = (cli) => {
           ...process.argv.slice(3),
           `--port=${serverPort}`,
         ];
+        if (opts.dbSync) {
+          argv.push('--db-sync');
+        }
         run('ts-node-dev', argv, {
           env: {
             APP_PORT: serverPort,
@@ -73,7 +85,8 @@ module.exports = (cli) => {
           env: {
             PORT: clientPort,
             APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
-            PROXY_TARGET_URL: process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
+            PROXY_TARGET_URL:
+              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
           },
         });
       }

package/src/commands/postinstall.js

@@ -21,6 +21,10 @@ module.exports = (cli) => {
         const content = await readFile(resolve(cwd, '.env.example'), 'utf-8');
         await writeFile(resolve(cwd, '.env'), content, 'utf-8');
       }
+      if (!existsSync(resolve(cwd, '.env.test')) && existsSync(resolve(cwd, '.env.test.example'))) {
+        const content = await readFile(resolve(cwd, '.env.test.example'), 'utf-8');
+        await writeFile(resolve(cwd, '.env.test'), content, 'utf-8');
+      }
       if (!isPackageValid('umi')) {
         return;
       }

package/src/commands/start.js

@@ -15,17 +15,12 @@ module.exports = (cli) => {
     .option('-p, --port [port]')
     .option('-d, --daemon')
     .option('--db-sync')
+    .option('--quickstart')
     .allowUnknownOption()
     .action(async (opts) => {
       if (opts.port) {
         process.env.APP_PORT = opts.port;
       }
-      if (process.platform === 'win32') {
-        console.log(
-          chalk.yellow(`It is not supported on win platform, please use \`${chalk.green('yarn dev')}\` instead`),
-        );
-        return;
-      }
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         promptForTs();
         run('ts-node', [
@@ -46,6 +41,10 @@ module.exports = (cli) => {
         return;
       }
       await postCheck(opts);
+      if (opts.quickstart) {
+        await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'install', '--ignore-installed']);
+        await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'upgrade']);
+      }
       if (opts.dbSync) {
         await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'db:sync']);
       }