@nocobase/cli 2.1.0-alpha.13 → 2.1.0-alpha.15

package/nocobase.conf.tpl

@@ -17,6 +17,11 @@ map $http_x_forwarded_proto $upstream_x_forwarded_proto {
     ""      $scheme;
 }
 
+map $http_host $final_host {
+    default $http_host;
+    ""      $host;
+}
+
 server {
     listen 80;
     server_name _;
@@ -82,7 +87,7 @@ server {
         proxy_set_header Connection 'upgrade';
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
-        proxy_set_header Host $host;
+        proxy_set_header Host $final_host;
         proxy_set_header Referer $http_referer;
         proxy_set_header User-Agent $http_user_agent;
         add_header Cache-Control 'no-cache, no-store';
@@ -102,7 +107,7 @@ server {
         proxy_set_header Connection 'upgrade';
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
-        proxy_set_header Host $host;
+        proxy_set_header Host $final_host;
         proxy_set_header Referer $http_referer;
         proxy_set_header User-Agent $http_user_agent;
         add_header Cache-Control 'no-cache, no-store';
@@ -121,7 +126,7 @@ server {
         proxy_set_header Connection 'upgrade';
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
-        proxy_set_header Host $host;
+        proxy_set_header Host $final_host;
         proxy_set_header Referer $http_referer;
         proxy_set_header User-Agent $http_user_agent;
         add_header Cache-Control 'no-cache, no-store';
@@ -158,7 +163,7 @@ server {
         proxy_set_header Connection 'upgrade';
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
-        proxy_set_header Host $host;
+        proxy_set_header Host $final_host;
         proxy_set_header Referer $http_referer;
         proxy_set_header User-Agent $http_user_agent;
         add_header Cache-Control 'no-cache, no-store';
@@ -174,6 +179,6 @@ server {
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "Upgrade";
-      proxy_set_header Host $host;
+      proxy_set_header Host $final_host;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.15",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "2.1.0-alpha.13",
+    "@nocobase/app": "2.1.0-alpha.15",
     "@nocobase/license-kit": "^0.3.8",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
@@ -27,12 +27,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.13"
+    "@nocobase/devtools": "2.1.0-alpha.15"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "2807a8948412d9c235115a31a81a66f7c82dd173"
+  "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
 }

package/src/cli.js

@@ -14,6 +14,15 @@ const cli = new Command();
 
 cli.version(require('../package.json').version);
 
+const argv = process.argv.slice(2);
+const emptyArgs = argv.length === 0;
+const isPmListCommand = argv[0] === 'pm' && argv[1] === 'list';
+const hasSilentLikeFlag = argv.includes('--help') || argv.includes('-h') || argv.includes('--silent');
+
+if (emptyArgs || isPmListCommand || hasSilentLikeFlag) {
+  process.env.LOGGER_SILENT = 'true';
+}
+
 commands(cli);
 
 module.exports = cli;

package/src/util.js

@@ -199,6 +199,9 @@ exports.runAppCommand = async (command, args = []) => {
 };
 
 exports.promptForTs = () => {
+  if (process.env.LOGGER_SILENT === 'true') {
+    return;
+  }
   console.log(chalk.green('WAIT: ') + 'TypeScript compiling...');
 };
 
@@ -360,7 +363,10 @@ function buildIndexHtml(force = false) {
     .replace(/\{\{env.WS_PATH\}\}/g, process.env.WS_PATH)
     .replace(/\{\{env.ESM_CDN_BASE_URL\}\}/g, process.env.ESM_CDN_BASE_URL || '')
     .replace(/\{\{env.ESM_CDN_SUFFIX\}\}/g, process.env.ESM_CDN_SUFFIX || '')
-    .replace('src="/umi.', `src="${process.env.APP_PUBLIC_PATH}umi.`);
+    .replace(/((?:src|href)=")(?:\.\/)?assets\//g, `$1${process.env.APP_PUBLIC_PATH}assets/`)
+    .replace(/((?:src|href)=")\/assets\//g, `$1${process.env.APP_PUBLIC_PATH}assets/`)
+    .replace('src="/umi.', `src="${process.env.APP_PUBLIC_PATH}umi.`)
+    .replace(/((?:src|href)="[^"]*?)\/{2,}(assets\/)/g, '$1/$2');
 
   if (process.env.CDN_BASE_URL) {
     const appBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, '');