@nocobase/cli-v1 2.1.31 → 2.2.0-alpha.10

package/nocobase.conf.tpl

@@ -167,7 +167,72 @@ server {
         send_timeout 600;
     }
 
+    # File access URLs are application routes. Keep them above the SPA
+    # locations so Nginx forwards them to the NocoBase gateway.
+    location ^~ {{publicPath}}files/ {
+        proxy_pass http://127.0.0.1:{{apiPort}};
+        proxy_http_version 1.1;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
+        proxy_set_header Host $final_host;
+        proxy_set_header Referer $http_referer;
+        proxy_set_header User-Agent $http_user_agent;
+        add_header Cache-Control 'no-cache, no-store';
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+
+
+    location ^~ {{publicPath}}x/apps/ {
+        absolute_redirect off;
+
+        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}}x/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+            return 404;
+        }
+
+        root {{cwd}}/storage;
+
+        if ($portal_path = "") {
+            rewrite ^ /portals/$subapp/$portal/dist/index.html break;
+        }
+
+        try_files
+            /portals/$subapp/$portal/dist/$portal_path
+            /portals/$subapp/$portal/dist/$portal_path/
+            /portals/$subapp/$portal/dist/index.html
+            =404;
+    }
+
+    location ^~ {{publicPath}}x/ {
+        absolute_redirect off;
 
+        if ($uri ~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)$) {
+            return 308 {{publicPath}}x/$portal/$is_args$args;
+        }
+
+        if ($uri !~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+            return 404;
+        }
+
+        root {{cwd}}/storage;
+
+        if ($portal_path = "") {
+            rewrite ^ /portals/main/$portal/dist/index.html break;
+        }
+
+        try_files
+            /portals/main/$portal/dist/$portal_path
+            /portals/main/$portal/dist/$portal_path/
+            /portals/main/$portal/dist/index.html
+            =404;
+    }
 
     location {{publicPath}} {
         alias {{cwd}}/node_modules/@nocobase/app/dist/client/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.31",
+  "version": "2.2.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -9,9 +9,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.31",
+    "@nocobase/cli": "2.2.0-alpha.10",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.31",
+    "@nocobase/utils": "2.2.0-alpha.10",
     "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": "b5d46b76adb72b4fa736dd0e6c89d8a0bc83bfe8"
+  "gitHead": "b5a3f131bb0a4a2fbfd96852896bccadc933d834"
 }

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

@@ -24,6 +24,8 @@ function createAppPackageRoot() {
     [
       "window['__nocobase_app_dev__'] = {{env.NOCOBASE_APP_DEV}};",
       "window['__nocobase_public_path__'] = '{{env.APP_PUBLIC_PATH}}';",
+      "window['__nocobase_modern_client_prefix__'] = '{{env.APP_MODERN_CLIENT_PREFIX}}';",
+      "window['__nocobase_app_client_entry_mode__'] = '{{env.APP_CLIENT_ENTRY_MODE}}';",
     ].join('\n'),
     'utf-8',
   );
