@nocobase/cli 0.20.0-alpha.8 → 0.21.0-alpha.1

package/nocobase.conf.tpl

@@ -0,0 +1,89 @@
+log_format apm '"$time_local" client=$remote_addr '
+               'method=$request_method request="$request" '
+               'request_length=$request_length '
+               'status=$status bytes_sent=$bytes_sent '
+               'body_bytes_sent=$body_bytes_sent '
+               'referer=$http_referer '
+               'user_agent="$http_user_agent" '
+               'upstream_addr=$upstream_addr '
+               'upstream_status=$upstream_status '
+               'request_time=$request_time '
+               'upstream_response_time=$upstream_response_time '
+               'upstream_connect_time=$upstream_connect_time '
+               'upstream_header_time=$upstream_header_time';
+
+server {
+    listen 80;
+    server_name _;
+    root {{cwd}}/node_modules/@nocobase/app/dist/client;
+    index index.html;
+    client_max_body_size 1000M;
+    access_log /var/log/nginx/nocobase.log apm;
+
+    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";
+        access_log off;
+        autoindex off;
+    }
+
+    location {{publicPath}} {
+        alias {{cwd}}/node_modules/@nocobase/app/dist/client/;
+        try_files $uri $uri/ /index.html;
+        add_header Last-Modified $date_gmt;
+        add_header Cache-Control 'no-store, no-cache';
+        if_modified_since off;
+        expires off;
+        etag off;
+    }
+
+    location ^~ {{publicPath}}api/ {
+        proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}api/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+    location ^~ {{publicPath}}static/plugins/ {
+        proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}static/plugins/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+    location {{publicPath}}ws {
+      proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}ws;
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "Upgrade";
+      proxy_set_header Host $host;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.20.0-alpha.8",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,12 +8,12 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.20.0-alpha.8",
+    "@nocobase/app": "0.21.0-alpha.1",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.0",
     "execa": "^5.1.1",
     "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.20.0-alpha.8"
+    "@nocobase/devtools": "0.21.0-alpha.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "39ebc1cefe5a826aecf0b14d73530dfa5f9c2b1c"
+  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
 }

package/src/commands/build.js

@@ -1,6 +1,6 @@
 const { resolve } = require('path');
 const { Command } = require('commander');
