@nocobase/cli 2.1.0-alpha.1 → 2.1.0-alpha.10

package/README.md

@@ -1,17 +1,24 @@
 # NocoBase
 
 <video width="100%" controls>
-      <source src="https://static-docs.nocobase.com/NocoBase0510.mp4" type="video/mp4">
+  <source src="https://github.com/user-attachments/assets/4d11a87b-00e2-48f3-9bf7-389d21072d13" type="video/mp4">
 </video>
 
+<p align="center">
+<a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</p>
 
 ## What is NocoBase
 
-NocoBase is a scalability-first, open-source no-code development platform.  
-Instead of investing years of time and millions of dollars in research and development, deploy NocoBase in a few minutes and you'll have a private, controllable, and extremely scalable no-code development platform!
+NocoBase is the most extensible AI-powered no-code platform.   
+Total control. Infinite extensibility. AI collaboration.  
+Enable your team to adapt quickly and cut costs dramatically.  
+No years of development. No millions wasted.  
+Deploy NocoBase in minutes — and take control of everything.
 
 Homepage:  
-https://www.nocobase.com/
+https://www.nocobase.com/  
 
 Online Demo:  
 https://demo.nocobase.com/new
@@ -19,12 +26,74 @@ https://demo.nocobase.com/new
 Documents:  
 https://docs.nocobase.com/
 
-Commericial license & plugins:  
-https://www.nocobase.com/en/commercial
+Forum:  
+https://forum.nocobase.com/
 
-License agreement:   
-https://www.nocobase.com/en/agreement
+Use Cases:  
+https://www.nocobase.com/en/blog/tags/customer-stories
 
+## Release Notes
 
