@nocobase/cli 2.0.22 → 2.1.0-alpha.10

package/nocobase.conf.tpl

@@ -12,6 +12,11 @@ log_format apm '"$time_local" client=$remote_addr '
                'upstream_connect_time=$upstream_connect_time '
                'upstream_header_time=$upstream_header_time';
 
+map $http_x_forwarded_proto $upstream_x_forwarded_proto {
+    default $http_x_forwarded_proto;
+    ""      $scheme;
+}
+
 server {
     listen 80;
     server_name _;
@@ -50,6 +55,77 @@ server {
         }
     }
 
+    location = {{v2PublicPathNoTrailingSlash}} {
+        return 302 {{v2PublicPath}}$is_args$args;
+    }
+
+    location {{v2PublicPath}}assets/ {
+        alias {{cwd}}/node_modules/@nocobase/app/dist/client/v2/assets/;
+        expires 365d;
+        add_header Cache-Control "public";
+        access_log off;
+        autoindex off;
+    }
+
+    location {{v2PublicPath}} {
+        proxy_pass http://127.0.0.1:{{apiPort}};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        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 $host;
+        proxy_set_header Referer $http_referer;
+        proxy_set_header User-Agent $http_user_agent;
+        add_header Cache-Control 'no-cache, no-store';
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+    # RFC 8414 root-mounted discovery compatibility for path-based issuers/resources.
+    location ~ ^/\.well-known/oauth-authorization-server/(.+)$ {
+        rewrite ^/\.well-known/oauth-authorization-server/(.+)$ /$1/.well-known/oauth-authorization-server break;
+        proxy_pass http://127.0.0.1:{{apiPort}};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        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 $host;
+        proxy_set_header Referer $http_referer;
+        proxy_set_header User-Agent $http_user_agent;
+        add_header Cache-Control 'no-cache, no-store';
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+    location ~ ^/\.well-known/openid-configuration/(.+)$ {
+        rewrite ^/\.well-known/openid-configuration/(.+)$ /$1/.well-known/openid-configuration break;
+        proxy_pass http://127.0.0.1:{{apiPort}};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        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 $host;
+        proxy_set_header Referer $http_referer;
+        proxy_set_header User-Agent $http_user_agent;
+        add_header Cache-Control 'no-cache, no-store';
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+    }
+
+
+
     location {{publicPath}} {
         alias {{cwd}}/node_modules/@nocobase/app/dist/client/;
         try_files $uri $uri/ /index.html;
@@ -73,7 +149,7 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
         proxy_set_header Host $host;
         proxy_set_header Referer $http_referer;
         proxy_set_header User-Agent $http_user_agent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.0.22",
+  "version": "2.1.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "2.0.22",
+    "@nocobase/app": "2.1.0-alpha.10",
     "@nocobase/license-kit": "^0.3.8",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
@@ -27,12 +27,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.0.22"
+    "@nocobase/devtools": "2.1.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "7b703580c4bb60f1e5e44c8fd685141bb8b3a47c"
+  "gitHead": "ce790d46c0a5768ca9618c7d0d77ab8300de75c8"
 }

package/src/commands/build.js

@@ -7,10 +7,34 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+const { existsSync } = require('fs');
 const { resolve } = require('path');
 const { Command } = require('commander');
 const { run, nodeCheck, isPackageValid, buildIndexHtml } = require('../util');
 
+async function buildClientV2() {
+  const configPath = resolve(process.env.APP_PACKAGE_ROOT, 'client-v2/rsbuild.config.ts');
+  if (!existsSync(configPath)) {
+    console.log(`client-v2 config not found: ${configPath}`);
+    return;
+  }
+  await run('rsbuild', ['build', '--config', configPath], {
+    env: {
+      ...process.env,
+      APP_ENV: 'production',
+      NODE_ENV: 'production',
+      API_BASE_URL: process.env.API_BASE_URL || process.env.API_BASE_PATH,
+      API_CLIENT_STORAGE_PREFIX: process.env.API_CLIENT_STORAGE_PREFIX,
+      API_CLIENT_STORAGE_TYPE: process.env.API_CLIENT_STORAGE_TYPE,
+      API_CLIENT_SHARE_TOKEN: process.env.API_CLIENT_SHARE_TOKEN || 'false',
+      WEBSOCKET_URL: process.env.WEBSOCKET_URL || '',
+      WS_PATH: process.env.WS_PATH,
+      ESM_CDN_BASE_URL: process.env.ESM_CDN_BASE_URL || 'https://esm.sh',
+      ESM_CDN_SUFFIX: process.env.ESM_CDN_SUFFIX || '',
+    },
+  });
+}
+
 /**
  *
  * @param {Command} cli
@@ -26,16 +50,23 @@ module.exports = (cli) => {
     .option('-w, --watch', 'watch compile the @nocobase/build package')
     .option('-s, --sourcemap', 'generate sourcemap')
     .option('--no-dts', 'not generate dts')
+    .option('--client-v2-only', 'build client-v2 shell only')
     .action(async (pkgs, options) => {
       nodeCheck();
+      process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
+      process.env.APP_ENV = 'production';
+
+      if (options.clientV2Only) {
+        await buildClientV2();
+        return;
+      }
+
       if (options.compile || options.watch || isPackageValid('@nocobase/build/src/index.ts')) {
         await run('yarn', ['build', options.watch ? '--watch' : ''], {
           cwd: resolve(process.cwd(), 'packages/core/build'),
         });
         if (options.watch) return;
       }
-      process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
-      process.env.APP_ENV = 'production';
 
       await run('nocobase-build', [
         ...pkgs,
@@ -45,5 +76,6 @@ module.exports = (cli) => {
         options.retry ? '--retry' : '',
       ]);
       buildIndexHtml(true);
+      await buildClientV2();
     });
 };

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

@@ -10,6 +10,7 @@
 const { resolve, posix } = require('path');
 const { Command } = require('commander');
 const { readFileSync, writeFileSync } = require('fs');
+const { resolvePublicPath, resolveV2PublicPath } = require('../util');
 
 /**
  *
@@ -17,18 +18,33 @@ const { readFileSync, writeFileSync } = require('fs');
  */
 module.exports = (cli) => {
   cli.command('create-nginx-conf').action(async (name, options) => {
+    const rawAppPublicPath = process.env.APP_PUBLIC_PATH || '/';
+    const appPublicPath = resolvePublicPath(rawAppPublicPath);
+    const v2PublicPath = resolveV2PublicPath(rawAppPublicPath);
+    const appPublicPathWithoutTrailingSlash = appPublicPath.replace(/\/$/, '');
+    const v2PublicPathWithoutTrailingSlash = v2PublicPath.replace(/\/$/, '');
     const file = resolve(__dirname, '../../nocobase.conf.tpl');
     const data = readFileSync(file, 'utf-8');
     let otherLocation = '';
-    if (process.env.APP_PUBLIC_PATH !== '/') {
-      otherLocation = `location / {
+    if (appPublicPath !== '/') {
+      otherLocation = `location = /v2 {
+        return 302 ${v2PublicPath}$is_args$args;
+    }
+
+    location /v2/ {
+        return 302 ${appPublicPathWithoutTrailingSlash}$uri$is_args$args;
+    }
+
+    location / {
         alias ${posix.resolve(process.cwd())}/node_modules/@nocobase/app/dist/client/;
         try_files $uri $uri/ /index.html;
     }`;
     }
     const replaced = data
       .replace(/\{\{cwd\}\}/g, posix.resolve(process.cwd()))
-      .replace(/\{\{publicPath\}\}/g, process.env.APP_PUBLIC_PATH)
+      .replace(/\{\{publicPath\}\}/g, appPublicPath)
+      .replace(/\{\{v2PublicPath\}\}/g, v2PublicPath)
+      .replace(/\{\{v2PublicPathNoTrailingSlash\}\}/g, v2PublicPathWithoutTrailingSlash)
       .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)
       .replace(/\{\{otherLocation\}\}/g, otherLocation);
     const targetFile = resolve(process.cwd(), 'storage', 'nocobase.conf');

package/src/commands/dev.js

@@ -42,74 +42,12 @@ module.exports = (cli) => {
     .option('-c, --client')
     .option('-s, --server')
     .option('--db-sync')
+    .option('--client-v2-only')
     .option('-i, --inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
       checkDBDialect();
       await buildBundleStatusHtml();
-      let subprocess;
-      const runDevClient = () => {
-        console.log('starting client', 1 * clientPort);
-        subprocess = run('umi', ['dev'], {
-          env: {
-            ...process.env,
-            stdio: 'inherit',
-            shell: true,
-            PORT: clientPort,
-            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-            WEBSOCKET_URL:
-              process.env.WEBSOCKET_URL ||
-              (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : undefined),
-            PROXY_TARGET_URL:
-              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
-          },
-        });
-      };
-      const watcher = chokidar.watch('./storage/plugins/**/*', {
-        cwd: process.cwd(),
-        ignored: /(^|[\/\\])\../, // 忽略隐藏文件
-        persistent: true,
-        depth: 1, // 只监听第一层目录
-      });
-
-      await fs.promises.mkdir(path.dirname(process.env.WATCH_FILE), { recursive: true });
-      let isReady = false;
-
-      const restartClient = _.debounce(async () => {
-        if (!isReady) return;
-        generatePlugins();
-        if (subprocess) {
-          console.log('client restarting...');
-          subprocess.cancel();
-          let i = 0;
-          while (true) {
-            ++i;
-            const result = await isPortReachable(clientPort);
-            if (!result) {
-              break;
-            }
-            await sleep(500);
-            if (i > 10) {
-              break;
-            }
-          }
-          runDevClient();
-          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
-        }
-      }, 500);
-
-      watcher
-        .on('ready', () => {
-          isReady = true;
-        })
-        .on('addDir', async (pathname) => {
-          if (!isReady) return;
-          restartClient();
-        })
-        .on('unlinkDir', async (pathname) => {
-          if (!isReady) return;
-          restartClient();
-        });
 
       promptForTs();
       const { SERVER_TSCONFIG_PATH } = process.env;
@@ -127,30 +65,136 @@ module.exports = (cli) => {
         return;
       }
 
-      const { port, client, server, inspect } = opts;
+      const { port, client, server, inspect, clientV2Only } = opts;
 
       if (port) {
         process.env.APP_PORT = opts.port;
       }
 
-      const { APP_PORT } = process.env;
+      const APP_PORT = Number(process.env.APP_PORT);
 
       let clientPort = APP_PORT;
       let serverPort;
+      let clientV2Port = APP_PORT;
 
       nodeCheck();
-
       await postCheck(opts);
 
-      if (server) {
+      const shouldRunClientV2 = clientV2Only || client || !server;
+      const shouldRunClient = !clientV2Only && (client || !server);
+      const shouldRunServer = !clientV2Only && (server || !client);
+
+      if (shouldRunServer && server) {
         serverPort = APP_PORT;
-      } else if (!server && !client) {
+      } else if (shouldRunServer) {
         serverPort = await getPortPromise({
           port: 1 * clientPort + 1,
         });
       }
 
-      if (server || !client) {
+      if (shouldRunClientV2 && !clientV2Only) {
+        clientV2Port = await getPortPromise({
+          port: 1 * clientPort + 2,
+        });
+      }
+
+      const runDevClientV2 = () => {
+        console.log('starting client-v2', 1 * clientV2Port);
+        run('rsbuild', ['dev', '--config', `${APP_PACKAGE_ROOT}/client-v2/rsbuild.config.ts`], {
+          env: {
+            ...process.env,
+            APP_V2_PORT: `${clientV2Port}`,
+            NODE_ENV: 'development',
+            RSPACK_HMR_CLIENT_PORT: `${clientV2Only ? clientV2Port : clientPort}`,
+            API_BASE_URL: process.env.API_BASE_URL || process.env.API_BASE_PATH,
+            API_CLIENT_STORAGE_PREFIX: process.env.API_CLIENT_STORAGE_PREFIX,
+            API_CLIENT_STORAGE_TYPE: process.env.API_CLIENT_STORAGE_TYPE,
+            API_CLIENT_SHARE_TOKEN: process.env.API_CLIENT_SHARE_TOKEN || 'false',
+            WEBSOCKET_URL:
+              process.env.WEBSOCKET_URL || (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : ''),
+            WS_PATH: process.env.WS_PATH,
+            ESM_CDN_BASE_URL: process.env.ESM_CDN_BASE_URL || 'https://esm.sh',
+            ESM_CDN_SUFFIX: process.env.ESM_CDN_SUFFIX || '',
+            PROXY_TARGET_URL:
+              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
+          },
+        });
+      };
+
+      if (clientV2Only) {
+        runDevClientV2();
+        return;
+      }
+
+      let subprocess;
+      const runDevClient = () => {
+        console.log('starting client', 1 * clientPort);
+        subprocess = run('umi', ['dev'], {
+          env: {
+            ...process.env,
+            stdio: 'inherit',
+            shell: true,
+            PORT: clientPort,
+            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
+            APP_V2_PORT: `${clientV2Port}`,
+            WEBSOCKET_URL:
+              process.env.WEBSOCKET_URL ||
+              (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : undefined),
+            PROXY_TARGET_URL:
+              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
+          },
+        });
+      };
+
+      if (shouldRunClient) {
+        const watcher = chokidar.watch('./storage/plugins/**/*', {
+          cwd: process.cwd(),
+          ignored: /(^|[\/\\])\../, // 忽略隐藏文件
+          persistent: true,
+          depth: 1, // 只监听第一层目录
+        });
+
+        await fs.promises.mkdir(path.dirname(process.env.WATCH_FILE), { recursive: true });
+        let isReady = false;
+
+        const restartClient = _.debounce(async () => {
+          if (!isReady) return;
+          generatePlugins();
+          if (subprocess) {
+            console.log('client restarting...');
+            subprocess.cancel();
+            let i = 0;
+            while (true) {
+              ++i;
+              const result = await isPortReachable(clientPort);
+              if (!result) {
+                break;
+              }
+              await sleep(500);
+              if (i > 10) {
+                break;
+              }
+            }
+            runDevClient();
+            await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+          }
+        }, 500);
+
+        watcher
+          .on('ready', () => {
+            isReady = true;
+          })
+          .on('addDir', async () => {
+            if (!isReady) return;
+            restartClient();
+          })
+          .on('unlinkDir', async () => {
+            if (!isReady) return;
+            restartClient();
+          });
+      }
+
+      if (shouldRunServer) {
         console.log('starting server', serverPort);
 
         const filteredArgs = process.argv.filter(
@@ -193,8 +237,12 @@ module.exports = (cli) => {
         runDevServer();
       }
 
-      if (client || !server) {
+      if (shouldRunClient) {
         runDevClient();
       }
+
+      if (shouldRunClientV2) {
+        runDevClientV2();
+      }
     });
 };

package/src/util.js

@@ -282,6 +282,21 @@ function parseEnv(name) {
   }
 }
 
+function resolvePublicPath(appPublicPath = '/') {
+  const normalized = String(appPublicPath || '/').trim() || '/';
+  const withLeadingSlash = normalized.startsWith('/') ? normalized : `/${normalized}`;
+  return withLeadingSlash.endsWith('/') ? withLeadingSlash : `${withLeadingSlash}/`;
+}
+
+exports.resolvePublicPath = resolvePublicPath;
+
+function resolveV2PublicPath(appPublicPath = '/') {
+  const publicPath = resolvePublicPath(appPublicPath);
+  return `${publicPath.replace(/\/$/, '')}/v2/`;
+}
+
+exports.resolveV2PublicPath = resolveV2PublicPath;
+
 function buildIndexHtml(force = false) {
   const file = `${process.env.APP_PACKAGE_ROOT}/dist/client/index.html`;
   if (!fs.existsSync(file)) {