@nocobase/cli 1.6.0-alpha.9 → 1.6.0-beta.2

package/nocobase.conf.tpl

@@ -65,6 +65,8 @@ server {
         }
     }
 
+    {{otherLocation}}
+
     location ^~ {{publicPath}}api/ {
         proxy_pass http://127.0.0.1:{{apiPort}};
         proxy_http_version 1.1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.6.0-alpha.9",
+  "version": "1.6.0-beta.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.6.0-alpha.9",
+    "@nocobase/app": "1.6.0-beta.2",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.6.0-alpha.9"
+    "@nocobase/devtools": "1.6.0-beta.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f"
+  "gitHead": "476ab2f424d86f585c8fba1459568c8aec49a5c6"
 }

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

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-const { resolve } = require('path');
+const { resolve, posix } = require('path');
 const { Command } = require('commander');
 const { readFileSync, writeFileSync } = require('fs');
 
@@ -19,11 +19,18 @@ 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');
+    let otherLocation = '';
+    if (process.env.APP_PUBLIC_PATH !== '/') {
+      otherLocation = `location / {
+        alias ${posix.resolve(process.cwd())}/node_modules/@nocobase/app/dist/client/;
+        try_files $uri $uri/ /index.html;
+    }`;
+    }
     const replaced = data
-      .replace(/\{\{cwd\}\}/g, '/app/nocobase')
+      .replace(/\{\{cwd\}\}/g, posix.resolve(process.cwd()))
       .replace(/\{\{publicPath\}\}/g, process.env.APP_PUBLIC_PATH)
-      .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT);
-
+      .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)
+      .replace(/\{\{otherLocation\}\}/g, otherLocation);
     const targetFile = resolve(process.cwd(), 'storage', 'nocobase.conf');
     writeFileSync(targetFile, replaced);
   });

package/src/commands/start.js

@@ -8,19 +8,30 @@
  */
 const _ = require('lodash');
 const { Command } = require('commander');
-const { isDev, run, postCheck, downloadPro, promptForTs } = require('../util');
+const { run, postCheck, downloadPro, promptForTs } = require('../util');
 const { existsSync, rmSync } = require('fs');
-const { resolve } = require('path');
+const { resolve, isAbsolute } = require('path');
 const chalk = require('chalk');
 const chokidar = require('chokidar');
 
+function getSocketPath() {
+  const { SOCKET_PATH } = process.env;
+
+  if (isAbsolute(SOCKET_PATH)) {
+    return SOCKET_PATH;
+  }
+
+  return resolve(process.cwd(), SOCKET_PATH);
+}
+
 function deleteSockFiles() {
-  const { SOCKET_PATH, PM2_HOME } = process.env;
+  const { PM2_HOME } = process.env;
   if (existsSync(PM2_HOME)) {
     rmSync(PM2_HOME, { recursive: true });
   }
-  if (existsSync(SOCKET_PATH)) {
-    rmSync(SOCKET_PATH);
+  const socketPath = getSocketPath();
+  if (existsSync(socketPath)) {
+    rmSync(socketPath);
   }
 }
 

package/src/util.js

@@ -11,11 +11,12 @@ const net = require('net');
 const chalk = require('chalk');
 const execa = require('execa');
 const fg = require('fast-glob');
-const { dirname, join, resolve, sep } = require('path');
+const { dirname, join, resolve, sep, isAbsolute } = require('path');
 const { readFile, writeFile } = require('fs').promises;
 const { existsSync, mkdirSync, cpSync, writeFileSync } = require('fs');
 const dotenv = require('dotenv');
-const fs = require('fs');
+const fs = require('fs-extra');
+const os = require('os');
 const moment = require('moment-timezone');
 
 exports.isPackageValid = (pkg) => {
@@ -325,6 +326,32 @@ function areTimeZonesEqual(timeZone1, timeZone2) {
   return moment.tz(timeZone1).format('Z') === moment.tz(timeZone2).format('Z');
 }
 
+function generateGatewayPath() {
+  if (process.env.SOCKET_PATH) {
+    if (isAbsolute(process.env.SOCKET_PATH)) {
+      return process.env.SOCKET_PATH;
+    }
+    return resolve(process.cwd(), process.env.SOCKET_PATH);
+  }
+  if (process.env.NOCOBASE_RUNNING_IN_DOCKER === 'true') {
+    return resolve(os.homedir(), '.nocobase', 'gateway.sock');
+  }
+  return resolve(process.cwd(), 'storage/gateway.sock');
+}
+
+function generatePm2Home() {
+  if (process.env.PM2_HOME) {
+    if (isAbsolute(process.env.PM2_HOME)) {
+      return process.env.PM2_HOME;
+    }
+    return resolve(process.cwd(), process.env.PM2_HOME);
+  }
+  if (process.env.NOCOBASE_RUNNING_IN_DOCKER === 'true') {
+    return resolve(os.homedir(), '.nocobase', 'pm2');
+  }
+  return resolve(process.cwd(), './storage/.pm2');
+}
+
 exports.initEnv = function initEnv() {
   const env = {
     APP_ENV: 'development',
@@ -343,9 +370,9 @@ exports.initEnv = function initEnv() {
     MFSU_AD: 'none',
     MAKO_AD: 'none',
     WS_PATH: '/ws',
-    SOCKET_PATH: 'storage/gateway.sock',
+    // PM2_HOME: generatePm2Home(),
+    // SOCKET_PATH: generateGatewayPath(),
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
-    PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
     PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',
     SERVER_TSCONFIG_PATH: './tsconfig.server.json',
     PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), 'storage/playwright/.auth/admin.json'),
@@ -428,6 +455,11 @@ exports.initEnv = function initEnv() {
       `process.env.DB_TIMEZONE="${process.env.DB_TIMEZONE}" and process.env.TZ="${process.env.TZ}" are different`,
     );
   }
+
+  process.env.PM2_HOME = generatePm2Home();
+  process.env.SOCKET_PATH = generateGatewayPath();
+  fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true });
+  fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true });
 };
 
 exports.generatePlugins = function () {