@nocobase/cli-v1 2.1.0-alpha.17 → 2.1.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-alpha.17",
+  "version": "2.1.0-alpha.19",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
+    "@nocobase/cli": "2.1.0-alpha.19",
     "@nocobase/license-kit": "^0.3.8",
+    "@nocobase/utils": "2.1.0-alpha.19",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -26,12 +28,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.17"
+    "@nocobase/devtools": "2.1.0-alpha.19"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "586cb00f56557e66168b9720d0e0193a1b752067"
+  "gitHead": "3d13700360eac1c0f9dbf6a5f167ed396a294a3c"
 }

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

@@ -8,9 +8,9 @@
  */
 
 const { resolve, posix } = require('path');
+const { storagePathJoin, resolvePublicPath, resolveV2PublicPath } = require('../util');
 const { Command } = require('commander');
 const { readFileSync, writeFileSync } = require('fs');
-const { resolvePublicPath, resolveV2PublicPath } = require('../util');
 
 /**
  *
@@ -47,7 +47,7 @@ module.exports = (cli) => {
       .replace(/\{\{v2PublicPathNoTrailingSlash\}\}/g, v2PublicPathWithoutTrailingSlash)
       .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)
       .replace(/\{\{otherLocation\}\}/g, otherLocation);
-    const targetFile = resolve(process.cwd(), 'storage', 'nocobase.conf');
+    const targetFile = storagePathJoin('nocobase.conf');
     writeFileSync(targetFile, replaced);
   });
 };

package/src/commands/e2e.js

@@ -93,14 +93,14 @@ async function appReady() {
 
 async function runApp(options = {}) {
   console.log('installing...');
-  await run('nocobase', ['install', '-f']);
-  await run('nocobase', ['pm', 'enable-all']);
+  await run('nocobase-v1', ['install', '-f']);
+  await run('nocobase-v1', ['pm', 'enable-all']);
   if (await isPortReachable(process.env.APP_PORT)) {
     console.log('app started');
     return;
   }
   console.log('starting...');
-  run('nocobase', [process.env.APP_ENV === 'production' ? 'start' : 'dev'], options);
+  run('nocobase-v1', [process.env.APP_ENV === 'production' ? 'start' : 'dev'], options);
 }
 
 process.on('SIGINT', async () => {
@@ -235,8 +235,8 @@ module.exports = (cli) => {
     });
 
   e2e.command('reinstall-app').action(async (options) => {
-    await run('nocobase', ['install', '-f'], options);
-    await run('nocobase', ['pm2', 'enable-all']);
+    await run('nocobase-v1', ['install', '-f'], options);
+    await run('nocobase-v1', ['pm2', 'enable-all']);
   });
 
   e2e.command('install-deps').action(async () => {

package/src/commands/pkg.js

@@ -13,7 +13,7 @@ const fs = require('fs-extra');
 const zlib = require('zlib');
 const tar = require('tar');
 const path = require('path');
-const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
+const { createStoragePluginsSymlink, resolvePluginStoragePath } = require('@nocobase/utils/plugin-symlink');
 const { getAccessKeyPair, showLicenseInfo, LicenseKeyError } = require('../license');
 const { logger } = require('../logger');
 
@@ -98,7 +98,7 @@ class Package {
 
   async isDepPackage() {
     const pkg1 = path.resolve(process.cwd(), 'node_modules', this.packageName, 'package.json');
-    const pkg2 = path.resolve(process.cwd(), process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
+    const pkg2 = path.resolve(resolvePluginStoragePath(), this.packageName, 'package.json');
     if ((await fs.exists(pkg1)) && (await fs.exists(pkg2))) {
       const readPath1 = fs.realpathSync(pkg1);
       const readPath2 = fs.realpathSync(pkg2);
@@ -110,7 +110,7 @@ class Package {
   }
 
   async isDownloaded(version) {
-    const packageFile = path.resolve(process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
+    const packageFile = path.resolve(resolvePluginStoragePath(), this.packageName, 'package.json');
     if (await fs.exists(packageFile)) {
       const json = await fs.readJson(packageFile);
       if (json.version === version) {
@@ -242,7 +242,7 @@ class PackageManager {
   }
 
   async removePackage(packageName) {
-    const dir = path.resolve(process.env.PLUGIN_STORAGE_PATH, packageName);
+    const dir = path.resolve(resolvePluginStoragePath(), packageName);
     const r = await fs.exists(dir);
     if (r) {
       logger.info(`Removed: ${packageName}`);

package/src/commands/upgrade.js

@@ -40,8 +40,8 @@ module.exports = (cli) => {
       if (options.skipCodeUpdate) {
         await runAppCommand('upgrade');
       } else {
-        await run('nocobase', ['update-deps']);
-        await run('nocobase', ['upgrade', '--skip-code-update']);
+        await run('nocobase-v1', ['update-deps']);
+        await run('nocobase-v1', ['upgrade', '--skip-code-update']);
       }
     });
 };

package/src/logger.js

@@ -9,6 +9,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const { storagePathJoin } = require('./util');
 const winston = require('winston');
 require('winston-daily-rotate-file');
 
@@ -62,7 +63,7 @@ function createSystemLogger({ dirname, filename, defaultMeta = {} }) {
 }
 
 const getLoggerFilePath = (...paths) => {
-  return path.resolve(process.env.LOGGER_BASE_PATH || path.resolve(process.cwd(), 'storage', 'logs'), ...paths);
+  return path.resolve(process.env.LOGGER_BASE_PATH || storagePathJoin('logs'), ...paths);
 };
 
 const logger = createSystemLogger({

package/src/util.js

@@ -18,6 +18,7 @@ const dotenv = require('dotenv');
 const fs = require('fs-extra');
 const os = require('os');
 const moment = require('moment-timezone');
+const { resolvePluginStoragePath } = require('@nocobase/utils/plugin-symlink');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -297,7 +298,7 @@ exports.genTsConfigPaths = function genTsConfigPaths() {
 
 function generatePlaywrightPath(clean = false) {
   try {
-    const playwright = resolve(process.cwd(), 'storage/playwright/tests');
+    const playwright = storagePathJoin('playwright', 'tests');
     if (clean && fs.existsSync(playwright)) {
       fs.rmSync(dirname(playwright), { force: true, recursive: true });
     }
@@ -399,6 +400,30 @@ function areTimeZonesEqual(timeZone1, timeZone2) {
   return moment.tz(timeZone1).format('Z') === moment.tz(timeZone2).format('Z');
 }
 
+/**
+ * Absolute application storage root (same rules as `@nocobase/utils` `resolveStorageRoot`).
+ * Resolves STORAGE_PATH for initEnv; after initEnv, `process.env.STORAGE_PATH` is set to this absolute path.
+ */
+function resolveStorageRoot() {
+  if (process.env.STORAGE_PATH) {
+    if (isAbsolute(process.env.STORAGE_PATH)) {
+      return process.env.STORAGE_PATH;
+    }
+    return resolve(process.cwd(), process.env.STORAGE_PATH);
+  }
+  return resolve(process.cwd(), 'storage');
+}
+
+/** Join segments under the storage root (same semantics as `@nocobase/utils` `storagePathJoin`). */
+function storagePathJoin(...segments) {
+  return join(resolveStorageRoot(), ...segments);
+}
+
+exports.resolveStorageRoot = resolveStorageRoot;
+exports.storagePathJoin = storagePathJoin;
+/** @deprecated Use resolveStorageRoot — kept for backward compatibility */
+exports.generateStoragePath = resolveStorageRoot;
+
 function generateGatewayPath() {
   if (process.env.SOCKET_PATH) {
     if (isAbsolute(process.env.SOCKET_PATH)) {
@@ -409,7 +434,7 @@ function generateGatewayPath() {
   if (process.env.NOCOBASE_RUNNING_IN_DOCKER === 'true') {
     return resolve(os.homedir(), '.nocobase', 'gateway.sock');
   }
-  return resolve(process.cwd(), 'storage/gateway.sock');
+  return storagePathJoin('gateway.sock');
 }
 
 function generatePm2Home() {
@@ -422,7 +447,7 @@ function generatePm2Home() {
   if (process.env.NOCOBASE_RUNNING_IN_DOCKER === 'true') {
     return resolve(os.homedir(), '.nocobase', 'pm2');
   }
-  return resolve(process.cwd(), './storage/.pm2');
+  return storagePathJoin('.pm2');
 }
 
 exports.initEnv = function initEnv() {
@@ -435,12 +460,10 @@ exports.initEnv = function initEnv() {
     API_CLIENT_SHARE_TOKEN: 'false',
     API_CLIENT_STORAGE_TYPE: 'localStorage',
     // DB_DIALECT: 'sqlite',
-    DB_STORAGE: 'storage/db/nocobase.sqlite',
+    // DB_STORAGE, LOCAL_STORAGE_DEST, PLUGIN_STORAGE_PATH, etc. are set after dotenv from STORAGE_PATH
     // DB_TIMEZONE: '+00:00',
     DB_UNDERSCORED: parseEnv('DB_UNDERSCORED'),
     DEFAULT_STORAGE_TYPE: 'local',
-    LOCAL_STORAGE_DEST: 'storage/uploads',
-    PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
     MFSU_AD: 'none',
     MAKO_AD: 'none',
     WS_PATH: '/ws',
@@ -449,17 +472,14 @@ exports.initEnv = function initEnv() {
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
     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'),
     CACHE_DEFAULT_STORE: 'memory',
     CACHE_MEMORY_MAX: 2000,
     BROWSERSLIST_IGNORE_OLD_DATA: true,
     PLUGIN_STATICS_PATH: '/static/plugins/',
-    LOGGER_BASE_PATH: 'storage/logs',
     APP_SERVER_BASE_URL: '',
     APP_BASE_URL: '',
     CDN_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
-    WATCH_FILE: resolve(process.cwd(), 'storage/app.watch.ts'),
     ESM_CDN_BASE_URL: 'https://esm.sh',
     ESM_CDN_SUFFIX: '',
   };
@@ -491,6 +511,17 @@ exports.initEnv = function initEnv() {
     path: resolve(process.cwd(), process.env.APP_ENV_PATH || '.env'),
   });
 
+  const storagePath = resolveStorageRoot();
+  process.env.STORAGE_PATH = storagePath; // absolute; other modules may use process.env.STORAGE_PATH after this
+  Object.assign(env, {
+    DB_STORAGE: storagePathJoin('db', 'nocobase.sqlite'),
+    LOCAL_STORAGE_DEST: storagePathJoin('uploads'),
+    PLUGIN_STORAGE_PATH: storagePathJoin('plugins'),
+    PLAYWRIGHT_AUTH_FILE: storagePathJoin('playwright', '.auth', 'admin.json'),
+    LOGGER_BASE_PATH: storagePathJoin('logs'),
+    WATCH_FILE: storagePathJoin('app.watch.ts'),
+  });
+
   if (process.argv[2] === 'e2e' && !process.env.APP_BASE_URL) {
     process.env.APP_BASE_URL = `http://127.0.0.1:${process.env.APP_PORT}`;
   }
@@ -555,7 +586,7 @@ exports.initEnv = function initEnv() {
     '@nocobase/plugin-workflow-response-message',
   ];
   for (const pkg of pkgs) {
-    const pkgDir = resolve(process.cwd(), 'storage/plugins', pkg);
+    const pkgDir = join(resolvePluginStoragePath(), pkg);
     fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
   }
 };