@nocobase/cli 0.21.0-alpha.1 → 0.21.0-alpha.10

package/nocobase.conf.tpl

@@ -23,19 +23,6 @@ server {
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
-    # 不缓存 HTML 文件
-    # location ~ \.html$ {
-    #   if_modified_since off;
-    #   expires off;
-    #   etag off;
-    # }
-
-    # # 缓存 JavaScript 和 CSS 文件
-    # location ~* \.(js|css)$ {
-    #   expires 365d;
-    #   add_header Cache-Control "public";
-    # }
-
     location {{publicPath}}storage/uploads/ {
         alias {{cwd}}/storage/uploads/;
         add_header Cache-Control "public";
@@ -51,6 +38,10 @@ server {
         if_modified_since off;
         expires off;
         etag off;
+        location ~* \.(js|css)$ {
+            expires 365d;
+            add_header Cache-Control "public";
+        }
     }
 
     location ^~ {{publicPath}}api/ {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.21.0-alpha.1",
+    "@nocobase/app": "0.21.0-alpha.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.21.0-alpha.1"
+    "@nocobase/devtools": "0.21.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }

package/src/commands/e2e.js

@@ -85,6 +85,7 @@ async function appReady() {
 async function runApp(options = {}) {
   console.log('installing...');
   await run('nocobase', ['install', '-f']);
+  await run('nocobase', ['pm', 'enable-all']);
   if (await isPortReachable(process.env.APP_PORT)) {
     console.log('app started');
     return;
@@ -232,6 +233,7 @@ module.exports = (cli) => {
 
   e2e.command('reinstall-app').action(async (options) => {
     await run('nocobase', ['install', '-f'], options);
+    await run('nocobase', ['pm2', 'enable-all']);
   });
 
   e2e.command('install-deps').action(async () => {

package/src/commands/index.js

@@ -18,6 +18,7 @@ module.exports = (cli) => {
   require('./doc')(cli);
   require('./pm2')(cli);
   require('./test')(cli);
+  require('./test-coverage')(cli);
   require('./umi')(cli);
   require('./upgrade')(cli);
   require('./postinstall')(cli);

package/src/commands/test-coverage.js

@@ -0,0 +1,44 @@
+const { run } = require('../util');
+const fg = require('fast-glob');
+
+const coreClientPackages = ['packages/core/client', 'packages/core/sdk'];
+const isCore = (dir) => dir.startsWith('packages/core');
+
+const getPackagesDir = (isClient) => {
+  if (process.argv.length > 3 && !process.argv[3].startsWith('-')) {
+    return [process.argv[3]];
+  }
+
+  const allPackageJson = fg.sync(['packages/*/*/package.json', 'packages/*/*/*/package.json'], {
+    cwd: process.cwd(),
+    onlyFiles: true,
+  });
+  const res = allPackageJson.map((pkg) => pkg.replace('/package.json', ''));
+  return isClient
+    ? res.filter((dir) => (isCore(dir) ? coreClientPackages.includes(dir) : true))
+    : res.filter((dir) => (isCore(dir) ? !coreClientPackages.includes(dir) : true));
+};
+
+module.exports = (cli) => {
+  cli.command('test-coverage:server').action(async () => {
+    const packageRoots = getPackagesDir(false);
+    for (const dir of packageRoots) {
+      try {
+        await run('yarn', ['test:server', dir, '--coverage']);
+      } catch (e) {
+        continue;
+      }
+    }
+  });
+
+  cli.command('test-coverage:client').action(async () => {
+    const packageRoots = getPackagesDir(true);
+    for (const dir of packageRoots) {
+      try {
+        await run('yarn', ['test:client', dir, '--coverage']);
+      } catch (e) {
+        continue;
+      }
+    }
+  });
+};

package/src/commands/test.js

@@ -14,12 +14,12 @@ function addTestCommand(name, cli) {
     .option('--run')
     .option('--allowOnly')
     .option('--bail')
+    .option('--coverage')
     .option('-h, --help')
     .option('--single-thread [singleThread]')
     .arguments('[paths...]')
     .allowUnknownOption()
     .action(async (paths, opts) => {
-      process.argv.push('--disable-console-intercept');
       if (name === 'test:server') {
         process.env.TEST_ENV = 'server-side';
       } else if (name === 'test:client') {
@@ -29,14 +29,18 @@ function addTestCommand(name, cli) {
         process.env.TEST_ENV = 'server-side';
         process.argv.splice(process.argv.indexOf('--server'), 1);
       }
+
       if (opts.client) {
         process.env.TEST_ENV = 'client-side';
         process.argv.splice(process.argv.indexOf('--client'), 1);
       }
+
       process.env.NODE_ENV = 'test';
+
       if (!opts.watch && !opts.run) {
         process.argv.push('--run');
       }
+
       const first = paths?.[0];
       if (!process.env.TEST_ENV && first) {
         const key = first.split(path.sep).join('/');
@@ -46,17 +50,22 @@ function addTestCommand(name, cli) {
           process.env.TEST_ENV = 'server-side';
         }
       }
+
       if (process.env.TEST_ENV === 'server-side' && opts.singleThread !== 'false') {
         process.argv.push('--poolOptions.threads.singleThread=true');
       }
+
       if (opts.singleThread === 'false') {
         process.argv.splice(process.argv.indexOf('--single-thread=false'), 1);
       }
+
       const cliArgs = ['--max_old_space_size=14096', './node_modules/.bin/vitest', ...process.argv.slice(3)];
+
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         await run('node', cliArgs);
         return;
       }
+
       if (process.env.TEST_ENV) {
         console.log('process.env.TEST_ENV', process.env.TEST_ENV, cliArgs);
         await run('node', cliArgs);