@@ -73,11 +75,43 @@ describe('cli-v1 buildIndexHtml', () => {
     process.env.APP_PACKAGE_ROOT = appRoot;
     process.env.APP_PUBLIC_PATH = '/';
     process.env.NOCOBASE_APP_DEV = '';
+    process.env.APP_MODERN_CLIENT_PREFIX = 'console';
+    process.env.APP_CLIENT_ENTRY_MODE = 'modern-default';
 
     buildIndexHtml();
 
     const html = fs.readFileSync(path.join(appRoot, 'dist/client/index.html'), 'utf-8');
     expect(html).toContain("window['__nocobase_app_dev__'] = false;");
+    expect(html).toContain("window['__nocobase_modern_client_prefix__'] = 'console';");
+    expect(html).toContain("window['__nocobase_app_client_entry_mode__'] = 'modern-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');
+    const indexPath = path.join(appRoot, 'dist/client/index.html');
+    fs.writeFileSync(tplPath, "window['__nocobase_public_path__'] = '{{env.APP_PUBLIC_PATH}}';", 'utf-8');
+    fs.writeFileSync(
+      indexPath,
+      [
+        "window['__nocobase_public_path__'] = '{{env.APP_PUBLIC_PATH}}';",
+        "window['__nocobase_modern_client_prefix__'] = '{{env.APP_MODERN_CLIENT_PREFIX}}';",
+        "window['__nocobase_app_client_entry_mode__'] = '{{env.APP_CLIENT_ENTRY_MODE}}';",
+      ].join('\n'),
+      'utf-8',
+    );
+    process.argv = ['node', 'nocobase-v1', 'start'];
+    process.env.APP_PACKAGE_ROOT = appRoot;
+    process.env.APP_PUBLIC_PATH = '/';
+    process.env.APP_MODERN_CLIENT_PREFIX = 'v';
+    process.env.APP_CLIENT_ENTRY_MODE = 'modern-only';
+
+    buildIndexHtml();
+
+    const tpl = fs.readFileSync(tplPath, 'utf-8');
+    expect(tpl).toContain('__nocobase_modern_client_prefix__');
+    expect(tpl).toContain('__nocobase_app_client_entry_mode__');
     fs.removeSync(appRoot);
   });
 });

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

@@ -9,13 +9,22 @@
 
 /* eslint-env jest */
 
