@nocobase/cli-v1 2.1.0-alpha.34 → 2.1.0-alpha.36

package/nocobase.conf.tpl

@@ -33,9 +33,19 @@ server {
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
+    location ~* ^{{publicPath}}storage/uploads/(.*\.(?:htm|html|svg|svgz|xhtml))$ {
+        alias {{cwd}}/storage/uploads/$1;
+        add_header Cache-Control "public";
+        add_header Content-Disposition "attachment" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        access_log off;
+        autoindex off;
+    }
+
     location {{publicPath}}storage/uploads/ {
         alias {{cwd}}/storage/uploads/;
         add_header Cache-Control "public";
+        add_header X-Content-Type-Options "nosniff" always;
         access_log off;
         autoindex off;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-alpha.34",
+  "version": "2.1.0-alpha.36",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,11 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.0-alpha.34",
+    "@nocobase/cli": "2.1.0-alpha.36",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-alpha.34",
-    "@types/fs-extra": "^11.0.1",
-    "@umijs/utils": "3.5.20",
+    "@nocobase/utils": "2.1.0-alpha.36",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -24,16 +22,16 @@
     "pm2": "^6.0.5",
     "portfinder": "^1.0.28",
     "tar": "^7.4.3",
-    "tree-kill": "^1.2.2",
-    "tsx": "^4.19.0"
+    "tree-kill": "^1.2.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.34"
+    "@nocobase/devtools": "2.1.0-alpha.36",
+    "@types/fs-extra": "^11.0.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "59970f73bdbea2656e20cd24357bacf78a3f759f"
+  "gitHead": "54cf3ac93b02ea9a409def6ebe4bdfdad07d0691"
 }

package/src/__tests__/test-command.test.js

@@ -9,7 +9,12 @@
 
 const testCommandModule = require('../commands/test');
 
-const { buildVitestNodeArgs, requiresNoNodeSnapshot } = testCommandModule._test;
+const {
+  buildVitestNodeArgs,
+  requiresNoNodeSnapshot,
+  stripDelegatedWorkspaceArgs,
+  resolveWorkspaceTestDelegation,
+} = testCommandModule._test;
 
 describe('cli-v1 test command helpers', () => {
   test('requiresNoNodeSnapshot enables the Node 20+ compatibility flag', () => {
@@ -34,4 +39,32 @@ describe('cli-v1 test command helpers', () => {
       'foo.test.ts',
     ]);
   });
+
+  test('stripDelegatedWorkspaceArgs removes workspace-only routing flags while preserving extra test args', () => {
+    expect(
+      stripDelegatedWorkspaceArgs(
+        [
+          'packages/core/cli',
+          '--server',
+          '--single-thread=true',
+          '--runInBand',
+          'src/__tests__/skills-manager.test.ts',
+        ],
+        'packages/core/cli',
+      ),
+    ).toEqual(['--runInBand', 'src/__tests__/skills-manager.test.ts']);
+  });
+
+  test('resolveWorkspaceTestDelegation forwards workspace package roots that define a test script', () => {
+    const delegation = resolveWorkspaceTestDelegation(
+      ['packages/core/cli'],
+      ['packages/core/cli', '--server'],
+      '/Users/chen/t300/app5/source',
+    );
+
+    expect(delegation).toEqual({
+      packageDir: '/Users/chen/t300/app5/source/packages/core/cli',
+      forwardedArgv: [],
+    });
+  });
 });

package/src/commands/test.js

@@ -10,6 +10,7 @@
 const { Command } = require('commander');
 const { run, checkDBDialect } = require('../util');
 const path = require('path');
+const fs = require('fs');
 
 function stripSingleThreadArgs(argv) {
   const nextArgv = [];
@@ -35,6 +36,85 @@ function stripSingleThreadArgs(argv) {
   return nextArgv;
 }
 
+function stripDelegatedWorkspaceArgs(argv, delegatedPath) {
+  const nextArgv = [];
+  const normalizedDelegatedPath = String(delegatedPath || '')
+    .trim()
+    .split(path.sep)
+    .join('/');
+  let skippedPath = false;
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const token = argv[index];
+    const normalizedToken = String(token || '')
+      .trim()
+      .split(path.sep)
+      .join('/');
+
+    if (
+      !skippedPath &&
+      normalizedDelegatedPath &&
+      !token.startsWith('-') &&
+      normalizedToken === normalizedDelegatedPath
+    ) {
+      skippedPath = true;
+      continue;
+    }
+
+    if (token === '--server' || token === '--client') {
+      continue;
+    }
+
+    if (token === '--single-thread') {
+      const next = argv[index + 1];
+      if (next && !next.startsWith('-')) {
+        index += 1;
+      }
+      continue;
+    }
+
+    if (token.startsWith('--single-thread=')) {
+      continue;
+    }
+
+    nextArgv.push(token);
+  }
+
+  return nextArgv;
+}
+
+function resolveWorkspaceTestDelegation(paths = [], argv = process.argv.slice(3), cwd = process.cwd()) {
+  const firstPath = String(paths?.[0] || '').trim();
+  if (!firstPath) {
+    return undefined;
+  }
+
+  const packageDir = path.resolve(cwd, firstPath);
+  if (packageDir === cwd) {
+    return undefined;
+  }
+
+  const packageJsonPath = path.join(packageDir, 'package.json');
+  if (!fs.existsSync(packageJsonPath)) {
+    return undefined;
+  }
+
+  try {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    const testScript = String(packageJson?.scripts?.test || '').trim();
+    if (!testScript) {
+      return undefined;
+    }
+
+    return {
+      packageDir,
+      forwardedArgv: stripDelegatedWorkspaceArgs(argv, firstPath),
+    };
+  } catch (error) {
+    return undefined;
+  }
+}
+
 function requiresNoNodeSnapshot(nodeVersion = process.versions.node) {
   const major = Number.parseInt(String(nodeVersion).split('.')[0], 10);
   return Number.isFinite(major) && major >= 20;
@@ -69,6 +149,12 @@ function addTestCommand(name, cli) {
     .arguments('[paths...]')
     .allowUnknownOption()
     .action(async (paths, opts) => {
+      const delegation = name === 'test' ? resolveWorkspaceTestDelegation(paths, process.argv.slice(3)) : undefined;
+      if (delegation) {
+        await run('yarn', ['--cwd', delegation.packageDir, 'test', ...delegation.forwardedArgv]);
+        return;
+      }
+
       checkDBDialect();
       if (name === 'test:server') {
         process.env.TEST_ENV = 'server-side';
@@ -144,6 +230,8 @@ module.exports = (cli) => {
 
 module.exports._test = {
   stripSingleThreadArgs,
+  stripDelegatedWorkspaceArgs,
+  resolveWorkspaceTestDelegation,
   requiresNoNodeSnapshot,
   buildVitestNodeArgs,
 };

package/src/util.js

@@ -227,6 +227,38 @@ exports.getVersion = async () => {
   return versions[versions.length - 1];
 };
 
+function normalizeAppDevClientRsbuildConfig(appDevDir) {
+  const configPath = resolve(appDevDir, 'client/rsbuild.config.ts');
+  if (!existsSync(configPath)) {
+    return;
+  }
+  const content = fs.readFileSync(configPath, 'utf-8');
+  const normalized = content.replace(
+    "require('../../devtools/package.json')",
+    "require('@nocobase/devtools/package.json')",
+  );
+  if (normalized !== content) {
+    fs.writeFileSync(configPath, normalized, 'utf-8');
+  }
+}
+
+function normalizeAppDevClientV2Tsconfig(appDevDir) {
+  const tsconfigPath = resolve(appDevDir, 'client-v2/tsconfig.json');
+  if (!existsSync(tsconfigPath)) {
+    return;
+  }
+  const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
+  tsconfig.extends = '../../../tsconfig.json';
+  tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+  tsconfig.compilerOptions.baseUrl = '../../../';
+  fs.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`, 'utf-8');
+}
+
+function normalizeAppDevFiles(appDevDir) {
+  normalizeAppDevClientRsbuildConfig(appDevDir);
+  normalizeAppDevClientV2Tsconfig(appDevDir);
+}
+
 exports.generateAppDir = function generateAppDir() {
   const appPkgPath = dirname(dirname(require.resolve('@nocobase/app/src/index.ts')));
   const appDevDir = resolve(process.cwd(), './storage/.app-dev');
@@ -238,6 +270,7 @@ exports.generateAppDir = function generateAppDir() {
         force: true,
       });
     }
+    normalizeAppDevFiles(appDevDir);
     process.env.APP_PACKAGE_ROOT = appDevDir;
   } else {
     process.env.APP_PACKAGE_ROOT = appPkgPath;