@nocobase/app-template-default 1.0.0-beta.57 → 1.0.0-beta.59

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nocobase/app-template-default",
   "displayName": "Default Template",
-  "version": "1.0.0-beta.57",
+  "version": "1.0.0-beta.59",
   "type": "module",
   "prettier": "@nocobase/dev-config/prettier",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "nocobase": {
     "templateKind": "app",
-    "defaultTemplateVersion": "1.0.0-beta.57"
+    "defaultTemplateVersion": "1.0.0-beta.59"
   },
   "devDependencies": {
     "@ai-sdk/react": "2.0.0",
@@ -17,7 +17,6 @@
     "@dicebear/core": "^9.4.3",
     "@gchust/agent-annotations": "0.1.9",
     "@hookform/resolvers": "^5.0.1",
-    "@nocobase/ai-employee-avatars": "^1.0.2",
     "@playwright/test": "^1.62.1",
     "@refinedev/cli": "^2.16.48",
     "@refinedev/core": "^5.0.8",
@@ -76,14 +75,13 @@
     "vite": "^6.3.5",
     "vitest": "^4.1.10",
     "tar": "^7.5.22",
-    "@nocobase/app-client": "^2.0.0-beta.2",
-    "@nocobase/app-plugin-template-print": "0.0.2-beta.0",
-    "@nocobase/app-skills": "0.1.0-beta.25",
+    "@nocobase/app-client": "^3.0.0-beta.0",
+    "@nocobase/app-plugin-template-print": "0.0.2-beta.1",
+    "@nocobase/app-skills": "0.1.0-beta.27",
+    "@nocobase/app-testing": "0.1.0-beta.2",
     "@nocobase/app-websocket": "^0.0.1",
-    "@nocobase/dev-config": "0.1.0-beta.19",
+    "@nocobase/dev-config": "0.1.0-beta.21",
     "@nocobase/drive": "^0.1.0-beta.4",
-    "@nocobase/app-testing": "0.1.0-beta.1",
-    "@nocobase/hub-cli": "^1.0.0-beta.1",
     "@nocobase/logging": "^0.1.0-beta.6",
     "@nocobase/session": "^0.1.0-beta.2"
   },
@@ -95,7 +93,6 @@
     "cli",
     "client",
     "server",
-    "workflows",
     "database/tsconfig.json",
     "database/*/migrations/**",
     "database/*/seeds/**",