-## Contact Us:  
-hello@nocobase.com
+Our [blog](https://www.nocobase.com/en/blog/timeline) is regularly updated with release notes and provides a weekly summary.
+
+## Distinctive features
+
+### 1. Data model-driven, not form/table–driven
+
+Instead of being constrained by forms or tables, NocoBase adopts a data model–driven approach, separating data structure from user interface to unlock unlimited possibilities.
+
+- UI and data structure are fully decoupled
+- Multiple blocks and actions can be created for the same table or record in any quantity or form
+- Supports the main database, external databases, and third-party APIs as data sources
+
+![model](https://static-docs.nocobase.com/model.png)
+
+### 2. AI employees, integrated into your business systems
+Unlike standalone AI demos, NocoBase allows you to embed AI capabilities seamlessly into your interfaces, workflows, and data context, making AI truly useful in real business scenarios.
+
+- Define AI employees for roles such as translator, analyst, researcher, or assistant
+- Seamless AI–human collaboration in interfaces and workflows
+- Ensure AI usage is secure, transparent, and customizable for your business needs
+
+![AI-employee](https://static-docs.nocobase.com/ai-employee-home.png)
+
+### 3. What you see is what you get, incredibly easy to use
+
+While enabling the development of complex business systems, NocoBase keeps the experience simple and intuitive.
+
+- One-click switch between usage mode and configuration mode
+- Pages serve as a canvas to arrange blocks and actions, similar to Notion
+- Configuration mode is designed for ordinary users, not just programmers
+
+![wysiwyg](https://static-docs.nocobase.com/wysiwyg.gif)
+
+### 4. Everything is a plugin, designed for extension
+Adding more no-code features will never cover every business case. NocoBase is built for extension through its plugin-based microkernel architecture.
+
+- All functionalities are plugins, similar to WordPress
+- Plugins are ready to use upon installation
+- Pages, blocks, actions, APIs, and data sources can all be extended through custom plugins
+
+![plugins](https://static-docs.nocobase.com/plugins.png)
+
+## Installation
+
+NocoBase supports three installation methods:
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/docker-compose">Installing With Docker (👍Recommended)</a>
+
+  Suitable for no-code scenarios, no code to write. When upgrading, just download the latest image and reboot.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/create-nocobase-app">Installing from create-nocobase-app CLI</a>
+
+  The business code of the project is completely independent and supports low-code development.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/git-clone">Installing from Git source code</a>
+
+  If you want to experience the latest unreleased version, or want to participate in the contribution, you need to make changes and debug on the source code, it is recommended to choose this installation method, which requires a high level of development skills, and if the code has been updated, you can git pull the latest code.
+
+## How NocoBase works
+
+<video width="100%" controls>
+  <source src="https://github.com/user-attachments/assets/8d183b44-9bb5-4792-b08f-bc08fe8dfaaf" type="video/mp4">
+</video>

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,15 +1,15 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.10",
   "description": "",
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "main": "./src/index.js",
   "bin": {
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "2.1.0-alpha.1",
-    "@nocobase/license-kit": "^0.3.5",
+    "@nocobase/app": "2.1.0-alpha.10",
+    "@nocobase/license-kit": "^0.3.8",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -27,12 +27,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.1"
+    "@nocobase/devtools": "2.1.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "d27baf21569643d6fa83f882233f4e90eb5b89f1"
+  "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/client.js

@@ -0,0 +1,166 @@
+/**
+ * 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.
+ */
+
+const chalk = require('chalk');
+const { Command } = require('commander');
+const fs = require('fs-extra');
+const { resolve } = require('path');
+
+/**
+ * 复制主应用客户端文件
+ * @param {string} source - 源目录路径
+ * @param {string} target - 目标目录路径
+ */
+async function copyMainClient(source, target) {
+  if (!(await fs.exists(source))) {
+    console.log(chalk.yellow(`Source directory does not exist: ${source}`));
+    return;
+  }
+  // 确保目标目录存在且为空
+  await fs.ensureDir(target);
+  await fs.emptyDir(target);
+  await fs.copy(source, target, { recursive: true });
+  console.log(chalk.green(`Copied main client files from ${source} to ${target}`));
+}
+
+/**
+ * 复制插件客户端文件
+ * @param {string} pluginsBaseDir - 插件基础目录路径
+ * @param {string} namespace - 命名空间（如 '@nocobase' 或 '@nocobase-example'）
+ * @param {string} target - 目标目录
+ */
+async function copyPluginClients(pluginsBaseDir, namespace, target) {
+  const pluginsDir = resolve(process.cwd(), pluginsBaseDir, namespace);
+  if (await fs.exists(pluginsDir)) {
+    const pluginNames = await fs.readdir(pluginsDir);
+    for (const pluginName of pluginNames) {
+      const pluginPath = resolve(pluginsDir, pluginName);
+      const pluginDistClient = resolve(pluginPath, 'dist/client');
+      if (await fs.exists(pluginDistClient)) {
+        const pluginTarget = resolve(target, 'static/plugins', namespace, pluginName, 'dist/client');
+        await fs.mkdir(resolve(pluginTarget, '..'), { recursive: true });
+        await fs.copy(pluginDistClient, pluginTarget, { recursive: true });
+        console.log(chalk.green(`Copied ${namespace}/${pluginName} client files`));
+      }
+    }
+  }
+}
+
+/**
+ * 递归上传目录到 OSS
+ * @param {Client} client - OSS 客户端实例
+ * @param {string} localDir - 本地目录路径
+ * @param {string} ossPrefix - OSS 对象前缀（目录路径）
+ */
+async function uploadDirectoryToOSS(client, localDir, ossPrefix = '') {
+  if (!(await fs.exists(localDir))) {
+    console.log(chalk.yellow(`Directory does not exist: ${localDir}`));
+    return;
+  }
+
+  const stats = await fs.stat(localDir);
+  if (!stats.isDirectory()) {
+    throw new Error(`${localDir} is not a directory`);
+  }
+
+  const files = await fs.readdir(localDir);
+  let uploadedCount = 0;
+
+  for (const file of files) {
+    const filePath = resolve(localDir, file);
+    const fileStats = await fs.stat(filePath);
+
+    if (fileStats.isDirectory()) {
+      // 递归处理子目录
+      const subOssPrefix = ossPrefix ? `${ossPrefix}/${file}` : file;
+      const subCount = await uploadDirectoryToOSS(client, filePath, subOssPrefix);
+      uploadedCount += subCount;
+    } else {
+      // 上传文件
+      const ossKey = ossPrefix ? `${ossPrefix}/${file}` : file;
+      try {
+        await client.put(ossKey, filePath);
+        // console.log(chalk.green(`Uploaded: ${ossKey}`));
+        uploadedCount++;
+      } catch (error) {
+        console.error(chalk.red(`Failed to upload ${ossKey}:`), error.message);
+        throw error;
+      }
+    }
+  }
+
+  return uploadedCount;
+}
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli
+    .command('client:extract')
+    .allowUnknownOption()
+    .action(async () => {
+      const version = require('../../package.json').version;
+      const target = resolve(process.cwd(), 'storage/dist-client', version);
+      const mainClientSource = resolve(process.cwd(), 'node_modules/@nocobase/app/dist/client');
+      await copyMainClient(mainClientSource, target);
+      await copyPluginClients('packages/plugins', '@nocobase', target);
+      await copyPluginClients('packages/plugins', '@nocobase-example', target);
+      await copyPluginClients('packages/pro-plugins', '@nocobase', target);
+    });
+
+  cli
+    .command('client:upload')
+    .allowUnknownOption()
+    .action(async () => {
+      const version = require('../../package.json').version;
+      const target = resolve(process.cwd(), 'storage/dist-client', version);
+
+      // 检查必要的环境变量
+      if (
+        !process.env.CDN_ALI_OSS_ACCESS_KEY_ID ||
+        !process.env.CDN_ALI_OSS_ACCESS_KEY_SECRET ||
+        !process.env.CDN_ALI_OSS_BUCKET ||
+        !process.env.CDN_ALI_OSS_REGION
+      ) {
+        console.error(
+          chalk.red(
+            'Missing required environment variables: CDN_ALI_OSS_ACCESS_KEY_ID, CDN_ALI_OSS_ACCESS_KEY_SECRET, CDN_ALI_OSS_BUCKET, CDN_ALI_OSS_REGION',
+          ),
+        );
+        process.exit(1);
+      }
+
+      const Client = require('ali-oss');
+
+      const client = new Client({
+        accessKeyId: process.env.CDN_ALI_OSS_ACCESS_KEY_ID,
+        accessKeySecret: process.env.CDN_ALI_OSS_ACCESS_KEY_SECRET,
+        bucket: process.env.CDN_ALI_OSS_BUCKET,
+        region: process.env.CDN_ALI_OSS_REGION,
+      });
+
+      if (!(await fs.exists(target))) {
+        console.error(chalk.red(`Target directory does not exist: ${target}`));
+        console.log(chalk.yellow('Please run "client:extract" first to generate the client files.'));
+        process.exit(1);
+      }
+
+      console.log(chalk.blue(`Uploading directory ${target} to OSS...`));
+      const ossPrefix = `${version}`;
+      try {
+        const uploadedCount = await uploadDirectoryToOSS(client, target, ossPrefix);
+        console.log(chalk.green(`Successfully uploaded ${uploadedCount} files to OSS`));
+      } catch (error) {
+        console.error(chalk.red('Upload failed:'), error);
+        process.exit(1);
+      }
+    });
+};

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');