-const { run, nodeCheck, isPackageValid } = require('../util');
+const { run, nodeCheck, isPackageValid, buildIndexHtml } = require('../util');
 
 /**
  *
@@ -13,6 +13,7 @@ module.exports = (cli) => {
     .argument('[packages...]')
     .option('-v, --version', 'print version')
     .option('-c, --compile', 'compile the @nocobase/build package')
+    .option('-r, --retry', 'retry the last failed package')
     .option('-w, --watch', 'watch compile the @nocobase/build package')
     .option('-s, --sourcemap', 'generate sourcemap')
     .option('--no-dts', 'not generate dts')
@@ -24,12 +25,15 @@ module.exports = (cli) => {
         });
         if (options.watch) return;
       }
+      process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
 
       await run('nocobase-build', [
         ...pkgs,
         options.version ? '--version' : '',
         !options.dts ? '--no-dts' : '',
         options.sourcemap ? '--sourcemap' : '',
+        options.retry ? '--retry' : '',
       ]);
+      buildIndexHtml(true);
     });
 };

package/src/commands/create-nginx-conf.js

@@ -0,0 +1,21 @@
+const { resolve } = require('path');
+const { Command } = require('commander');
+const { readFileSync, writeFileSync } = require('fs');
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli.command('create-nginx-conf').action(async (name, options) => {
+    const file = resolve(__dirname, '../../nocobase.conf.tpl');
+    const data = readFileSync(file, 'utf-8');
+    const replaced = data
+      .replace(/\{\{cwd\}\}/g, '/app/nocobase')
+      .replace(/\{\{publicPath\}\}/g, process.env.APP_PUBLIC_PATH)
+      .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT);
+
+    const targetFile = resolve(process.cwd(), 'storage', 'nocobase.conf');
+    writeFileSync(targetFile, replaced);
+  });
+};

package/src/commands/e2e.js

@@ -243,6 +243,12 @@ module.exports = (cli) => {
     .option('--stop-on-error')
     .option('--build')
     .option('--concurrency [concurrency]', '', os.cpus().length)
+    .option(
+      '--match [match]',
+      'Only the files matching one of these patterns are executed as test files. Matching is performed against the absolute file path. Strings are treated as glob patterns.',
+      'packages/**/__e2e__/**/*.test.ts',
+    )
+    .option('--ignore [ignore]', 'Skip tests that match the pattern. Strings are treated as glob patterns.', undefined)
     .action(async (options) => {
       process.env.__E2E__ = true;
       if (options.build) {

package/src/commands/index.js

@@ -8,6 +8,7 @@ const { isPackageValid, generateAppDir } = require('../util');
 module.exports = (cli) => {
   generateAppDir();
   require('./global')(cli);
+  require('./create-nginx-conf')(cli);
   require('./build')(cli);
   require('./tar')(cli);
   require('./dev')(cli);
@@ -15,6 +16,7 @@ module.exports = (cli) => {
   require('./e2e')(cli);
   require('./clean')(cli);
   require('./doc')(cli);
+  require('./pm2')(cli);
   require('./test')(cli);
   require('./umi')(cli);
   require('./upgrade')(cli);

package/src/commands/p-test.js

@@ -60,7 +60,8 @@ exports.pTest = async (options) => {
     fs.mkdirSync(dir, { recursive: true });
   }
 
-  const files = glob.sync('packages/**/__e2e__/**/*.test.ts', {
+  const files = glob.sync(options.match, {
+    ignore: options.ignore,
     root: process.cwd(),
   });
 

package/src/commands/pm2.js

@@ -0,0 +1,28 @@
+const chalk = require('chalk');
+const { Command } = require('commander');
+const { run, isDev } = require('../util');
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli
+    .command('pm2')
+    .allowUnknownOption()
+    .action(() => {
+      run('pm2', process.argv.slice(3));
+    });
+  cli
+    .command('pm2-restart')
+    .allowUnknownOption()
+    .action(() => {
+      run('pm2', ['restart', 'all']);
+    });
+  cli
+    .command('pm2-stop')
+    .allowUnknownOption()
+    .action(() => {
+      run('pm2', ['stop', 'all']);
+    });
+};

package/src/commands/test.js

@@ -19,6 +19,7 @@ function addTestCommand(name, cli) {
     .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') {

package/src/util.js

@@ -180,6 +180,7 @@ exports.generateAppDir = function generateAppDir() {
   } else {
     process.env.APP_PACKAGE_ROOT = appPkgPath;
   }
+  buildIndexHtml();
 };
 
 exports.genTsConfigPaths = function genTsConfigPaths() {
@@ -257,6 +258,30 @@ function parseEnv(name) {
   }
 }
 
+function buildIndexHtml(force = false) {
+  const file = `${process.env.APP_PACKAGE_ROOT}/dist/client/index.html`;
+  if (!fs.existsSync(file)) {
+    return;
+  }
+  const tpl = `${process.env.APP_PACKAGE_ROOT}/dist/client/index.html.tpl`;
+  if (force && fs.existsSync(tpl)) {
+    fs.rmSync(tpl);
+  }
+  if (!fs.existsSync(tpl)) {
+    fs.copyFileSync(file, tpl);
+  }
+  const data = fs.readFileSync(tpl, 'utf-8');
+  const replacedData = data
+    .replace(/\{\{env.APP_PUBLIC_PATH\}\}/g, process.env.APP_PUBLIC_PATH)
+    .replace(/\{\{env.API_BASE_URL\}\}/g, process.env.API_BASE_URL || process.env.API_BASE_PATH)
+    .replace(/\{\{env.WS_URL\}\}/g, process.env.WEBSOCKET_URL || '')
+    .replace(/\{\{env.WS_PATH\}\}/g, process.env.WS_PATH)
+    .replace('src="/umi.', `src="${process.env.APP_PUBLIC_PATH}umi.`);
+  fs.writeFileSync(file, replacedData, 'utf-8');
+}
+
+exports.buildIndexHtml = buildIndexHtml;
+
 exports.initEnv = function initEnv() {
   const env = {
     APP_ENV: 'development',
@@ -280,7 +305,10 @@ exports.initEnv = function initEnv() {
     PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), 'storage/playwright/.auth/admin.json'),
     CACHE_DEFAULT_STORE: 'memory',
     CACHE_MEMORY_MAX: 2000,
+    PLUGIN_STATICS_PATH: '/static/plugins/',
     LOGGER_BASE_PATH: 'storage/logs',
+    APP_SERVER_BASE_URL: '',
+    APP_PUBLIC_PATH: '/',
   };
 
   if (
@@ -319,4 +347,18 @@ exports.initEnv = function initEnv() {
       process.env[key] = env[key];
     }
   }
+
+  if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
+    const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, '');
+    const keys = ['API_BASE_PATH', 'WS_PATH', 'PLUGIN_STATICS_PATH'];
+    for (const key of keys) {
+      process.env[key] = publicPath + process.env[key];
+    }
+    process.env.__env_modified__ = true;
+  }
+
+  if (!process.env.__env_modified__ && process.env.APP_SERVER_BASE_URL && !process.env.API_BASE_URL) {
+    process.env.API_BASE_URL = process.env.APP_SERVER_BASE_URL + process.env.API_BASE_PATH;
+    process.env.__env_modified__ = true;
+  }
 };