@@ -124,7 +121,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nocobase/nocobase3.git",
+    "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/templates/app-template-default"
   },
   "browserslist": {
@@ -144,36 +141,33 @@
     "@oclif/core": "^4.14.0",
     "better-auth": "1.7.5",
     "hono": "^4.13.2",
-    "@nocobase/app-plugin-ai-employee": "^3.0.0-beta.1",
-    "@nocobase/app-plugin-api-keys": "^1.0.0-beta.13",
-    "@nocobase/app-plugin-authentication": "^2.0.0-beta.2",
-    "@nocobase/app-plugin-authorization": "^1.0.0-beta.25",
-    "@nocobase/app-plugin-database-explorer": "^1.0.0-beta.11",
-    "@nocobase/app-plugin-file": "^1.0.0-beta.20",
-    "@nocobase/app-plugin-i18n": "^1.0.0-beta.13",
-    "@nocobase/app-plugin-notification": "^1.0.0-beta.24",
-    "@nocobase/app-plugin-notification-in-app": "^1.0.0-beta.22",
+    "@nocobase/app-plugin-api-keys": "^1.0.0-beta.14",
+    "@nocobase/app-plugin-authentication": "^2.0.0-beta.3",
+    "@nocobase/app-plugin-authorization": "^1.0.0-beta.26",
+    "@nocobase/app-plugin-database-explorer": "^1.0.0-beta.12",
+    "@nocobase/app-plugin-file": "^1.0.0-beta.22",
+    "@nocobase/app-plugin-i18n": "^1.0.0-beta.14",
+    "@nocobase/app-plugin-notification": "^1.0.0-beta.25",
+    "@nocobase/app-plugin-notification-in-app": "^1.0.0-beta.23",
     "@nocobase/app-plugin-notification-providers": "^0.2.0-beta.10",
-    "@nocobase/app-plugin-scheduler": "^1.0.0-beta.14",
-    "@nocobase/app-plugin-users": "^2.0.0-beta.1",
-    "@nocobase/app-server": "^2.0.0-beta.1",
+    "@nocobase/app-plugin-scheduler": "^1.0.0-beta.16",
+    "@nocobase/app-plugin-users": "^2.0.0-beta.2",
+    "@nocobase/app-server": "^2.0.0-beta.3",
     "@nocobase/config": "^0.1.0-beta.2",
     "@nocobase/db": "^1.0.0-beta.18",
-    "@nocobase/app-plugin-workflow": "^2.0.0-beta.1",
     "@nocobase/db-sqlite": "^0.1.0-beta.4",
     "@nocobase/service-provider": "^0.0.2-beta.1",
     "@nocobase/snowflake": "^1.0.0-beta.3",
-    "@nocobase/app-plugin-authz-default-access": "^1.0.0-beta.10",
-    "@nocobase/app-plugin-authz-sharing-rules": "^1.0.0-beta.10",
-    "@nocobase/app-plugin-authz-restriction-rules": "^1.0.0-beta.9",
+    "@nocobase/app-plugin-authz-default-access": "^1.0.0-beta.11",
+    "@nocobase/app-plugin-authz-sharing-rules": "^1.0.0-beta.11",
+    "@nocobase/app-plugin-authz-restriction-rules": "^1.0.0-beta.10",
     "@nocobase/authorization": "^1.0.0-beta.12",
     "@nocobase/queue": "^0.1.0-beta.8",
     "@nocobase/jobs": "^0.1.0-beta.2",
-    "@nocobase/i18n": "^1.0.0-beta.5",
+    "@nocobase/i18n": "^1.0.0-beta.6",
     "@nocobase/caching": "^0.1.0-beta.2",
-    "@nocobase/ai-employee": "^0.2.0-beta.8",
     "@nocobase/repository-input": "^0.1.0-beta.2",
-    "@nocobase/app-cli": "^1.0.0-beta.14"
+    "@nocobase/app-cli": "^1.0.0-beta.17"
   },
   "description": "NocoBase 3 application template with the standard product capabilities.",
   "imports": {

package/server/config/index.ts

@@ -20,8 +20,6 @@ import app from './app.js';
 import api from './api.js';
 import database from './database.js';
 import snowflake from './snowflake.js';
-import ai from './ai.js';
-import workflow from './workflow.js';
 import users from './users.js';
 
 const defaultConfigs: AppConfigFactory<{
@@ -43,8 +41,6 @@ const defaultConfigs: AppConfigFactory<{
   api: ReturnType<typeof api>;
   database: ReturnType<typeof database>;
   snowflake: ReturnType<typeof snowflake>;
-  ai: ReturnType<typeof ai>;
-  workflow: ReturnType<typeof workflow>;
   users: ReturnType<typeof users>;
 }> = defaultAppConfigs({
   auth,
@@ -65,8 +61,6 @@ const defaultConfigs: AppConfigFactory<{
   api,
   database,
   snowflake,
-  ai,
-  workflow,
   users,
 });
 

package/server/plugins.ts

@@ -3,7 +3,6 @@ import sharingRules from '@nocobase/app-plugin-authz-sharing-rules/server';
 import restrictionRules from '@nocobase/app-plugin-authz-restriction-rules/server';
 import apiKeys from '@nocobase/app-plugin-api-keys/server';
 import authentication from '@nocobase/app-plugin-authentication/server';
-import aiEmployee from '@nocobase/app-plugin-ai-employee/server/plugin';
 import authorization from '@nocobase/app-plugin-authorization/server';
 import databaseExplorer from '@nocobase/app-plugin-database-explorer/server';
 import users from '@nocobase/app-plugin-users/server';
@@ -11,7 +10,6 @@ import i18n from '@nocobase/app-plugin-i18n/server';
 import notification from '@nocobase/app-plugin-notification/server';
 import notificationInApp from '@nocobase/app-plugin-notification-in-app/server';
 import notificationProviders from '@nocobase/app-plugin-notification-providers/server';
-import workflow from '@nocobase/app-plugin-workflow/server';
 import {
   defineServerPlugins,
   type AppServerPlugins,
@@ -21,7 +19,6 @@ import file from '@nocobase/app-plugin-file/server';
 
 const serverPlugins: AppServerPlugins = defineServerPlugins([
   authentication,
-  aiEmployee,
   authorization,
   defaultAccess,
   sharingRules,
@@ -33,7 +30,6 @@ const serverPlugins: AppServerPlugins = defineServerPlugins([
   notification,
   notificationInApp,
   notificationProviders,
-  workflow,
   file,
   scheduler,
 ]);

package/tests/components/app-layout-routes.test.tsx

@@ -31,7 +31,7 @@ vi.mock('@nocobase/app-plugin-i18n/client', async (importOriginal) => ({
 }));
 vi.mock('@nocobase/app-client', async (original) => ({
   ...(await original<typeof import('@nocobase/app-client')>()),
-  useClientApplication: () => ({ runtime: { settingsRouteTree: [] } }),
+  useClientApplication: () => ({ runtime: {} }),
 }));
 vi.mock('../../client/routing/route-navigation.js', async (original) => ({
   ...(await original<

package/tests/components/inbox.test.tsx

@@ -29,7 +29,6 @@ vi.mock('@nocobase/app-client', async (importOriginal) => {
   };
 });
 
-import { InboxHeaderButton } from '../../client/components/inbox-header-button.tsx';
 import InboxPage from '../../client/pages/inbox.tsx';
 
 const messages = [
@@ -97,24 +96,6 @@ function Frame({
   );
 }
 
-it('links the header to the inbox with the unread count, for a signed-in person only', async () => {
-  const view = render(
-    <Frame path='/'>
-      <InboxHeaderButton />
-    </Frame>,
-  );
-  const link = await screen.findByRole('link', { name: 'Inbox, 2 unread' });
-  expect(link).toHaveAttribute('href', '/inbox');
-  expect(screen.getByText('2')).toBeInTheDocument();
-  mocks.session = null;
-  view.rerender(
-    <Frame path='/'>
-      <InboxHeaderButton />
-    </Frame>,
-  );
-  expect(screen.queryByRole('link')).toBeNull();
-});
-
 it("lists the plugin's messages as notifications and marks one read when it is opened", async () => {
   render(
     <Frame path='/inbox'>

package/tests/components/layout-i18n.test.tsx

@@ -6,10 +6,9 @@ import {
 import type { AppClientRegisteredRoute } from '@nocobase/app-client/plugins';
 import { I18nRuntime } from '@nocobase/i18n';
 import { I18nProvider } from '@nocobase/i18n/client';
-import userEvent from '@testing-library/user-event';
 import { act, render, screen } from '@testing-library/react';
 import type { ReactNode } from 'react';
-import { MemoryRouter, Route, Routes } from 'react-router';
+import { MemoryRouter } from 'react-router';
 import { describe, expect, it, vi } from 'vitest';
 
 import locales from '../../client/locales/index.js';
@@ -17,17 +16,7 @@ import { AppLayout } from '../../client/layouts/app-layout.js';
 vi.mock('@nocobase/app-plugin-i18n/client', () => ({
   useSyncServerLocale: () => {},
 }));
-import { SettingsLayout } from '../../client/layouts/settings-layout.js';
 
-// The header's inbox button reads the in-app notification plugin's API, which these tests do not serve; it is
-// covered by tests/components/inbox.test.tsx.
-vi.mock('../../client/components/inbox-header-button', () => ({
-  InboxHeaderButton: () => null,
-}));
-
-vi.mock('../../client/routing/client-route.js', () => ({
-  ClientRoute: () => <p>Preferences content</p>,
-}));
 vi.mock('../../client/theme/index.js', () => ({ ThemeSettings: () => null }));
 vi.mock('../../client/layouts/components/user-menu.js', () => ({
   UserMenu: () => null,
@@ -43,17 +32,6 @@ vi.mock('../../client/routing/route-navigation.js', async (importOriginal) => ({
   }),
 }));
 
-const route: AppClientRegisteredRoute = {
-  id: 'preferences',
-  name: 'preferences',
-  path: '/settings/preferences',
-  packageName: 'test',
-  source: 'application',
-  auth: 'optional',
-  navigation: { title: 'Preferences' },
-  componentLoader: async () => ({ default: () => <p>Preferences content</p> }),
-};
-
 /** The page the shell opens on: the header names it. */
 const overview: AppClientRegisteredRoute = {
   id: 'overview',
@@ -66,7 +44,7 @@ const overview: AppClientRegisteredRoute = {
   componentLoader: async () => ({ default: () => null }),
 };
 
-async function setup(children: ReactNode, path = '/') {
+async function setup(children: ReactNode) {
   vi.stubGlobal('matchMedia', () => ({
     matches: true,
     addEventListener: vi.fn(),
@@ -81,12 +59,12 @@ async function setup(children: ReactNode, path = '/') {
   await runtime.init('en-US');
   const app = {
     config: createAppClientConfig({ rawConfig: {} }),
-    runtime: { settingsRouteTree: [route] },
+    runtime: {},
   } as unknown as ClientApplication;
   render(
     <I18nProvider runtime={runtime}>
       <ClientApplicationContext.Provider value={app}>
-        <MemoryRouter initialEntries={[path]}>{children}</MemoryRouter>
+        <MemoryRouter initialEntries={['/']}>{children}</MemoryRouter>
       </ClientApplicationContext.Provider>
     </I18nProvider>,
   );
@@ -94,7 +72,7 @@ async function setup(children: ReactNode, path = '/') {
 }
 
 describe('shell translations', () => {
-  it('updates header, footer, tooltips and accessible labels without remounting', async () => {
+  it('updates header, footer and accessible labels without remounting', async () => {
     const runtime = await setup(<AppLayout routes={[overview]} />);
     // The header's trail, where a tagline used to be.
     expect(
@@ -114,74 +92,9 @@ describe('shell translations', () => {
       'href',
       'https://www.nocobase.com',
     );
-    const user = userEvent.setup();
-    const settings = screen.getByRole('link', { name: '设置' });
-    expect(settings).not.toHaveAttribute('title');
-    await user.hover(settings);
-    expect(
-      await screen.findByText('设置', {
-        selector: '[data-slot=tooltip-content]',
-      }),
-    ).toBeVisible();
-    await user.unhover(settings);
     await act(() => runtime.changeLanguage('en-US'));
     expect(
       screen.getByRole('navigation', { name: 'Breadcrumb' }),
     ).toBeVisible();
-    act(() => settings.focus());
-    expect(
-      await screen.findByText('Settings', {
-        selector: '[data-slot=tooltip-content]',
-      }),
-    ).toBeVisible();
   });
-
-  it.each([
-    [
-      'settings',
-      SettingsLayout,
-      '暂无可用设置',
-      '没有已启用的插件提供你有权访问的设置页面。',
-    ],
-  ] as const)(
-    'translates the %s empty state',
-    async (surface, Layout, title, description) => {
-      const runtime = await setup(<Layout routeTree={[]} />, `/${surface}`);
-      await act(() => runtime.changeLanguage('zh-CN'));
-      expect(screen.getByRole('heading', { name: title })).toBeVisible();
-      expect(screen.getByText(description)).toBeVisible();
-      expect(screen.getByRole('link', { name: '返回应用' })).toHaveAttribute(
-        'href',
-        '/',
-      );
-    },
-  );
-
-  it.each(['settings'] as const)(
-    'translates the %s page header',
-    async (surface) => {
-      const Layout = SettingsLayout;
-      const page = { ...route, path: `/${surface}/preferences` };
-      const runtime = await setup(
-        <Routes>
-          <Route
-            path={`/${surface}/*`}
-            element={<Layout routeTree={[page]} />}
-          />
-        </Routes>,
-        page.path,
-      );
-      await screen.findByText('Preferences content');
-      await act(() => runtime.changeLanguage('zh-CN'));
-      expect(screen.getByRole('link', { name: '返回应用' })).toHaveAttribute(
-        'href',
-        '/',
-      );
-      expect(
-        screen.getByRole('navigation', {
-          name: '设置',
-        }),
-      ).toBeVisible();
-    },
-  );
 });

package/tests/components/primitive-labels.test.tsx

@@ -6,9 +6,21 @@ import { act, render, screen } from '@testing-library/react';
 import type { ReactElement, ReactNode } from 'react';
 import { describe, expect, it } from 'vitest';
 
-import { Dialog, DialogContent, DialogTitle } from '#components/ui/dialog';
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogTitle,
+} from '#components/ui/dialog';
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogTitle,
+} from '#components/ui/alert-dialog';
 import { Sheet, SheetContent, SheetTitle } from '#components/ui/sheet';
 import { Spinner } from '#components/ui/spinner';
+import { BrandSpinner } from '#components/brand-spinner';
+import { Loading } from '#components/loading';
 import { createToastManager, Toaster } from '#components/ui/toast';
 
 import zhCN from '../../client/locales/zh-CN.js';
@@ -70,6 +82,19 @@ describe('labels built into the shipped primitives', () => {
     expect(close).toHaveAttribute('data-slot', 'toast-close');
   });
 
+  it('labels brand loading and allows decorative inline indicators', () => {
+    const { rerender } = render(<BrandSpinner />, { wrapper: I18n });
+    expect(
+      screen.getByRole('status', { name: zhCN['status.loading'] }),
+    ).toBeVisible();
+    rerender(<BrandSpinner aria-hidden='true' />);
+    expect(screen.queryByRole('status')).not.toBeInTheDocument();
+    rerender(<Loading label='正在加载客户' />);
+    expect(
+      screen.getByRole('status', { name: '正在加载客户' }),
+    ).toHaveTextContent('正在加载客户');
+  });
+
   it('labels the Spinner through status.loading', () => {
     render(<Spinner />, { wrapper: I18n });
 
@@ -78,3 +103,38 @@ describe('labels built into the shipped primitives', () => {
     ).toBeInTheDocument();
   });
 });
+
+describe('application-owned dialog layout overrides', () => {
+  it('allows a form dialog to replace default width, padding and spacing', () => {
+    render(
+      <Dialog open>
+        <DialogContent className='sm:max-w-3xl p-8 gap-2'>
+          <DialogTitle>Custom form</DialogTitle>
+          <DialogFooter className='mx-0 mb-0 px-8 py-2 gap-1'>
+            Actions
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>,
+      { wrapper: I18n },
+    );
+    const content = screen.getByRole('dialog');
+    expect(content).toHaveClass('sm:max-w-3xl', 'p-8', 'gap-2');
+    expect(content).not.toHaveClass('sm:max-w-lg', 'p-6', 'gap-5');
+    const footer = screen.getByText('Actions');
+    expect(footer).toHaveClass('mx-0', 'mb-0', 'px-8', 'py-2', 'gap-1');
+    expect(footer).not.toHaveClass('-mx-6', '-mb-6', 'px-6', 'py-4', 'gap-3');
+  });
+  it('allows a compact confirmation to replace its size default', () => {
+    render(
+      <AlertDialog open>
+        <AlertDialogContent size='sm' className='sm:max-w-xl p-8 gap-2'>
+          <AlertDialogTitle>Custom confirmation</AlertDialogTitle>
+        </AlertDialogContent>
+      </AlertDialog>,
+      { wrapper: I18n },
+    );
+    const content = screen.getByRole('alertdialog');
+    expect(content).toHaveClass('sm:max-w-xl', 'p-8', 'gap-2');
+    expect(content).not.toHaveClass('sm:max-w-sm', 'p-6', 'gap-5');
+  });
+});

package/tests/fixtures/theme-tokens.html

@@ -7,6 +7,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="./theme-tokens.tsx"></script>
+    <script type="module" src="./tests/fixtures/theme-tokens.tsx"></script>
   </body>
 </html>

package/tests/fixtures/theme-tokens.tsx

@@ -1,6 +1,7 @@
 import { Refine } from '@refinedev/core';
 import { createRoot } from 'react-dom/client';
 import { MemoryRouter } from 'react-router';
+import { Loading } from '../../client/components/loading';
 import { Button } from '../../client/components/ui/button';
 import { Input } from '../../client/components/ui/input';
 import {
@@ -36,6 +37,12 @@ export default function Fixture() {
                 <AppSidebarToggle />
               </div>
               <h1 className='text-3xl'>Theme tokens · 主题样式</h1>
+              <section
+                className='flex h-32 items-center justify-center rounded-lg border bg-background'
+                aria-label='Brand loading preview'
+              >
+                <Loading label='Loading preview' />
+              </section>
               <p data-testid='body'>Body text · 中文内容与 English text</p>
               <p className='font-serif'>Serif text</p>
               <code>const theme = 'compact';</code>

package/tests/logic/app-server.test.ts

@@ -276,14 +276,6 @@ describe('app server', () => {
     }
   });
 
-  it('starts without optional plugins or workflow routes', async () => {
-    const app = createTestApp();
-
-    expect(
-      app.router.routes.some((route) => route.path.includes('/workflows')),
-    ).toBe(false);
-  });
-
   it('creates embedded apps from a scope', async () => {
     const app = await createEmbeddedServer(
       await createEmbeddedTestScope({
@@ -1230,12 +1222,6 @@ function createTestApp(options: CreateTestAppOptions = {}): TestApp {
     logging: createSilentLoggingConfig(),
     queue: options.queue ?? createTestQueueConfig(),
     session: createNullSessionConfig(),
-    workflow: {
-      sourceRoot: path.resolve(process.cwd(), 'workflows'),
-      distRoot: path.resolve(process.cwd(), 'dist/workflows'),
-      artifactDisk: 'local',
-      production: false,
-    },
     snowflake: {
       workerId: 0,
     },
@@ -1566,7 +1552,6 @@ async function writeRuntimeTestConfig(
           main: { seeds: { autoRun: env.DB_SEEDS_AUTO_RUN === 'true' } },
         },
       },
-      hub: { host: { enabled: false } },
     },
   });
   testConfigs.push(config);

package/tests/logic/client-plugin-registry.test.ts

@@ -34,27 +34,6 @@ describe('client plugin registry consistency', () => {
     expect(undeclared).toEqual([]);
   });
 
-  it('mounts the standard user and API key pages under Settings', () => {
-    for (const [packageName, routePath] of [
-      ['@nocobase/app-plugin-users', '/users'],
-      ['@nocobase/app-plugin-api-keys', '/api-keys'],
-    ]) {
-      const plugin = clientPlugins.plugins.find(
-        (entry) => entry.packageName === packageName,
-      );
-      expect(plugin?.routes).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            parent: 'settings',
-            routes: expect.arrayContaining([
-              expect.objectContaining({ path: routePath }),
-            ]),
-          }),
-        ]),
-      );
-    }
-  });
-
   it('registers no package twice', () => {
     expect(new Set(registeredClientPackages).size).toBe(
       registeredClientPackages.length,

package/tests/logic/client-routes.test.ts

@@ -29,12 +29,8 @@ describe('app client routes', () => {
 
   it('loads every page component', async () => {
     const resolved = resolveRoutes();
-    const loaders = [
-      ...componentLoadersIn(resolved.routes),
-      ...componentLoadersIn(resolved.settingsRouteTree),
-      ...componentLoadersIn(resolved.devRouteTree),
-    ];
-    // The trees above are filtered by loader, so an empty list would make the loop below pass without loading
+    const loaders = componentLoadersIn(resolved.routes);
+    // The tree above is filtered by loader, so an empty list would make the loop below pass without loading
     // anything at all.
     expect(loaders).not.toHaveLength(0);