-const { buildAppDevForwardArgs, forwardDevToAppDev } = require('../commands/dev')._test;
+const { buildAppDevForwardArgs, forwardDevToAppDev, resolveDevRuntimeMode } = require('../commands/dev')._test;
 
 describe('cli-v1 dev command', () => {
   test('buildAppDevForwardArgs rewrites dev argv to app-dev while preserving extra args', () => {
     expect(
-      buildAppDevForwardArgs(['node', 'nocobase-v1', 'dev', '--rsbuild', '--port', '13000', '--inspect=9229']),
-    ).toEqual(['app-dev', '--rsbuild', '--port', '13000', '--inspect=9229']);
+      buildAppDevForwardArgs([
+        'node',
+        'nocobase-v1',
+        'dev',
+        '--rsbuild',
+        '--quickstart',
+        '--port',
+        '13000',
+        '--inspect=9229',
+      ]),
+    ).toEqual(['app-dev', '--rsbuild', '--quickstart', '--port', '13000', '--inspect=9229']);
   });
 
   test('forwardDevToAppDev delegates to nocobase-v1 app-dev for create-app projects', async () => {
@@ -31,4 +40,31 @@ describe('cli-v1 dev command', () => {
 
     expect(calls).toEqual([['nocobase-v1', ['app-dev', '--port', '13000', '--db-sync']]]);
   });
+
+  test('resolveDevRuntimeMode keeps both clients in legacy-default', () => {
+    expect(resolveDevRuntimeMode({ appClientEntryMode: 'legacy-default' })).toMatchObject({
+      useModernOnlyEntryMode: false,
+      shouldRunClient: true,
+      shouldRunClientV2: true,
+      shouldRunServer: true,
+    });
+  });
+
+  test('resolveDevRuntimeMode only runs v2 client and server in modern-only', () => {
+    expect(resolveDevRuntimeMode({ appClientEntryMode: 'modern-only' })).toMatchObject({
+      useModernOnlyEntryMode: true,
+      shouldRunClient: false,
+      shouldRunClientV2: true,
+      shouldRunServer: true,
+    });
+  });
+
+  test('resolveDevRuntimeMode preserves explicit client-v2-only flag behavior', () => {
+    expect(resolveDevRuntimeMode({ clientV2Only: true, appClientEntryMode: 'legacy-default' })).toMatchObject({
+      useModernOnlyEntryMode: false,
+      shouldRunClient: false,
+      shouldRunClientV2: true,
+      shouldRunServer: false,
+    });
+  });
 });

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

@@ -38,6 +38,21 @@ module.exports = (cli) => {
         return 302 ${appPublicPathWithoutTrailingSlash}$uri$is_args$args;
     }
 
+    location ^~ /files/ {
+        proxy_pass http://127.0.0.1:${process.env.APP_PORT};
+        proxy_http_version 1.1;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
+        proxy_set_header Host $final_host;
+        proxy_set_header Referer $http_referer;
+        proxy_set_header User-Agent $http_user_agent;
+        add_header Cache-Control 'no-cache, no-store';
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
     location / {
         alias ${posix.resolve(process.cwd())}/node_modules/@nocobase/app/dist/client/;
         try_files $uri $uri/ /index.html;

package/src/commands/dev.js

@@ -20,6 +20,7 @@ const {
   isPortReachable,
   buildWSURL,
   checkDBDialect,
+  resolveAppClientEntryMode,
 } = require('../util');
 const { getPortPromise } = require('portfinder');
 const chokidar = require('chokidar');
@@ -47,6 +48,25 @@ function buildAppDevForwardArgs(argv = process.argv) {
   return ['app-dev', ...argv.slice(3)];
 }
 
+function resolveDevRuntimeMode(opts = {}) {
+  const appClientEntryMode = opts.appClientEntryMode || resolveAppClientEntryMode();
+  const useModernOnlyEntryMode = appClientEntryMode === 'modern-only';
+  const clientV2Only = !!opts.clientV2Only;
+  const forceClient = !!opts.client;
+  const forceServer = !!opts.server;
+  const shouldRunClientV2 = clientV2Only || useModernOnlyEntryMode || forceClient || !forceServer;
+  const shouldRunClient = !clientV2Only && !useModernOnlyEntryMode && (forceClient || !forceServer);
+  const shouldRunServer = !clientV2Only && (forceServer || !forceClient || useModernOnlyEntryMode);
+
+  return {
+    appClientEntryMode,
+    useModernOnlyEntryMode,
+    shouldRunClientV2,
+    shouldRunClient,
+    shouldRunServer,
+  };
+}
+
 async function forwardDevToAppDev({ argv = process.argv, runCommand = run } = {}) {
   await runCommand('nocobase-v1', buildAppDevForwardArgs(argv));
 }
@@ -63,6 +83,7 @@ module.exports = (cli) => {
     .option('-c, --client')
     .option('-s, --server')
     .option('--db-sync')
+    .option('--quickstart')
     .option('--rsbuild')
     .option('--client-v2-only')
     .option('-i, --inspect [port]')
@@ -107,9 +128,9 @@ module.exports = (cli) => {
       nodeCheck();
       await postCheck(opts);
 
-      const shouldRunClientV2 = clientV2Only || client || !server;
-      const shouldRunClient = !clientV2Only && (client || !server);
-      const shouldRunServer = !clientV2Only && (server || !client);
+      const { useModernOnlyEntryMode, shouldRunClientV2, shouldRunClient, shouldRunServer } = resolveDevRuntimeMode(
+        opts,
+      );
       const shouldRunClientWithRsbuild = shouldRunClient && !!rsbuild;
 
       if (shouldRunServer && server) {
@@ -120,12 +141,16 @@ module.exports = (cli) => {
         });
       }
 
-      if (shouldRunClientV2 && !clientV2Only) {
+      if (shouldRunClientV2 && !clientV2Only && !useModernOnlyEntryMode) {
         clientV2Port = await getPortPromise({
           port: 1 * clientPort + 2,
         });
       }
 
+      if (useModernOnlyEntryMode) {
+        clientV2Port = APP_PORT;
+      }
+
       let subprocessClient;
       let subprocessClientV2;
 
@@ -306,4 +331,5 @@ module.exports = (cli) => {
 module.exports._test = {
   buildAppDevForwardArgs,
   forwardDevToAppDev,
+  resolveDevRuntimeMode,
 };

package/src/util.js

@@ -432,6 +432,30 @@ 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']);
+
+exports.DEFAULT_APP_CLIENT_ENTRY_MODE = DEFAULT_APP_CLIENT_ENTRY_MODE;
+
+function isAppClientEntryMode(value) {
+  return APP_CLIENT_ENTRY_MODES.has(String(value || '').trim());
+}
+
+exports.isAppClientEntryMode = isAppClientEntryMode;
+
+function normalizeAppClientEntryMode(value) {
+  const normalized = String(value || '').trim();
+  return isAppClientEntryMode(normalized) ? normalized : DEFAULT_APP_CLIENT_ENTRY_MODE;
+}
+
+exports.normalizeAppClientEntryMode = normalizeAppClientEntryMode;
+
+function resolveAppClientEntryMode() {
+  return normalizeAppClientEntryMode(process.env.APP_CLIENT_ENTRY_MODE);
+}
+
+exports.resolveAppClientEntryMode = resolveAppClientEntryMode;
+
 // Normalize APP_MODERN_CLIENT_PREFIX (accepts `v`, `/v`, `/v/`)
 // down to a bare segment like `v`.
 function normalizeModernClientPrefix(value) {
@@ -455,6 +479,13 @@ function isAppDevHtml() {
   return process.argv[2] === 'app-dev' || process.env.NOCOBASE_APP_DEV === 'true';
 }
 
+function shouldRefreshLegacyIndexTemplate(data = '') {
+  return (
+    !data.includes("window['__nocobase_modern_client_prefix__']") ||
+    !data.includes("window['__nocobase_app_client_entry_mode__']")
+  );
+}
+
 function buildIndexHtml(force = false) {
   if (process.env.NOCOBASE_EXTRACT_CLIENT_ASSETS === 'true') {
     return;
@@ -469,11 +500,15 @@ function buildIndexHtml(force = false) {
   }
   if (!fs.existsSync(tpl)) {
     fs.copyFileSync(file, tpl);
+  } else if (shouldRefreshLegacyIndexTemplate(fs.readFileSync(tpl, 'utf-8'))) {
+    fs.copyFileSync(file, tpl);
   }
   const data = fs.readFileSync(tpl, 'utf-8');
   let replacedData = data
     .replace(/\{\{env.CDN_BASE_URL\}\}/g, process.env.CDN_BASE_URL)
     .replace(/\{\{env.APP_PUBLIC_PATH\}\}/g, process.env.APP_PUBLIC_PATH)
+    .replace(/\{\{env.APP_MODERN_CLIENT_PREFIX\}\}/g, normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX))
+    .replace(/\{\{env.APP_CLIENT_ENTRY_MODE\}\}/g, resolveAppClientEntryMode())
     .replace(/\{\{env.API_CLIENT_SHARE_TOKEN\}\}/g, process.env.API_CLIENT_SHARE_TOKEN || 'false')
     .replace(/\{\{env.API_CLIENT_STORAGE_TYPE\}\}/g, process.env.API_CLIENT_STORAGE_TYPE)
     .replace(/\{\{env.API_CLIENT_STORAGE_PREFIX\}\}/g, process.env.API_CLIENT_STORAGE_PREFIX)
@@ -614,6 +649,7 @@ exports.initEnv = function initEnv() {
     CDN_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
     APP_MODERN_CLIENT_PREFIX: DEFAULT_MODERN_CLIENT_PREFIX,
+    APP_CLIENT_ENTRY_MODE: DEFAULT_APP_CLIENT_ENTRY_MODE,
     ESM_CDN_BASE_URL: 'https://esm.sh',
     ESM_CDN_SUFFIX: '',
   };
@@ -665,6 +701,14 @@ exports.initEnv = function initEnv() {
     }
   }
 
+  const rawAppClientEntryMode = String(process.env.APP_CLIENT_ENTRY_MODE || '').trim();
+  if (rawAppClientEntryMode && !isAppClientEntryMode(rawAppClientEntryMode)) {
+    console.warn(
+      `Unknown APP_CLIENT_ENTRY_MODE "${rawAppClientEntryMode}", falling back to ${DEFAULT_APP_CLIENT_ENTRY_MODE}.`,
+    );
+  }
+  process.env.APP_CLIENT_ENTRY_MODE = normalizeAppClientEntryMode(rawAppClientEntryMode);
+
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
     const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, '');
     const keys = ['API_BASE_PATH', 'WS_PATH', 'PLUGIN_STATICS_PATH'];