diff --git a/package.json b/package.json index dc634fa51..bab59fb0b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,10 @@ "lint": "eslint --ext .ts,.tsx,.js \"packages/*/src/**.@(ts|tsx|js)\" --fix", "start-prod": "concurrently \"npx pm2-runtime start packages/api/lib/index.js\" \"cd packages/app && npm run start-client\"", "pm2-start": "npx pm2-runtime start packages/api/lib/index.js", - "test": "npm run lint && jest" + "version:alpha": "lerna version prerelease --preid alpha --force-publish=* --no-git-tag-version -m \"chore(versions): publish packages %s\"", + "test": "npm run lint && jest", + "release:force": "lerna publish from-package --yes", + "release": "lerna publish" }, "resolutions": { "@types/react": "^17.0.0", diff --git a/packages/actions/package.json b/packages/actions/package.json index 852a32f40..9525d4946 100644 --- a/packages/actions/package.json +++ b/packages/actions/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/actions", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "description": "", "license": "MIT", "main": "./lib/index.js", "types": "./lib/index.d.ts", "scripts": {}, "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7" + "@nocobase/database": "^0.5.0-alpha.5", + "@nocobase/resourcer": "^0.5.0-alpha.5" }, "devDependencies": { - "@nocobase/test": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "repository": { "type": "git", diff --git a/packages/api/package.json b/packages/api/package.json index 8cd3a05ee..eb5beefbf 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,7 @@ { "name": "@nocobase/api", - "version": "0.4.0-alpha.7", + "private": true, + "version": "0.5.0-alpha.5", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", @@ -9,20 +10,18 @@ "nocobase": "bin/nocobase.js" }, "dependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/client": "^0.4.0-alpha.7", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/plugin-action-logs": "^0.4.0-alpha.7", - "@nocobase/plugin-automations": "^0.4.0-alpha.7", - "@nocobase/plugin-china-region": "^0.4.0-alpha.7", - "@nocobase/plugin-collections": "^0.4.0-alpha.7", - "@nocobase/plugin-file-manager": "^0.4.0-alpha.7", - "@nocobase/plugin-pages": "^0.4.0-alpha.7", - "@nocobase/plugin-permissions": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-router": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-schema": "^0.4.0-alpha.7", - "@nocobase/plugin-users": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/actions": "^0.5.0-alpha.5", + "@nocobase/client": "^0.5.0-alpha.5", + "@nocobase/database": "^0.5.0-alpha.5", + "@nocobase/plugin-action-logs": "^0.5.0-alpha.5", + "@nocobase/plugin-china-region": "^0.5.0-alpha.5", + "@nocobase/plugin-collections": "^0.5.0-alpha.5", + "@nocobase/plugin-file-manager": "^0.5.0-alpha.5", + "@nocobase/plugin-permissions": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-router": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-schema": "^0.5.0-alpha.5", + "@nocobase/plugin-users": "^0.5.0-alpha.5", + "@nocobase/server": "^0.5.0-alpha.5", "koa-static": "^5.0.0" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" diff --git a/packages/app/package.json b/packages/app/package.json index 07a0eb19c..206a6ff08 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,7 @@ { "name": "@nocobase/app", - "version": "0.4.0-alpha.7", + "private": true, + "version": "0.5.0-alpha.5", "scripts": { "start": "concurrently \"cd ../../ && npm run start-server\" \"umi dev\"", "start-client": "umi dev", @@ -25,26 +26,23 @@ ] }, "dependencies": { - "@nocobase/client": "^0.4.0-alpha.7", - "@nocobase/plugin-action-logs": "^0.4.0-alpha.7", - "@nocobase/plugin-automations": "^0.4.0-alpha.7", - "@nocobase/plugin-china-region": "^0.4.0-alpha.7", - "@nocobase/plugin-client": "^0.4.0-alpha.7", - "@nocobase/plugin-collections": "^0.4.0-alpha.7", - "@nocobase/plugin-file-manager": "^0.4.0-alpha.7", - "@nocobase/plugin-pages": "^0.4.0-alpha.7", - "@nocobase/plugin-permissions": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-router": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-schema": "^0.4.0-alpha.7", - "@nocobase/plugin-users": "^0.4.0-alpha.7", - "@nocobase/plugin-multi-apps": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", - "@umijs/preset-react": "1.x", - "umi": "^3.0.0" + "@nocobase/plugin-action-logs": "^0.5.0-alpha.5", + "@nocobase/plugin-china-region": "^0.5.0-alpha.5", + "@nocobase/plugin-client": "^0.5.0-alpha.5", + "@nocobase/plugin-collections": "^0.5.0-alpha.5", + "@nocobase/plugin-file-manager": "^0.5.0-alpha.5", + "@nocobase/plugin-multi-apps": "^0.5.0-alpha.5", + "@nocobase/plugin-permissions": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-router": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-schema": "^0.5.0-alpha.5", + "@nocobase/plugin-users": "^0.5.0-alpha.5", + "@nocobase/server": "^0.5.0-alpha.5" }, "devDependencies": { + "@nocobase/client": "^0.5.0-alpha.5", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", + "@umijs/preset-react": "1.x", "@umijs/test": "^3.4.15", "concurrently": "^5.3.0", "cross-env": "^7.0.3", @@ -53,6 +51,7 @@ "react": "17.x", "react-dom": "17.x", "ts-node-dev": "^1.1.8", + "umi": "^3.0.0", "yorkie": "^2.0.0" } } diff --git a/packages/client/package.json b/packages/client/package.json index c1b409438..fd89b3591 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "typings": "lib/index.d.ts", "license": "MIT", @@ -21,9 +21,9 @@ "@antv/g2plot": "^2.3.27", "@dnd-kit/core": "4.0.0-next-2021720152655", "@dnd-kit/sortable": "5.0.0-next-2021720152655", - "@formily/antd": "^2.0.0-rc.3", - "@formily/core": "^2.0.0-rc.3", - "@formily/react": "^2.0.0-rc.3", + "@formily/antd": "2.0.0-rc.3", + "@formily/core": "2.0.0-rc.3", + "@formily/react": "2.0.0-rc.3", "@monaco-editor/react": "^4.2.1", "ahooks": "^2.10.2", "axios": "^0.21.1", @@ -33,16 +33,11 @@ "flat": "^5.0.2", "html-react-parser": "^1.2.7", "lodash": "^4.17.21", + "micromark": "~2.11.0", "monaco-editor": "^0.25.2", "react-big-calendar": "^0.33.6", - "react-dnd": "^14.0.2", - "react-dnd-html5-backend": "^14.0.0", - "react-dnd-preview": "^6.0.2", - "react-dnd-touch-backend": "^14.0.0", "react-helmet": "^6.1.0", - "react-hooks-global-state": "^1.0.1", "react-image-lightbox": "^5.1.4", - "react-modal-hook": "^3.0.0", "umi-request": "^1.3.5" } } diff --git a/packages/client/src/schemas/menu/index.tsx b/packages/client/src/schemas/menu/index.tsx index 0610b5936..25de65676 100644 --- a/packages/client/src/schemas/menu/index.tsx +++ b/packages/client/src/schemas/menu/index.tsx @@ -166,6 +166,9 @@ export const Menu: any = observer((props: any) => { return; } const sideMenuElement = sideMenuRef && (sideMenuRef.current as HTMLElement); + if (!sideMenuElement) { + return; + } if (sideMenuElement && ref.current) { sideMenuElement.querySelector(':scope > div').appendChild(ref.current); } diff --git a/packages/client/src/state.ts b/packages/client/src/state.ts deleted file mode 100644 index ddb29eb64..000000000 --- a/packages/client/src/state.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { createGlobalState } from 'react-hooks-global-state'; -import { useRequest } from 'ahooks'; -import request from 'umi-request'; - -const initialState = { - actions: {}, -}; - -type GlobalActionNames = 'routes:getAccessible' | 'routes:getMenu' | 'users:check'; - -const { setGlobalState, useGlobalState } = createGlobalState(initialState); - -export { setGlobalState, useGlobalState } - -export function setGlobalActionState(actionName: GlobalActionNames, data) { - setGlobalState('actions', (actions) => ({ - ...actions, - [actionName]: data, - })); -} - -export function useGlobalAction(actionName: GlobalActionNames, options: any = {}) { - const result = useAction(actionName, { - onSuccess(data) { - setGlobalActionState(actionName, data); - }, - ...options, - }); - return result; -} - -export async function refreshGlobalAction(actionName: GlobalActionNames) { - const { data } = await doAction(actionName); - setGlobalActionState(actionName, data); -} - -export function useAction(actionName, options: any = {}) { - let params = actionName; - if (typeof actionName === 'string') { - params = { url: `/api/${actionName}` }; - } - return useRequest(params, { - formatResult: result => result?.data, - // requestMethod(service) { - // if (typeof service === 'string') { - // return request(service,); - // } - // if (typeof service === 'object') { - // const { url, ...rest } = service; - // return request(url, rest); - // } - // throw new Error('request options error'); - // }, - ...options, - }); -} - -export async function doAction(actionName: any, options?: any) { - const res = await request(`/api/${actionName}`, options); - return res.data; -} - -export function usePage(name: string, options?: any) { - return useAction('routes:getPage', { - refreshDeps: [name], - ...options, - }); -} \ No newline at end of file diff --git a/packages/collections/package.json b/packages/collections/package.json index d66baf9be..92bda5895 100644 --- a/packages/collections/package.json +++ b/packages/collections/package.json @@ -1,6 +1,7 @@ { "name": "@nocobase/collections", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", + "private": true, "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/create-nocobase-app/templates/AppGenerator/package.json b/packages/create-nocobase-app/templates/AppGenerator/package.json index d88ed3697..529b9d729 100644 --- a/packages/create-nocobase-app/templates/AppGenerator/package.json +++ b/packages/create-nocobase-app/templates/AppGenerator/package.json @@ -25,28 +25,29 @@ ] }, "dependencies": { - "@nocobase/plugin-action-logs": "^0.5.0-alpha.2", - "@nocobase/plugin-china-region": "^0.5.0-alpha.2", - "@nocobase/plugin-client": "^0.5.0-alpha.2", - "@nocobase/plugin-collections": "^0.5.0-alpha.2", - "@nocobase/plugin-file-manager": "^0.5.0-alpha.2", - "@nocobase/plugin-multi-apps": "^0.5.0-alpha.2", - "@nocobase/plugin-permissions": "^0.5.0-alpha.2", - "@nocobase/plugin-ui-router": "^0.5.0-alpha.2", - "@nocobase/plugin-ui-schema": "^0.5.0-alpha.2", - "@nocobase/plugin-users": "^0.5.0-alpha.2", - "@nocobase/server": "^0.5.0-alpha.2" + "@nocobase/plugin-action-logs": "^0.5.0-alpha.5", + "@nocobase/plugin-china-region": "^0.5.0-alpha.5", + "@nocobase/plugin-client": "^0.5.0-alpha.5", + "@nocobase/plugin-collections": "^0.5.0-alpha.5", + "@nocobase/plugin-export": "^0.5.0-alpha.5", + "@nocobase/plugin-file-manager": "^0.5.0-alpha.5", + "@nocobase/plugin-multi-apps": "^0.5.0-alpha.5", + "@nocobase/plugin-permissions": "^0.5.0-alpha.5", + "@nocobase/plugin-system-settings": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-router": "^0.5.0-alpha.5", + "@nocobase/plugin-ui-schema": "^0.5.0-alpha.5", + "@nocobase/plugin-users": "^0.5.0-alpha.5", + "@nocobase/server": "^0.5.0-alpha.5" }, "devDependencies": { - "@nocobase/client": "^0.5.0-alpha.2", + "@nocobase/client": "^0.5.0-alpha.5", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@umijs/preset-react": "1.x", "@umijs/test": "^3.4.15", "concurrently": "^5.3.0", - "core-js": "^3.18.2", "cross-env": "^7.0.3", - "micromark": "^3.0.6", + "micromark": "~2.11.0", "mockjs": "^1.1.0", "prettier": "^2.2.0", "react": "17.x", diff --git a/packages/database/package.json b/packages/database/package.json index a8b0ed4d0..ae0d7e750 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/database", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/father-build/package.json b/packages/father-build/package.json index 0e2e59789..685e3ab63 100755 --- a/packages/father-build/package.json +++ b/packages/father-build/package.json @@ -1,6 +1,7 @@ { "name": "father-build", - "version": "1.19.4", + "private": true, + "version": "1.19.5-alpha.3", "description": "Library build tool based on rollup.", "main": "lib/index.js", "bin": { @@ -45,8 +46,8 @@ "gulp-if": "2.0.2", "gulp-less": "^4.0.1", "gulp-plumber": "^1.2.1", - "gulp-typescript": "5.0.1", "gulp-sourcemaps": "2.6.5", + "gulp-typescript": "5.0.1", "less": "3.9.0", "less-plugin-npm-import": "2.1.0", "lodash": "4.17.19", diff --git a/packages/plugin-action-logs/package.json b/packages/plugin-action-logs/package.json index 8ca5234bf..8ba15202d 100644 --- a/packages/plugin-action-logs/package.json +++ b/packages/plugin-action-logs/package.json @@ -1,15 +1,13 @@ { "name": "@nocobase/plugin-action-logs", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7" + "@nocobase/server": "^0.5.0-alpha.5" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/test": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-automations/package.json b/packages/plugin-automations/package.json index 8a609d2de..7e47d3c5d 100644 --- a/packages/plugin-automations/package.json +++ b/packages/plugin-automations/package.json @@ -1,13 +1,11 @@ { "name": "@nocobase/plugin-automations", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", + "private": true, "license": "MIT", "dependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "json-templates": "^4.1.0", "node-schedule": "^2.0.0" }, diff --git a/packages/plugin-china-region/package.json b/packages/plugin-china-region/package.json index 5c6ccb68e..0fc0577d7 100644 --- a/packages/plugin-china-region/package.json +++ b/packages/plugin-china-region/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-china-region", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "china-division": "2.3.1" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" diff --git a/packages/plugin-client/package.json b/packages/plugin-client/package.json index 5959d5b98..6f08d5ceb 100644 --- a/packages/plugin-client/package.json +++ b/packages/plugin-client/package.json @@ -1,18 +1,16 @@ { "name": "@nocobase/plugin-client", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "deepmerge": "^4.2.2", "flat-to-nested": "^1.1.1", "koa-compress": "^5.1.0" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-collections/package.json b/packages/plugin-collections/package.json index 60dd3db5a..ade7ea65b 100644 --- a/packages/plugin-collections/package.json +++ b/packages/plugin-collections/package.json @@ -1,16 +1,14 @@ { "name": "@nocobase/plugin-collections", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "deepmerge": "^4.2.2" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-export/package.json b/packages/plugin-export/package.json index c737c1623..3d0bb0bce 100644 --- a/packages/plugin-export/package.json +++ b/packages/plugin-export/package.json @@ -1,19 +1,13 @@ { "name": "@nocobase/plugin-export", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", - "devDependencies": { - "@types/node-xlsx": "^0.15.1" - }, "dependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "node-xlsx": "^0.16.1" }, - "peerDependencies": { - "@nocobase/plugin-collections": "*", - "@nocobase/plugin-permissions": "*" + "devDependencies": { + "@types/node-xlsx": "^0.15.1" } } diff --git a/packages/plugin-file-manager/package.json b/packages/plugin-file-manager/package.json index 6d19b596e..4ae2b1e11 100644 --- a/packages/plugin-file-manager/package.json +++ b/packages/plugin-file-manager/package.json @@ -1,13 +1,11 @@ { "name": "@nocobase/plugin-file-manager", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { "@koa/multer": "^3.0.0", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@types/multer": "^1.4.5", + "@nocobase/server": "^0.5.0-alpha.5", "ali-oss": "^6.12.0", "koa-mount": "^4.0.0", "koa-static": "^5.0.0", @@ -15,8 +13,8 @@ "multer": "^1.4.2" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5", + "@types/multer": "^1.4.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-multi-apps/package.json b/packages/plugin-multi-apps/package.json index e47d03ede..6819dfbba 100644 --- a/packages/plugin-multi-apps/package.json +++ b/packages/plugin-multi-apps/package.json @@ -1,12 +1,10 @@ { "name": "@nocobase/plugin-multi-apps", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "deepmerge": "^4.2.2", "flat-to-nested": "^1.1.1" }, diff --git a/packages/plugin-permissions/package.json b/packages/plugin-permissions/package.json index a3cd5bfd8..beb6ace81 100644 --- a/packages/plugin-permissions/package.json +++ b/packages/plugin-permissions/package.json @@ -1,13 +1,10 @@ { "name": "@nocobase/plugin-permissions", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7" + "@nocobase/server": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-system-settings/package.json b/packages/plugin-system-settings/package.json index 7aed1d653..19a6d21c1 100644 --- a/packages/plugin-system-settings/package.json +++ b/packages/plugin-system-settings/package.json @@ -1,15 +1,13 @@ { "name": "@nocobase/plugin-system-settings", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7" + "@nocobase/server": "^0.5.0-alpha.5" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-ui-router/package.json b/packages/plugin-ui-router/package.json index 0813e6cf5..8ff316d87 100644 --- a/packages/plugin-ui-router/package.json +++ b/packages/plugin-ui-router/package.json @@ -1,17 +1,15 @@ { "name": "@nocobase/plugin-ui-router", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "deepmerge": "^4.2.2", "flat-to-nested": "^1.1.1" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-ui-schema/package.json b/packages/plugin-ui-schema/package.json index 8b8a3430a..f4e22b06f 100644 --- a/packages/plugin-ui-schema/package.json +++ b/packages/plugin-ui-schema/package.json @@ -1,17 +1,14 @@ { "name": "@nocobase/plugin-ui-schema", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "deepmerge": "^4.2.2" }, "devDependencies": { - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/test": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-users/package.json b/packages/plugin-users/package.json index 1d68ddba1..b91e1d762 100644 --- a/packages/plugin-users/package.json +++ b/packages/plugin-users/package.json @@ -1,15 +1,14 @@ { "name": "@nocobase/plugin-users", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "license": "MIT", "dependencies": { - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "crypto-random-string": "^3.3.0" }, "devDependencies": { - "@nocobase/test": "^0.4.0-alpha.7" + "@nocobase/test": "^0.5.0-alpha.5" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/preset-nocobase/.npmignore b/packages/preset-nocobase/.npmignore deleted file mode 100644 index 461574b2f..000000000 --- a/packages/preset-nocobase/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -node_modules -*.log -docs -__tests__ -tsconfig.json -src -.fatherrc.ts \ No newline at end of file diff --git a/packages/preset-nocobase/package.json b/packages/preset-nocobase/package.json deleted file mode 100644 index c6670d8fa..000000000 --- a/packages/preset-nocobase/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "@nocobase/preset-nocobase", - "version": "0.4.0-alpha.7", - "main": "lib/index.js", - "license": "MIT", - "dependencies": { - "@nocobase/plugin-action-logs": "^0.4.0-alpha.7", - "@nocobase/plugin-automations": "^0.4.0-alpha.7", - "@nocobase/plugin-china-region": "^0.4.0-alpha.7", - "@nocobase/plugin-collections": "^0.4.0-alpha.7", - "@nocobase/plugin-file-manager": "^0.4.0-alpha.7", - "@nocobase/plugin-pages": "^0.4.0-alpha.7", - "@nocobase/plugin-permissions": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-router": "^0.4.0-alpha.7", - "@nocobase/plugin-ui-schema": "^0.4.0-alpha.7", - "@nocobase/plugin-users": "^0.4.0-alpha.7" - }, - "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" -} diff --git a/packages/preset-nocobase/src/index.ts b/packages/preset-nocobase/src/index.ts deleted file mode 100644 index 8f367f515..000000000 --- a/packages/preset-nocobase/src/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -export default function (api) { - const plugins = [ - '@nocobase/plugin-collections', - '@nocobase/plugin-ui-router', - '@nocobase/plugin-ui-schema', - '@nocobase/plugin-users', - '@nocobase/plugin-action-logs', - '@nocobase/plugin-file-manager', - '@nocobase/plugin-permissions', - '@nocobase/plugin-export', - '@nocobase/plugin-system-settings', - // // '@nocobase/plugin-automations', - '@nocobase/plugin-china-region', - ]; - console.log(plugins); - for (const plugin of plugins) { - this.registerPlugin(plugin, [require(`${plugin}/${__filename.endsWith('.ts') ? 'src' : 'lib'}/server`).default]); - } -} diff --git a/packages/resourcer/package.json b/packages/resourcer/package.json index 82777084c..17c3668af 100644 --- a/packages/resourcer/package.json +++ b/packages/resourcer/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/resourcer", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/server/package.json b/packages/server/package.json index 64ee55b03..e124c0b89 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", @@ -8,9 +8,9 @@ "dependencies": { "@koa/cors": "^3.1.0", "@koa/router": "^9.4.0", - "@nocobase/actions": "^0.4.0-alpha.7", - "@nocobase/database": "^0.4.0-alpha.7", - "@nocobase/resourcer": "^0.4.0-alpha.7", + "@nocobase/actions": "^0.5.0-alpha.5", + "@nocobase/database": "^0.5.0-alpha.5", + "@nocobase/resourcer": "^0.5.0-alpha.5", "commander": "^8.1.0", "dotenv": "^8.2.0", "koa": "^2.13.0", diff --git a/packages/test/package.json b/packages/test/package.json index a0e9a6beb..ea2e536f8 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/test", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", "scripts": {}, "dependencies": { - "@nocobase/server": "^0.4.0-alpha.7", + "@nocobase/server": "^0.5.0-alpha.5", "@types/supertest": "^2.0.11", "mockjs": "^1.1.0", "mysql2": "^2.1.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 46b2ff6de..588e9213c 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "0.4.0-alpha.7", + "version": "0.5.0-alpha.5", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", diff --git a/yarn.lock b/yarn.lock index 0bc4e7d66..f9976651b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1915,7 +1915,7 @@ resolved "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799" integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ== -"@formily/antd@^2.0.0-rc.3": +"@formily/antd@2.0.0-rc.3": version "2.0.0-rc.3" resolved "https://registry.npmjs.org/@formily/antd/-/antd-2.0.0-rc.3.tgz#714e3cca4dee78799ff3b51f9d9fca143ed52513" integrity sha512-uHq+Z1YWzBQgk5zYRhUcRL6UUfLLveSwRptDxUjw/TRS760WIfzs52m/763TZqKpmMmDb83lFoailEoKwalVtg== @@ -1932,7 +1932,7 @@ react-sortable-hoc "^1.11.0" react-sticky-box "^0.9.3" -"@formily/core@2.0.0-rc.3", "@formily/core@^2.0.0-rc.3": +"@formily/core@2.0.0-rc.3": version "2.0.0-rc.3" resolved "https://registry.npmjs.org/@formily/core/-/core-2.0.0-rc.3.tgz#aeb085c88f24527fec9b14efe162a77b0a9a4741" integrity sha512-DZvrCbQqpg8A0V0asVFYWbmdiqmDLq52OZmImr/1Vh3fa6wLExenoMfd1Koz1NXHdtMsLDlqOLnneS8e8+xKgw== @@ -1955,7 +1955,7 @@ resolved "https://registry.npmjs.org/@formily/path/-/path-2.0.0-rc.3.tgz#10023fe2776d9f2b22ddce1019b5d931f4a517a5" integrity sha512-Q2QgJQH7VOJ/T3dx1GjnA1KCQfutatDcJ7yH7XIJY4XQILnoI5HnNM4b0kJfYH+0LppUsRJrZAhEMO4bH2PUUQ== -"@formily/react@2.0.0-rc.3", "@formily/react@^2.0.0-rc.3": +"@formily/react@2.0.0-rc.3": version "2.0.0-rc.3" resolved "https://registry.npmjs.org/@formily/react/-/react-2.0.0-rc.3.tgz#7ba70b8045b096b4117e2664948b695747e5545c" integrity sha512-nPiYAOymAtS6ZRN+/uT6c6M729x3c4keRF4johXpBL3gj9Qy3RtGAy41e9Ey/oGHfJjYXCjeLBxtedEyH/3YhA== @@ -3144,17 +3144,6 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@nocobase/plugin-pages@^0.4.0-alpha.7": - version "0.4.0-alpha.7" - resolved "https://registry.npmjs.org/@nocobase/plugin-pages/-/plugin-pages-0.4.0-alpha.7.tgz#f3998d565eaca66c60b4e8f090ff2b9743cba615" - integrity sha512-eOyvxmGuKLaEk9E5M31gA8XYLCEsg2GUYpbtwwqYfurzICxwezEKYJZ/2o4yVy4sSCCdqMMzvwpPJDR/+mmrJw== - dependencies: - "@nocobase/actions" "^0.4.0-alpha.7" - "@nocobase/database" "^0.4.0-alpha.7" - "@nocobase/resourcer" "^0.4.0-alpha.7" - "@nocobase/server" "^0.4.0-alpha.7" - crypto-random-string "^3.3.1" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -3386,21 +3375,6 @@ resolved "https://registry.npmjs.org/@qixian.cs/path-to-regexp/-/path-to-regexp-6.1.0.tgz#6b84ad01596332aba95fa29d2e70104698cd5c45" integrity sha512-2jIiLiVZB1jnY7IIRQKtoV8Gnr7XIhk4mC88ONGunZE3hYt5IHUG4BE/6+JiTBjjEWQLBeWnZB8hGpppkufiVw== -"@react-dnd/asap@^4.0.0": - version "4.0.0" - resolved "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651" - integrity sha512-0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ== - -"@react-dnd/invariant@^2.0.0": - version "2.0.0" - resolved "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz#09d2e81cd39e0e767d7da62df9325860f24e517e" - integrity sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw== - -"@react-dnd/shallowequal@^2.0.0": - version "2.0.0" - resolved "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a" - integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg== - "@restart/hooks@^0.3.25": version "0.3.27" resolved "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz#91f356d66d4699a8cd8b3d008402708b6a9dc505" @@ -7213,7 +7187,7 @@ crypto-random-string@^2.0.0: resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -crypto-random-string@^3.3.0, crypto-random-string@^3.3.1: +crypto-random-string@^3.3.0: version "3.3.1" resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-3.3.1.tgz#13cee94cac8001e4842501608ef779e0ed08f82d" integrity sha512-5j88ECEn6h17UePrLi6pn1JcLtAiANa3KExyr9y9Z5vo2mv56Gh3I4Aja/B9P9uyMwyxNHAHWv+nE72f30T5Dg== @@ -7918,15 +7892,6 @@ discontinuous-range@1.0.0: resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= -dnd-core@14.0.0: - version "14.0.0" - resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.0.tgz#973ab3470d0a9ac5a0fa9021c4feba93ad12347d" - integrity sha512-wTDYKyjSqWuYw3ZG0GJ7k+UIfzxTNoZLjDrut37PbcPGNfwhlKYlPUqjAKUjOOv80izshUiqusaKgJPItXSevA== - dependencies: - "@react-dnd/asap" "^4.0.0" - "@react-dnd/invariant" "^2.0.0" - redux "^4.0.5" - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -16689,39 +16654,6 @@ react-big-calendar@^0.33.6: react-overlays "^4.1.1" uncontrollable "^7.0.0" -react-dnd-html5-backend@^14.0.0: - version "14.0.1" - resolved "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-14.0.1.tgz#37d43d6b6ddd91069101969d9eac6d688a9d57ef" - integrity sha512-ZDmpvFpd1NR4riw/CMbr8C3mgP6ZhsTf0c48a36kw4ZW8emgiugNlAz/qhhZ4/Pz9TO6DZ63sQohUTTl+AWGiA== - dependencies: - dnd-core "14.0.0" - -react-dnd-preview@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/react-dnd-preview/-/react-dnd-preview-6.0.2.tgz#dd34931c270853c80438e1275e6c9e77174f8afe" - integrity sha512-F2+uK4Be+q+7mZfNh9kaZols7wp1hX6G7UBTVaTpDsBpMhjFvY7/v7odxYSerSFBShh23MJl33a4XOVRFj1zoQ== - dependencies: - prop-types "^15.7.2" - -react-dnd-touch-backend@^14.0.0: - version "14.1.0" - resolved "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-14.1.0.tgz#f1e6240cf4ace1136a6bad15bcc887e8db453943" - integrity sha512-pOLXe9Hj2tYEzT8Vr8w/VpGZh5d0qaPxSz6nP2gvK+KBoka/KW2hYWsI6tFj+ewhhNjs07cjMjJIlvRg+4zq2Q== - dependencies: - "@react-dnd/invariant" "^2.0.0" - dnd-core "14.0.0" - -react-dnd@^14.0.2: - version "14.0.3" - resolved "https://registry.npmjs.org/react-dnd/-/react-dnd-14.0.3.tgz#1762c1ec84815439f2d8a6a40efd1f57eee41ba6" - integrity sha512-i73Hx5SKfDRdwXe30+CjF/DidiRdt/gwpPN14ajkPR20t/0osnNKFNHg3DLV6RZym+DJ0pO9H5APeMsBWGU3+Q== - dependencies: - "@react-dnd/invariant" "^2.0.0" - "@react-dnd/shallowequal" "^2.0.0" - dnd-core "14.0.0" - fast-deep-equal "^3.1.3" - hoist-non-react-statics "^3.3.2" - react-docgen-typescript-dumi-tmp@^1.22.1-0: version "1.22.1-0" resolved "https://registry.npmjs.org/react-docgen-typescript-dumi-tmp/-/react-docgen-typescript-dumi-tmp-1.22.1-0.tgz#6f452de05c5c114a6e1dd60b34930afaa7ae39a0" @@ -16761,11 +16693,6 @@ react-helmet@^6.1.0: react-fast-compare "^3.1.1" react-side-effect "^2.1.0" -react-hooks-global-state@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/react-hooks-global-state/-/react-hooks-global-state-1.0.2.tgz#37bbc3203a0be9f3ac0658abfd28dd7ce7ee166c" - integrity sha512-UcWz+VjcUUCQ7bXGmOhanGII3j22zyPSjwJnQWeycxFYj/etBxIbz9xziEm4sv5+OqGuS7bzvpx24XkCxgJ7Bg== - react-image-lightbox@^5.1.4: version "5.1.4" resolved "https://registry.npmjs.org/react-image-lightbox/-/react-image-lightbox-5.1.4.tgz#5b847dcb79e9efdf9d7cd5621a92e0f156d2cf30" @@ -16807,11 +16734,6 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-modal-hook@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/react-modal-hook/-/react-modal-hook-3.0.0.tgz#24b2ff2acf288ef25c11e4fb11b329458a823ea3" - integrity sha512-mNkJwgEtOoIabuILlWnGAto993WVkimZASBWk/rAGZ6tNIqjx4faQtNdr/X31vw+QGfKhspXc4vPi1jbfkk2Yg== - react-modal@^3.11.1: version "3.14.3" resolved "https://registry.npmjs.org/react-modal/-/react-modal-3.14.3.tgz#7eb7c5ec85523e5843e2d4737cc17fc3f6aeb1c0" @@ -17182,7 +17104,7 @@ redux-saga@^0.16.0: resolved "https://registry.npmjs.org/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971" integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w== -redux@^4.0.0, redux@^4.0.1, redux@^4.0.5: +redux@^4.0.0, redux@^4.0.1: version "4.1.1" resolved "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47" integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==