@nocobase/cli-v1 2.1.0-beta.35 → 2.1.0-beta.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-beta.35",
+  "version": "2.1.0-beta.36",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,9 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.0-beta.35",
+    "@nocobase/cli": "2.1.0-beta.36",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-beta.35",
+    "@nocobase/utils": "2.1.0-beta.36",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -25,7 +25,7 @@
     "tree-kill": "^1.2.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-beta.35",
+    "@nocobase/devtools": "2.1.0-beta.36",
     "@types/fs-extra": "^11.0.1"
   },
   "repository": {
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
+  "gitHead": "397d45c744f6eb48b3a0cd785c87cbf1257c3513"
 }

package/src/__tests__/plugin-generator.test.js

@@ -0,0 +1,43 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/* eslint-env jest */
+
+const path = require('path');
+const { PluginGenerator } = require('../plugin-generator');
+
+describe('cli-v1 plugin generator', () => {
+  test('uses cwd as baseDir when baseDir is not provided', () => {
+    const cwd = path.resolve('/tmp/nocobase-plugin-generator');
+    const generator = new PluginGenerator({
+      cwd,
+      args: {},
+      context: {
+        name: '@nocobase/plugin-demo',
+      },
+    });
+
+    expect(generator.baseDir).toBe(cwd);
+  });
+
+  test('prefers explicit baseDir over cwd', () => {
+    const baseDir = path.resolve('/tmp/nocobase-plugin-generator-base');
+    const cwd = path.resolve('/tmp/nocobase-plugin-generator-cwd');
+    const generator = new PluginGenerator({
+      baseDir,
+      cwd,
+      args: {},
+      context: {
+        name: '@nocobase/plugin-demo',
+      },
+    });
+
+    expect(generator.baseDir).toBe(baseDir);
+  });
+});

package/src/plugin-generator.js

@@ -38,8 +38,11 @@ async function getProjectVersion() {
 
 class PluginGenerator extends Generator {
   constructor(options) {
-    const { log, context = {}, ...opts } = options;
-    super(opts);
+    const { log, context = {}, cwd, baseDir, ...opts } = options;
+    super({
+      ...opts,
+      baseDir: baseDir || cwd || process.cwd(),
+    });
     this.context = context;
     this.log = log || console.log;
   }

package/src/util.js

@@ -521,6 +521,7 @@ exports.initEnv = function initEnv() {
     // PM2_HOME: generatePm2Home(),
     // SOCKET_PATH: generateGatewayPath(),
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
+    NODE_PATH: resolve(process.cwd(), 'node_modules'),
     PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',
     SERVER_TSCONFIG_PATH: './tsconfig.server.json',
     CACHE_DEFAULT_STORE: 'memory',