From fa7d66db056aaa86d5dca517fd1eeab98276aa57 Mon Sep 17 00:00:00 2001 From: gchust Date: Fri, 14 Aug 2026 18:35:13 +0000 Subject: [PATCH] chore(js-template): prune dependencies and unrelated changes --- packages/core/client-v2/package.json | 50 ------------------- packages/core/client/package.json | 2 +- packages/core/flow-engine/package.json | 1 + .../server/swagger/__tests__/loader.test.ts | 45 ----------------- .../@nocobase/plugin-flow-engine/package.json | 3 +- .../@nocobase/plugin-js-template/package.json | 5 +- .../collection/AssignedFieldsEditor.tsx | 1 + yarn.lock | 6 +-- 8 files changed, 10 insertions(+), 103 deletions(-) delete mode 100644 packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/__tests__/loader.test.ts diff --git a/packages/core/client-v2/package.json b/packages/core/client-v2/package.json index c21291e4999..b48636b1cac 100644 --- a/packages/core/client-v2/package.json +++ b/packages/core/client-v2/package.json @@ -19,85 +19,35 @@ "./package.json": "./package.json" }, "dependencies": { - "@ant-design/cssinjs": "^1.11.1", "@ant-design/icons": "^5.6.1", - "@ant-design/pro-layout": "^7.22.1", - "@codemirror/autocomplete": "^6.0.0", - "@codemirror/lang-html": "^6.4.10", - "@codemirror/lang-javascript": "^6.2.2", "@codemirror/lang-json": "^6.0.2", - "@codemirror/language": "6.11.2", - "@codemirror/lint": "^6.8.3", - "@codemirror/state": "^6.4.1", - "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.37.2", "@ctrl/tinycolor": "^3.6.0", "@dnd-kit/core": "^6.0.0", "@dnd-kit/sortable": "^7.0.0", - "@dnd-kit/utilities": "^3.2.2", "@emotion/css": "^11.7.1", "@formily/antd-v5": "1.2.3", - "@formily/core": "^2.2.27", - "@formily/json-schema": "^2.2.27", "@formily/react": "^2.2.27", - "@formily/reactive": "^2.2.27", - "@formily/reactive-react": "^2.2.27", "@formily/shared": "^2.2.27", - "@formily/validator": "^2.2.27", - "@lezer/common": "1.2.3", "@nocobase/evaluators": "3.0.0-alpha.9", "@nocobase/flow-engine": "3.0.0-alpha.9", "@nocobase/sdk": "3.0.0-alpha.9", "@nocobase/shared": "3.0.0-alpha.9", "@nocobase/utils": "3.0.0-alpha.9", - "@swc/helpers": "^0.5.18", - "acorn": "^8.10.0", - "acorn-jsx": "^5.3.2", - "acorn-walk": "8.3.4", "ahooks": "^3.7.2", "antd": "5.24.2", - "antd-mobile": "^5.41.1", "antd-style": "3.7.1", "axios": "^1.7.0", - "axios-mock-adapter": "1.22.0", - "bignumber.js": "^9.1.2", "classnames": "^2.3.1", - "codemirror": "^6.0.2", - "cronstrue": "^2.11.0", - "d3-format": "^3.1.0", "dayjs": "^1.11.10", "file-saver": "^2.0.5", "html5-qrcode": "^2.3.8", "i18next": "^22.4.9", - "ignore": "^5.2.0", "json5": "^2.2.3", "jsqr": "^1.4.0", - "liquidjs": "^10.0.0", "lodash": "4.17.21", - "markdown-it": "14.1.0", - "markdown-it-highlightjs": "3.3.1", - "mathjs": "^15.2.0", - "mermaid": "9.4.3", - "mime": "^4.0.4", - "mime-match": "^1.0.2", - "nanoid": "^3.3.11", - "qs": "^6.10.1", - "quill": "^1.3.7", - "quill-image-resize-module-react": "^3.0.0", - "rc-table": "~7.50.3", - "rc-upload": "~4.8.1", "react-device-detect": "2.2.3", - "react-error-boundary": "^4.0.10", - "react-hotkeys-hook": "^3.4.7", "react-i18next": "^11.15.1", - "react-quill": "^2.0.0", "react-router-dom": "^6.30.1", - "vditor": "^3.10.3", "vscode-json-languageservice": "^5.7.2" - }, - "peerDependencies": { - "react": ">=18.0.0", - "react-dom": ">=18.0.0", - "react-is": ">=18.0.0" } } diff --git a/packages/core/client/package.json b/packages/core/client/package.json index b6eafe31d5a..71731a10c27 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -59,7 +59,7 @@ "lru-cache": "^11.3.5", "markdown-it": "14.1.0", "markdown-it-highlightjs": "3.3.1", - "mathjs": "^15.2.0", + "mathjs": "^15.1.0", "mermaid": "9.4.3", "mime": "^4.0.4", "mime-match": "^1.0.2", diff --git a/packages/core/flow-engine/package.json b/packages/core/flow-engine/package.json index 963fd003fc9..627def6da71 100644 --- a/packages/core/flow-engine/package.json +++ b/packages/core/flow-engine/package.json @@ -7,6 +7,7 @@ "types": "lib/index.d.ts", "dependencies": { "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", "@formily/antd-v5": "1.x", "@formily/reactive": "2.x", "@nocobase/sdk": "3.0.0-alpha.9", diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/__tests__/loader.test.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/__tests__/loader.test.ts deleted file mode 100644 index b0be79e282f..00000000000 --- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/__tests__/loader.test.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * 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. - */ - -import { readFileSync } from 'node:fs'; -import { join } from 'node:path'; -import { beforeAll, describe, expect, test } from 'vitest'; -import { loadSwagger } from '../loader'; - -describe('loadSwagger', () => { - beforeAll(async () => { - await import('tsx/cjs'); - await import('tsconfig-paths/register'); - }); - - test.each(['/jsTemplateFiles:saveSource', '/runJSSources:save', '/runJSSources:saveChanges'])( - 'loads %s from the JS Template source Swagger entry', - (expectedPath) => { - const swagger = loadSwagger('@nocobase/plugin-js-template'); - - expect(swagger.paths).toHaveProperty(expectedPath); - }, - ); - - test('resolves the source and distribution Swagger directory exports', () => { - expect( - require - .resolve('@nocobase/plugin-js-template/src/swagger') - .endsWith(join('@nocobase', 'plugin-js-template', 'src', 'swagger', 'index.ts')), - ).toBe(true); - - const packageJsonPath = require.resolve('@nocobase/plugin-js-template/package.json'); - const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8')) as { - exports?: Record; - }; - - expect(packageJson.exports?.['./src/swagger']).toBe('./src/swagger/index.ts'); - expect(packageJson.exports?.['./dist/swagger']).toBe('./dist/swagger/index.js'); - }); -}); diff --git a/packages/plugins/@nocobase/plugin-flow-engine/package.json b/packages/plugins/@nocobase/plugin-flow-engine/package.json index 6f993bf74fe..3e6b6bda559 100644 --- a/packages/plugins/@nocobase/plugin-flow-engine/package.json +++ b/packages/plugins/@nocobase/plugin-flow-engine/package.json @@ -21,10 +21,9 @@ "ses": "^1.14.0" }, "peerDependencies": { - "@nocobase/acl": "2.x", "@nocobase/client": "2.x", - "@nocobase/client-v2": "2.x", "@nocobase/database": "2.x", + "@nocobase/flow-engine": "2.x", "@nocobase/server": "2.x", "@nocobase/test": "2.x", "@nocobase/utils": "2.x" diff --git a/packages/plugins/@nocobase/plugin-js-template/package.json b/packages/plugins/@nocobase/plugin-js-template/package.json index 6541b4b88d7..808e430f929 100644 --- a/packages/plugins/@nocobase/plugin-js-template/package.json +++ b/packages/plugins/@nocobase/plugin-js-template/package.json @@ -51,14 +51,14 @@ ], "dependencies": { "@nocobase/runjs": "3.0.0-alpha.9", + "dayjs": "^1.11.10", "ipaddr.js": "^1.9.1", + "jszip": "^3.10.1", "typescript": "5.1.3" }, "devDependencies": { "@formily/core": "2.x", "@formily/react": "2.x", - "dayjs": "^1.11.10", - "react-dom": "^18.2.0", "react-router-dom": "^6.11.2" }, "peerDependencies": { @@ -77,6 +77,7 @@ "@nocobase/utils": "2.x", "antd": "5.x", "react": "^18.2.0", + "react-dom": "^18.2.0", "react-i18next": "^11.15.1" } } diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client-v2/components/collection/AssignedFieldsEditor.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client-v2/components/collection/AssignedFieldsEditor.tsx index b4cb8d54b87..fe10eb299f0 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client-v2/components/collection/AssignedFieldsEditor.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client-v2/components/collection/AssignedFieldsEditor.tsx @@ -230,6 +230,7 @@ export function AssignedFieldsEditor({ targetPath={field.name} value={normalizedValue[field.name]} onChange={(nextValue) => updateValue(field.name, nextValue)} + allowRunJS={false} disabled={mergedDisabled} variableConverters={{ resolvePathFromValue: (currentValue) => diff --git a/yarn.lock b/yarn.lock index 0a08a21cc9a..64b3b03f3a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3445,7 +3445,7 @@ "@lezer/highlight" "^1.0.0" "@lezer/lr" "^1.0.0" -"@codemirror/language@6.11.2", "@codemirror/language@^6.0.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0": +"@codemirror/language@^6.0.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0": version "6.11.2" resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.11.2.tgz#90d2d094cfbd14263bc5354ebd2445ee4e81bdc3" integrity sha512-p44TsNArL4IVXDTbapUmEkAlvWs2CFQbcfc0ymDsis1kH2wh0gcY96AS29c/vp2d0y2Tquk1EDSaawpzilUiAw== @@ -6610,7 +6610,7 @@ npmlog "^4.1.2" write-file-atomic "^3.0.3" -"@lezer/common@1.2.3", "@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": +"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": version "1.2.3" resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz#138fcddab157d83da557554851017c6c1e5667fd" integrity sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA== @@ -23625,7 +23625,7 @@ math-intrinsics@^1.1.0: resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g== -mathjs@^15.1.0, mathjs@^15.2.0: +mathjs@^15.1.0: version "15.2.0" resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-15.2.0.tgz#ddfbf50a9aeaec2edfb524195e8202ca29f8e757" integrity sha512-UAQzSVob9rNLdGpqcFMYmSu9dkuLYy7Lr2hBEQS5SHQdknA9VppJz3cy2KkpMzTODunad6V6cNv+5kOLsePLow==