@nocobase/cli-v1 3.0.0-alpha.1 → 3.0.0-alpha.12

package/nocobase.conf.tpl

@@ -214,14 +214,28 @@ server {
 
 
 
-    location ^~ {{publicPath}}x/apps/ {
+    location = {{publicPath}}{{portalClientPrefix}} {
         absolute_redirect off;
+        return 302 {{v2PublicPath}}$is_args$args;
+    }
+
+    location = {{publicPath}}{{portalClientPrefix}}/ {
+        absolute_redirect off;
+        return 302 {{v2PublicPath}}$is_args$args;
+    }
+
+    location ^~ {{publicPath}}{{portalClientPrefix}}/apps/ {
+        absolute_redirect off;
+
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/?$) {
+            return 302 {{v2PublicPath}}apps/$subapp/$is_args$args;
+        }
 
-        if ($uri ~ ^{{publicPath}}x/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)$) {
-            return 308 {{publicPath}}x/apps/$subapp/$portal/$is_args$args;
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)$) {
+            return 308 {{publicPath}}{{portalClientPrefix}}/apps/$subapp/$portal/$is_args$args;
         }
 
-        if ($uri !~ ^{{publicPath}}x/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+        if ($uri !~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
             return 404;
         }
 
@@ -238,14 +252,14 @@ server {
             =404;
     }
 
-    location ^~ {{publicPath}}x/ {
+    location ^~ {{publicPath}}{{portalClientPrefix}}/ {
         absolute_redirect off;
 
-        if ($uri ~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)$) {
-            return 308 {{publicPath}}x/$portal/$is_args$args;
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/(?<portal>[A-Za-z0-9_-]+)$) {
+            return 308 {{publicPath}}{{portalClientPrefix}}/$portal/$is_args$args;
         }
 
-        if ($uri !~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+        if ($uri !~ ^{{publicPath}}{{portalClientPrefix}}/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
             return 404;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.12",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -9,9 +9,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "3.0.0-alpha.1",
+    "@nocobase/cli": "3.0.0-alpha.12",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "3.0.0-alpha.1",
+    "@nocobase/utils": "3.0.0-alpha.12",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
+  "gitHead": "2ba035885741a9977d76bbabf8f2caf44b199139"
 }

package/src/__tests__/build-index-html.test.js

@@ -87,6 +87,20 @@ describe('cli-v1 buildIndexHtml', () => {
     fs.removeSync(appRoot);
   });
 
+  test('injects settings-default as a valid client entry mode', () => {
+    const appRoot = createAppPackageRoot();
+    process.argv = ['node', 'nocobase-v1', 'start'];
+    process.env.APP_PACKAGE_ROOT = appRoot;
+    process.env.APP_PUBLIC_PATH = '/';
+    process.env.APP_CLIENT_ENTRY_MODE = 'settings-default';
+
+    buildIndexHtml();
+
+    const html = fs.readFileSync(path.join(appRoot, 'dist/client/index.html'), 'utf-8');
+    expect(html).toContain("window['__nocobase_app_client_entry_mode__'] = 'settings-default';");
+    fs.removeSync(appRoot);
+  });
+
   test('refreshes cached tpl when new runtime placeholders are missing', () => {
     const appRoot = createAppPackageRoot();
     const tplPath = path.join(appRoot, 'dist/client/index.html.tpl');

package/src/__tests__/create-nginx-conf.test.js

@@ -15,7 +15,7 @@ const path = require('path');
 
 const registerCreateNginxConf = require('../commands/create-nginx-conf');
 
-describe('create-nginx-conf Settings SPA routing', () => {
+describe('create-nginx-conf routing', () => {
   const originalEnv = { ...process.env };
   let storagePath;
 
@@ -65,4 +65,23 @@ describe('create-nginx-conf Settings SPA routing', () => {
       expect(config).toContain('try_files $uri $uri/ /index.html;');
     },
   );
+
+  test.each([
+    ['root mount', '/', '/x', '/v/'],
+    ['custom public path', '/nocobase/', '/nocobase/x', '/nocobase/v/'],
+  ])('redirects Portal roots to the Modern Client for %s', async (_label, publicPath, portalRoot, modernRoot) => {
+    const config = await renderConfig(publicPath);
+
+    expect(config).toContain(`location = ${portalRoot} {
+        absolute_redirect off;
+        return 302 ${modernRoot}$is_args$args;
+    }`);
+    expect(config).toContain(`location = ${portalRoot}/ {
+        absolute_redirect off;
+        return 302 ${modernRoot}$is_args$args;
+    }`);
+    expect(config).toContain(`return 302 ${modernRoot}$is_args$args;`);
+    expect(config).toContain(`if ($uri ~ ^${portalRoot}/apps/(?<subapp>[A-Za-z0-9_-]+)/?$) {`);
+    expect(config).toContain(`return 302 ${modernRoot}apps/$subapp/$is_args$args;`);
+  });
 });

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

@@ -67,6 +67,16 @@ describe('cli-v1 dev command', () => {
     });
   });
 
+  test('resolveDevRuntimeMode keeps all clients in settings-default', () => {
+    expect(resolveDevRuntimeMode({ appClientEntryMode: 'settings-default' })).toMatchObject({
+      useModernOnlyEntryMode: false,
+      shouldRunClient: true,
+      shouldRunClientV2: true,
+      shouldRunSettings: true,
+      shouldRunServer: true,
+    });
+  });
+
   test('resolveDevRuntimeMode preserves explicit client-v2-only flag behavior', () => {
     expect(resolveDevRuntimeMode({ clientV2Only: true, appClientEntryMode: 'legacy-default' })).toMatchObject({
       useModernOnlyEntryMode: false,

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

@@ -11,6 +11,8 @@ const { resolve, posix } = require('path');
 const { storagePathJoin, resolvePublicPath, resolveV2PublicPath, normalizeModernClientPrefix } = require('../util');
 const { readFileSync, writeFileSync } = require('fs');
 
+const PORTAL_CLIENT_PREFIX = 'x';
+
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -70,6 +72,7 @@ module.exports = (cli) => {
       .replace(/\{\{distPath\}\}/g, distPath)
       .replace(/\{\{v2PublicPath\}\}/g, v2PublicPath)
       .replace(/\{\{v2PublicPathNoTrailingSlash\}\}/g, v2PublicPathWithoutTrailingSlash)
+      .replace(/\{\{portalClientPrefix\}\}/g, PORTAL_CLIENT_PREFIX)
       .replace(/\{\{settingsAssetsPath\}\}/g, settingsAssetsPath)
       .replace(/\{\{settingsDocumentPattern\}\}/g, settingsDocumentPattern)
       .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)

package/src/commands/docs.js

@@ -57,6 +57,8 @@ function createCdnClient() {
  * @param {string} timestampDir
  */
 const REWRITE_RULES = [
+  // AI API 请求保持原路径，避免被后续规则补上文档版本的时间戳前缀
+  { sourceUrl: '^/api/ai/(.*)$', targetTemplate: () => '/api/ai/$1', flag: 'break' },
   // /en/ 下无后缀的页面路由，去掉 /en/ 前缀并改写到目录式 index.html
   { sourceUrl: '^/en/([^.]*[^/.])$', targetTemplate: (ts) => `/${ts}/$1/index.html`, flag: 'break' },
   // 其他语言和默认语言的无后缀页面路由，统一改写到目录式 index.html
@@ -147,7 +149,11 @@ async function waitForRewriteRule(cdnClient, domain, timestampDir) {
           if (!config) return false;
           const args = config.functionArgs?.functionArg || [];
           const targetArg = args.find((a) => a.argName === 'target_url');
-          return config.status === 'success' && (targetArg?.argValue || '').startsWith(expectedPrefix);
+          const expectedTarget = rule.targetTemplate(timestampDir);
+          const targetMatches = expectedTarget.startsWith(expectedPrefix)
+            ? (targetArg?.argValue || '').startsWith(expectedPrefix)
+            : targetArg?.argValue === expectedTarget;
+          return config.status === 'success' && targetMatches;
         });
 
         if (allEffective) {

package/src/util.js

@@ -433,7 +433,7 @@ const DEFAULT_MODERN_CLIENT_PREFIX = 'v';
 exports.DEFAULT_MODERN_CLIENT_PREFIX = DEFAULT_MODERN_CLIENT_PREFIX;
 
 const DEFAULT_APP_CLIENT_ENTRY_MODE = 'legacy-default';
-const APP_CLIENT_ENTRY_MODES = new Set(['legacy-default', 'modern-default', 'modern-only']);
+const APP_CLIENT_ENTRY_MODES = new Set(['legacy-default', 'modern-default', 'modern-only', 'settings-default']);
 
 exports.DEFAULT_APP_CLIENT_ENTRY_MODE = DEFAULT_APP_CLIENT_ENTRY_MODE;