diff --git a/.env.example b/.env.example index bb54dc9cb..783b92cb2 100644 --- a/.env.example +++ b/.env.example @@ -1,11 +1,13 @@ NOCOBASE_ENV=development -API_PORT=3000 +JWT_SECRET=09f26e402586e2faa8da4c98a35f1b20d6b033c60 + +SERVER_PORT=3000 # api base path endpoint for app(web) -API_BASE_PATH=/api/ +SERVER_BASE_PATH=/api/ # api server access point for app(web when build) -API_BASE_URL= +SERVER_BASE_URL= DB_DIALECT=sqlite diff --git a/.gitignore b/.gitignore index 4c226c472..39467aba9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules/ lib/ +!packages/core/create-nocobase-app/lib esm/ .env .DS_Store @@ -12,4 +13,5 @@ coverage .umi /uploads .env.test -docs-dist/ \ No newline at end of file +docs-dist/ +.npmrc diff --git a/README.md b/README.md index e69de29bb..d0fee8d36 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,123 @@ +English | [简体中文](./README.zh-CN.md) + +![](https://nocobase.oss-cn-beijing.aliyuncs.com/bbcedd403d31cd1ccc4e9709581f5c2f.png) + +What is NocoBase +---------- +NocoBase is a scalability-first, open-source no-code development platform. No programming required, build your own collaboration platform, management system with NocoBase in minutes. + +Homepage: +https://www.nocobase.com/ + +Online Demo: +https://demo.nocobase.com/new + +Contact Us: +hello@nocobase.com + +When to use NocoBase +---------- +- **SMEs and organizations build business platforms and management systems for themselves or for their industry** + - Want the price to be low enough or even free + - Can be flexibly customized without programming knowledge + - Need full control of source code and data + - Can freely distribute and sell as their own products +- **Service providers and outsourcing teams develop collaboration platforms and management systems for their clients** + - Want to keep development costs as low as possible + - Need the most user-friendly secondary development experience + - Must be deployed privately as a standalone product for the client + - Can be freely distributed and sold by the client + +Why choose NocoBase +---------- +- **Open source and free** + - Unrestricted commercial use under the MIT license + - Full code ownership, private deployment, private and secure data + - Free to expand and develop for actual needs + - Good ecological support +- **Strong no-code capability** + - WYSIWYG visual configuration + - Separation of data structure configuration from interface configuration + - Rich combination of blocks and operations + - Role-based access control +- **Developer-friendly** + - Microkernel architecture, flexible and easy to extend, with a robust plug-in system + - Node.js-based, with popular frameworks and technologies, including Koa, Sequelize, React, Formily, Ant Design, etc. + - Progressive development, easy for getting-started, friendly to newcomers + - No binding, no strong dependencies, can be used in any combination or extensions, can be used in existing projects + +Note +---------- +NocoBase is still in early development and is for preview purposes only and is not suitable for use in a production environment. A relatively stable and well-documented public beta is expected to be released as early as the first quarter of 2022. +If you are interested in NocoBase, please join us to discuss and develop it together. + +Architecture +---------- + +![](https://docs.nocobase.com/static/NocoBase.c9542b1f.png) + +Requirements +---------- + +Node: + +- Node.js 12.20+ + +Database: + +- PostgreSQL 10.x+ +- Mysql 8.x+ +- Sqlite 3+ + +Installation +---------- + +## Create a project with `create-nocobase-app` + +~~~shell +# 1. create project +yarn create nocobase-app my-nocobase-app + +# 2. switch to the project directory +cd my-nocobase-app + +# 3. create initialization data +yarn nocobase install --lang=en-US + +# 4. start project +yarn start +~~~ + +Open [http://localhost:8000](http://localhost:8000) in a web browser. The initial account and password are `admin@nocobase.com` and `admin123`. + +## Contributing + +- Fork the source code to your own repository +- Modify source code +- Submit pull request + +```bash +# Replace the following git address with your own repo +git clone https://github.com/nocobase/nocobase.git +cd nocobase +cp .env.example .env +yarn install +yarn nocobase install +yarn start +``` + +### Build + +```bash +yarn build +``` + +### Test + +```bash +# For all packages +yarn test + +# For specific package +yarn test packages/ +``` diff --git a/docker-compose.yml b/docker-compose.yml index 4e8311bc2..d6f6d1cd2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,15 @@ networks: nocobase: driver: bridge services: + verdaccio: + image: verdaccio/verdaccio + networks: + - nocobase + environment: + VERDACCIO_PORT: ${VERDACCIO_PORT} + restart: always + ports: + - "${VERDACCIO_PORT}:${VERDACCIO_PORT}" adminer: build: context: . diff --git a/lerna.json b/lerna.json index ab7d9b789..4ebda0322 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,10 @@ { - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "npmClient": "yarn", "useWorkspaces": true, - "npmClientArgs": ["--ignore-engines"], + "npmClientArgs": [ + "--ignore-engines" + ], "command": { "version": { "forcePublish": true, diff --git a/package.json b/package.json index 6696e8687..35cf5656a 100644 --- a/package.json +++ b/package.json @@ -2,21 +2,26 @@ "name": "root", "private": true, "workspaces": [ - "packages/*" + "packages/app/*", + "packages/core/*", + "packages/plugins/*" ], "scripts": { "start": "concurrently \"npm run start-server\" \"npm run start-client\"", - "start-pm2": "yarn pm2-runtime start packages/api/lib/index.js", + "start-pm2": "yarn pm2-runtime start packages/app/server/lib/index.js", "start-docs": "dumi dev", "bootstrap": "lerna bootstrap", - "clean": "rimraf -rf packages/*/{lib,esm,dist} && lerna clean", - "nocobase": "ts-node-dev -r dotenv/config -r tsconfig-paths/register ./packages/api/src/index.ts", - "start-client": "cd packages/app && npm run start", - "start-server": "ts-node-dev -r dotenv/config -r tsconfig-paths/register ./packages/api/src/index.ts", + "clean": "rimraf -rf packages/{app,core,plugins}/*/{lib,esm,dist} && lerna clean", + "nocobase": "cross-env DOTENV_CONFIG_PATH=.env ts-node-dev -r dotenv/config -r tsconfig-paths/register ./packages/app/server/src/index.ts", + "start-client": "cd packages/app/client && npm run start", + "start-server": "npm run nocobase start", "build": "lerna run build", "build-docs": "dumi build", "test": "node ./jest.cli.js -i", - "lint": "eslint ." + "lint": "eslint .", + "version:alpha": "lerna version prerelease --preid alpha --force-publish=* --no-git-tag-version -m \"chore(versions): publish packages %s\"", + "release:force": "lerna publish from-package --yes", + "release": "lerna publish" }, "resolutions": { "@types/react": "^17.0.0", @@ -44,7 +49,7 @@ "antd": "^4.18.9", "classnames": "^2.3.1", "concurrently": "^7.0.0", - "cross-env": "^5.2.0", + "cross-env": "^7.0.3", "dotenv": "^10.0.0", "dumi": "^1.1.33", "eslint": "^7.14.0", diff --git a/packages/api/package.json b/packages/api/package.json deleted file mode 100644 index 852277bfd..000000000 --- a/packages/api/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@nocobase/api", - "version": "0.6.0-alpha.0", - "description": "", - "license": "MIT", - "main": "./lib/index.js", - "types": "./lib/index.d.ts", - "scripts": { - "build": "rimraf -rf lib esm dist && npm run build:cjs && npm run build:esm", - "build:cjs": "tsc --project tsconfig.build.json", - "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" - }, - "dependencies": { - "@nocobase/server": "^0.6.0-alpha.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/nocobase/nocobase.git", - "directory": "packages/actions" - }, - "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" -} diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts deleted file mode 100644 index e7d7a156f..000000000 --- a/packages/api/src/index.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Application } from '@nocobase/server'; -import { resolve } from 'path'; - -require('dotenv').config({ path: resolve(process.cwd(), '.env') }); - -const start = Date.now(); - -const api = new Application({ - database: { - storage: resolve(process.cwd(), './db.sqlite'), - username: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.DB_DATABASE, - host: process.env.DB_HOST, - port: process.env.DB_PORT as any, - dialect: process.env.DB_DIALECT as any, - dialectOptions: { - charset: 'utf8mb4', - collate: 'utf8mb4_unicode_ci', - }, - pool: { - max: 5, - min: 0, - acquire: 60000, - idle: 10000, - }, - logging: process.env.DB_LOG_SQL === 'on' ? console.log : false, - define: {}, - sync: { - force: false, - alter: { - drop: false, - }, - }, - }, - resourcer: { - prefix: process.env.API_BASE_PATH || '/api/', - }, -}); - -const plugins = [ - '@nocobase/plugin-error-handler', - '@nocobase/plugin-collection-manager', - '@nocobase/plugin-ui-schema-storage', - '@nocobase/plugin-ui-routes-storage', - '@nocobase/plugin-file-manager', - '@nocobase/plugin-system-settings', - [ - '@nocobase/plugin-users', - { - jwt: { - secret: process.env.JWT_SECRET || '09f26e402586e2faa8da4c98a35f1b20d6b033c60', - }, - installing: { - adminNickname: 'Super Admin', - adminEmail: 'admin@nocobase.com', - adminPassword: 'admin123', - }, - }, - ], - '@nocobase/plugin-acl', - '@nocobase/plugin-china-region', - '@nocobase/plugin-workflow', - [ - '@nocobase/plugin-client', - { - dist: resolve(__dirname, '../../app/dist'), - }, - ], -]; - -for (const plugin of plugins) { - if (Array.isArray(plugin)) { - api.plugin(require(plugin.shift() as string).default, plugin.shift()); - } else { - api.plugin(require(plugin).default); - } -} - -// api.acl.use(async (ctx, next) => { -// ctx.permission = { -// skip: true, -// }; -// await next(); -// }); - -if (process.argv.length < 3) { - // @ts-ignore - process.argv.push('start', '--port', process.env.API_PORT || 12302); -} - -api.parse(process.argv).then(() => { - console.log(`${new Date().toLocaleTimeString()} Start-up time: ${(Date.now() - start) / 1000}s`); -}); diff --git a/packages/app/README.md b/packages/app/README.md deleted file mode 100644 index 07afeb7fd..000000000 --- a/packages/app/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# umi project - -## Getting Started - -Install dependencies, - -```bash -$ yarn -``` - -Start the dev server, - -```bash -$ yarn start -``` diff --git a/packages/app/.gitignore b/packages/app/client/.gitignore similarity index 100% rename from packages/app/.gitignore rename to packages/app/client/.gitignore diff --git a/packages/app/.umirc.ts b/packages/app/client/.umirc.ts similarity index 53% rename from packages/app/.umirc.ts rename to packages/app/client/.umirc.ts index a47097428..43b9fd055 100644 --- a/packages/app/.umirc.ts +++ b/packages/app/client/.umirc.ts @@ -1,10 +1,10 @@ import dotenv from 'dotenv'; import { resolve } from 'path'; import { defineConfig } from 'umi'; -import { getUmiConfig } from '../utils/src/umiConfig'; +import { getUmiConfig } from '../../core/utils/src/umiConfig'; dotenv.config({ - path: resolve(__dirname, '../../.env'), + path: resolve(__dirname, '../../../.env'), }); process.env.MFSU_AD = 'none'; @@ -28,19 +28,11 @@ export default defineConfig({ routes: [{ path: '/', exact: false, component: '@/pages/index' }], // fastRefresh: {}, chainWebpack(config) { - config.module.rules - .get('ts-in-node_modules') - .include.add(resolve(__dirname, '../client/src')); - config.resolve.alias.set( - '@nocobase/client', - resolve(__dirname, '../client/src'), - ); - config.module.rules - .get('ts-in-node_modules') - .include.add(resolve(__dirname, '../utils/src')); - config.resolve.alias.set( - '@nocobase/utils', - resolve(__dirname, '../utils/src'), - ); + const clientSrc = resolve(__dirname, '../../core/client/src'); + const utilsSrc = resolve(__dirname, '../../core/utils/src'); + config.module.rules.get('ts-in-node_modules').include.add(clientSrc); + config.resolve.alias.set('@nocobase/client', clientSrc); + config.module.rules.get('ts-in-node_modules').include.add(utilsSrc); + config.resolve.alias.set('@nocobase/utils', utilsSrc); }, }); diff --git a/packages/app/package.json b/packages/app/client/package.json similarity index 59% rename from packages/app/package.json rename to packages/app/client/package.json index d6341677c..e1cfcc96e 100644 --- a/packages/app/package.json +++ b/packages/app/client/package.json @@ -1,6 +1,6 @@ { - "name": "@nocobase/app", - "version": "0.6.0-alpha.0", + "name": "@nocobase/app-client", + "version": "0.6.2-alpha.8", "scripts": { "start": "umi dev", "build": "umi build", @@ -8,17 +8,19 @@ "test": "umi-test", "test:coverage": "umi-test --coverage" }, - "dependencies": { - "@nocobase/client": "^0.6.0-alpha.0", + "devDependencies": { + "@nocobase/client": "0.6.2-alpha.8", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0", + "@umijs/test": "^3.5.20", + "antd": "^4.19.5", "react": "17.x", "react-dom": "17.x", "umi": "^3.5.20" }, - "devDependencies": { - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", - "@umijs/test": "^3.5.20", - "lint-staged": "^10.0.7", - "yorkie": "^2.0.0" + "repository": { + "type": "git", + "url": "git+https://github.com/nocobase/nocobase.git", + "directory": "packages/app/client" } } diff --git a/packages/app/src/pages/apiClient.ts b/packages/app/client/src/pages/apiClient.ts similarity index 73% rename from packages/app/src/pages/apiClient.ts rename to packages/app/client/src/pages/apiClient.ts index 082319619..63cba55cf 100644 --- a/packages/app/src/pages/apiClient.ts +++ b/packages/app/client/src/pages/apiClient.ts @@ -1,7 +1,7 @@ import { APIClient } from '@nocobase/client'; const apiClient = new APIClient({ - baseURL: process.env.API_BASE_URL, + baseURL: process.env.SERVER_BASE_URL, }); export default apiClient; diff --git a/packages/app/src/pages/document.ejs b/packages/app/client/src/pages/document.ejs similarity index 100% rename from packages/app/src/pages/document.ejs rename to packages/app/client/src/pages/document.ejs diff --git a/packages/app/src/pages/index.less b/packages/app/client/src/pages/index.less similarity index 100% rename from packages/app/src/pages/index.less rename to packages/app/client/src/pages/index.less diff --git a/packages/app/src/pages/index.tsx b/packages/app/client/src/pages/index.tsx similarity index 100% rename from packages/app/src/pages/index.tsx rename to packages/app/client/src/pages/index.tsx diff --git a/packages/app/src/pages/mock.ts b/packages/app/client/src/pages/mock.ts similarity index 100% rename from packages/app/src/pages/mock.ts rename to packages/app/client/src/pages/mock.ts diff --git a/packages/app/tsconfig.json b/packages/app/client/tsconfig.json similarity index 100% rename from packages/app/tsconfig.json rename to packages/app/client/tsconfig.json diff --git a/packages/app/typings.d.ts b/packages/app/client/typings.d.ts similarity index 100% rename from packages/app/typings.d.ts rename to packages/app/client/typings.d.ts diff --git a/packages/app/client/umi.cli.js b/packages/app/client/umi.cli.js new file mode 100644 index 000000000..ba80fce41 --- /dev/null +++ b/packages/app/client/umi.cli.js @@ -0,0 +1,7 @@ +#!/usr/bin/env node +try { + require('v8-compile-cache'); + require('umi/lib/cli'); +} catch (error) { + +} diff --git a/packages/app/server/.npmignore b/packages/app/server/.npmignore new file mode 100644 index 000000000..8019620d5 --- /dev/null +++ b/packages/app/server/.npmignore @@ -0,0 +1,8 @@ +node_modules +*.log +docs +__tests__ +jest.config.js +tsconfig.json +tsconfig.build.json +.fatherrc.ts diff --git a/packages/app/server/package.json b/packages/app/server/package.json new file mode 100644 index 000000000..e501d602e --- /dev/null +++ b/packages/app/server/package.json @@ -0,0 +1,33 @@ +{ + "name": "@nocobase/app-server", + "version": "0.6.2-alpha.8", + "description": "", + "license": "MIT", + "main": "./lib/index.js", + "types": "./lib/index.d.ts", + "scripts": { + "build": "rimraf -rf lib esm dist && npm run build:cjs && npm run build:esm", + "build:cjs": "tsc --project tsconfig.build.json", + "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" + }, + "dependencies": { + "@nocobase/database": "0.6.2-alpha.8", + "@nocobase/plugin-acl": "0.6.2-alpha.8", + "@nocobase/plugin-china-region": "0.6.2-alpha.8", + "@nocobase/plugin-client": "0.6.2-alpha.8", + "@nocobase/plugin-collection-manager": "0.6.2-alpha.8", + "@nocobase/plugin-error-handler": "0.6.2-alpha.8", + "@nocobase/plugin-file-manager": "0.6.2-alpha.8", + "@nocobase/plugin-system-settings": "0.6.2-alpha.8", + "@nocobase/plugin-ui-routes-storage": "0.6.2-alpha.8", + "@nocobase/plugin-ui-schema-storage": "0.6.2-alpha.8", + "@nocobase/plugin-users": "0.6.2-alpha.8", + "@nocobase/plugin-workflow": "0.6.2-alpha.8", + "@nocobase/server": "0.6.2-alpha.8" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/nocobase/nocobase.git", + "directory": "packages/app/server" + } +} diff --git a/packages/app/server/src/config/database.ts b/packages/app/server/src/config/database.ts new file mode 100644 index 000000000..cc6f3bc65 --- /dev/null +++ b/packages/app/server/src/config/database.ts @@ -0,0 +1,27 @@ +import { IDatabaseOptions } from '@nocobase/database'; +import { resolve } from 'path'; + +const dialect = process.env.DB_DIALECT as any; + +let databaseConfig: IDatabaseOptions = { + dialect, + logging: process.env.DB_LOG_SQL === 'on' ? console.log : false, +}; + +if (dialect === 'sqlite') { + databaseConfig = { + ...databaseConfig, + storage: resolve(process.cwd(), process.env.DB_STORAGE || 'db.sqlite'), + }; +} else { + databaseConfig = { + ...databaseConfig, + username: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.DB_DATABASE, + host: process.env.DB_HOST, + port: process.env.DB_PORT as any, + }; +} + +export default databaseConfig; diff --git a/packages/app/server/src/config/plugins.ts b/packages/app/server/src/config/plugins.ts new file mode 100644 index 000000000..1dc997e5d --- /dev/null +++ b/packages/app/server/src/config/plugins.ts @@ -0,0 +1,23 @@ +import { PluginsConfigurations } from '@nocobase/server'; +import { resolve } from 'path'; + +export default [ + '@nocobase/plugin-error-handler', + '@nocobase/plugin-collection-manager', + '@nocobase/plugin-ui-schema-storage', + '@nocobase/plugin-ui-routes-storage', + '@nocobase/plugin-file-manager', + '@nocobase/plugin-system-settings', + [ + '@nocobase/plugin-users', + { + jwt: { + secret: process.env.JWT_SECRET, + }, + }, + ], + '@nocobase/plugin-acl', + '@nocobase/plugin-china-region', + '@nocobase/plugin-workflow', + ['@nocobase/plugin-client'], +] as PluginsConfigurations; diff --git a/packages/app/server/src/config/resourcer.ts b/packages/app/server/src/config/resourcer.ts new file mode 100644 index 000000000..e3dd1eb92 --- /dev/null +++ b/packages/app/server/src/config/resourcer.ts @@ -0,0 +1,3 @@ +export default { + prefix: process.env.SERVER_BASE_PATH, +}; diff --git a/packages/app/server/src/index.ts b/packages/app/server/src/index.ts new file mode 100644 index 000000000..aae0494b5 --- /dev/null +++ b/packages/app/server/src/index.ts @@ -0,0 +1,8 @@ +import { Application, readConfig } from '@nocobase/server'; +import * as path from 'path'; + +(async () => { + const config = await readConfig(path.join(__dirname, './config')); + const app = new Application(config); + await app.parse(); +})(); diff --git a/packages/actions/tsconfig.build.json b/packages/app/server/tsconfig.build.json similarity index 80% rename from packages/actions/tsconfig.build.json rename to packages/app/server/tsconfig.build.json index 8d3db734b..9bdd87769 100644 --- a/packages/actions/tsconfig.build.json +++ b/packages/app/server/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/api/tsconfig.json b/packages/app/server/tsconfig.json similarity index 69% rename from packages/api/tsconfig.json rename to packages/app/server/tsconfig.json index e10a5305a..bf4bd3fa9 100644 --- a/packages/api/tsconfig.json +++ b/packages/app/server/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } \ No newline at end of file diff --git a/packages/app/umi.cli.js b/packages/app/umi.cli.js deleted file mode 100644 index d5812a8d1..000000000 --- a/packages/app/umi.cli.js +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -require('v8-compile-cache'); -require('umi/lib/cli'); diff --git a/packages/acl/.npmignore b/packages/core/acl/.npmignore similarity index 100% rename from packages/acl/.npmignore rename to packages/core/acl/.npmignore diff --git a/packages/acl/package.json b/packages/core/acl/package.json similarity index 88% rename from packages/acl/package.json rename to packages/core/acl/package.json index 4a01ab80b..9c1662da7 100644 --- a/packages/acl/package.json +++ b/packages/core/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/acl", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "license": "MIT", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/resourcer": "0.6.0-alpha.0", + "@nocobase/resourcer": "0.6.2-alpha.8", "json-templates": "^4.2.0" }, "repository": { diff --git a/packages/acl/src/__tests__/acl.test.ts b/packages/core/acl/src/__tests__/acl.test.ts similarity index 100% rename from packages/acl/src/__tests__/acl.test.ts rename to packages/core/acl/src/__tests__/acl.test.ts diff --git a/packages/acl/src/__tests__/skip.test.ts b/packages/core/acl/src/__tests__/skip.test.ts similarity index 100% rename from packages/acl/src/__tests__/skip.test.ts rename to packages/core/acl/src/__tests__/skip.test.ts diff --git a/packages/acl/src/acl-available-action.ts b/packages/core/acl/src/acl-available-action.ts similarity index 100% rename from packages/acl/src/acl-available-action.ts rename to packages/core/acl/src/acl-available-action.ts diff --git a/packages/acl/src/acl-available-strategy.ts b/packages/core/acl/src/acl-available-strategy.ts similarity index 100% rename from packages/acl/src/acl-available-strategy.ts rename to packages/core/acl/src/acl-available-strategy.ts diff --git a/packages/acl/src/acl-resource.ts b/packages/core/acl/src/acl-resource.ts similarity index 100% rename from packages/acl/src/acl-resource.ts rename to packages/core/acl/src/acl-resource.ts diff --git a/packages/acl/src/acl-role.ts b/packages/core/acl/src/acl-role.ts similarity index 100% rename from packages/acl/src/acl-role.ts rename to packages/core/acl/src/acl-role.ts diff --git a/packages/acl/src/acl.ts b/packages/core/acl/src/acl.ts similarity index 100% rename from packages/acl/src/acl.ts rename to packages/core/acl/src/acl.ts diff --git a/packages/acl/src/index.ts b/packages/core/acl/src/index.ts similarity index 100% rename from packages/acl/src/index.ts rename to packages/core/acl/src/index.ts diff --git a/packages/acl/src/skip-manager.ts b/packages/core/acl/src/skip-manager.ts similarity index 100% rename from packages/acl/src/skip-manager.ts rename to packages/core/acl/src/skip-manager.ts diff --git a/packages/acl/src/skip-middleware.ts b/packages/core/acl/src/skip-middleware.ts similarity index 100% rename from packages/acl/src/skip-middleware.ts rename to packages/core/acl/src/skip-middleware.ts diff --git a/packages/acl/tsconfig.build.json b/packages/core/acl/tsconfig.build.json similarity index 80% rename from packages/acl/tsconfig.build.json rename to packages/core/acl/tsconfig.build.json index 8d3db734b..9bdd87769 100644 --- a/packages/acl/tsconfig.build.json +++ b/packages/core/acl/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/database/tsconfig.json b/packages/core/acl/tsconfig.json similarity index 69% rename from packages/database/tsconfig.json rename to packages/core/acl/tsconfig.json index e10a5305a..bf4bd3fa9 100644 --- a/packages/database/tsconfig.json +++ b/packages/core/acl/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } \ No newline at end of file diff --git a/packages/actions/.npmignore b/packages/core/actions/.npmignore similarity index 100% rename from packages/actions/.npmignore rename to packages/core/actions/.npmignore diff --git a/packages/actions/package.json b/packages/core/actions/package.json similarity index 83% rename from packages/actions/package.json rename to packages/core/actions/package.json index 73ce7fa1f..8d9694873 100644 --- a/packages/actions/package.json +++ b/packages/core/actions/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/actions", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "license": "MIT", "main": "./lib/index.js", @@ -11,8 +11,8 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/database": "^0.6.0-alpha.0", - "@nocobase/resourcer": "^0.6.0-alpha.0" + "@nocobase/database": "0.6.2-alpha.8", + "@nocobase/resourcer": "0.6.2-alpha.8" }, "repository": { "type": "git", diff --git a/packages/actions/src/__tests__/add-action.test.ts b/packages/core/actions/src/__tests__/add-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/add-action.test.ts rename to packages/core/actions/src/__tests__/add-action.test.ts diff --git a/packages/actions/src/__tests__/create-action.test.ts b/packages/core/actions/src/__tests__/create-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/create-action.test.ts rename to packages/core/actions/src/__tests__/create-action.test.ts diff --git a/packages/actions/src/__tests__/destroy-action.test.ts b/packages/core/actions/src/__tests__/destroy-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/destroy-action.test.ts rename to packages/core/actions/src/__tests__/destroy-action.test.ts diff --git a/packages/actions/src/__tests__/get-action.test.ts b/packages/core/actions/src/__tests__/get-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/get-action.test.ts rename to packages/core/actions/src/__tests__/get-action.test.ts diff --git a/packages/actions/src/__tests__/index.ts b/packages/core/actions/src/__tests__/index.ts similarity index 100% rename from packages/actions/src/__tests__/index.ts rename to packages/core/actions/src/__tests__/index.ts diff --git a/packages/actions/src/__tests__/list-action.test.ts b/packages/core/actions/src/__tests__/list-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/list-action.test.ts rename to packages/core/actions/src/__tests__/list-action.test.ts diff --git a/packages/actions/src/__tests__/move-action.test.ts b/packages/core/actions/src/__tests__/move-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/move-action.test.ts rename to packages/core/actions/src/__tests__/move-action.test.ts diff --git a/packages/actions/src/__tests__/remove-action.test.ts b/packages/core/actions/src/__tests__/remove-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/remove-action.test.ts rename to packages/core/actions/src/__tests__/remove-action.test.ts diff --git a/packages/actions/src/__tests__/set-action.test.ts b/packages/core/actions/src/__tests__/set-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/set-action.test.ts rename to packages/core/actions/src/__tests__/set-action.test.ts diff --git a/packages/actions/src/__tests__/sort-collection.test.ts b/packages/core/actions/src/__tests__/sort-collection.test.ts similarity index 100% rename from packages/actions/src/__tests__/sort-collection.test.ts rename to packages/core/actions/src/__tests__/sort-collection.test.ts diff --git a/packages/actions/src/__tests__/toggle-action.test.ts b/packages/core/actions/src/__tests__/toggle-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/toggle-action.test.ts rename to packages/core/actions/src/__tests__/toggle-action.test.ts diff --git a/packages/actions/src/__tests__/update-action.test.ts b/packages/core/actions/src/__tests__/update-action.test.ts similarity index 100% rename from packages/actions/src/__tests__/update-action.test.ts rename to packages/core/actions/src/__tests__/update-action.test.ts diff --git a/packages/actions/src/actions/add.ts b/packages/core/actions/src/actions/add.ts similarity index 100% rename from packages/actions/src/actions/add.ts rename to packages/core/actions/src/actions/add.ts diff --git a/packages/actions/src/actions/create.ts b/packages/core/actions/src/actions/create.ts similarity index 100% rename from packages/actions/src/actions/create.ts rename to packages/core/actions/src/actions/create.ts diff --git a/packages/actions/src/actions/destroy.ts b/packages/core/actions/src/actions/destroy.ts similarity index 100% rename from packages/actions/src/actions/destroy.ts rename to packages/core/actions/src/actions/destroy.ts diff --git a/packages/actions/src/actions/get.ts b/packages/core/actions/src/actions/get.ts similarity index 100% rename from packages/actions/src/actions/get.ts rename to packages/core/actions/src/actions/get.ts diff --git a/packages/actions/src/actions/index.ts b/packages/core/actions/src/actions/index.ts similarity index 100% rename from packages/actions/src/actions/index.ts rename to packages/core/actions/src/actions/index.ts diff --git a/packages/actions/src/actions/list.ts b/packages/core/actions/src/actions/list.ts similarity index 100% rename from packages/actions/src/actions/list.ts rename to packages/core/actions/src/actions/list.ts diff --git a/packages/actions/src/actions/move.ts b/packages/core/actions/src/actions/move.ts similarity index 100% rename from packages/actions/src/actions/move.ts rename to packages/core/actions/src/actions/move.ts diff --git a/packages/actions/src/actions/remove.ts b/packages/core/actions/src/actions/remove.ts similarity index 100% rename from packages/actions/src/actions/remove.ts rename to packages/core/actions/src/actions/remove.ts diff --git a/packages/actions/src/actions/set.ts b/packages/core/actions/src/actions/set.ts similarity index 100% rename from packages/actions/src/actions/set.ts rename to packages/core/actions/src/actions/set.ts diff --git a/packages/actions/src/actions/toggle.ts b/packages/core/actions/src/actions/toggle.ts similarity index 100% rename from packages/actions/src/actions/toggle.ts rename to packages/core/actions/src/actions/toggle.ts diff --git a/packages/actions/src/actions/update.ts b/packages/core/actions/src/actions/update.ts similarity index 100% rename from packages/actions/src/actions/update.ts rename to packages/core/actions/src/actions/update.ts diff --git a/packages/actions/src/index.ts b/packages/core/actions/src/index.ts similarity index 100% rename from packages/actions/src/index.ts rename to packages/core/actions/src/index.ts diff --git a/packages/actions/src/utils.ts b/packages/core/actions/src/utils.ts similarity index 100% rename from packages/actions/src/utils.ts rename to packages/core/actions/src/utils.ts diff --git a/packages/api/tsconfig.build.json b/packages/core/actions/tsconfig.build.json similarity index 80% rename from packages/api/tsconfig.build.json rename to packages/core/actions/tsconfig.build.json index 8d3db734b..9bdd87769 100644 --- a/packages/api/tsconfig.build.json +++ b/packages/core/actions/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/acl/tsconfig.json b/packages/core/actions/tsconfig.json similarity index 69% rename from packages/acl/tsconfig.json rename to packages/core/actions/tsconfig.json index e10a5305a..bf4bd3fa9 100644 --- a/packages/acl/tsconfig.json +++ b/packages/core/actions/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } \ No newline at end of file diff --git a/packages/client/contributing.md b/packages/core/client/contributing.md similarity index 100% rename from packages/client/contributing.md rename to packages/core/client/contributing.md diff --git a/packages/client/develop.md b/packages/core/client/develop.md similarity index 100% rename from packages/client/develop.md rename to packages/core/client/develop.md diff --git a/packages/client/intro.md b/packages/core/client/intro.md similarity index 100% rename from packages/client/intro.md rename to packages/core/client/intro.md diff --git a/packages/client/package.json b/packages/core/client/package.json similarity index 95% rename from packages/client/package.json rename to packages/core/client/package.json index 1a4c8a2c7..c5d25fae7 100644 --- a/packages/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "license": "MIT", "main": "lib", "module": "esm", @@ -23,7 +23,7 @@ "@formily/antd": "^2.0.15", "@formily/core": "^2.0.15", "@formily/react": "^2.0.15", - "@nocobase/utils": "0.6.0-alpha.0", + "@nocobase/utils": "0.6.2-alpha.8", "ahooks": "^3.0.5", "antd": "^4.18.9", "axios": "^0.24.0", diff --git a/packages/client/src/acl/ACLProvider.tsx b/packages/core/client/src/acl/ACLProvider.tsx similarity index 100% rename from packages/client/src/acl/ACLProvider.tsx rename to packages/core/client/src/acl/ACLProvider.tsx diff --git a/packages/client/src/acl/ACLShortcut.tsx b/packages/core/client/src/acl/ACLShortcut.tsx similarity index 100% rename from packages/client/src/acl/ACLShortcut.tsx rename to packages/core/client/src/acl/ACLShortcut.tsx diff --git a/packages/client/src/acl/Configuration/MenuConfigure.tsx b/packages/core/client/src/acl/Configuration/MenuConfigure.tsx similarity index 100% rename from packages/client/src/acl/Configuration/MenuConfigure.tsx rename to packages/core/client/src/acl/Configuration/MenuConfigure.tsx diff --git a/packages/client/src/acl/Configuration/RoleConfigure.tsx b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx similarity index 100% rename from packages/client/src/acl/Configuration/RoleConfigure.tsx rename to packages/core/client/src/acl/Configuration/RoleConfigure.tsx diff --git a/packages/client/src/acl/Configuration/RoleTable.tsx b/packages/core/client/src/acl/Configuration/RoleTable.tsx similarity index 100% rename from packages/client/src/acl/Configuration/RoleTable.tsx rename to packages/core/client/src/acl/Configuration/RoleTable.tsx diff --git a/packages/client/src/acl/Configuration/RolesResourcesActions.tsx b/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx similarity index 100% rename from packages/client/src/acl/Configuration/RolesResourcesActions.tsx rename to packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx diff --git a/packages/client/src/acl/Configuration/ScopeSelect.tsx b/packages/core/client/src/acl/Configuration/ScopeSelect.tsx similarity index 100% rename from packages/client/src/acl/Configuration/ScopeSelect.tsx rename to packages/core/client/src/acl/Configuration/ScopeSelect.tsx diff --git a/packages/client/src/acl/Configuration/StrategyActions.tsx b/packages/core/client/src/acl/Configuration/StrategyActions.tsx similarity index 100% rename from packages/client/src/acl/Configuration/StrategyActions.tsx rename to packages/core/client/src/acl/Configuration/StrategyActions.tsx diff --git a/packages/client/src/acl/Configuration/index.tsx b/packages/core/client/src/acl/Configuration/index.tsx similarity index 100% rename from packages/client/src/acl/Configuration/index.tsx rename to packages/core/client/src/acl/Configuration/index.tsx diff --git a/packages/client/src/acl/Configuration/schemas/roleCollections.ts b/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts similarity index 100% rename from packages/client/src/acl/Configuration/schemas/roleCollections.ts rename to packages/core/client/src/acl/Configuration/schemas/roleCollections.ts diff --git a/packages/client/src/acl/Configuration/schemas/roles.ts b/packages/core/client/src/acl/Configuration/schemas/roles.ts similarity index 100% rename from packages/client/src/acl/Configuration/schemas/roles.ts rename to packages/core/client/src/acl/Configuration/schemas/roles.ts diff --git a/packages/client/src/acl/Configuration/schemas/scopes.ts b/packages/core/client/src/acl/Configuration/schemas/scopes.ts similarity index 100% rename from packages/client/src/acl/Configuration/schemas/scopes.ts rename to packages/core/client/src/acl/Configuration/schemas/scopes.ts diff --git a/packages/client/src/acl/Configuration/schemas/useRoleResourceValues.ts b/packages/core/client/src/acl/Configuration/schemas/useRoleResourceValues.ts similarity index 100% rename from packages/client/src/acl/Configuration/schemas/useRoleResourceValues.ts rename to packages/core/client/src/acl/Configuration/schemas/useRoleResourceValues.ts diff --git a/packages/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts b/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts similarity index 100% rename from packages/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts rename to packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts diff --git a/packages/client/src/acl/index.md b/packages/core/client/src/acl/index.md similarity index 100% rename from packages/client/src/acl/index.md rename to packages/core/client/src/acl/index.md diff --git a/packages/client/src/acl/index.tsx b/packages/core/client/src/acl/index.tsx similarity index 100% rename from packages/client/src/acl/index.tsx rename to packages/core/client/src/acl/index.tsx diff --git a/packages/client/src/action-logs/ActionLog.Designer.tsx b/packages/core/client/src/action-logs/ActionLog.Designer.tsx similarity index 100% rename from packages/client/src/action-logs/ActionLog.Designer.tsx rename to packages/core/client/src/action-logs/ActionLog.Designer.tsx diff --git a/packages/client/src/action-logs/ActionLog.tsx b/packages/core/client/src/action-logs/ActionLog.tsx similarity index 100% rename from packages/client/src/action-logs/ActionLog.tsx rename to packages/core/client/src/action-logs/ActionLog.tsx diff --git a/packages/client/src/action-logs/ActionLogBlockInitializer.tsx b/packages/core/client/src/action-logs/ActionLogBlockInitializer.tsx similarity index 100% rename from packages/client/src/action-logs/ActionLogBlockInitializer.tsx rename to packages/core/client/src/action-logs/ActionLogBlockInitializer.tsx diff --git a/packages/client/src/action-logs/ActionLogProvider.tsx b/packages/core/client/src/action-logs/ActionLogProvider.tsx similarity index 100% rename from packages/client/src/action-logs/ActionLogProvider.tsx rename to packages/core/client/src/action-logs/ActionLogProvider.tsx diff --git a/packages/client/src/action-logs/demos/demo1.tsx b/packages/core/client/src/action-logs/demos/demo1.tsx similarity index 100% rename from packages/client/src/action-logs/demos/demo1.tsx rename to packages/core/client/src/action-logs/demos/demo1.tsx diff --git a/packages/client/src/action-logs/demos/mockData.ts b/packages/core/client/src/action-logs/demos/mockData.ts similarity index 100% rename from packages/client/src/action-logs/demos/mockData.ts rename to packages/core/client/src/action-logs/demos/mockData.ts diff --git a/packages/client/src/action-logs/index.md b/packages/core/client/src/action-logs/index.md similarity index 100% rename from packages/client/src/action-logs/index.md rename to packages/core/client/src/action-logs/index.md diff --git a/packages/client/src/action-logs/index.ts b/packages/core/client/src/action-logs/index.ts similarity index 100% rename from packages/client/src/action-logs/index.ts rename to packages/core/client/src/action-logs/index.ts diff --git a/packages/client/src/action-logs/utils.ts b/packages/core/client/src/action-logs/utils.ts similarity index 100% rename from packages/client/src/action-logs/utils.ts rename to packages/core/client/src/action-logs/utils.ts diff --git a/packages/client/src/antd-config-provider/demos/demo1.tsx b/packages/core/client/src/antd-config-provider/demos/demo1.tsx similarity index 100% rename from packages/client/src/antd-config-provider/demos/demo1.tsx rename to packages/core/client/src/antd-config-provider/demos/demo1.tsx diff --git a/packages/client/src/antd-config-provider/index.md b/packages/core/client/src/antd-config-provider/index.md similarity index 100% rename from packages/client/src/antd-config-provider/index.md rename to packages/core/client/src/antd-config-provider/index.md diff --git a/packages/client/src/antd-config-provider/index.tsx b/packages/core/client/src/antd-config-provider/index.tsx similarity index 100% rename from packages/client/src/antd-config-provider/index.tsx rename to packages/core/client/src/antd-config-provider/index.tsx diff --git a/packages/client/src/api-client/APIClient.ts b/packages/core/client/src/api-client/APIClient.ts similarity index 100% rename from packages/client/src/api-client/APIClient.ts rename to packages/core/client/src/api-client/APIClient.ts diff --git a/packages/client/src/api-client/APIClientProvider.tsx b/packages/core/client/src/api-client/APIClientProvider.tsx similarity index 100% rename from packages/client/src/api-client/APIClientProvider.tsx rename to packages/core/client/src/api-client/APIClientProvider.tsx diff --git a/packages/client/src/api-client/__tests__/APIClient.test.tsx b/packages/core/client/src/api-client/__tests__/APIClient.test.tsx similarity index 100% rename from packages/client/src/api-client/__tests__/APIClient.test.tsx rename to packages/core/client/src/api-client/__tests__/APIClient.test.tsx diff --git a/packages/client/src/api-client/context.ts b/packages/core/client/src/api-client/context.ts similarity index 100% rename from packages/client/src/api-client/context.ts rename to packages/core/client/src/api-client/context.ts diff --git a/packages/client/src/api-client/demos/demo1.tsx b/packages/core/client/src/api-client/demos/demo1.tsx similarity index 100% rename from packages/client/src/api-client/demos/demo1.tsx rename to packages/core/client/src/api-client/demos/demo1.tsx diff --git a/packages/client/src/api-client/demos/demo2.tsx b/packages/core/client/src/api-client/demos/demo2.tsx similarity index 100% rename from packages/client/src/api-client/demos/demo2.tsx rename to packages/core/client/src/api-client/demos/demo2.tsx diff --git a/packages/client/src/api-client/demos/demo3.tsx b/packages/core/client/src/api-client/demos/demo3.tsx similarity index 100% rename from packages/client/src/api-client/demos/demo3.tsx rename to packages/core/client/src/api-client/demos/demo3.tsx diff --git a/packages/client/src/api-client/hooks/assign.ts b/packages/core/client/src/api-client/hooks/assign.ts similarity index 100% rename from packages/client/src/api-client/hooks/assign.ts rename to packages/core/client/src/api-client/hooks/assign.ts diff --git a/packages/client/src/api-client/hooks/index.ts b/packages/core/client/src/api-client/hooks/index.ts similarity index 100% rename from packages/client/src/api-client/hooks/index.ts rename to packages/core/client/src/api-client/hooks/index.ts diff --git a/packages/client/src/api-client/hooks/useAPIClient.ts b/packages/core/client/src/api-client/hooks/useAPIClient.ts similarity index 100% rename from packages/client/src/api-client/hooks/useAPIClient.ts rename to packages/core/client/src/api-client/hooks/useAPIClient.ts diff --git a/packages/client/src/api-client/hooks/useRequest.ts b/packages/core/client/src/api-client/hooks/useRequest.ts similarity index 100% rename from packages/client/src/api-client/hooks/useRequest.ts rename to packages/core/client/src/api-client/hooks/useRequest.ts diff --git a/packages/client/src/api-client/hooks/useResource.ts b/packages/core/client/src/api-client/hooks/useResource.ts similarity index 100% rename from packages/client/src/api-client/hooks/useResource.ts rename to packages/core/client/src/api-client/hooks/useResource.ts diff --git a/packages/client/src/api-client/index.md b/packages/core/client/src/api-client/index.md similarity index 100% rename from packages/client/src/api-client/index.md rename to packages/core/client/src/api-client/index.md diff --git a/packages/client/src/api-client/index.tsx b/packages/core/client/src/api-client/index.tsx similarity index 100% rename from packages/client/src/api-client/index.tsx rename to packages/core/client/src/api-client/index.tsx diff --git a/packages/client/src/application/__tests__/__snapshots__/compose.test.tsx.snap b/packages/core/client/src/application/__tests__/__snapshots__/compose.test.tsx.snap similarity index 100% rename from packages/client/src/application/__tests__/__snapshots__/compose.test.tsx.snap rename to packages/core/client/src/application/__tests__/__snapshots__/compose.test.tsx.snap diff --git a/packages/client/src/application/__tests__/compose.test.tsx b/packages/core/client/src/application/__tests__/compose.test.tsx similarity index 100% rename from packages/client/src/application/__tests__/compose.test.tsx rename to packages/core/client/src/application/__tests__/compose.test.tsx diff --git a/packages/client/src/application/compose.tsx b/packages/core/client/src/application/compose.tsx similarity index 100% rename from packages/client/src/application/compose.tsx rename to packages/core/client/src/application/compose.tsx diff --git a/packages/client/src/application/demos/demo1/Hello.tsx b/packages/core/client/src/application/demos/demo1/Hello.tsx similarity index 100% rename from packages/client/src/application/demos/demo1/Hello.tsx rename to packages/core/client/src/application/demos/demo1/Hello.tsx diff --git a/packages/client/src/application/demos/demo1/RouteSchemaComponent.tsx b/packages/core/client/src/application/demos/demo1/RouteSchemaComponent.tsx similarity index 100% rename from packages/client/src/application/demos/demo1/RouteSchemaComponent.tsx rename to packages/core/client/src/application/demos/demo1/RouteSchemaComponent.tsx diff --git a/packages/client/src/application/demos/demo1/index.tsx b/packages/core/client/src/application/demos/demo1/index.tsx similarity index 100% rename from packages/client/src/application/demos/demo1/index.tsx rename to packages/core/client/src/application/demos/demo1/index.tsx diff --git a/packages/client/src/application/demos/demo1/routes.ts b/packages/core/client/src/application/demos/demo1/routes.ts similarity index 100% rename from packages/client/src/application/demos/demo1/routes.ts rename to packages/core/client/src/application/demos/demo1/routes.ts diff --git a/packages/client/src/application/demos/demo2/apiClient.ts b/packages/core/client/src/application/demos/demo2/apiClient.ts similarity index 100% rename from packages/client/src/application/demos/demo2/apiClient.ts rename to packages/core/client/src/application/demos/demo2/apiClient.ts diff --git a/packages/client/src/application/demos/demo2/index.tsx b/packages/core/client/src/application/demos/demo2/index.tsx similarity index 100% rename from packages/client/src/application/demos/demo2/index.tsx rename to packages/core/client/src/application/demos/demo2/index.tsx diff --git a/packages/client/src/application/demos/demo2/mock.ts b/packages/core/client/src/application/demos/demo2/mock.ts similarity index 100% rename from packages/client/src/application/demos/demo2/mock.ts rename to packages/core/client/src/application/demos/demo2/mock.ts diff --git a/packages/client/src/application/index.md b/packages/core/client/src/application/index.md similarity index 100% rename from packages/client/src/application/index.md rename to packages/core/client/src/application/index.md diff --git a/packages/client/src/application/index.tsx b/packages/core/client/src/application/index.tsx similarity index 100% rename from packages/client/src/application/index.tsx rename to packages/core/client/src/application/index.tsx diff --git a/packages/client/src/async-data-provider/demos/demo1.tsx b/packages/core/client/src/async-data-provider/demos/demo1.tsx similarity index 100% rename from packages/client/src/async-data-provider/demos/demo1.tsx rename to packages/core/client/src/async-data-provider/demos/demo1.tsx diff --git a/packages/client/src/async-data-provider/demos/demo2.tsx b/packages/core/client/src/async-data-provider/demos/demo2.tsx similarity index 100% rename from packages/client/src/async-data-provider/demos/demo2.tsx rename to packages/core/client/src/async-data-provider/demos/demo2.tsx diff --git a/packages/client/src/async-data-provider/demos/demo3.tsx b/packages/core/client/src/async-data-provider/demos/demo3.tsx similarity index 100% rename from packages/client/src/async-data-provider/demos/demo3.tsx rename to packages/core/client/src/async-data-provider/demos/demo3.tsx diff --git a/packages/client/src/async-data-provider/index.md b/packages/core/client/src/async-data-provider/index.md similarity index 100% rename from packages/client/src/async-data-provider/index.md rename to packages/core/client/src/async-data-provider/index.md diff --git a/packages/client/src/async-data-provider/index.tsx b/packages/core/client/src/async-data-provider/index.tsx similarity index 100% rename from packages/client/src/async-data-provider/index.tsx rename to packages/core/client/src/async-data-provider/index.tsx diff --git a/packages/client/src/block-provider/BlockProvider.tsx b/packages/core/client/src/block-provider/BlockProvider.tsx similarity index 100% rename from packages/client/src/block-provider/BlockProvider.tsx rename to packages/core/client/src/block-provider/BlockProvider.tsx diff --git a/packages/client/src/block-provider/BlockSchemaComponentProvider.tsx b/packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx similarity index 100% rename from packages/client/src/block-provider/BlockSchemaComponentProvider.tsx rename to packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx diff --git a/packages/client/src/block-provider/CalendarBlockProvider.tsx b/packages/core/client/src/block-provider/CalendarBlockProvider.tsx similarity index 100% rename from packages/client/src/block-provider/CalendarBlockProvider.tsx rename to packages/core/client/src/block-provider/CalendarBlockProvider.tsx diff --git a/packages/client/src/block-provider/FormBlockProvider.tsx b/packages/core/client/src/block-provider/FormBlockProvider.tsx similarity index 100% rename from packages/client/src/block-provider/FormBlockProvider.tsx rename to packages/core/client/src/block-provider/FormBlockProvider.tsx diff --git a/packages/client/src/block-provider/KanbanBlockProvider.tsx b/packages/core/client/src/block-provider/KanbanBlockProvider.tsx similarity index 100% rename from packages/client/src/block-provider/KanbanBlockProvider.tsx rename to packages/core/client/src/block-provider/KanbanBlockProvider.tsx diff --git a/packages/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx similarity index 100% rename from packages/client/src/block-provider/TableBlockProvider.tsx rename to packages/core/client/src/block-provider/TableBlockProvider.tsx diff --git a/packages/client/src/block-provider/TableFieldProvider.tsx b/packages/core/client/src/block-provider/TableFieldProvider.tsx similarity index 100% rename from packages/client/src/block-provider/TableFieldProvider.tsx rename to packages/core/client/src/block-provider/TableFieldProvider.tsx diff --git a/packages/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx similarity index 100% rename from packages/client/src/block-provider/TableSelectorProvider.tsx rename to packages/core/client/src/block-provider/TableSelectorProvider.tsx diff --git a/packages/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts similarity index 100% rename from packages/client/src/block-provider/hooks/index.ts rename to packages/core/client/src/block-provider/hooks/index.ts diff --git a/packages/client/src/block-provider/index.tsx b/packages/core/client/src/block-provider/index.tsx similarity index 100% rename from packages/client/src/block-provider/index.tsx rename to packages/core/client/src/block-provider/index.tsx diff --git a/packages/client/src/board/Board.tsx b/packages/core/client/src/board/Board.tsx similarity index 100% rename from packages/client/src/board/Board.tsx rename to packages/core/client/src/board/Board.tsx diff --git a/packages/client/src/board/Card.tsx b/packages/core/client/src/board/Card.tsx similarity index 100% rename from packages/client/src/board/Card.tsx rename to packages/core/client/src/board/Card.tsx diff --git a/packages/client/src/board/CardAdder.tsx b/packages/core/client/src/board/CardAdder.tsx similarity index 100% rename from packages/client/src/board/CardAdder.tsx rename to packages/core/client/src/board/CardAdder.tsx diff --git a/packages/client/src/board/CardForm.tsx b/packages/core/client/src/board/CardForm.tsx similarity index 100% rename from packages/client/src/board/CardForm.tsx rename to packages/core/client/src/board/CardForm.tsx diff --git a/packages/client/src/board/Column.tsx b/packages/core/client/src/board/Column.tsx similarity index 100% rename from packages/client/src/board/Column.tsx rename to packages/core/client/src/board/Column.tsx diff --git a/packages/client/src/board/ColumnAdder.tsx b/packages/core/client/src/board/ColumnAdder.tsx similarity index 100% rename from packages/client/src/board/ColumnAdder.tsx rename to packages/core/client/src/board/ColumnAdder.tsx diff --git a/packages/client/src/board/ColumnForm.tsx b/packages/core/client/src/board/ColumnForm.tsx similarity index 100% rename from packages/client/src/board/ColumnForm.tsx rename to packages/core/client/src/board/ColumnForm.tsx diff --git a/packages/client/src/board/DefaultCard.tsx b/packages/core/client/src/board/DefaultCard.tsx similarity index 100% rename from packages/client/src/board/DefaultCard.tsx rename to packages/core/client/src/board/DefaultCard.tsx diff --git a/packages/client/src/board/DefaultColumnHeader.tsx b/packages/core/client/src/board/DefaultColumnHeader.tsx similarity index 100% rename from packages/client/src/board/DefaultColumnHeader.tsx rename to packages/core/client/src/board/DefaultColumnHeader.tsx diff --git a/packages/client/src/board/Kanban.tsx b/packages/core/client/src/board/Kanban.tsx similarity index 100% rename from packages/client/src/board/Kanban.tsx rename to packages/core/client/src/board/Kanban.tsx diff --git a/packages/client/src/board/demos/demo2.tsx b/packages/core/client/src/board/demos/demo2.tsx similarity index 100% rename from packages/client/src/board/demos/demo2.tsx rename to packages/core/client/src/board/demos/demo2.tsx diff --git a/packages/client/src/board/helpers.ts b/packages/core/client/src/board/helpers.ts similarity index 100% rename from packages/client/src/board/helpers.ts rename to packages/core/client/src/board/helpers.ts diff --git a/packages/client/src/board/index.md b/packages/core/client/src/board/index.md similarity index 100% rename from packages/client/src/board/index.md rename to packages/core/client/src/board/index.md diff --git a/packages/client/src/board/index.ts b/packages/core/client/src/board/index.ts similarity index 100% rename from packages/client/src/board/index.ts rename to packages/core/client/src/board/index.ts diff --git a/packages/client/src/board/services.ts b/packages/core/client/src/board/services.ts similarity index 100% rename from packages/client/src/board/services.ts rename to packages/core/client/src/board/services.ts diff --git a/packages/client/src/board/style.less b/packages/core/client/src/board/style.less similarity index 100% rename from packages/client/src/board/style.less rename to packages/core/client/src/board/style.less diff --git a/packages/client/src/board/utils.ts b/packages/core/client/src/board/utils.ts similarity index 100% rename from packages/client/src/board/utils.ts rename to packages/core/client/src/board/utils.ts diff --git a/packages/client/src/board/withDroppable.tsx b/packages/core/client/src/board/withDroppable.tsx similarity index 100% rename from packages/client/src/board/withDroppable.tsx rename to packages/core/client/src/board/withDroppable.tsx diff --git a/packages/client/src/china-region/index.tsx b/packages/core/client/src/china-region/index.tsx similarity index 100% rename from packages/client/src/china-region/index.tsx rename to packages/core/client/src/china-region/index.tsx diff --git a/packages/client/src/collection-manager/CollectionField.tsx b/packages/core/client/src/collection-manager/CollectionField.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionField.tsx rename to packages/core/client/src/collection-manager/CollectionField.tsx diff --git a/packages/client/src/collection-manager/CollectionFieldProvider.tsx b/packages/core/client/src/collection-manager/CollectionFieldProvider.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionFieldProvider.tsx rename to packages/core/client/src/collection-manager/CollectionFieldProvider.tsx diff --git a/packages/client/src/collection-manager/CollectionManagerProvider.tsx b/packages/core/client/src/collection-manager/CollectionManagerProvider.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionManagerProvider.tsx rename to packages/core/client/src/collection-manager/CollectionManagerProvider.tsx diff --git a/packages/client/src/collection-manager/CollectionManagerSchemaComponentProvider.tsx b/packages/core/client/src/collection-manager/CollectionManagerSchemaComponentProvider.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionManagerSchemaComponentProvider.tsx rename to packages/core/client/src/collection-manager/CollectionManagerSchemaComponentProvider.tsx diff --git a/packages/client/src/collection-manager/CollectionManagerShortcut.tsx b/packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionManagerShortcut.tsx rename to packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx diff --git a/packages/client/src/collection-manager/CollectionProvider.tsx b/packages/core/client/src/collection-manager/CollectionProvider.tsx similarity index 100% rename from packages/client/src/collection-manager/CollectionProvider.tsx rename to packages/core/client/src/collection-manager/CollectionProvider.tsx diff --git a/packages/client/src/collection-manager/Configuration/AddFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/AddFieldAction.tsx rename to packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx diff --git a/packages/client/src/collection-manager/Configuration/AddSubFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/AddSubFieldAction.tsx rename to packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx diff --git a/packages/client/src/collection-manager/Configuration/ConfigurationTable.tsx b/packages/core/client/src/collection-manager/Configuration/ConfigurationTable.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/ConfigurationTable.tsx rename to packages/core/client/src/collection-manager/Configuration/ConfigurationTable.tsx diff --git a/packages/client/src/collection-manager/Configuration/EditFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/EditFieldAction.tsx rename to packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx diff --git a/packages/client/src/collection-manager/Configuration/EditSubFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/EditSubFieldAction.tsx rename to packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx diff --git a/packages/client/src/collection-manager/Configuration/index.tsx b/packages/core/client/src/collection-manager/Configuration/index.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/index.tsx rename to packages/core/client/src/collection-manager/Configuration/index.tsx diff --git a/packages/client/src/collection-manager/Configuration/interfaces.tsx b/packages/core/client/src/collection-manager/Configuration/interfaces.tsx similarity index 100% rename from packages/client/src/collection-manager/Configuration/interfaces.tsx rename to packages/core/client/src/collection-manager/Configuration/interfaces.tsx diff --git a/packages/client/src/collection-manager/Configuration/schemas/collectionFields.ts b/packages/core/client/src/collection-manager/Configuration/schemas/collectionFields.ts similarity index 100% rename from packages/client/src/collection-manager/Configuration/schemas/collectionFields.ts rename to packages/core/client/src/collection-manager/Configuration/schemas/collectionFields.ts diff --git a/packages/client/src/collection-manager/Configuration/schemas/collections.ts b/packages/core/client/src/collection-manager/Configuration/schemas/collections.ts similarity index 100% rename from packages/client/src/collection-manager/Configuration/schemas/collections.ts rename to packages/core/client/src/collection-manager/Configuration/schemas/collections.ts diff --git a/packages/client/src/collection-manager/ResourceActionProvider.tsx b/packages/core/client/src/collection-manager/ResourceActionProvider.tsx similarity index 100% rename from packages/client/src/collection-manager/ResourceActionProvider.tsx rename to packages/core/client/src/collection-manager/ResourceActionProvider.tsx diff --git a/packages/client/src/collection-manager/action-hooks.ts b/packages/core/client/src/collection-manager/action-hooks.ts similarity index 100% rename from packages/client/src/collection-manager/action-hooks.ts rename to packages/core/client/src/collection-manager/action-hooks.ts diff --git a/packages/client/src/collection-manager/context.ts b/packages/core/client/src/collection-manager/context.ts similarity index 100% rename from packages/client/src/collection-manager/context.ts rename to packages/core/client/src/collection-manager/context.ts diff --git a/packages/client/src/collection-manager/demos/demo2.tsx b/packages/core/client/src/collection-manager/demos/demo2.tsx similarity index 100% rename from packages/client/src/collection-manager/demos/demo2.tsx rename to packages/core/client/src/collection-manager/demos/demo2.tsx diff --git a/packages/client/src/collection-manager/demos/demo3.tsx b/packages/core/client/src/collection-manager/demos/demo3.tsx similarity index 100% rename from packages/client/src/collection-manager/demos/demo3.tsx rename to packages/core/client/src/collection-manager/demos/demo3.tsx diff --git a/packages/client/src/collection-manager/demos/demo4.tsx b/packages/core/client/src/collection-manager/demos/demo4.tsx similarity index 100% rename from packages/client/src/collection-manager/demos/demo4.tsx rename to packages/core/client/src/collection-manager/demos/demo4.tsx diff --git a/packages/client/src/collection-manager/hooks/index.ts b/packages/core/client/src/collection-manager/hooks/index.ts similarity index 100% rename from packages/client/src/collection-manager/hooks/index.ts rename to packages/core/client/src/collection-manager/hooks/index.ts diff --git a/packages/client/src/collection-manager/hooks/useCollection.ts b/packages/core/client/src/collection-manager/hooks/useCollection.ts similarity index 100% rename from packages/client/src/collection-manager/hooks/useCollection.ts rename to packages/core/client/src/collection-manager/hooks/useCollection.ts diff --git a/packages/client/src/collection-manager/hooks/useCollectionDataSource.ts b/packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts similarity index 100% rename from packages/client/src/collection-manager/hooks/useCollectionDataSource.ts rename to packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts diff --git a/packages/client/src/collection-manager/hooks/useCollectionField.ts b/packages/core/client/src/collection-manager/hooks/useCollectionField.ts similarity index 100% rename from packages/client/src/collection-manager/hooks/useCollectionField.ts rename to packages/core/client/src/collection-manager/hooks/useCollectionField.ts diff --git a/packages/client/src/collection-manager/hooks/useCollectionManager.ts b/packages/core/client/src/collection-manager/hooks/useCollectionManager.ts similarity index 100% rename from packages/client/src/collection-manager/hooks/useCollectionManager.ts rename to packages/core/client/src/collection-manager/hooks/useCollectionManager.ts diff --git a/packages/client/src/collection-manager/index.md b/packages/core/client/src/collection-manager/index.md similarity index 100% rename from packages/client/src/collection-manager/index.md rename to packages/core/client/src/collection-manager/index.md diff --git a/packages/client/src/collection-manager/index.tsx b/packages/core/client/src/collection-manager/index.tsx similarity index 100% rename from packages/client/src/collection-manager/index.tsx rename to packages/core/client/src/collection-manager/index.tsx diff --git a/packages/client/src/collection-manager/interfaces/attachment.ts b/packages/core/client/src/collection-manager/interfaces/attachment.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/attachment.ts rename to packages/core/client/src/collection-manager/interfaces/attachment.ts diff --git a/packages/client/src/collection-manager/interfaces/checkbox.ts b/packages/core/client/src/collection-manager/interfaces/checkbox.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/checkbox.ts rename to packages/core/client/src/collection-manager/interfaces/checkbox.ts diff --git a/packages/client/src/collection-manager/interfaces/checkboxGroup.ts b/packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/checkboxGroup.ts rename to packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts diff --git a/packages/client/src/collection-manager/interfaces/chinaRegion.ts b/packages/core/client/src/collection-manager/interfaces/chinaRegion.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/chinaRegion.ts rename to packages/core/client/src/collection-manager/interfaces/chinaRegion.ts diff --git a/packages/client/src/collection-manager/interfaces/createdAt.ts b/packages/core/client/src/collection-manager/interfaces/createdAt.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/createdAt.ts rename to packages/core/client/src/collection-manager/interfaces/createdAt.ts diff --git a/packages/client/src/collection-manager/interfaces/createdBy.ts b/packages/core/client/src/collection-manager/interfaces/createdBy.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/createdBy.ts rename to packages/core/client/src/collection-manager/interfaces/createdBy.ts diff --git a/packages/client/src/collection-manager/interfaces/datetime.ts b/packages/core/client/src/collection-manager/interfaces/datetime.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/datetime.ts rename to packages/core/client/src/collection-manager/interfaces/datetime.ts diff --git a/packages/client/src/collection-manager/interfaces/email.ts b/packages/core/client/src/collection-manager/interfaces/email.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/email.ts rename to packages/core/client/src/collection-manager/interfaces/email.ts diff --git a/packages/client/src/collection-manager/interfaces/icon.ts b/packages/core/client/src/collection-manager/interfaces/icon.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/icon.ts rename to packages/core/client/src/collection-manager/interfaces/icon.ts diff --git a/packages/client/src/collection-manager/interfaces/id.ts b/packages/core/client/src/collection-manager/interfaces/id.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/id.ts rename to packages/core/client/src/collection-manager/interfaces/id.ts diff --git a/packages/client/src/collection-manager/interfaces/index.ts b/packages/core/client/src/collection-manager/interfaces/index.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/index.ts rename to packages/core/client/src/collection-manager/interfaces/index.ts diff --git a/packages/client/src/collection-manager/interfaces/input.ts b/packages/core/client/src/collection-manager/interfaces/input.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/input.ts rename to packages/core/client/src/collection-manager/interfaces/input.ts diff --git a/packages/client/src/collection-manager/interfaces/linkTo.ts b/packages/core/client/src/collection-manager/interfaces/linkTo.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/linkTo.ts rename to packages/core/client/src/collection-manager/interfaces/linkTo.ts diff --git a/packages/client/src/collection-manager/interfaces/markdown.ts b/packages/core/client/src/collection-manager/interfaces/markdown.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/markdown.ts rename to packages/core/client/src/collection-manager/interfaces/markdown.ts diff --git a/packages/client/src/collection-manager/interfaces/multipleSelect.ts b/packages/core/client/src/collection-manager/interfaces/multipleSelect.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/multipleSelect.ts rename to packages/core/client/src/collection-manager/interfaces/multipleSelect.ts diff --git a/packages/client/src/collection-manager/interfaces/number.ts b/packages/core/client/src/collection-manager/interfaces/number.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/number.ts rename to packages/core/client/src/collection-manager/interfaces/number.ts diff --git a/packages/client/src/collection-manager/interfaces/password.ts b/packages/core/client/src/collection-manager/interfaces/password.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/password.ts rename to packages/core/client/src/collection-manager/interfaces/password.ts diff --git a/packages/client/src/collection-manager/interfaces/percent.ts b/packages/core/client/src/collection-manager/interfaces/percent.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/percent.ts rename to packages/core/client/src/collection-manager/interfaces/percent.ts diff --git a/packages/client/src/collection-manager/interfaces/phone.ts b/packages/core/client/src/collection-manager/interfaces/phone.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/phone.ts rename to packages/core/client/src/collection-manager/interfaces/phone.ts diff --git a/packages/client/src/collection-manager/interfaces/properties/index.ts b/packages/core/client/src/collection-manager/interfaces/properties/index.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/properties/index.ts rename to packages/core/client/src/collection-manager/interfaces/properties/index.ts diff --git a/packages/client/src/collection-manager/interfaces/properties/operators.ts b/packages/core/client/src/collection-manager/interfaces/properties/operators.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/properties/operators.ts rename to packages/core/client/src/collection-manager/interfaces/properties/operators.ts diff --git a/packages/client/src/collection-manager/interfaces/radioGroup.ts b/packages/core/client/src/collection-manager/interfaces/radioGroup.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/radioGroup.ts rename to packages/core/client/src/collection-manager/interfaces/radioGroup.ts diff --git a/packages/client/src/collection-manager/interfaces/richText.ts b/packages/core/client/src/collection-manager/interfaces/richText.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/richText.ts rename to packages/core/client/src/collection-manager/interfaces/richText.ts diff --git a/packages/client/src/collection-manager/interfaces/select.ts b/packages/core/client/src/collection-manager/interfaces/select.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/select.ts rename to packages/core/client/src/collection-manager/interfaces/select.ts diff --git a/packages/client/src/collection-manager/interfaces/subTable.ts b/packages/core/client/src/collection-manager/interfaces/subTable.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/subTable.ts rename to packages/core/client/src/collection-manager/interfaces/subTable.ts diff --git a/packages/client/src/collection-manager/interfaces/textarea.ts b/packages/core/client/src/collection-manager/interfaces/textarea.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/textarea.ts rename to packages/core/client/src/collection-manager/interfaces/textarea.ts diff --git a/packages/client/src/collection-manager/interfaces/time.ts b/packages/core/client/src/collection-manager/interfaces/time.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/time.ts rename to packages/core/client/src/collection-manager/interfaces/time.ts diff --git a/packages/client/src/collection-manager/interfaces/types.ts b/packages/core/client/src/collection-manager/interfaces/types.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/types.ts rename to packages/core/client/src/collection-manager/interfaces/types.ts diff --git a/packages/client/src/collection-manager/interfaces/updatedAt.ts b/packages/core/client/src/collection-manager/interfaces/updatedAt.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/updatedAt.ts rename to packages/core/client/src/collection-manager/interfaces/updatedAt.ts diff --git a/packages/client/src/collection-manager/interfaces/updatedBy.ts b/packages/core/client/src/collection-manager/interfaces/updatedBy.ts similarity index 100% rename from packages/client/src/collection-manager/interfaces/updatedBy.ts rename to packages/core/client/src/collection-manager/interfaces/updatedBy.ts diff --git a/packages/client/src/collection-manager/sub-table.tsx b/packages/core/client/src/collection-manager/sub-table.tsx similarity index 100% rename from packages/client/src/collection-manager/sub-table.tsx rename to packages/core/client/src/collection-manager/sub-table.tsx diff --git a/packages/client/src/collection-manager/types.ts b/packages/core/client/src/collection-manager/types.ts similarity index 100% rename from packages/client/src/collection-manager/types.ts rename to packages/core/client/src/collection-manager/types.ts diff --git a/packages/client/src/document-title/index.md b/packages/core/client/src/document-title/index.md similarity index 100% rename from packages/client/src/document-title/index.md rename to packages/core/client/src/document-title/index.md diff --git a/packages/client/src/document-title/index.tsx b/packages/core/client/src/document-title/index.tsx similarity index 100% rename from packages/client/src/document-title/index.tsx rename to packages/core/client/src/document-title/index.tsx diff --git a/packages/client/src/global.less b/packages/core/client/src/global.less similarity index 100% rename from packages/client/src/global.less rename to packages/core/client/src/global.less diff --git a/packages/client/src/i18n/i18n.ts b/packages/core/client/src/i18n/i18n.ts similarity index 100% rename from packages/client/src/i18n/i18n.ts rename to packages/core/client/src/i18n/i18n.ts diff --git a/packages/client/src/i18n/index.md b/packages/core/client/src/i18n/index.md similarity index 100% rename from packages/client/src/i18n/index.md rename to packages/core/client/src/i18n/index.md diff --git a/packages/client/src/i18n/index.ts b/packages/core/client/src/i18n/index.ts similarity index 100% rename from packages/client/src/i18n/index.ts rename to packages/core/client/src/i18n/index.ts diff --git a/packages/client/src/icon/Icon.tsx b/packages/core/client/src/icon/Icon.tsx similarity index 100% rename from packages/client/src/icon/Icon.tsx rename to packages/core/client/src/icon/Icon.tsx diff --git a/packages/client/src/icon/index.md b/packages/core/client/src/icon/index.md similarity index 100% rename from packages/client/src/icon/index.md rename to packages/core/client/src/icon/index.md diff --git a/packages/client/src/icon/index.ts b/packages/core/client/src/icon/index.ts similarity index 100% rename from packages/client/src/icon/index.ts rename to packages/core/client/src/icon/index.ts diff --git a/packages/client/src/index.tsx b/packages/core/client/src/index.tsx similarity index 100% rename from packages/client/src/index.tsx rename to packages/core/client/src/index.tsx diff --git a/packages/client/src/locale/en_US.ts b/packages/core/client/src/locale/en_US.ts similarity index 100% rename from packages/client/src/locale/en_US.ts rename to packages/core/client/src/locale/en_US.ts diff --git a/packages/client/src/locale/index.ts b/packages/core/client/src/locale/index.ts similarity index 100% rename from packages/client/src/locale/index.ts rename to packages/core/client/src/locale/index.ts diff --git a/packages/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts similarity index 100% rename from packages/client/src/locale/zh_CN.ts rename to packages/core/client/src/locale/zh_CN.ts diff --git a/packages/client/src/plugin-manager/PluginManager.tsx b/packages/core/client/src/plugin-manager/PluginManager.tsx similarity index 100% rename from packages/client/src/plugin-manager/PluginManager.tsx rename to packages/core/client/src/plugin-manager/PluginManager.tsx diff --git a/packages/client/src/plugin-manager/PluginManagerProvider.tsx b/packages/core/client/src/plugin-manager/PluginManagerProvider.tsx similarity index 100% rename from packages/client/src/plugin-manager/PluginManagerProvider.tsx rename to packages/core/client/src/plugin-manager/PluginManagerProvider.tsx diff --git a/packages/client/src/plugin-manager/context.ts b/packages/core/client/src/plugin-manager/context.ts similarity index 100% rename from packages/client/src/plugin-manager/context.ts rename to packages/core/client/src/plugin-manager/context.ts diff --git a/packages/client/src/plugin-manager/demos/demo1.tsx b/packages/core/client/src/plugin-manager/demos/demo1.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/demo1.tsx rename to packages/core/client/src/plugin-manager/demos/demo1.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/index.tsx b/packages/core/client/src/plugin-manager/demos/plugins/index.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/index.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/index.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/plugin1.tsx b/packages/core/client/src/plugin-manager/demos/plugins/plugin1.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/plugin1.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/plugin1.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/plugin2.tsx b/packages/core/client/src/plugin-manager/demos/plugins/plugin2.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/plugin2.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/plugin2.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/plugin3.tsx b/packages/core/client/src/plugin-manager/demos/plugins/plugin3.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/plugin3.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/plugin3.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/plugin4.tsx b/packages/core/client/src/plugin-manager/demos/plugins/plugin4.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/plugin4.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/plugin4.tsx diff --git a/packages/client/src/plugin-manager/demos/plugins/plugin5.tsx b/packages/core/client/src/plugin-manager/demos/plugins/plugin5.tsx similarity index 100% rename from packages/client/src/plugin-manager/demos/plugins/plugin5.tsx rename to packages/core/client/src/plugin-manager/demos/plugins/plugin5.tsx diff --git a/packages/client/src/plugin-manager/index.md b/packages/core/client/src/plugin-manager/index.md similarity index 100% rename from packages/client/src/plugin-manager/index.md rename to packages/core/client/src/plugin-manager/index.md diff --git a/packages/client/src/plugin-manager/index.ts b/packages/core/client/src/plugin-manager/index.ts similarity index 100% rename from packages/client/src/plugin-manager/index.ts rename to packages/core/client/src/plugin-manager/index.ts diff --git a/packages/client/src/powered-by/index.tsx b/packages/core/client/src/powered-by/index.tsx similarity index 100% rename from packages/client/src/powered-by/index.tsx rename to packages/core/client/src/powered-by/index.tsx diff --git a/packages/client/src/record-provider/index.md b/packages/core/client/src/record-provider/index.md similarity index 100% rename from packages/client/src/record-provider/index.md rename to packages/core/client/src/record-provider/index.md diff --git a/packages/client/src/record-provider/index.tsx b/packages/core/client/src/record-provider/index.tsx similarity index 100% rename from packages/client/src/record-provider/index.tsx rename to packages/core/client/src/record-provider/index.tsx diff --git a/packages/client/src/route-switch/RouteSwitch.tsx b/packages/core/client/src/route-switch/RouteSwitch.tsx similarity index 100% rename from packages/client/src/route-switch/RouteSwitch.tsx rename to packages/core/client/src/route-switch/RouteSwitch.tsx diff --git a/packages/client/src/route-switch/RouteSwitchProvider.tsx b/packages/core/client/src/route-switch/RouteSwitchProvider.tsx similarity index 100% rename from packages/client/src/route-switch/RouteSwitchProvider.tsx rename to packages/core/client/src/route-switch/RouteSwitchProvider.tsx diff --git a/packages/client/src/route-switch/__tests__/RouteSwitch.test.tsx b/packages/core/client/src/route-switch/__tests__/RouteSwitch.test.tsx similarity index 100% rename from packages/client/src/route-switch/__tests__/RouteSwitch.test.tsx rename to packages/core/client/src/route-switch/__tests__/RouteSwitch.test.tsx diff --git a/packages/client/src/route-switch/__tests__/__snapshots__/RouteSwitch.test.tsx.snap b/packages/core/client/src/route-switch/__tests__/__snapshots__/RouteSwitch.test.tsx.snap similarity index 100% rename from packages/client/src/route-switch/__tests__/__snapshots__/RouteSwitch.test.tsx.snap rename to packages/core/client/src/route-switch/__tests__/__snapshots__/RouteSwitch.test.tsx.snap diff --git a/packages/client/src/route-switch/antd/admin-layout/index.md b/packages/core/client/src/route-switch/antd/admin-layout/index.md similarity index 100% rename from packages/client/src/route-switch/antd/admin-layout/index.md rename to packages/core/client/src/route-switch/antd/admin-layout/index.md diff --git a/packages/client/src/route-switch/antd/admin-layout/index.tsx b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx similarity index 100% rename from packages/client/src/route-switch/antd/admin-layout/index.tsx rename to packages/core/client/src/route-switch/antd/admin-layout/index.tsx diff --git a/packages/client/src/route-switch/antd/auth-layout/index.md b/packages/core/client/src/route-switch/antd/auth-layout/index.md similarity index 100% rename from packages/client/src/route-switch/antd/auth-layout/index.md rename to packages/core/client/src/route-switch/antd/auth-layout/index.md diff --git a/packages/client/src/route-switch/antd/auth-layout/index.tsx b/packages/core/client/src/route-switch/antd/auth-layout/index.tsx similarity index 100% rename from packages/client/src/route-switch/antd/auth-layout/index.tsx rename to packages/core/client/src/route-switch/antd/auth-layout/index.tsx diff --git a/packages/client/src/route-switch/antd/index.ts b/packages/core/client/src/route-switch/antd/index.ts similarity index 100% rename from packages/client/src/route-switch/antd/index.ts rename to packages/core/client/src/route-switch/antd/index.ts diff --git a/packages/client/src/route-switch/antd/route-schema-component/index.tsx b/packages/core/client/src/route-switch/antd/route-schema-component/index.tsx similarity index 100% rename from packages/client/src/route-switch/antd/route-schema-component/index.tsx rename to packages/core/client/src/route-switch/antd/route-schema-component/index.tsx diff --git a/packages/client/src/route-switch/context.ts b/packages/core/client/src/route-switch/context.ts similarity index 100% rename from packages/client/src/route-switch/context.ts rename to packages/core/client/src/route-switch/context.ts diff --git a/packages/client/src/route-switch/demos/demo1.tsx b/packages/core/client/src/route-switch/demos/demo1.tsx similarity index 100% rename from packages/client/src/route-switch/demos/demo1.tsx rename to packages/core/client/src/route-switch/demos/demo1.tsx diff --git a/packages/client/src/route-switch/hooks.ts b/packages/core/client/src/route-switch/hooks.ts similarity index 100% rename from packages/client/src/route-switch/hooks.ts rename to packages/core/client/src/route-switch/hooks.ts diff --git a/packages/client/src/route-switch/index.md b/packages/core/client/src/route-switch/index.md similarity index 100% rename from packages/client/src/route-switch/index.md rename to packages/core/client/src/route-switch/index.md diff --git a/packages/client/src/route-switch/index.tsx b/packages/core/client/src/route-switch/index.tsx similarity index 100% rename from packages/client/src/route-switch/index.tsx rename to packages/core/client/src/route-switch/index.tsx diff --git a/packages/client/src/route-switch/types.ts b/packages/core/client/src/route-switch/types.ts similarity index 100% rename from packages/client/src/route-switch/types.ts rename to packages/core/client/src/route-switch/types.ts diff --git a/packages/client/src/schema-component/antd/AntdSchemaComponentProvider.tsx b/packages/core/client/src/schema-component/antd/AntdSchemaComponentProvider.tsx similarity index 100% rename from packages/client/src/schema-component/antd/AntdSchemaComponentProvider.tsx rename to packages/core/client/src/schema-component/antd/AntdSchemaComponentProvider.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Container.tsx b/packages/core/client/src/schema-component/antd/action/Action.Container.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Container.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Container.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Designer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Designer.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Designer.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Drawer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Drawer.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Link.tsx b/packages/core/client/src/schema-component/antd/action/Action.Link.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Link.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Link.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Modal.tsx b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Modal.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Modal.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Page.tsx b/packages/core/client/src/schema-component/antd/action/Action.Page.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Page.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Page.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.Popover.tsx b/packages/core/client/src/schema-component/antd/action/Action.Popover.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.Popover.tsx rename to packages/core/client/src/schema-component/antd/action/Action.Popover.tsx diff --git a/packages/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/Action.tsx rename to packages/core/client/src/schema-component/antd/action/Action.tsx diff --git a/packages/client/src/schema-component/antd/action/ActionBar.tsx b/packages/core/client/src/schema-component/antd/action/ActionBar.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/ActionBar.tsx rename to packages/core/client/src/schema-component/antd/action/ActionBar.tsx diff --git a/packages/client/src/schema-component/antd/action/context.tsx b/packages/core/client/src/schema-component/antd/action/context.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/context.tsx rename to packages/core/client/src/schema-component/antd/action/context.tsx diff --git a/packages/client/src/schema-component/antd/action/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/action/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/action/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/action/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/action/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/action/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/action/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/demos/demo4.tsx rename to packages/core/client/src/schema-component/antd/action/demos/demo4.tsx diff --git a/packages/client/src/schema-component/antd/action/hooks.ts b/packages/core/client/src/schema-component/antd/action/hooks.ts similarity index 100% rename from packages/client/src/schema-component/antd/action/hooks.ts rename to packages/core/client/src/schema-component/antd/action/hooks.ts diff --git a/packages/client/src/schema-component/antd/action/index.md b/packages/core/client/src/schema-component/antd/action/index.md similarity index 100% rename from packages/client/src/schema-component/antd/action/index.md rename to packages/core/client/src/schema-component/antd/action/index.md diff --git a/packages/client/src/schema-component/antd/action/index.tsx b/packages/core/client/src/schema-component/antd/action/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/action/index.tsx rename to packages/core/client/src/schema-component/antd/action/index.tsx diff --git a/packages/client/src/schema-component/antd/action/types.ts b/packages/core/client/src/schema-component/antd/action/types.ts similarity index 100% rename from packages/client/src/schema-component/antd/action/types.ts rename to packages/core/client/src/schema-component/antd/action/types.ts diff --git a/packages/client/src/schema-component/antd/block-item/BlockItem.tsx b/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx similarity index 100% rename from packages/client/src/schema-component/antd/block-item/BlockItem.tsx rename to packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx diff --git a/packages/client/src/schema-component/antd/block-item/TestDesigner.tsx b/packages/core/client/src/schema-component/antd/block-item/TestDesigner.tsx similarity index 100% rename from packages/client/src/schema-component/antd/block-item/TestDesigner.tsx rename to packages/core/client/src/schema-component/antd/block-item/TestDesigner.tsx diff --git a/packages/client/src/schema-component/antd/block-item/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/block-item/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/block-item/index.md b/packages/core/client/src/schema-component/antd/block-item/index.md similarity index 100% rename from packages/client/src/schema-component/antd/block-item/index.md rename to packages/core/client/src/schema-component/antd/block-item/index.md diff --git a/packages/client/src/schema-component/antd/block-item/index.tsx b/packages/core/client/src/schema-component/antd/block-item/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/block-item/index.tsx rename to packages/core/client/src/schema-component/antd/block-item/index.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Calendar.Designer.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Calendar.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Calendar.Designer.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Calendar.Designer.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Calendar.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Calendar.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Calendar.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Calendar.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Event.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Event.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Event.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Event.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Nav.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Nav.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Nav.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Nav.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Title.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Title.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Title.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Title.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/Today.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/Today.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/Today.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/Today.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/ViewSelect.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/ViewSelect.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/ViewSelect.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/ViewSelect.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/context.ts b/packages/core/client/src/schema-component/antd/calendar-v2/context.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/context.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/context.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/demos/collections.ts b/packages/core/client/src/schema-component/antd/calendar-v2/demos/collections.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/demos/collections.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/demos/collections.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/demos/data.ts b/packages/core/client/src/schema-component/antd/calendar-v2/demos/data.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/demos/data.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/demos/data.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/demos/defaultValues.ts b/packages/core/client/src/schema-component/antd/calendar-v2/demos/defaultValues.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/demos/defaultValues.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/demos/defaultValues.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/calendar-v2/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/calendar-v2/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/calendar-v2/index.md b/packages/core/client/src/schema-component/antd/calendar-v2/index.md similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/index.md rename to packages/core/client/src/schema-component/antd/calendar-v2/index.md diff --git a/packages/client/src/schema-component/antd/calendar-v2/index.ts b/packages/core/client/src/schema-component/antd/calendar-v2/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/index.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/index.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/style.less b/packages/core/client/src/schema-component/antd/calendar-v2/style.less similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/style.less rename to packages/core/client/src/schema-component/antd/calendar-v2/style.less diff --git a/packages/client/src/schema-component/antd/calendar-v2/types.d.ts b/packages/core/client/src/schema-component/antd/calendar-v2/types.d.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/types.d.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/types.d.ts diff --git a/packages/client/src/schema-component/antd/calendar-v2/utils.ts b/packages/core/client/src/schema-component/antd/calendar-v2/utils.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar-v2/utils.ts rename to packages/core/client/src/schema-component/antd/calendar-v2/utils.ts diff --git a/packages/client/src/schema-component/antd/calendar/Calendar.Designer.tsx b/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Calendar.Designer.tsx rename to packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx diff --git a/packages/client/src/schema-component/antd/calendar/Calendar.tsx b/packages/core/client/src/schema-component/antd/calendar/Calendar.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Calendar.tsx rename to packages/core/client/src/schema-component/antd/calendar/Calendar.tsx diff --git a/packages/client/src/schema-component/antd/calendar/Event.tsx b/packages/core/client/src/schema-component/antd/calendar/Event.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Event.tsx rename to packages/core/client/src/schema-component/antd/calendar/Event.tsx diff --git a/packages/client/src/schema-component/antd/calendar/Nav.tsx b/packages/core/client/src/schema-component/antd/calendar/Nav.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Nav.tsx rename to packages/core/client/src/schema-component/antd/calendar/Nav.tsx diff --git a/packages/client/src/schema-component/antd/calendar/Title.tsx b/packages/core/client/src/schema-component/antd/calendar/Title.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Title.tsx rename to packages/core/client/src/schema-component/antd/calendar/Title.tsx diff --git a/packages/client/src/schema-component/antd/calendar/Today.tsx b/packages/core/client/src/schema-component/antd/calendar/Today.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/Today.tsx rename to packages/core/client/src/schema-component/antd/calendar/Today.tsx diff --git a/packages/client/src/schema-component/antd/calendar/ViewSelect.tsx b/packages/core/client/src/schema-component/antd/calendar/ViewSelect.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/ViewSelect.tsx rename to packages/core/client/src/schema-component/antd/calendar/ViewSelect.tsx diff --git a/packages/client/src/schema-component/antd/calendar/context.ts b/packages/core/client/src/schema-component/antd/calendar/context.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/context.ts rename to packages/core/client/src/schema-component/antd/calendar/context.ts diff --git a/packages/client/src/schema-component/antd/calendar/demos/ActionInitializer.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/ActionInitializer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/ActionInitializer.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/ActionInitializer.tsx diff --git a/packages/client/src/schema-component/antd/calendar/demos/FooterActionInitializer.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/FooterActionInitializer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/FooterActionInitializer.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/FooterActionInitializer.tsx diff --git a/packages/client/src/schema-component/antd/calendar/demos/apiClient.ts b/packages/core/client/src/schema-component/antd/calendar/demos/apiClient.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/apiClient.ts rename to packages/core/client/src/schema-component/antd/calendar/demos/apiClient.ts diff --git a/packages/client/src/schema-component/antd/calendar/demos/defaultValues.ts b/packages/core/client/src/schema-component/antd/calendar/demos/defaultValues.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/defaultValues.ts rename to packages/core/client/src/schema-component/antd/calendar/demos/defaultValues.ts diff --git a/packages/client/src/schema-component/antd/calendar/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/calendar/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/calendar/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/calendar/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/calendar/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-component/antd/calendar/demos/demo4.tsx rename to packages/core/client/src/schema-component/antd/calendar/demos/demo4.tsx diff --git a/packages/client/src/schema-component/antd/calendar/index.md b/packages/core/client/src/schema-component/antd/calendar/index.md similarity index 100% rename from packages/client/src/schema-component/antd/calendar/index.md rename to packages/core/client/src/schema-component/antd/calendar/index.md diff --git a/packages/client/src/schema-component/antd/calendar/index.ts b/packages/core/client/src/schema-component/antd/calendar/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/index.ts rename to packages/core/client/src/schema-component/antd/calendar/index.ts diff --git a/packages/client/src/schema-component/antd/calendar/style.less b/packages/core/client/src/schema-component/antd/calendar/style.less similarity index 100% rename from packages/client/src/schema-component/antd/calendar/style.less rename to packages/core/client/src/schema-component/antd/calendar/style.less diff --git a/packages/client/src/schema-component/antd/calendar/types.d.ts b/packages/core/client/src/schema-component/antd/calendar/types.d.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/types.d.ts rename to packages/core/client/src/schema-component/antd/calendar/types.d.ts diff --git a/packages/client/src/schema-component/antd/calendar/utils.ts b/packages/core/client/src/schema-component/antd/calendar/utils.ts similarity index 100% rename from packages/client/src/schema-component/antd/calendar/utils.ts rename to packages/core/client/src/schema-component/antd/calendar/utils.ts diff --git a/packages/client/src/schema-component/antd/card-item/CardItem.tsx b/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx similarity index 100% rename from packages/client/src/schema-component/antd/card-item/CardItem.tsx rename to packages/core/client/src/schema-component/antd/card-item/CardItem.tsx diff --git a/packages/client/src/schema-component/antd/card-item/index.md b/packages/core/client/src/schema-component/antd/card-item/index.md similarity index 100% rename from packages/client/src/schema-component/antd/card-item/index.md rename to packages/core/client/src/schema-component/antd/card-item/index.md diff --git a/packages/client/src/schema-component/antd/card-item/index.ts b/packages/core/client/src/schema-component/antd/card-item/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/card-item/index.ts rename to packages/core/client/src/schema-component/antd/card-item/index.ts diff --git a/packages/client/src/schema-component/antd/cascader/Cascader.tsx b/packages/core/client/src/schema-component/antd/cascader/Cascader.tsx similarity index 100% rename from packages/client/src/schema-component/antd/cascader/Cascader.tsx rename to packages/core/client/src/schema-component/antd/cascader/Cascader.tsx diff --git a/packages/client/src/schema-component/antd/cascader/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/cascader/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/cascader/defaultFieldNames.ts b/packages/core/client/src/schema-component/antd/cascader/defaultFieldNames.ts similarity index 100% rename from packages/client/src/schema-component/antd/cascader/defaultFieldNames.ts rename to packages/core/client/src/schema-component/antd/cascader/defaultFieldNames.ts diff --git a/packages/client/src/schema-component/antd/cascader/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/cascader/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/cascader/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/cascader/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/cascader/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/cascader/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/cascader/index.md b/packages/core/client/src/schema-component/antd/cascader/index.md similarity index 100% rename from packages/client/src/schema-component/antd/cascader/index.md rename to packages/core/client/src/schema-component/antd/cascader/index.md diff --git a/packages/client/src/schema-component/antd/cascader/index.ts b/packages/core/client/src/schema-component/antd/cascader/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/cascader/index.ts rename to packages/core/client/src/schema-component/antd/cascader/index.ts diff --git a/packages/client/src/schema-component/antd/chart/Chart.tsx b/packages/core/client/src/schema-component/antd/chart/Chart.tsx similarity index 100% rename from packages/client/src/schema-component/antd/chart/Chart.tsx rename to packages/core/client/src/schema-component/antd/chart/Chart.tsx diff --git a/packages/client/src/schema-component/antd/chart/index.md b/packages/core/client/src/schema-component/antd/chart/index.md similarity index 100% rename from packages/client/src/schema-component/antd/chart/index.md rename to packages/core/client/src/schema-component/antd/chart/index.md diff --git a/packages/client/src/schema-component/antd/chart/index.ts b/packages/core/client/src/schema-component/antd/chart/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/chart/index.ts rename to packages/core/client/src/schema-component/antd/chart/index.ts diff --git a/packages/client/src/schema-component/antd/checkbox/Checkbox.tsx b/packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx similarity index 100% rename from packages/client/src/schema-component/antd/checkbox/Checkbox.tsx rename to packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx diff --git a/packages/client/src/schema-component/antd/checkbox/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/checkbox/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/checkbox/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/checkbox/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/checkbox/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/checkbox/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/checkbox/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/checkbox/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/checkbox/index.md b/packages/core/client/src/schema-component/antd/checkbox/index.md similarity index 100% rename from packages/client/src/schema-component/antd/checkbox/index.md rename to packages/core/client/src/schema-component/antd/checkbox/index.md diff --git a/packages/client/src/schema-component/antd/checkbox/index.ts b/packages/core/client/src/schema-component/antd/checkbox/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/checkbox/index.ts rename to packages/core/client/src/schema-component/antd/checkbox/index.ts diff --git a/packages/client/src/schema-component/antd/color-select/ColorSelect.tsx b/packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx similarity index 100% rename from packages/client/src/schema-component/antd/color-select/ColorSelect.tsx rename to packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx diff --git a/packages/client/src/schema-component/antd/color-select/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/color-select/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/color-select/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/color-select/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/color-select/index.md b/packages/core/client/src/schema-component/antd/color-select/index.md similarity index 100% rename from packages/client/src/schema-component/antd/color-select/index.md rename to packages/core/client/src/schema-component/antd/color-select/index.md diff --git a/packages/client/src/schema-component/antd/color-select/index.ts b/packages/core/client/src/schema-component/antd/color-select/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/color-select/index.ts rename to packages/core/client/src/schema-component/antd/color-select/index.ts diff --git a/packages/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/DatePicker.tsx rename to packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx diff --git a/packages/client/src/schema-component/antd/date-picker/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/date-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/date-picker/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/date-picker/index.md b/packages/core/client/src/schema-component/antd/date-picker/index.md similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/index.md rename to packages/core/client/src/schema-component/antd/date-picker/index.md diff --git a/packages/client/src/schema-component/antd/date-picker/index.ts b/packages/core/client/src/schema-component/antd/date-picker/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/index.ts rename to packages/core/client/src/schema-component/antd/date-picker/index.ts diff --git a/packages/client/src/schema-component/antd/date-picker/util.ts b/packages/core/client/src/schema-component/antd/date-picker/util.ts similarity index 100% rename from packages/client/src/schema-component/antd/date-picker/util.ts rename to packages/core/client/src/schema-component/antd/date-picker/util.ts diff --git a/packages/client/src/schema-component/antd/filter/DynamicComponent.tsx b/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/DynamicComponent.tsx rename to packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx diff --git a/packages/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx b/packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx rename to packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx diff --git a/packages/client/src/schema-component/antd/filter/Filter.tsx b/packages/core/client/src/schema-component/antd/filter/Filter.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/Filter.tsx rename to packages/core/client/src/schema-component/antd/filter/Filter.tsx diff --git a/packages/client/src/schema-component/antd/filter/FilterAction.tsx b/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/FilterAction.tsx rename to packages/core/client/src/schema-component/antd/filter/FilterAction.tsx diff --git a/packages/client/src/schema-component/antd/filter/FilterGroup.tsx b/packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/FilterGroup.tsx rename to packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx diff --git a/packages/client/src/schema-component/antd/filter/FilterItem.tsx b/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/FilterItem.tsx rename to packages/core/client/src/schema-component/antd/filter/FilterItem.tsx diff --git a/packages/client/src/schema-component/antd/filter/FilterItems.tsx b/packages/core/client/src/schema-component/antd/filter/FilterItems.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/FilterItems.tsx rename to packages/core/client/src/schema-component/antd/filter/FilterItems.tsx diff --git a/packages/client/src/schema-component/antd/filter/SaveDefaultValue.tsx b/packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/SaveDefaultValue.tsx rename to packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx diff --git a/packages/client/src/schema-component/antd/filter/context.ts b/packages/core/client/src/schema-component/antd/filter/context.ts similarity index 100% rename from packages/client/src/schema-component/antd/filter/context.ts rename to packages/core/client/src/schema-component/antd/filter/context.ts diff --git a/packages/client/src/schema-component/antd/filter/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/filter/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/filter/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/filter/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/demos/demo4.tsx rename to packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx diff --git a/packages/client/src/schema-component/antd/filter/demos/demo5.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/demos/demo5.tsx rename to packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx diff --git a/packages/client/src/schema-component/antd/filter/demos/demo6.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo6.tsx similarity index 100% rename from packages/client/src/schema-component/antd/filter/demos/demo6.tsx rename to packages/core/client/src/schema-component/antd/filter/demos/demo6.tsx diff --git a/packages/client/src/schema-component/antd/filter/index.md b/packages/core/client/src/schema-component/antd/filter/index.md similarity index 100% rename from packages/client/src/schema-component/antd/filter/index.md rename to packages/core/client/src/schema-component/antd/filter/index.md diff --git a/packages/client/src/schema-component/antd/filter/index.ts b/packages/core/client/src/schema-component/antd/filter/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/filter/index.ts rename to packages/core/client/src/schema-component/antd/filter/index.ts diff --git a/packages/client/src/schema-component/antd/filter/style.less b/packages/core/client/src/schema-component/antd/filter/style.less similarity index 100% rename from packages/client/src/schema-component/antd/filter/style.less rename to packages/core/client/src/schema-component/antd/filter/style.less diff --git a/packages/client/src/schema-component/antd/filter/useFilterActionProps.ts b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts similarity index 100% rename from packages/client/src/schema-component/antd/filter/useFilterActionProps.ts rename to packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts diff --git a/packages/client/src/schema-component/antd/filter/useValues.ts b/packages/core/client/src/schema-component/antd/filter/useValues.ts similarity index 100% rename from packages/client/src/schema-component/antd/filter/useValues.ts rename to packages/core/client/src/schema-component/antd/filter/useValues.ts diff --git a/packages/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-item/FormItem.tsx rename to packages/core/client/src/schema-component/antd/form-item/FormItem.tsx diff --git a/packages/client/src/schema-component/antd/form-item/index.md b/packages/core/client/src/schema-component/antd/form-item/index.md similarity index 100% rename from packages/client/src/schema-component/antd/form-item/index.md rename to packages/core/client/src/schema-component/antd/form-item/index.md diff --git a/packages/client/src/schema-component/antd/form-item/index.tsx b/packages/core/client/src/schema-component/antd/form-item/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-item/index.tsx rename to packages/core/client/src/schema-component/antd/form-item/index.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/Form.Designer.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/Form.Designer.tsx rename to packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/Form.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/Form.tsx rename to packages/core/client/src/schema-component/antd/form-v2/Form.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/demos/collections.ts b/packages/core/client/src/schema-component/antd/form-v2/demos/collections.ts similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/demos/collections.ts rename to packages/core/client/src/schema-component/antd/form-v2/demos/collections.ts diff --git a/packages/client/src/schema-component/antd/form-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/form-v2/index.md b/packages/core/client/src/schema-component/antd/form-v2/index.md similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/index.md rename to packages/core/client/src/schema-component/antd/form-v2/index.md diff --git a/packages/client/src/schema-component/antd/form-v2/index.ts b/packages/core/client/src/schema-component/antd/form-v2/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/form-v2/index.ts rename to packages/core/client/src/schema-component/antd/form-v2/index.ts diff --git a/packages/client/src/schema-component/antd/form/Form.Designer.tsx b/packages/core/client/src/schema-component/antd/form/Form.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/Form.Designer.tsx rename to packages/core/client/src/schema-component/antd/form/Form.Designer.tsx diff --git a/packages/client/src/schema-component/antd/form/Form.tsx b/packages/core/client/src/schema-component/antd/form/Form.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/Form.tsx rename to packages/core/client/src/schema-component/antd/form/Form.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/apiClient.ts b/packages/core/client/src/schema-component/antd/form/demos/apiClient.ts similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/apiClient.ts rename to packages/core/client/src/schema-component/antd/form/demos/apiClient.ts diff --git a/packages/client/src/schema-component/antd/form/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo4.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo4.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo5.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo5.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo5.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo5.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo6.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo6.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo6.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo6.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo7.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo7.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo7.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo7.tsx diff --git a/packages/client/src/schema-component/antd/form/demos/demo8.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo8.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/demos/demo8.tsx rename to packages/core/client/src/schema-component/antd/form/demos/demo8.tsx diff --git a/packages/client/src/schema-component/antd/form/index.md b/packages/core/client/src/schema-component/antd/form/index.md similarity index 100% rename from packages/client/src/schema-component/antd/form/index.md rename to packages/core/client/src/schema-component/antd/form/index.md diff --git a/packages/client/src/schema-component/antd/form/index.tsx b/packages/core/client/src/schema-component/antd/form/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/form/index.tsx rename to packages/core/client/src/schema-component/antd/form/index.tsx diff --git a/packages/client/src/schema-component/antd/grid/Block.tsx b/packages/core/client/src/schema-component/antd/grid/Block.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/Block.tsx rename to packages/core/client/src/schema-component/antd/grid/Block.tsx diff --git a/packages/client/src/schema-component/antd/grid/Grid.tsx b/packages/core/client/src/schema-component/antd/grid/Grid.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/Grid.tsx rename to packages/core/client/src/schema-component/antd/grid/Grid.tsx diff --git a/packages/client/src/schema-component/antd/grid/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/grid/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/grid/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/grid/index.md b/packages/core/client/src/schema-component/antd/grid/index.md similarity index 100% rename from packages/client/src/schema-component/antd/grid/index.md rename to packages/core/client/src/schema-component/antd/grid/index.md diff --git a/packages/client/src/schema-component/antd/grid/index.tsx b/packages/core/client/src/schema-component/antd/grid/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/grid/index.tsx rename to packages/core/client/src/schema-component/antd/grid/index.tsx diff --git a/packages/client/src/schema-component/antd/icon-picker/IconPicker.tsx b/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/icon-picker/IconPicker.tsx rename to packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx diff --git a/packages/client/src/schema-component/antd/icon-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/icon-picker/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/icon-picker/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/icon-picker/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/icon-picker/index.md b/packages/core/client/src/schema-component/antd/icon-picker/index.md similarity index 100% rename from packages/client/src/schema-component/antd/icon-picker/index.md rename to packages/core/client/src/schema-component/antd/icon-picker/index.md diff --git a/packages/client/src/schema-component/antd/icon-picker/index.ts b/packages/core/client/src/schema-component/antd/icon-picker/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/icon-picker/index.ts rename to packages/core/client/src/schema-component/antd/icon-picker/index.ts diff --git a/packages/client/src/schema-component/antd/index.less b/packages/core/client/src/schema-component/antd/index.less similarity index 100% rename from packages/client/src/schema-component/antd/index.less rename to packages/core/client/src/schema-component/antd/index.less diff --git a/packages/client/src/schema-component/antd/index.ts b/packages/core/client/src/schema-component/antd/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/index.ts rename to packages/core/client/src/schema-component/antd/index.ts diff --git a/packages/client/src/schema-component/antd/input-number/InputNumber.tsx b/packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input-number/InputNumber.tsx rename to packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx diff --git a/packages/client/src/schema-component/antd/input-number/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input-number/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/input-number/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/input-number/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input-number/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/input-number/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/input-number/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/input-number/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input-number/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/input-number/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/input-number/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/input-number/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input-number/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/input-number/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/input-number/index.md b/packages/core/client/src/schema-component/antd/input-number/index.md similarity index 100% rename from packages/client/src/schema-component/antd/input-number/index.md rename to packages/core/client/src/schema-component/antd/input-number/index.md diff --git a/packages/client/src/schema-component/antd/input-number/index.ts b/packages/core/client/src/schema-component/antd/input-number/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/input-number/index.ts rename to packages/core/client/src/schema-component/antd/input-number/index.ts diff --git a/packages/client/src/schema-component/antd/input/EllipsisWithTooltip.tsx b/packages/core/client/src/schema-component/antd/input/EllipsisWithTooltip.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/EllipsisWithTooltip.tsx rename to packages/core/client/src/schema-component/antd/input/EllipsisWithTooltip.tsx diff --git a/packages/client/src/schema-component/antd/input/Input.tsx b/packages/core/client/src/schema-component/antd/input/Input.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/Input.tsx rename to packages/core/client/src/schema-component/antd/input/Input.tsx diff --git a/packages/client/src/schema-component/antd/input/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/input/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/input/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/input/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/input/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/input/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/input/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/input/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/input/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/input/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/input/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/input/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/input/index.md b/packages/core/client/src/schema-component/antd/input/index.md similarity index 100% rename from packages/client/src/schema-component/antd/input/index.md rename to packages/core/client/src/schema-component/antd/input/index.md diff --git a/packages/client/src/schema-component/antd/input/index.ts b/packages/core/client/src/schema-component/antd/input/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/input/index.ts rename to packages/core/client/src/schema-component/antd/input/index.ts diff --git a/packages/client/src/schema-component/antd/input/shared.ts b/packages/core/client/src/schema-component/antd/input/shared.ts similarity index 100% rename from packages/client/src/schema-component/antd/input/shared.ts rename to packages/core/client/src/schema-component/antd/input/shared.ts diff --git a/packages/client/src/schema-component/antd/kanban-v2/Kanban.Card.Designer.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Card.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/Kanban.Card.Designer.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Card.Designer.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/Kanban.Card.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Card.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/Kanban.Card.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Card.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/Kanban.CardViewer.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/Kanban.CardViewer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/Kanban.CardViewer.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/Kanban.CardViewer.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/Kanban.Designer.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/Kanban.Designer.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/Kanban.Designer.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/Kanban.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/Kanban.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/Kanban.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/Kanban.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/context.ts b/packages/core/client/src/schema-component/antd/kanban-v2/context.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/context.ts rename to packages/core/client/src/schema-component/antd/kanban-v2/context.ts diff --git a/packages/client/src/schema-component/antd/kanban-v2/demos/collections.ts b/packages/core/client/src/schema-component/antd/kanban-v2/demos/collections.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/demos/collections.ts rename to packages/core/client/src/schema-component/antd/kanban-v2/demos/collections.ts diff --git a/packages/client/src/schema-component/antd/kanban-v2/demos/data.ts b/packages/core/client/src/schema-component/antd/kanban-v2/demos/data.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/demos/data.ts rename to packages/core/client/src/schema-component/antd/kanban-v2/demos/data.ts diff --git a/packages/client/src/schema-component/antd/kanban-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/kanban-v2/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/kanban-v2/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/kanban-v2/index.md b/packages/core/client/src/schema-component/antd/kanban-v2/index.md similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/index.md rename to packages/core/client/src/schema-component/antd/kanban-v2/index.md diff --git a/packages/client/src/schema-component/antd/kanban-v2/index.ts b/packages/core/client/src/schema-component/antd/kanban-v2/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban-v2/index.ts rename to packages/core/client/src/schema-component/antd/kanban-v2/index.ts diff --git a/packages/client/src/schema-component/antd/kanban/Kanban.Card.Designer.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.Card.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/Kanban.Card.Designer.tsx rename to packages/core/client/src/schema-component/antd/kanban/Kanban.Card.Designer.tsx diff --git a/packages/client/src/schema-component/antd/kanban/Kanban.Card.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.Card.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/Kanban.Card.tsx rename to packages/core/client/src/schema-component/antd/kanban/Kanban.Card.tsx diff --git a/packages/client/src/schema-component/antd/kanban/Kanban.CardViewer.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.CardViewer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/Kanban.CardViewer.tsx rename to packages/core/client/src/schema-component/antd/kanban/Kanban.CardViewer.tsx diff --git a/packages/client/src/schema-component/antd/kanban/Kanban.Designer.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/Kanban.Designer.tsx rename to packages/core/client/src/schema-component/antd/kanban/Kanban.Designer.tsx diff --git a/packages/client/src/schema-component/antd/kanban/Kanban.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/Kanban.tsx rename to packages/core/client/src/schema-component/antd/kanban/Kanban.tsx diff --git a/packages/client/src/schema-component/antd/kanban/context.ts b/packages/core/client/src/schema-component/antd/kanban/context.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban/context.ts rename to packages/core/client/src/schema-component/antd/kanban/context.ts diff --git a/packages/client/src/schema-component/antd/kanban/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/kanban/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/kanban/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/kanban/hoooks/index.ts b/packages/core/client/src/schema-component/antd/kanban/hoooks/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban/hoooks/index.ts rename to packages/core/client/src/schema-component/antd/kanban/hoooks/index.ts diff --git a/packages/client/src/schema-component/antd/kanban/hoooks/useCardItemInitializerFields.tsx b/packages/core/client/src/schema-component/antd/kanban/hoooks/useCardItemInitializerFields.tsx similarity index 100% rename from packages/client/src/schema-component/antd/kanban/hoooks/useCardItemInitializerFields.tsx rename to packages/core/client/src/schema-component/antd/kanban/hoooks/useCardItemInitializerFields.tsx diff --git a/packages/client/src/schema-component/antd/kanban/index.md b/packages/core/client/src/schema-component/antd/kanban/index.md similarity index 100% rename from packages/client/src/schema-component/antd/kanban/index.md rename to packages/core/client/src/schema-component/antd/kanban/index.md diff --git a/packages/client/src/schema-component/antd/kanban/index.ts b/packages/core/client/src/schema-component/antd/kanban/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban/index.ts rename to packages/core/client/src/schema-component/antd/kanban/index.ts diff --git a/packages/client/src/schema-component/antd/kanban/type.d.ts b/packages/core/client/src/schema-component/antd/kanban/type.d.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban/type.d.ts rename to packages/core/client/src/schema-component/antd/kanban/type.d.ts diff --git a/packages/client/src/schema-component/antd/kanban/utils.ts b/packages/core/client/src/schema-component/antd/kanban/utils.ts similarity index 100% rename from packages/client/src/schema-component/antd/kanban/utils.ts rename to packages/core/client/src/schema-component/antd/kanban/utils.ts diff --git a/packages/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx rename to packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx diff --git a/packages/client/src/schema-component/antd/markdown/Markdown.Void.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx similarity index 100% rename from packages/client/src/schema-component/antd/markdown/Markdown.Void.tsx rename to packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx diff --git a/packages/client/src/schema-component/antd/markdown/Markdown.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx similarity index 100% rename from packages/client/src/schema-component/antd/markdown/Markdown.tsx rename to packages/core/client/src/schema-component/antd/markdown/Markdown.tsx diff --git a/packages/client/src/schema-component/antd/markdown/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/markdown/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/markdown/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/markdown/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/markdown/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/markdown/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/markdown/index.md b/packages/core/client/src/schema-component/antd/markdown/index.md similarity index 100% rename from packages/client/src/schema-component/antd/markdown/index.md rename to packages/core/client/src/schema-component/antd/markdown/index.md diff --git a/packages/client/src/schema-component/antd/markdown/index.ts b/packages/core/client/src/schema-component/antd/markdown/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/markdown/index.ts rename to packages/core/client/src/schema-component/antd/markdown/index.ts diff --git a/packages/client/src/schema-component/antd/markdown/style.less b/packages/core/client/src/schema-component/antd/markdown/style.less similarity index 100% rename from packages/client/src/schema-component/antd/markdown/style.less rename to packages/core/client/src/schema-component/antd/markdown/style.less diff --git a/packages/client/src/schema-component/antd/markdown/util.ts b/packages/core/client/src/schema-component/antd/markdown/util.ts similarity index 100% rename from packages/client/src/schema-component/antd/markdown/util.ts rename to packages/core/client/src/schema-component/antd/markdown/util.ts diff --git a/packages/client/src/schema-component/antd/menu/Menu.Designer.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/Menu.Designer.tsx rename to packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx diff --git a/packages/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/Menu.tsx rename to packages/core/client/src/schema-component/antd/menu/Menu.tsx diff --git a/packages/client/src/schema-component/antd/menu/MenuItemInitializers/index.tsx b/packages/core/client/src/schema-component/antd/menu/MenuItemInitializers/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/MenuItemInitializers/index.tsx rename to packages/core/client/src/schema-component/antd/menu/MenuItemInitializers/index.tsx diff --git a/packages/client/src/schema-component/antd/menu/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/menu/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/menu/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/menu/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/menu/index.md b/packages/core/client/src/schema-component/antd/menu/index.md similarity index 100% rename from packages/client/src/schema-component/antd/menu/index.md rename to packages/core/client/src/schema-component/antd/menu/index.md diff --git a/packages/client/src/schema-component/antd/menu/index.ts b/packages/core/client/src/schema-component/antd/menu/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/menu/index.ts rename to packages/core/client/src/schema-component/antd/menu/index.ts diff --git a/packages/client/src/schema-component/antd/menu/util.ts b/packages/core/client/src/schema-component/antd/menu/util.ts similarity index 100% rename from packages/client/src/schema-component/antd/menu/util.ts rename to packages/core/client/src/schema-component/antd/menu/util.ts diff --git a/packages/client/src/schema-component/antd/page/Page.tsx b/packages/core/client/src/schema-component/antd/page/Page.tsx similarity index 100% rename from packages/client/src/schema-component/antd/page/Page.tsx rename to packages/core/client/src/schema-component/antd/page/Page.tsx diff --git a/packages/client/src/schema-component/antd/page/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/page/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/page/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/page/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/page/index.md b/packages/core/client/src/schema-component/antd/page/index.md similarity index 100% rename from packages/client/src/schema-component/antd/page/index.md rename to packages/core/client/src/schema-component/antd/page/index.md diff --git a/packages/client/src/schema-component/antd/page/index.ts b/packages/core/client/src/schema-component/antd/page/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/page/index.ts rename to packages/core/client/src/schema-component/antd/page/index.ts diff --git a/packages/client/src/schema-component/antd/password/Password.tsx b/packages/core/client/src/schema-component/antd/password/Password.tsx similarity index 100% rename from packages/client/src/schema-component/antd/password/Password.tsx rename to packages/core/client/src/schema-component/antd/password/Password.tsx diff --git a/packages/client/src/schema-component/antd/password/PasswordStrength.tsx b/packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx similarity index 100% rename from packages/client/src/schema-component/antd/password/PasswordStrength.tsx rename to packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx diff --git a/packages/client/src/schema-component/antd/password/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/password/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/password/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/password/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/password/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/password/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/password/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/password/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/password/index.md b/packages/core/client/src/schema-component/antd/password/index.md similarity index 100% rename from packages/client/src/schema-component/antd/password/index.md rename to packages/core/client/src/schema-component/antd/password/index.md diff --git a/packages/client/src/schema-component/antd/password/index.ts b/packages/core/client/src/schema-component/antd/password/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/password/index.ts rename to packages/core/client/src/schema-component/antd/password/index.ts diff --git a/packages/client/src/schema-component/antd/radio/Radio.tsx b/packages/core/client/src/schema-component/antd/radio/Radio.tsx similarity index 100% rename from packages/client/src/schema-component/antd/radio/Radio.tsx rename to packages/core/client/src/schema-component/antd/radio/Radio.tsx diff --git a/packages/client/src/schema-component/antd/radio/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/radio/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/radio/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/radio/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/radio/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/radio/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/radio/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/radio/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/radio/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/radio/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/radio/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/radio/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/radio/index.md b/packages/core/client/src/schema-component/antd/radio/index.md similarity index 100% rename from packages/client/src/schema-component/antd/radio/index.md rename to packages/core/client/src/schema-component/antd/radio/index.md diff --git a/packages/client/src/schema-component/antd/radio/index.ts b/packages/core/client/src/schema-component/antd/radio/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/radio/index.ts rename to packages/core/client/src/schema-component/antd/radio/index.ts diff --git a/packages/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx rename to packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx diff --git a/packages/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx rename to packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx diff --git a/packages/client/src/schema-component/antd/record-picker/RecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/RecordPicker.tsx rename to packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx diff --git a/packages/client/src/schema-component/antd/record-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/record-picker/index.md b/packages/core/client/src/schema-component/antd/record-picker/index.md similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/index.md rename to packages/core/client/src/schema-component/antd/record-picker/index.md diff --git a/packages/client/src/schema-component/antd/record-picker/index.tsx b/packages/core/client/src/schema-component/antd/record-picker/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/index.tsx rename to packages/core/client/src/schema-component/antd/record-picker/index.tsx diff --git a/packages/client/src/schema-component/antd/record-picker/useFieldNames.ts b/packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts similarity index 100% rename from packages/client/src/schema-component/antd/record-picker/useFieldNames.ts rename to packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts diff --git a/packages/client/src/schema-component/antd/rich-text/RichText.tsx b/packages/core/client/src/schema-component/antd/rich-text/RichText.tsx similarity index 100% rename from packages/client/src/schema-component/antd/rich-text/RichText.tsx rename to packages/core/client/src/schema-component/antd/rich-text/RichText.tsx diff --git a/packages/client/src/schema-component/antd/rich-text/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/rich-text/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/rich-text/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/rich-text/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/rich-text/index.md b/packages/core/client/src/schema-component/antd/rich-text/index.md similarity index 100% rename from packages/client/src/schema-component/antd/rich-text/index.md rename to packages/core/client/src/schema-component/antd/rich-text/index.md diff --git a/packages/client/src/schema-component/antd/rich-text/index.ts b/packages/core/client/src/schema-component/antd/rich-text/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/rich-text/index.ts rename to packages/core/client/src/schema-component/antd/rich-text/index.ts diff --git a/packages/client/src/schema-component/antd/rich-text/style.less b/packages/core/client/src/schema-component/antd/rich-text/style.less similarity index 100% rename from packages/client/src/schema-component/antd/rich-text/style.less rename to packages/core/client/src/schema-component/antd/rich-text/style.less diff --git a/packages/client/src/schema-component/antd/select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/select/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/select/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/select/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/select/Select.tsx b/packages/core/client/src/schema-component/antd/select/Select.tsx similarity index 100% rename from packages/client/src/schema-component/antd/select/Select.tsx rename to packages/core/client/src/schema-component/antd/select/Select.tsx diff --git a/packages/client/src/schema-component/antd/select/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/select/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/select/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/select/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/select/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/select/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/select/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/select/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/select/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/select/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/select/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/select/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/select/index.md b/packages/core/client/src/schema-component/antd/select/index.md similarity index 100% rename from packages/client/src/schema-component/antd/select/index.md rename to packages/core/client/src/schema-component/antd/select/index.md diff --git a/packages/client/src/schema-component/antd/select/index.ts b/packages/core/client/src/schema-component/antd/select/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/select/index.ts rename to packages/core/client/src/schema-component/antd/select/index.ts diff --git a/packages/client/src/schema-component/antd/select/shared.ts b/packages/core/client/src/schema-component/antd/select/shared.ts similarity index 100% rename from packages/client/src/schema-component/antd/select/shared.ts rename to packages/core/client/src/schema-component/antd/select/shared.ts diff --git a/packages/client/src/schema-component/antd/space/index.tsx b/packages/core/client/src/schema-component/antd/space/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/space/index.tsx rename to packages/core/client/src/schema-component/antd/space/index.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.Column.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.Column.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.Designer.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.Designer.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/Table.tsx rename to packages/core/client/src/schema-component/antd/table-v2/Table.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx rename to packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/TableField.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableField.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/TableField.tsx rename to packages/core/client/src/schema-component/antd/table-v2/TableField.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/TableSelector.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableSelector.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/TableSelector.tsx rename to packages/core/client/src/schema-component/antd/table-v2/TableSelector.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx rename to packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/demos/collections.ts b/packages/core/client/src/schema-component/antd/table-v2/demos/collections.ts similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/demos/collections.ts rename to packages/core/client/src/schema-component/antd/table-v2/demos/collections.ts diff --git a/packages/client/src/schema-component/antd/table-v2/demos/data.ts b/packages/core/client/src/schema-component/antd/table-v2/demos/data.ts similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/demos/data.ts rename to packages/core/client/src/schema-component/antd/table-v2/demos/data.ts diff --git a/packages/client/src/schema-component/antd/table-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/table-v2/index.md b/packages/core/client/src/schema-component/antd/table-v2/index.md similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/index.md rename to packages/core/client/src/schema-component/antd/table-v2/index.md diff --git a/packages/client/src/schema-component/antd/table-v2/index.ts b/packages/core/client/src/schema-component/antd/table-v2/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/table-v2/index.ts rename to packages/core/client/src/schema-component/antd/table-v2/index.ts diff --git a/packages/client/src/schema-component/antd/table/Table.Array.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Array.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Array.Designer.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Array.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Array.tsx b/packages/core/client/src/schema-component/antd/table/Table.Array.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Array.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Array.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Column.Decorator.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Column.Decorator.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Column.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Column.Designer.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Column.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Column.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Column.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Designer.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx b/packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx rename to packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.RowSelection.tsx b/packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.RowSelection.tsx rename to packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Void.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Void.Designer.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx diff --git a/packages/client/src/schema-component/antd/table/Table.Void.tsx b/packages/core/client/src/schema-component/antd/table/Table.Void.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/Table.Void.tsx rename to packages/core/client/src/schema-component/antd/table/Table.Void.tsx diff --git a/packages/client/src/schema-component/antd/table/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/table/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/table/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/table/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/table/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/demos/demo3.tsx rename to packages/core/client/src/schema-component/antd/table/demos/demo3.tsx diff --git a/packages/client/src/schema-component/antd/table/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/demos/demo4.tsx rename to packages/core/client/src/schema-component/antd/table/demos/demo4.tsx diff --git a/packages/client/src/schema-component/antd/table/index.md b/packages/core/client/src/schema-component/antd/table/index.md similarity index 100% rename from packages/client/src/schema-component/antd/table/index.md rename to packages/core/client/src/schema-component/antd/table/index.md diff --git a/packages/client/src/schema-component/antd/table/index.tsx b/packages/core/client/src/schema-component/antd/table/index.tsx similarity index 100% rename from packages/client/src/schema-component/antd/table/index.tsx rename to packages/core/client/src/schema-component/antd/table/index.tsx diff --git a/packages/client/src/schema-component/antd/tabs/Tabs.Designer.tsx b/packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tabs/Tabs.Designer.tsx rename to packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx diff --git a/packages/client/src/schema-component/antd/tabs/Tabs.tsx b/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tabs/Tabs.tsx rename to packages/core/client/src/schema-component/antd/tabs/Tabs.tsx diff --git a/packages/client/src/schema-component/antd/tabs/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tabs/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/tabs/index.md b/packages/core/client/src/schema-component/antd/tabs/index.md similarity index 100% rename from packages/client/src/schema-component/antd/tabs/index.md rename to packages/core/client/src/schema-component/antd/tabs/index.md diff --git a/packages/client/src/schema-component/antd/tabs/index.ts b/packages/core/client/src/schema-component/antd/tabs/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/tabs/index.ts rename to packages/core/client/src/schema-component/antd/tabs/index.ts diff --git a/packages/client/src/schema-component/antd/time-picker/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/time-picker/TimePicker.tsx b/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/TimePicker.tsx rename to packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx diff --git a/packages/client/src/schema-component/antd/time-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/time-picker/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/time-picker/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/time-picker/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/time-picker/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/time-picker/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/time-picker/index.md b/packages/core/client/src/schema-component/antd/time-picker/index.md similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/index.md rename to packages/core/client/src/schema-component/antd/time-picker/index.md diff --git a/packages/client/src/schema-component/antd/time-picker/index.ts b/packages/core/client/src/schema-component/antd/time-picker/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/time-picker/index.ts rename to packages/core/client/src/schema-component/antd/time-picker/index.ts diff --git a/packages/client/src/schema-component/antd/tree-select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tree-select/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/tree-select/TreeSelect.tsx b/packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tree-select/TreeSelect.tsx rename to packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx diff --git a/packages/client/src/schema-component/antd/tree-select/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/tree-select/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/tree-select/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/tree-select/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/tree-select/index.md b/packages/core/client/src/schema-component/antd/tree-select/index.md similarity index 100% rename from packages/client/src/schema-component/antd/tree-select/index.md rename to packages/core/client/src/schema-component/antd/tree-select/index.md diff --git a/packages/client/src/schema-component/antd/tree-select/index.ts b/packages/core/client/src/schema-component/antd/tree-select/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/tree-select/index.ts rename to packages/core/client/src/schema-component/antd/tree-select/index.ts diff --git a/packages/client/src/schema-component/antd/upload/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx similarity index 100% rename from packages/client/src/schema-component/antd/upload/ReadPretty.tsx rename to packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx diff --git a/packages/client/src/schema-component/antd/upload/Upload.tsx b/packages/core/client/src/schema-component/antd/upload/Upload.tsx similarity index 100% rename from packages/client/src/schema-component/antd/upload/Upload.tsx rename to packages/core/client/src/schema-component/antd/upload/Upload.tsx diff --git a/packages/client/src/schema-component/antd/upload/demos/apiClient.ts b/packages/core/client/src/schema-component/antd/upload/demos/apiClient.ts similarity index 100% rename from packages/client/src/schema-component/antd/upload/demos/apiClient.ts rename to packages/core/client/src/schema-component/antd/upload/demos/apiClient.ts diff --git a/packages/client/src/schema-component/antd/upload/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/upload/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/antd/upload/demos/demo1.tsx rename to packages/core/client/src/schema-component/antd/upload/demos/demo1.tsx diff --git a/packages/client/src/schema-component/antd/upload/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/upload/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-component/antd/upload/demos/demo2.tsx rename to packages/core/client/src/schema-component/antd/upload/demos/demo2.tsx diff --git a/packages/client/src/schema-component/antd/upload/index.md b/packages/core/client/src/schema-component/antd/upload/index.md similarity index 100% rename from packages/client/src/schema-component/antd/upload/index.md rename to packages/core/client/src/schema-component/antd/upload/index.md diff --git a/packages/client/src/schema-component/antd/upload/index.ts b/packages/core/client/src/schema-component/antd/upload/index.ts similarity index 100% rename from packages/client/src/schema-component/antd/upload/index.ts rename to packages/core/client/src/schema-component/antd/upload/index.ts diff --git a/packages/client/src/schema-component/antd/upload/placeholder.ts b/packages/core/client/src/schema-component/antd/upload/placeholder.ts similarity index 100% rename from packages/client/src/schema-component/antd/upload/placeholder.ts rename to packages/core/client/src/schema-component/antd/upload/placeholder.ts diff --git a/packages/client/src/schema-component/antd/upload/shared.ts b/packages/core/client/src/schema-component/antd/upload/shared.ts similarity index 100% rename from packages/client/src/schema-component/antd/upload/shared.ts rename to packages/core/client/src/schema-component/antd/upload/shared.ts diff --git a/packages/client/src/schema-component/antd/upload/style.less b/packages/core/client/src/schema-component/antd/upload/style.less similarity index 100% rename from packages/client/src/schema-component/antd/upload/style.less rename to packages/core/client/src/schema-component/antd/upload/style.less diff --git a/packages/client/src/schema-component/antd/upload/type.d.ts b/packages/core/client/src/schema-component/antd/upload/type.d.ts similarity index 100% rename from packages/client/src/schema-component/antd/upload/type.d.ts rename to packages/core/client/src/schema-component/antd/upload/type.d.ts diff --git a/packages/client/src/schema-component/common/dnd-context/index.md b/packages/core/client/src/schema-component/common/dnd-context/index.md similarity index 100% rename from packages/client/src/schema-component/common/dnd-context/index.md rename to packages/core/client/src/schema-component/common/dnd-context/index.md diff --git a/packages/client/src/schema-component/common/dnd-context/index.tsx b/packages/core/client/src/schema-component/common/dnd-context/index.tsx similarity index 100% rename from packages/client/src/schema-component/common/dnd-context/index.tsx rename to packages/core/client/src/schema-component/common/dnd-context/index.tsx diff --git a/packages/client/src/schema-component/common/index.ts b/packages/core/client/src/schema-component/common/index.ts similarity index 100% rename from packages/client/src/schema-component/common/index.ts rename to packages/core/client/src/schema-component/common/index.ts diff --git a/packages/client/src/schema-component/common/sortable-item/SortableItem.tsx b/packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx similarity index 100% rename from packages/client/src/schema-component/common/sortable-item/SortableItem.tsx rename to packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx diff --git a/packages/client/src/schema-component/common/sortable-item/index.md b/packages/core/client/src/schema-component/common/sortable-item/index.md similarity index 100% rename from packages/client/src/schema-component/common/sortable-item/index.md rename to packages/core/client/src/schema-component/common/sortable-item/index.md diff --git a/packages/client/src/schema-component/common/sortable-item/index.ts b/packages/core/client/src/schema-component/common/sortable-item/index.ts similarity index 100% rename from packages/client/src/schema-component/common/sortable-item/index.ts rename to packages/core/client/src/schema-component/common/sortable-item/index.ts diff --git a/packages/client/src/schema-component/context.ts b/packages/core/client/src/schema-component/context.ts similarity index 100% rename from packages/client/src/schema-component/context.ts rename to packages/core/client/src/schema-component/context.ts diff --git a/packages/client/src/schema-component/core/DesignableSwitch.tsx b/packages/core/client/src/schema-component/core/DesignableSwitch.tsx similarity index 100% rename from packages/client/src/schema-component/core/DesignableSwitch.tsx rename to packages/core/client/src/schema-component/core/DesignableSwitch.tsx diff --git a/packages/client/src/schema-component/core/FormProvider.tsx b/packages/core/client/src/schema-component/core/FormProvider.tsx similarity index 100% rename from packages/client/src/schema-component/core/FormProvider.tsx rename to packages/core/client/src/schema-component/core/FormProvider.tsx diff --git a/packages/client/src/schema-component/core/RemoteSchemaComponent.tsx b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx similarity index 100% rename from packages/client/src/schema-component/core/RemoteSchemaComponent.tsx rename to packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx diff --git a/packages/client/src/schema-component/core/SchemaComponent.tsx b/packages/core/client/src/schema-component/core/SchemaComponent.tsx similarity index 100% rename from packages/client/src/schema-component/core/SchemaComponent.tsx rename to packages/core/client/src/schema-component/core/SchemaComponent.tsx diff --git a/packages/client/src/schema-component/core/SchemaComponentOptions.tsx b/packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx similarity index 100% rename from packages/client/src/schema-component/core/SchemaComponentOptions.tsx rename to packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx diff --git a/packages/client/src/schema-component/core/SchemaComponentProvider.tsx b/packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx similarity index 100% rename from packages/client/src/schema-component/core/SchemaComponentProvider.tsx rename to packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx diff --git a/packages/client/src/schema-component/core/index.tsx b/packages/core/client/src/schema-component/core/index.tsx similarity index 100% rename from packages/client/src/schema-component/core/index.tsx rename to packages/core/client/src/schema-component/core/index.tsx diff --git a/packages/client/src/schema-component/demos/demo1.tsx b/packages/core/client/src/schema-component/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-component/demos/demo1.tsx rename to packages/core/client/src/schema-component/demos/demo1.tsx diff --git a/packages/client/src/schema-component/demos/demo3.tsx b/packages/core/client/src/schema-component/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-component/demos/demo3.tsx rename to packages/core/client/src/schema-component/demos/demo3.tsx diff --git a/packages/client/src/schema-component/hooks/__tests__/designable.test.ts b/packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts similarity index 100% rename from packages/client/src/schema-component/hooks/__tests__/designable.test.ts rename to packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts diff --git a/packages/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts b/packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts similarity index 100% rename from packages/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts rename to packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts diff --git a/packages/client/src/schema-component/hooks/index.ts b/packages/core/client/src/schema-component/hooks/index.ts similarity index 100% rename from packages/client/src/schema-component/hooks/index.ts rename to packages/core/client/src/schema-component/hooks/index.ts diff --git a/packages/client/src/schema-component/hooks/useAttach.ts b/packages/core/client/src/schema-component/hooks/useAttach.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useAttach.ts rename to packages/core/client/src/schema-component/hooks/useAttach.ts diff --git a/packages/client/src/schema-component/hooks/useCompile.ts b/packages/core/client/src/schema-component/hooks/useCompile.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useCompile.ts rename to packages/core/client/src/schema-component/hooks/useCompile.ts diff --git a/packages/client/src/schema-component/hooks/useComponent.ts b/packages/core/client/src/schema-component/hooks/useComponent.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useComponent.ts rename to packages/core/client/src/schema-component/hooks/useComponent.ts diff --git a/packages/client/src/schema-component/hooks/useDesignable.tsx b/packages/core/client/src/schema-component/hooks/useDesignable.tsx similarity index 100% rename from packages/client/src/schema-component/hooks/useDesignable.tsx rename to packages/core/client/src/schema-component/hooks/useDesignable.tsx diff --git a/packages/client/src/schema-component/hooks/useDesigner.ts b/packages/core/client/src/schema-component/hooks/useDesigner.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useDesigner.ts rename to packages/core/client/src/schema-component/hooks/useDesigner.ts diff --git a/packages/client/src/schema-component/hooks/useFieldProps.ts b/packages/core/client/src/schema-component/hooks/useFieldProps.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useFieldProps.ts rename to packages/core/client/src/schema-component/hooks/useFieldProps.ts diff --git a/packages/client/src/schema-component/hooks/useProps.ts b/packages/core/client/src/schema-component/hooks/useProps.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useProps.ts rename to packages/core/client/src/schema-component/hooks/useProps.ts diff --git a/packages/client/src/schema-component/hooks/useSchemaComponentContext.ts b/packages/core/client/src/schema-component/hooks/useSchemaComponentContext.ts similarity index 100% rename from packages/client/src/schema-component/hooks/useSchemaComponentContext.ts rename to packages/core/client/src/schema-component/hooks/useSchemaComponentContext.ts diff --git a/packages/client/src/schema-component/index.md b/packages/core/client/src/schema-component/index.md similarity index 100% rename from packages/client/src/schema-component/index.md rename to packages/core/client/src/schema-component/index.md diff --git a/packages/client/src/schema-component/index.tsx b/packages/core/client/src/schema-component/index.tsx similarity index 100% rename from packages/client/src/schema-component/index.tsx rename to packages/core/client/src/schema-component/index.tsx diff --git a/packages/client/src/schema-component/types.ts b/packages/core/client/src/schema-component/types.ts similarity index 100% rename from packages/client/src/schema-component/types.ts rename to packages/core/client/src/schema-component/types.ts diff --git a/packages/client/src/schema-initializer/SchemaInitializer.tsx b/packages/core/client/src/schema-initializer/SchemaInitializer.tsx similarity index 100% rename from packages/client/src/schema-initializer/SchemaInitializer.tsx rename to packages/core/client/src/schema-initializer/SchemaInitializer.tsx diff --git a/packages/client/src/schema-initializer/SchemaInitializerProvider.tsx b/packages/core/client/src/schema-initializer/SchemaInitializerProvider.tsx similarity index 100% rename from packages/client/src/schema-initializer/SchemaInitializerProvider.tsx rename to packages/core/client/src/schema-initializer/SchemaInitializerProvider.tsx diff --git a/packages/client/src/schema-initializer/buttons/BlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/BlockInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/CalendarActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/CalendarActionInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/CalendarActionInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/CalendarActionInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/CreateFormBlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/CreateFormBlockInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/CreateFormBlockInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/CreateFormBlockInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/FormActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/FormActionInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/FormActionInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/FormActionInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/FormItemInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/FormItemInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/KanbanCardFormItemInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/KanbanCardFormItemInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/KanbanCardFormItemInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/KanbanCardFormItemInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/RecordFormBlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/RecordFormBlockInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/RecordFormBlockInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/RecordFormBlockInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/SubTableActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/SubTableActionInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/SubTableActionInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/SubTableActionInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/TabPaneInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/TabPaneInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/TableActionColumnInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TableActionColumnInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/TableActionColumnInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/TableActionColumnInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/TableActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/TableActionInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/TableColumnInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TableColumnInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/TableColumnInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/TableColumnInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/TableSelectorInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TableSelectorInitializers.tsx similarity index 100% rename from packages/client/src/schema-initializer/buttons/TableSelectorInitializers.tsx rename to packages/core/client/src/schema-initializer/buttons/TableSelectorInitializers.tsx diff --git a/packages/client/src/schema-initializer/buttons/index.ts b/packages/core/client/src/schema-initializer/buttons/index.ts similarity index 100% rename from packages/client/src/schema-initializer/buttons/index.ts rename to packages/core/client/src/schema-initializer/buttons/index.ts diff --git a/packages/client/src/schema-initializer/demos/demo1.tsx b/packages/core/client/src/schema-initializer/demos/demo1.tsx similarity index 100% rename from packages/client/src/schema-initializer/demos/demo1.tsx rename to packages/core/client/src/schema-initializer/demos/demo1.tsx diff --git a/packages/client/src/schema-initializer/demos/demo2.tsx b/packages/core/client/src/schema-initializer/demos/demo2.tsx similarity index 100% rename from packages/client/src/schema-initializer/demos/demo2.tsx rename to packages/core/client/src/schema-initializer/demos/demo2.tsx diff --git a/packages/client/src/schema-initializer/demos/demo3.tsx b/packages/core/client/src/schema-initializer/demos/demo3.tsx similarity index 100% rename from packages/client/src/schema-initializer/demos/demo3.tsx rename to packages/core/client/src/schema-initializer/demos/demo3.tsx diff --git a/packages/client/src/schema-initializer/demos/demo4.tsx b/packages/core/client/src/schema-initializer/demos/demo4.tsx similarity index 100% rename from packages/client/src/schema-initializer/demos/demo4.tsx rename to packages/core/client/src/schema-initializer/demos/demo4.tsx diff --git a/packages/client/src/schema-initializer/index.md b/packages/core/client/src/schema-initializer/index.md similarity index 100% rename from packages/client/src/schema-initializer/index.md rename to packages/core/client/src/schema-initializer/index.md diff --git a/packages/client/src/schema-initializer/index.ts b/packages/core/client/src/schema-initializer/index.ts similarity index 100% rename from packages/client/src/schema-initializer/index.ts rename to packages/core/client/src/schema-initializer/index.ts diff --git a/packages/client/src/schema-initializer/items/index.tsx b/packages/core/client/src/schema-initializer/items/index.tsx similarity index 100% rename from packages/client/src/schema-initializer/items/index.tsx rename to packages/core/client/src/schema-initializer/items/index.tsx diff --git a/packages/client/src/schema-initializer/types.ts b/packages/core/client/src/schema-initializer/types.ts similarity index 100% rename from packages/client/src/schema-initializer/types.ts rename to packages/core/client/src/schema-initializer/types.ts diff --git a/packages/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts similarity index 100% rename from packages/client/src/schema-initializer/utils.ts rename to packages/core/client/src/schema-initializer/utils.ts diff --git a/packages/client/src/schema-settings/GeneralSchemaDesigner.tsx b/packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx similarity index 100% rename from packages/client/src/schema-settings/GeneralSchemaDesigner.tsx rename to packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx diff --git a/packages/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx similarity index 100% rename from packages/client/src/schema-settings/SchemaSettings.tsx rename to packages/core/client/src/schema-settings/SchemaSettings.tsx diff --git a/packages/client/src/schema-settings/index.ts b/packages/core/client/src/schema-settings/index.ts similarity index 100% rename from packages/client/src/schema-settings/index.ts rename to packages/core/client/src/schema-settings/index.ts diff --git a/packages/client/src/schema-templates/BlockTemplate.tsx b/packages/core/client/src/schema-templates/BlockTemplate.tsx similarity index 100% rename from packages/client/src/schema-templates/BlockTemplate.tsx rename to packages/core/client/src/schema-templates/BlockTemplate.tsx diff --git a/packages/client/src/schema-templates/BlockTemplateDetails.tsx b/packages/core/client/src/schema-templates/BlockTemplateDetails.tsx similarity index 100% rename from packages/client/src/schema-templates/BlockTemplateDetails.tsx rename to packages/core/client/src/schema-templates/BlockTemplateDetails.tsx diff --git a/packages/client/src/schema-templates/BlockTemplatePage.tsx b/packages/core/client/src/schema-templates/BlockTemplatePage.tsx similarity index 100% rename from packages/client/src/schema-templates/BlockTemplatePage.tsx rename to packages/core/client/src/schema-templates/BlockTemplatePage.tsx diff --git a/packages/client/src/schema-templates/SchemaTemplateManagerProvider.tsx b/packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx similarity index 100% rename from packages/client/src/schema-templates/SchemaTemplateManagerProvider.tsx rename to packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx diff --git a/packages/client/src/schema-templates/SchemaTemplateShortcut.tsx b/packages/core/client/src/schema-templates/SchemaTemplateShortcut.tsx similarity index 100% rename from packages/client/src/schema-templates/SchemaTemplateShortcut.tsx rename to packages/core/client/src/schema-templates/SchemaTemplateShortcut.tsx diff --git a/packages/client/src/schema-templates/collections/uiSchemaTemplates.ts b/packages/core/client/src/schema-templates/collections/uiSchemaTemplates.ts similarity index 100% rename from packages/client/src/schema-templates/collections/uiSchemaTemplates.ts rename to packages/core/client/src/schema-templates/collections/uiSchemaTemplates.ts diff --git a/packages/client/src/schema-templates/index.ts b/packages/core/client/src/schema-templates/index.ts similarity index 100% rename from packages/client/src/schema-templates/index.ts rename to packages/core/client/src/schema-templates/index.ts diff --git a/packages/client/src/schema-templates/schemas/uiSchemaTemplates.ts b/packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts similarity index 100% rename from packages/client/src/schema-templates/schemas/uiSchemaTemplates.ts rename to packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts diff --git a/packages/client/src/settings-form/SettingsForm.tsx b/packages/core/client/src/settings-form/SettingsForm.tsx similarity index 100% rename from packages/client/src/settings-form/SettingsForm.tsx rename to packages/core/client/src/settings-form/SettingsForm.tsx diff --git a/packages/client/src/settings-form/demos/demo1.tsx b/packages/core/client/src/settings-form/demos/demo1.tsx similarity index 100% rename from packages/client/src/settings-form/demos/demo1.tsx rename to packages/core/client/src/settings-form/demos/demo1.tsx diff --git a/packages/client/src/settings-form/index.md b/packages/core/client/src/settings-form/index.md similarity index 100% rename from packages/client/src/settings-form/index.md rename to packages/core/client/src/settings-form/index.md diff --git a/packages/client/src/settings-form/index.ts b/packages/core/client/src/settings-form/index.ts similarity index 100% rename from packages/client/src/settings-form/index.ts rename to packages/core/client/src/settings-form/index.ts diff --git a/packages/client/src/slate/RichText.tsx b/packages/core/client/src/slate/RichText.tsx similarity index 100% rename from packages/client/src/slate/RichText.tsx rename to packages/core/client/src/slate/RichText.tsx diff --git a/packages/client/src/slate/Slate.tsx b/packages/core/client/src/slate/Slate.tsx similarity index 100% rename from packages/client/src/slate/Slate.tsx rename to packages/core/client/src/slate/Slate.tsx diff --git a/packages/client/src/slate/components.tsx b/packages/core/client/src/slate/components.tsx similarity index 100% rename from packages/client/src/slate/components.tsx rename to packages/core/client/src/slate/components.tsx diff --git a/packages/client/src/slate/demos/demo1.tsx b/packages/core/client/src/slate/demos/demo1.tsx similarity index 100% rename from packages/client/src/slate/demos/demo1.tsx rename to packages/core/client/src/slate/demos/demo1.tsx diff --git a/packages/client/src/slate/demos/demo2.tsx b/packages/core/client/src/slate/demos/demo2.tsx similarity index 100% rename from packages/client/src/slate/demos/demo2.tsx rename to packages/core/client/src/slate/demos/demo2.tsx diff --git a/packages/client/src/slate/demos/demo3.tsx b/packages/core/client/src/slate/demos/demo3.tsx similarity index 100% rename from packages/client/src/slate/demos/demo3.tsx rename to packages/core/client/src/slate/demos/demo3.tsx diff --git a/packages/client/src/slate/index.less b/packages/core/client/src/slate/index.less similarity index 100% rename from packages/client/src/slate/index.less rename to packages/core/client/src/slate/index.less diff --git a/packages/client/src/slate/index.md b/packages/core/client/src/slate/index.md similarity index 100% rename from packages/client/src/slate/index.md rename to packages/core/client/src/slate/index.md diff --git a/packages/client/src/slate/index.ts b/packages/core/client/src/slate/index.ts similarity index 100% rename from packages/client/src/slate/index.ts rename to packages/core/client/src/slate/index.ts diff --git a/packages/client/src/slate/materialicons.woff2 b/packages/core/client/src/slate/materialicons.woff2 similarity index 100% rename from packages/client/src/slate/materialicons.woff2 rename to packages/core/client/src/slate/materialicons.woff2 diff --git a/packages/client/src/system-settings/SystemSettingsProvider.tsx b/packages/core/client/src/system-settings/SystemSettingsProvider.tsx similarity index 100% rename from packages/client/src/system-settings/SystemSettingsProvider.tsx rename to packages/core/client/src/system-settings/SystemSettingsProvider.tsx diff --git a/packages/client/src/system-settings/SystemSettingsShortcut.tsx b/packages/core/client/src/system-settings/SystemSettingsShortcut.tsx similarity index 100% rename from packages/client/src/system-settings/SystemSettingsShortcut.tsx rename to packages/core/client/src/system-settings/SystemSettingsShortcut.tsx diff --git a/packages/client/src/system-settings/demos/demo1.tsx b/packages/core/client/src/system-settings/demos/demo1.tsx similarity index 100% rename from packages/client/src/system-settings/demos/demo1.tsx rename to packages/core/client/src/system-settings/demos/demo1.tsx diff --git a/packages/client/src/system-settings/index.md b/packages/core/client/src/system-settings/index.md similarity index 100% rename from packages/client/src/system-settings/index.md rename to packages/core/client/src/system-settings/index.md diff --git a/packages/client/src/system-settings/index.tsx b/packages/core/client/src/system-settings/index.tsx similarity index 100% rename from packages/client/src/system-settings/index.tsx rename to packages/core/client/src/system-settings/index.tsx diff --git a/packages/client/src/user/ChangePassword.tsx b/packages/core/client/src/user/ChangePassword.tsx similarity index 100% rename from packages/client/src/user/ChangePassword.tsx rename to packages/core/client/src/user/ChangePassword.tsx diff --git a/packages/client/src/user/CurrentUser.tsx b/packages/core/client/src/user/CurrentUser.tsx similarity index 100% rename from packages/client/src/user/CurrentUser.tsx rename to packages/core/client/src/user/CurrentUser.tsx diff --git a/packages/client/src/user/CurrentUserProvider.tsx b/packages/core/client/src/user/CurrentUserProvider.tsx similarity index 100% rename from packages/client/src/user/CurrentUserProvider.tsx rename to packages/core/client/src/user/CurrentUserProvider.tsx diff --git a/packages/client/src/user/EditProfile.tsx b/packages/core/client/src/user/EditProfile.tsx similarity index 100% rename from packages/client/src/user/EditProfile.tsx rename to packages/core/client/src/user/EditProfile.tsx diff --git a/packages/client/src/user/LanguageSettings.tsx b/packages/core/client/src/user/LanguageSettings.tsx similarity index 100% rename from packages/client/src/user/LanguageSettings.tsx rename to packages/core/client/src/user/LanguageSettings.tsx diff --git a/packages/client/src/user/SigninPage.tsx b/packages/core/client/src/user/SigninPage.tsx similarity index 100% rename from packages/client/src/user/SigninPage.tsx rename to packages/core/client/src/user/SigninPage.tsx diff --git a/packages/client/src/user/SignupPage.tsx b/packages/core/client/src/user/SignupPage.tsx similarity index 100% rename from packages/client/src/user/SignupPage.tsx rename to packages/core/client/src/user/SignupPage.tsx diff --git a/packages/client/src/user/SwitchRole.tsx b/packages/core/client/src/user/SwitchRole.tsx similarity index 100% rename from packages/client/src/user/SwitchRole.tsx rename to packages/core/client/src/user/SwitchRole.tsx diff --git a/packages/client/src/user/index.md b/packages/core/client/src/user/index.md similarity index 100% rename from packages/client/src/user/index.md rename to packages/core/client/src/user/index.md diff --git a/packages/client/src/user/index.ts b/packages/core/client/src/user/index.ts similarity index 100% rename from packages/client/src/user/index.ts rename to packages/core/client/src/user/index.ts diff --git a/packages/client/src/workflow/ExecutionResourceProvider.tsx b/packages/core/client/src/workflow/ExecutionResourceProvider.tsx similarity index 100% rename from packages/client/src/workflow/ExecutionResourceProvider.tsx rename to packages/core/client/src/workflow/ExecutionResourceProvider.tsx diff --git a/packages/client/src/workflow/WorkflowCanvas.tsx b/packages/core/client/src/workflow/WorkflowCanvas.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowCanvas.tsx rename to packages/core/client/src/workflow/WorkflowCanvas.tsx diff --git a/packages/client/src/workflow/WorkflowLink.tsx b/packages/core/client/src/workflow/WorkflowLink.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowLink.tsx rename to packages/core/client/src/workflow/WorkflowLink.tsx diff --git a/packages/client/src/workflow/WorkflowPage.tsx b/packages/core/client/src/workflow/WorkflowPage.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowPage.tsx rename to packages/core/client/src/workflow/WorkflowPage.tsx diff --git a/packages/client/src/workflow/WorkflowRouteProvider.tsx b/packages/core/client/src/workflow/WorkflowRouteProvider.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowRouteProvider.tsx rename to packages/core/client/src/workflow/WorkflowRouteProvider.tsx diff --git a/packages/client/src/workflow/WorkflowShortcut.tsx b/packages/core/client/src/workflow/WorkflowShortcut.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowShortcut.tsx rename to packages/core/client/src/workflow/WorkflowShortcut.tsx diff --git a/packages/client/src/workflow/WorkflowTable.tsx b/packages/core/client/src/workflow/WorkflowTable.tsx similarity index 100% rename from packages/client/src/workflow/WorkflowTable.tsx rename to packages/core/client/src/workflow/WorkflowTable.tsx diff --git a/packages/client/src/workflow/calculators.tsx b/packages/core/client/src/workflow/calculators.tsx similarity index 100% rename from packages/client/src/workflow/calculators.tsx rename to packages/core/client/src/workflow/calculators.tsx diff --git a/packages/client/src/workflow/index.tsx b/packages/core/client/src/workflow/index.tsx similarity index 100% rename from packages/client/src/workflow/index.tsx rename to packages/core/client/src/workflow/index.tsx diff --git a/packages/client/src/workflow/nodes/calculation.tsx b/packages/core/client/src/workflow/nodes/calculation.tsx similarity index 100% rename from packages/client/src/workflow/nodes/calculation.tsx rename to packages/core/client/src/workflow/nodes/calculation.tsx diff --git a/packages/client/src/workflow/nodes/condition.tsx b/packages/core/client/src/workflow/nodes/condition.tsx similarity index 100% rename from packages/client/src/workflow/nodes/condition.tsx rename to packages/core/client/src/workflow/nodes/condition.tsx diff --git a/packages/client/src/workflow/nodes/create.tsx b/packages/core/client/src/workflow/nodes/create.tsx similarity index 100% rename from packages/client/src/workflow/nodes/create.tsx rename to packages/core/client/src/workflow/nodes/create.tsx diff --git a/packages/client/src/workflow/nodes/destroy.tsx b/packages/core/client/src/workflow/nodes/destroy.tsx similarity index 100% rename from packages/client/src/workflow/nodes/destroy.tsx rename to packages/core/client/src/workflow/nodes/destroy.tsx diff --git a/packages/client/src/workflow/nodes/index.tsx b/packages/core/client/src/workflow/nodes/index.tsx similarity index 100% rename from packages/client/src/workflow/nodes/index.tsx rename to packages/core/client/src/workflow/nodes/index.tsx diff --git a/packages/client/src/workflow/nodes/parallel.tsx b/packages/core/client/src/workflow/nodes/parallel.tsx similarity index 100% rename from packages/client/src/workflow/nodes/parallel.tsx rename to packages/core/client/src/workflow/nodes/parallel.tsx diff --git a/packages/client/src/workflow/nodes/query.tsx b/packages/core/client/src/workflow/nodes/query.tsx similarity index 100% rename from packages/client/src/workflow/nodes/query.tsx rename to packages/core/client/src/workflow/nodes/query.tsx diff --git a/packages/client/src/workflow/nodes/update.tsx b/packages/core/client/src/workflow/nodes/update.tsx similarity index 100% rename from packages/client/src/workflow/nodes/update.tsx rename to packages/core/client/src/workflow/nodes/update.tsx diff --git a/packages/client/src/workflow/schemas/collection.ts b/packages/core/client/src/workflow/schemas/collection.ts similarity index 100% rename from packages/client/src/workflow/schemas/collection.ts rename to packages/core/client/src/workflow/schemas/collection.ts diff --git a/packages/client/src/workflow/schemas/executions.ts b/packages/core/client/src/workflow/schemas/executions.ts similarity index 100% rename from packages/client/src/workflow/schemas/executions.ts rename to packages/core/client/src/workflow/schemas/executions.ts diff --git a/packages/client/src/workflow/schemas/workflows.ts b/packages/core/client/src/workflow/schemas/workflows.ts similarity index 100% rename from packages/client/src/workflow/schemas/workflows.ts rename to packages/core/client/src/workflow/schemas/workflows.ts diff --git a/packages/client/src/workflow/style.tsx b/packages/core/client/src/workflow/style.tsx similarity index 100% rename from packages/client/src/workflow/style.tsx rename to packages/core/client/src/workflow/style.tsx diff --git a/packages/client/src/workflow/triggers/index.tsx b/packages/core/client/src/workflow/triggers/index.tsx similarity index 100% rename from packages/client/src/workflow/triggers/index.tsx rename to packages/core/client/src/workflow/triggers/index.tsx diff --git a/packages/client/src/workflow/triggers/model.tsx b/packages/core/client/src/workflow/triggers/model.tsx similarity index 100% rename from packages/client/src/workflow/triggers/model.tsx rename to packages/core/client/src/workflow/triggers/model.tsx diff --git a/packages/client/tsconfig.build.json b/packages/core/client/tsconfig.build.json similarity index 84% rename from packages/client/tsconfig.build.json rename to packages/core/client/tsconfig.build.json index 5ed6cf5a2..16973d7f3 100644 --- a/packages/client/tsconfig.build.json +++ b/packages/core/client/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true, diff --git a/packages/client/tsconfig.json b/packages/core/client/tsconfig.json similarity index 79% rename from packages/client/tsconfig.json rename to packages/core/client/tsconfig.json index 7a3f8d014..85b69513d 100644 --- a/packages/client/tsconfig.json +++ b/packages/core/client/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "compilerOptions": { "resolveJsonModule": true }, diff --git a/packages/plugin-action-logs/.npmignore b/packages/core/create-nocobase-app/.npmignore similarity index 100% rename from packages/plugin-action-logs/.npmignore rename to packages/core/create-nocobase-app/.npmignore diff --git a/packages/core/create-nocobase-app/bin/create-nocobase-app.js b/packages/core/create-nocobase-app/bin/create-nocobase-app.js new file mode 100755 index 000000000..509a3a7ab --- /dev/null +++ b/packages/core/create-nocobase-app/bin/create-nocobase-app.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../lib/create-nocobase-app'); diff --git a/packages/core/create-nocobase-app/lib/create-app.js b/packages/core/create-nocobase-app/lib/create-app.js new file mode 100644 index 000000000..ce69758ac --- /dev/null +++ b/packages/core/create-nocobase-app/lib/create-app.js @@ -0,0 +1,101 @@ +const chalk = require('chalk'); +const fse = require('fs-extra'); +const path = require('path'); +const { hasYarn, runInit, runInstall } = require('./utils'); +const ora = require('ora'); +const execa = require('execa'); +const { join, resolve } = require('path'); + +const createEnvFile = require('./resources/templates/env'); +const createPackageJson = require('./resources/templates/package.json.js'); +const createServerPackageJson = require('./resources/templates/server.package.json.js'); +const loadSrcFromNpm = require('./resources/templates/load-src-from-npm'); + +const getDatabaseOptionsFromCommandOptions = (commandOptions) => { + if ( + commandOptions.quickstart || + !commandOptions.dbdialect || + commandOptions.dbdialect === 'sqlite' || + commandOptions.dbstorage + ) { + return { + dialect: 'sqlite', + storage: commandOptions.dbstorage || 'db.sqlite', + }; + } + + return { + dialect: commandOptions.dbdialect, + host: commandOptions.dbhost, + port: commandOptions.dbport, + database: commandOptions.dbdatabase, + username: commandOptions.dbusername, + password: commandOptions.dbpassword, + }; +}; + +async function createApp(directory, options) { + console.log(`Creating a new NocoBase application at ${chalk.green(directory)}.`); + console.log('Creating files.'); + + const projectPath = path.join(process.cwd(), directory); + const resourcePath = path.join(__dirname, 'resources'); + + const dbOptions = getDatabaseOptionsFromCommandOptions(options); + + // copy files + await fse.copy(path.join(resourcePath, 'files'), projectPath); + + console.log('download @nocobase/app-server'); + await loadSrcFromNpm('@nocobase/app-server', path.join(projectPath, 'packages/app/server')); + + console.log('download @nocobase/app-client'); + await loadSrcFromNpm('@nocobase/app-client', path.join(projectPath, 'packages/app/client')); + + // write .env file + await fse.writeFile(join(projectPath, '.env'), createEnvFile({ dbOptions })); + + // write root packages.json + await fse.writeJson( + join(projectPath, 'package.json'), + createPackageJson({ + projectName: 'nocobase-app', + }), + { + spaces: 2, + }, + ); + + // write server package.json + await fse.writeJson( + join(projectPath, 'packages/app/server/package.json'), + createServerPackageJson({ + projectPath, + dbOptions, + }), + { + spaces: 2, + }, + ); + + // run install command +} + +function setCommandOptions(command) { + return command + .arguments('', 'directory of new NocoBase app') + .option('--quickstart', 'Quickstart app creation') + .option('--dbdialect ', 'Database dialect, current support sqlite/mysql/postgres') + .option('--dbhost ', 'Database host') + .option('--dbport ', 'Database port') + .option('--dbdatabase ', 'Database name') + .option('--dbusername ', 'Database username') + .option('--dbpassword ', 'Database password') + .option('--dbstorage ', 'Database file storage path for sqlite') + .description('create a new application'); +} + +module.exports = { + setCommandOptions, + createApp, +}; diff --git a/packages/core/create-nocobase-app/lib/create-nocobase-app.js b/packages/core/create-nocobase-app/lib/create-nocobase-app.js new file mode 100644 index 000000000..8d87411f4 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/create-nocobase-app.js @@ -0,0 +1,11 @@ +const { createApp, setCommandOptions } = require('./create-app'); + +const { Command } = require('commander'); +const packageJson = require('../package.json'); +const program = new Command(packageJson.name); + +setCommandOptions(program); + +program.action((directory, options) => createApp(directory, options)); + +program.parse(process.argv); diff --git a/packages/database/src/__tests__/fixtures/collections/test.jpg b/packages/core/create-nocobase-app/lib/index.js old mode 100644 new mode 100755 similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/test.jpg rename to packages/core/create-nocobase-app/lib/index.js diff --git a/packages/core/create-nocobase-app/lib/resources/files/.eslintignore b/packages/core/create-nocobase-app/lib/resources/files/.eslintignore new file mode 100755 index 000000000..92c7bb060 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/.eslintignore @@ -0,0 +1,16 @@ +node_modules +lib +dist +build +coverage +expected +website +gh-pages +weex +build.ts +packages/vue +packages/element +esm +doc-site +public +package \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/files/.eslintrc b/packages/core/create-nocobase-app/lib/resources/files/.eslintrc new file mode 100755 index 000000000..3f30d0680 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/.eslintrc @@ -0,0 +1,14 @@ +{ + "parser": "@typescript-eslint/parser", + "env": { + "node": true + }, + "globals": { + "sleep": true, + "prettyFormat": true + }, + "parserOptions": { + "ecmaVersion": 2018, + "sourceType": "module" + } +} \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/files/.gitignore b/packages/core/create-nocobase-app/lib/resources/files/.gitignore new file mode 100644 index 000000000..1b165bc0f --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/.gitignore @@ -0,0 +1,16 @@ +node_modules/ +lib/ +esm/ +.env +.DS_Store +yarn-error.log +lerna-debug.log +/.vscode +/.idea +db.sqlite +coverage +.umi +/uploads +.env.test +docs-dist/ +.npmrc diff --git a/packages/app/.prettierignore b/packages/core/create-nocobase-app/lib/resources/files/.prettierignore similarity index 55% rename from packages/app/.prettierignore rename to packages/core/create-nocobase-app/lib/resources/files/.prettierignore index 0d4222f54..b60e8840b 100644 --- a/packages/app/.prettierignore +++ b/packages/core/create-nocobase-app/lib/resources/files/.prettierignore @@ -6,3 +6,6 @@ package.json .umi .umi-production .umi-test +packages/**/lib/** +packages/**/esm/** +packages/**/node_modules/** \ No newline at end of file diff --git a/packages/app/.prettierrc b/packages/core/create-nocobase-app/lib/resources/files/.prettierrc similarity index 88% rename from packages/app/.prettierrc rename to packages/core/create-nocobase-app/lib/resources/files/.prettierrc index 94beb1484..764fbde2e 100644 --- a/packages/app/.prettierrc +++ b/packages/core/create-nocobase-app/lib/resources/files/.prettierrc @@ -1,7 +1,7 @@ { "singleQuote": true, "trailingComma": "all", - "printWidth": 80, + "printWidth": 120, "overrides": [ { "files": ".prettierrc", diff --git a/packages/core/create-nocobase-app/lib/resources/files/jest.cli.js b/packages/core/create-nocobase-app/lib/resources/files/jest.cli.js new file mode 100644 index 000000000..8be1963dd --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/jest.cli.js @@ -0,0 +1,23 @@ +const dotenv = require('dotenv'); +const { existsSync } = require('fs'); +const { resolve } = require('path') +const yargs = require('yargs'); + +const envFile = existsSync(resolve(__dirname, '.env.test')) ? '.env.test' : '.env'; + +dotenv.config({ + path: resolve(__dirname, envFile), +}); + +if (yargs.argv.dbDialect) { + process.env.DB_DIALECT = yargs.argv.dbDialect; +} + +if (yargs.argv.dbPort) { + process.env.DB_PORT = yargs.argv.dbPort; +} + +console.log('DB_DIALECT:', process.env.DB_DIALECT); +console.log('DB_PORT:', process.env.DB_PORT); + +require('jest-cli/bin/jest'); diff --git a/packages/core/create-nocobase-app/lib/resources/files/jest.config.js b/packages/core/create-nocobase-app/lib/resources/files/jest.config.js new file mode 100644 index 000000000..2c327d6a9 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/jest.config.js @@ -0,0 +1,31 @@ +const { pathsToModuleNameMapper } = require('ts-jest/utils'); +const { compilerOptions } = require('./tsconfig.jest.json'); + +module.exports = { + collectCoverage: false, + verbose: true, + testEnvironment: 'jsdom', + preset: 'ts-jest', + testMatch: ['**/__tests__/**/*.test.[jt]s?(x)'], + setupFilesAfterEnv: [require.resolve('jest-dom/extend-expect'), './jest.setup.ts'], + moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { + prefix: '/', + }), + globals: { + 'ts-jest': { + babelConfig: false, + tsconfig: './tsconfig.jest.json', + diagnostics: false, + }, + }, + modulePathIgnorePatterns: ['/esm/', '/lib/'], + coveragePathIgnorePatterns: [ + '/node_modules/', + '/__tests__/', + '/esm/', + '/lib/', + 'package.json', + '/demo/', + 'package-lock.json', + ], +}; diff --git a/packages/core/create-nocobase-app/lib/resources/files/jest.setup.ts b/packages/core/create-nocobase-app/lib/resources/files/jest.setup.ts new file mode 100644 index 000000000..2c95f5081 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/jest.setup.ts @@ -0,0 +1,13 @@ +import prettyFormat from 'pretty-format'; + +global['prettyFormat'] = prettyFormat; + +jest.setTimeout(300000); + +// 把 console.error 转换成 error，方便断言 +(() => { + const spy = jest.spyOn(console, 'error'); + afterAll(() => { + spy.mockRestore(); + }); +})(); diff --git a/packages/core/create-nocobase-app/lib/resources/files/lerna.json b/packages/core/create-nocobase-app/lib/resources/files/lerna.json new file mode 100644 index 000000000..cde40c032 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/lerna.json @@ -0,0 +1,15 @@ +{ + "version": "0.6.0", + "npmClient": "yarn", + "useWorkspaces": true, + "npmClientArgs": [ + "--ignore-engines" + ], + "command": { + "version": { + "forcePublish": true, + "exact": true, + "message": "chore(versions): 😊 publish %s" + } + } +} diff --git a/packages/plugin-ui-schema-storage/src/helper.ts b/packages/core/create-nocobase-app/lib/resources/files/packages/app/client/.gitkeep similarity index 100% rename from packages/plugin-ui-schema-storage/src/helper.ts rename to packages/core/create-nocobase-app/lib/resources/files/packages/app/client/.gitkeep diff --git a/packages/core/create-nocobase-app/lib/resources/files/packages/app/client/.umirc.ts b/packages/core/create-nocobase-app/lib/resources/files/packages/app/client/.umirc.ts new file mode 100644 index 000000000..023182d4a --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/packages/app/client/.umirc.ts @@ -0,0 +1,35 @@ +import { getUmiConfig } from '@nocobase/utils'; +import dotenv from 'dotenv'; +import { resolve } from 'path'; +import { defineConfig } from 'umi'; + +dotenv.config({ + path: resolve(__dirname, '../../../.env'), +}); + +process.env.MFSU_AD = 'none'; + +const umiConfig = getUmiConfig(); + +export default defineConfig({ + hash: true, + define: { + 'process.env.NOCOBASE_ENV': process.env.NOCOBASE_ENV, + ...umiConfig.define, + }, + // only proxy when using `umi dev` + // if the assets are built, will not proxy + proxy: { + ...umiConfig.proxy, + }, + nodeModulesTransform: { + type: 'none', + }, + routes: [{ path: '/', exact: false, component: '@/pages/index' }], + // fastRefresh: {}, + chainWebpack(config) { + const clientSrc = resolve(__dirname, '../../../node_modules/@nocobase/client/src'); + config.module.rules.get('ts-in-node_modules').include.add(clientSrc); + config.resolve.alias.set('@nocobase/client', clientSrc); + }, +}); diff --git a/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/.gitkeep b/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/database/tsconfig.build.json b/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.build.json similarity index 80% rename from packages/database/tsconfig.build.json rename to packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.build.json index 8d3db734b..9bdd87769 100644 --- a/packages/database/tsconfig.build.json +++ b/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/actions/tsconfig.json b/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.json similarity index 69% rename from packages/actions/tsconfig.json rename to packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.json index e10a5305a..bf4bd3fa9 100644 --- a/packages/actions/tsconfig.json +++ b/packages/core/create-nocobase-app/lib/resources/files/packages/app/server/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/files/packages/plugins/.gitkeep b/packages/core/create-nocobase-app/lib/resources/files/packages/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/core/create-nocobase-app/lib/resources/files/pnpm-workspace.yaml b/packages/core/create-nocobase-app/lib/resources/files/pnpm-workspace.yaml new file mode 100644 index 000000000..f10aa3331 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +packages: + - packages/** diff --git a/packages/core/create-nocobase-app/lib/resources/files/tsconfig.build.json b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.build.json new file mode 100644 index 000000000..6e6850961 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.build.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "resolveJsonModule": true, + "moduleResolution": "node", + "jsx": "react", + "module": "commonjs", + "target": "es6", + "allowJs": false, + "noUnusedLocals": false, + "preserveConstEnums": true, + "skipLibCheck": true, + "sourceMap": true, + "inlineSources": true, + "declaration": true, + "experimentalDecorators": true, + "downlevelIteration": true, + } +} \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/files/tsconfig.jest.json b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.jest.json new file mode 100644 index 000000000..99237bad7 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.jest.json @@ -0,0 +1,16 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "jsx": "react", + "esModuleInterop": true, + "resolveJsonModule": true, + "moduleResolution": "node", + "allowJs": true, + "module": "commonjs", + "target": "es6", + "paths": { + "@nocobase/*": ["./packages/*/src"] + } + }, + "exclude": ["./packages/*/esm", "./packages/*/lib"] +} \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/files/tsconfig.json b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.json new file mode 100644 index 000000000..ba9315620 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/files/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "moduleResolution": "node", + "jsx": "react", + "module": "commonjs", + "target": "es6", + "allowJs": false, + "noUnusedLocals": false, + "preserveConstEnums": true, + "skipLibCheck": true, + "sourceMap": true, + "inlineSources": true, + "resolveJsonModule": true, + "declaration": true, + "experimentalDecorators": true, + "downlevelIteration": true, + "baseUrl": ".", + "paths": { + "@nocobase/*": ["packages/*/src"] + } + } +} \ No newline at end of file diff --git a/packages/core/create-nocobase-app/lib/resources/templates/env.js b/packages/core/create-nocobase-app/lib/resources/templates/env.js new file mode 100644 index 000000000..e0d997cc1 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/templates/env.js @@ -0,0 +1,24 @@ +const fs = require('fs'); +const path = require('path'); +const crypto = require('crypto'); +const _ = require('lodash'); + +const generateASecret = () => crypto.randomBytes(256).toString('base64'); + +module.exports = (options) => { + const { dbOptions } = options; + const tmpl = fs.readFileSync(path.join(__dirname, 'env.template')); + const compile = _.template(tmpl); + + const dbEnvs = Object.keys(dbOptions) + .map((keyName) => [`DB_${keyName.toUpperCase()}`, dbOptions[keyName]]) + .map((item) => `${item[0]}=${item[1] || ''}`) + .join('\n'); + + const envContent = compile({ + jwtSecret: generateASecret(), + dbEnvs, + }); + + return envContent; +}; diff --git a/packages/core/create-nocobase-app/lib/resources/templates/env.template b/packages/core/create-nocobase-app/lib/resources/templates/env.template new file mode 100644 index 000000000..f6652e992 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/templates/env.template @@ -0,0 +1,37 @@ +NOCOBASE_ENV=development + +SERVER_HOST=0.0.0.0 +SERVER_PORT=3000 + +JWT_SECRET=<%= jwtSecret %> + +# api base path endpoint for app(web) +SERVER_BASE_PATH=/api/ + +# api server access point for app(web when build) +SERVER_BASE_URL= + +DB_LOG_SQL=off +<%= dbEnvs %> + +# local or ali-oss +DEFAULT_STORAGE_TYPE=local +STORAGE_TYPE=local + +# LOCAL STORAGE +LOCAL_STORAGE_USE_STATIC_SERVER=true +LOCAL_STORAGE_BASE_URL= + +# ALI OSS STORAGE +ALI_OSS_STORAGE_BASE_URL= +ALI_OSS_REGION=oss-cn-beijing +ALI_OSS_ACCESS_KEY_ID= +ALI_OSS_ACCESS_KEY_SECRET= +ALI_OSS_BUCKET= + +# AWS +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_S3_REGION= +AWS_S3_BUCKET= +AWS_S3_STORAGE_BASE_URL= diff --git a/packages/core/create-nocobase-app/lib/resources/templates/load-src-from-npm.js b/packages/core/create-nocobase-app/lib/resources/templates/load-src-from-npm.js new file mode 100644 index 000000000..7a9a159e7 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/templates/load-src-from-npm.js @@ -0,0 +1,49 @@ +const execa = require('execa'); +const axios = require('axios'); +const fs = require('fs'); +const fsP = require('fs/promises'); +const tar = require('tar'); +const { join } = require('path'); +const crypto = require('crypto'); + +module.exports = async (packageName, target) => { + const viewResult = await execa('npm', ['v', packageName, 'dist.tarball']); + const url = viewResult['stdout']; + + const tarballFile = join(target, '..', `${crypto.createHash('md5').update(packageName).digest('hex')}-tarball.gz`); + + const writer = fs.createWriteStream(tarballFile); + + await axios.get(url, { responseType: 'stream' }).then((response) => { + return new Promise((resolve, reject) => { + response.data.pipe(writer); + + let error = null; + + writer.on('error', (err) => { + error = err; + writer.close(); + reject(err); + }); + + writer.on('close', () => { + if (!error) { + resolve(true); + } + }); + }); + }); + + const result = await tar.x({ + file: tarballFile, + gzip: true, + cwd: target, + strip: 1, + k: true, + filter(path, entry) { + return !(path.startsWith('package/lib') || path.startsWith('package/esm') || path.startsWith('package/dist')); + }, + }); + + await fsP.unlink(tarballFile); +}; diff --git a/packages/core/create-nocobase-app/lib/resources/templates/package.json.js b/packages/core/create-nocobase-app/lib/resources/templates/package.json.js new file mode 100644 index 000000000..0a12ab36d --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/templates/package.json.js @@ -0,0 +1,66 @@ +module.exports = (opts) => { + const { projectName } = opts; + return { + name: projectName, + version: '0.1.0', + private: true, + workspaces: ['packages/app/*', 'packages/plugins/*'], + license: 'MIT', + scripts: { + start: 'concurrently "npm run start-server" "npm run start-client"', + bootstrap: 'lerna bootstrap', + clean: 'rimraf -rf packages/{app,plugins}/*/{lib,esm,dist} && lerna clean', + nocobase: + 'cross-env DOTENV_CONFIG_PATH=.env ts-node-dev -r dotenv/config -r tsconfig-paths/register ./packages/app/server/src/index.ts', + 'start-client': 'cd packages/app/client && npm run start', + 'start-server': 'npm run nocobase start', + build: 'lerna run build', + 'build-docs': 'dumi build', + test: 'node ./jest.cli.js -i', + lint: 'eslint .', + }, + resolutions: { + '@types/react': '^17.0.0', + '@types/react-dom': '^17.0.0', + }, + devDependencies: { + '@testing-library/react': '^12.1.2', + '@types/jest': '^26.0.0', + '@types/node': '^12.6.8', + '@types/react': '^17.0.0', + '@types/react-dom': '^17.0.0', + '@typescript-eslint/eslint-plugin': '^4.9.1', + '@typescript-eslint/parser': '^4.8.2', + concurrently: '^7.0.0', + 'cross-env': '^7.0.3', + dotenv: '^10.0.0', + eslint: '^7.14.0', + 'eslint-config-prettier': '^7.0.0', + 'eslint-plugin-import': '^2.13.0', + 'eslint-plugin-markdown': '^2.0.1', + 'eslint-plugin-node': '^11.1.0', + 'eslint-plugin-prettier': '^3.1.0', + 'eslint-plugin-promise': '^4.0.0', + 'eslint-plugin-react': '^7.14.2', + 'eslint-plugin-react-hooks': '^4.2.0', + 'eslint-plugin-vue': '^7.0.1', + jest: '^26.0.0', + 'jest-codemods': '^0.19.1', + 'jest-dom': '^3.1.2', + 'jest-localstorage-mock': '^2.3.0', + 'jest-styled-components': '6.3.3', + 'jest-watch-lerna-packages': '^1.1.0', + lerna: '^4.0.0', + prettier: '^2.2.1', + 'pretty-format': '^24.0.0', + 'pretty-quick': '^3.1.0', + rimraf: '^3.0.0', + 'ts-jest': '^26.0.0', + 'ts-loader': '^7.0.4', + 'ts-node': '^9.1.1', + 'ts-node-dev': '^1.1.8', + 'tsconfig-paths': '^3.12.0', + typescript: '^4.1.5', + }, + }; +}; diff --git a/packages/core/create-nocobase-app/lib/resources/templates/server.package.json.js b/packages/core/create-nocobase-app/lib/resources/templates/server.package.json.js new file mode 100644 index 000000000..c1394f7ec --- /dev/null +++ b/packages/core/create-nocobase-app/lib/resources/templates/server.package.json.js @@ -0,0 +1,37 @@ +const path = require('path'); +const dialectLib = (dialect) => { + if (dialect === 'sqlite') { + return { + sqlite3: '^5.0.2', + }; + } + + if (dialect === 'mysql') { + return { + mysql2: '^2.3.3', + }; + } + + if (dialect === 'postgres') { + return { + pg: '^8.7.3', + }; + } +}; + +module.exports = (opts) => { + const { dbOptions, projectPath } = opts; + const templateJsonPath = path.join(projectPath, 'packages/app/server/package.json'); + const templateJson = require(templateJsonPath); + + return { + ...templateJson, + name: 'server', + version: '0.1.0', + main: 'index.js', + dependencies: { + ...templateJson.dependencies, + ...dialectLib(dbOptions.dialect), + }, + }; +}; diff --git a/packages/core/create-nocobase-app/lib/utils.js b/packages/core/create-nocobase-app/lib/utils.js new file mode 100644 index 000000000..562b7f605 --- /dev/null +++ b/packages/core/create-nocobase-app/lib/utils.js @@ -0,0 +1,39 @@ +const execa = require('execa'); + +function hasYarn() { + return (process.env.npm_config_user_agent || '').indexOf('yarn') === 0; +} + +function runYarn(path, args) { + if (hasYarn()) { + return execa('yarn', args, { + cwd: path, + stdin: 'ignore', + }); + } + + return execa('npm', args, { cwd: path, stdin: 'ignore' }); +} + +function runInstall(path) { + return runYarn(path, ['install']); +} + +function runStart(path) { + return runYarn(path, ['run', 'start']); +} + +function runInit(path, args = []) { + if (!hasYarn()) { + args.unshift('--'); + } + console.log('run init', args); + return runYarn(path, ['run', 'nocobase', 'init', ...args]); +} + +module.exports = { + runInit, + runStart, + runInstall, + hasYarn, +}; diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json new file mode 100755 index 000000000..a2a18a009 --- /dev/null +++ b/packages/core/create-nocobase-app/package.json @@ -0,0 +1,27 @@ +{ + "name": "create-nocobase-app", + "version": "0.6.2-alpha.8", + "main": "lib/index.js", + "files": [ + "lib", + "bin", + "templates" + ], + "license": "MIT", + "dependencies": { + "@nocobase/utils": "^0.5.0-alpha.38", + "axios": "^0.26.1", + "chalk": "^4.1.1", + "commander": "^8.2.0", + "execa": "5", + "fs-extra": "^10.0.1", + "ora": "^5.4.1", + "tar": "^6.1.11" + }, + "bin": "./bin/create-nocobase-app.js", + "repository": { + "type": "git", + "url": "git+https://github.com/nocobase/nocobase.git", + "directory": "packages/core/create-nocobase-app" + } +} diff --git a/packages/database/package.json b/packages/core/database/package.json similarity index 91% rename from packages/database/package.json rename to packages/core/database/package.json index 8ce3294d8..1063560c5 100644 --- a/packages/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/database", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -11,7 +11,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/utils": "^0.6.0-alpha.0", + "@nocobase/utils": "0.6.2-alpha.8", "async-mutex": "^0.3.2", "deepmerge": "^4.2.2", "flat": "^5.0.2", diff --git a/packages/database/src/__tests__/collection-importer.test.ts b/packages/core/database/src/__tests__/collection-importer.test.ts similarity index 100% rename from packages/database/src/__tests__/collection-importer.test.ts rename to packages/core/database/src/__tests__/collection-importer.test.ts diff --git a/packages/database/src/__tests__/collection.sortable.test.ts b/packages/core/database/src/__tests__/collection.sortable.test.ts similarity index 100% rename from packages/database/src/__tests__/collection.sortable.test.ts rename to packages/core/database/src/__tests__/collection.sortable.test.ts diff --git a/packages/database/src/__tests__/collection.test.ts b/packages/core/database/src/__tests__/collection.test.ts similarity index 100% rename from packages/database/src/__tests__/collection.test.ts rename to packages/core/database/src/__tests__/collection.test.ts diff --git a/packages/database/src/__tests__/database.import.test.ts b/packages/core/database/src/__tests__/database.import.test.ts similarity index 100% rename from packages/database/src/__tests__/database.import.test.ts rename to packages/core/database/src/__tests__/database.import.test.ts diff --git a/packages/database/src/__tests__/database.test.ts b/packages/core/database/src/__tests__/database.test.ts similarity index 100% rename from packages/database/src/__tests__/database.test.ts rename to packages/core/database/src/__tests__/database.test.ts diff --git a/packages/database/src/__tests__/field-options/hidden.test.ts b/packages/core/database/src/__tests__/field-options/hidden.test.ts similarity index 100% rename from packages/database/src/__tests__/field-options/hidden.test.ts rename to packages/core/database/src/__tests__/field-options/hidden.test.ts diff --git a/packages/database/src/__tests__/field-options/sort-by.test.ts b/packages/core/database/src/__tests__/field-options/sort-by.test.ts similarity index 100% rename from packages/database/src/__tests__/field-options/sort-by.test.ts rename to packages/core/database/src/__tests__/field-options/sort-by.test.ts diff --git a/packages/database/src/__tests__/fields/belongs-to-field.test.ts b/packages/core/database/src/__tests__/fields/belongs-to-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/belongs-to-field.test.ts rename to packages/core/database/src/__tests__/fields/belongs-to-field.test.ts diff --git a/packages/database/src/__tests__/fields/belongs-to-many-field.test.ts b/packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/belongs-to-many-field.test.ts rename to packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts diff --git a/packages/database/src/__tests__/fields/context-field.test.ts b/packages/core/database/src/__tests__/fields/context-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/context-field.test.ts rename to packages/core/database/src/__tests__/fields/context-field.test.ts diff --git a/packages/database/src/__tests__/fields/has-many-field.test.ts b/packages/core/database/src/__tests__/fields/has-many-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/has-many-field.test.ts rename to packages/core/database/src/__tests__/fields/has-many-field.test.ts diff --git a/packages/database/src/__tests__/fields/has-one-field.test.ts b/packages/core/database/src/__tests__/fields/has-one-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/has-one-field.test.ts rename to packages/core/database/src/__tests__/fields/has-one-field.test.ts diff --git a/packages/database/src/__tests__/fields/password-field.test.ts b/packages/core/database/src/__tests__/fields/password-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/password-field.test.ts rename to packages/core/database/src/__tests__/fields/password-field.test.ts diff --git a/packages/database/src/__tests__/fields/sort-field.test.ts b/packages/core/database/src/__tests__/fields/sort-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/sort-field.test.ts rename to packages/core/database/src/__tests__/fields/sort-field.test.ts diff --git a/packages/database/src/__tests__/fields/string-field.test.ts b/packages/core/database/src/__tests__/fields/string-field.test.ts similarity index 100% rename from packages/database/src/__tests__/fields/string-field.test.ts rename to packages/core/database/src/__tests__/fields/string-field.test.ts diff --git a/packages/database/src/__tests__/filter-parser.test.ts b/packages/core/database/src/__tests__/filter-parser.test.ts similarity index 100% rename from packages/database/src/__tests__/filter-parser.test.ts rename to packages/core/database/src/__tests__/filter-parser.test.ts diff --git a/packages/database/src/__tests__/fixtures/c0/a.ts b/packages/core/database/src/__tests__/fixtures/c0/a.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/c0/a.ts rename to packages/core/database/src/__tests__/fixtures/c0/a.ts diff --git a/packages/database/src/__tests__/fixtures/c1/b.ts b/packages/core/database/src/__tests__/fixtures/c1/b.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/c1/b.ts rename to packages/core/database/src/__tests__/fixtures/c1/b.ts diff --git a/packages/database/src/__tests__/fixtures/c2/a.ts b/packages/core/database/src/__tests__/fixtures/c2/a.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/c2/a.ts rename to packages/core/database/src/__tests__/fixtures/c2/a.ts diff --git a/packages/database/src/__tests__/fixtures/collections/delay-extend.ts b/packages/core/database/src/__tests__/fixtures/collections/delay-extend.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/delay-extend.ts rename to packages/core/database/src/__tests__/fixtures/collections/delay-extend.ts diff --git a/packages/database/src/__tests__/fixtures/collections/delay-extend2.ts b/packages/core/database/src/__tests__/fixtures/collections/delay-extend2.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/delay-extend2.ts rename to packages/core/database/src/__tests__/fixtures/collections/delay-extend2.ts diff --git a/packages/database/src/__tests__/fixtures/collections/extend.ts b/packages/core/database/src/__tests__/fixtures/collections/extend.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/extend.ts rename to packages/core/database/src/__tests__/fixtures/collections/extend.ts diff --git a/packages/database/src/__tests__/fixtures/collections/extend2.ts b/packages/core/database/src/__tests__/fixtures/collections/extend2.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/extend2.ts rename to packages/core/database/src/__tests__/fixtures/collections/extend2.ts diff --git a/packages/database/src/__tests__/fixtures/collections/posts.ts b/packages/core/database/src/__tests__/fixtures/collections/posts.ts similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/posts.ts rename to packages/core/database/src/__tests__/fixtures/collections/posts.ts diff --git a/packages/database/src/__tests__/fixtures/collections/tags.js b/packages/core/database/src/__tests__/fixtures/collections/tags.js similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/tags.js rename to packages/core/database/src/__tests__/fixtures/collections/tags.js diff --git a/packages/core/database/src/__tests__/fixtures/collections/test.jpg b/packages/core/database/src/__tests__/fixtures/collections/test.jpg new file mode 100644 index 000000000..e69de29bb diff --git a/packages/database/src/__tests__/fixtures/collections/user.json b/packages/core/database/src/__tests__/fixtures/collections/user.json similarity index 100% rename from packages/database/src/__tests__/fixtures/collections/user.json rename to packages/core/database/src/__tests__/fixtures/collections/user.json diff --git a/packages/database/src/__tests__/index.ts b/packages/core/database/src/__tests__/index.ts similarity index 100% rename from packages/database/src/__tests__/index.ts rename to packages/core/database/src/__tests__/index.ts diff --git a/packages/database/src/__tests__/magic-attribute-model.test.ts b/packages/core/database/src/__tests__/magic-attribute-model.test.ts similarity index 100% rename from packages/database/src/__tests__/magic-attribute-model.test.ts rename to packages/core/database/src/__tests__/magic-attribute-model.test.ts diff --git a/packages/database/src/__tests__/model.test.ts b/packages/core/database/src/__tests__/model.test.ts similarity index 100% rename from packages/database/src/__tests__/model.test.ts rename to packages/core/database/src/__tests__/model.test.ts diff --git a/packages/database/src/__tests__/operator/array-operator.test.ts b/packages/core/database/src/__tests__/operator/array-operator.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/array-operator.test.ts rename to packages/core/database/src/__tests__/operator/array-operator.test.ts diff --git a/packages/database/src/__tests__/operator/association-operator.test.ts b/packages/core/database/src/__tests__/operator/association-operator.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/association-operator.test.ts rename to packages/core/database/src/__tests__/operator/association-operator.test.ts diff --git a/packages/database/src/__tests__/operator/date-operator.test.ts b/packages/core/database/src/__tests__/operator/date-operator.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/date-operator.test.ts rename to packages/core/database/src/__tests__/operator/date-operator.test.ts diff --git a/packages/database/src/__tests__/operator/empty-operator.test.ts b/packages/core/database/src/__tests__/operator/empty-operator.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/empty-operator.test.ts rename to packages/core/database/src/__tests__/operator/empty-operator.test.ts diff --git a/packages/database/src/__tests__/operator/ne.test.ts b/packages/core/database/src/__tests__/operator/ne.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/ne.test.ts rename to packages/core/database/src/__tests__/operator/ne.test.ts diff --git a/packages/database/src/__tests__/operator/string-operator.test.ts b/packages/core/database/src/__tests__/operator/string-operator.test.ts similarity index 100% rename from packages/database/src/__tests__/operator/string-operator.test.ts rename to packages/core/database/src/__tests__/operator/string-operator.test.ts diff --git a/packages/database/src/__tests__/option-parser.test.ts b/packages/core/database/src/__tests__/option-parser.test.ts similarity index 100% rename from packages/database/src/__tests__/option-parser.test.ts rename to packages/core/database/src/__tests__/option-parser.test.ts diff --git a/packages/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts similarity index 100% rename from packages/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts rename to packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts diff --git a/packages/database/src/__tests__/relation-repository/has-many-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts similarity index 100% rename from packages/database/src/__tests__/relation-repository/has-many-repository.test.ts rename to packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts diff --git a/packages/database/src/__tests__/relation-repository/hasone-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts similarity index 100% rename from packages/database/src/__tests__/relation-repository/hasone-repository.test.ts rename to packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts diff --git a/packages/database/src/__tests__/repository.test.ts b/packages/core/database/src/__tests__/repository.test.ts similarity index 100% rename from packages/database/src/__tests__/repository.test.ts rename to packages/core/database/src/__tests__/repository.test.ts diff --git a/packages/database/src/__tests__/repository/count.test.ts b/packages/core/database/src/__tests__/repository/count.test.ts similarity index 100% rename from packages/database/src/__tests__/repository/count.test.ts rename to packages/core/database/src/__tests__/repository/count.test.ts diff --git a/packages/database/src/__tests__/repository/create.test.ts b/packages/core/database/src/__tests__/repository/create.test.ts similarity index 100% rename from packages/database/src/__tests__/repository/create.test.ts rename to packages/core/database/src/__tests__/repository/create.test.ts diff --git a/packages/database/src/__tests__/repository/destroy.test.ts b/packages/core/database/src/__tests__/repository/destroy.test.ts similarity index 100% rename from packages/database/src/__tests__/repository/destroy.test.ts rename to packages/core/database/src/__tests__/repository/destroy.test.ts diff --git a/packages/database/src/__tests__/repository/find.test.ts b/packages/core/database/src/__tests__/repository/find.test.ts similarity index 100% rename from packages/database/src/__tests__/repository/find.test.ts rename to packages/core/database/src/__tests__/repository/find.test.ts diff --git a/packages/database/src/__tests__/repository/update.test.ts b/packages/core/database/src/__tests__/repository/update.test.ts similarity index 100% rename from packages/database/src/__tests__/repository/update.test.ts rename to packages/core/database/src/__tests__/repository/update.test.ts diff --git a/packages/database/src/__tests__/update-associations.test.ts b/packages/core/database/src/__tests__/update-associations.test.ts similarity index 100% rename from packages/database/src/__tests__/update-associations.test.ts rename to packages/core/database/src/__tests__/update-associations.test.ts diff --git a/packages/database/src/__tests__/update-guard.test.ts b/packages/core/database/src/__tests__/update-guard.test.ts similarity index 100% rename from packages/database/src/__tests__/update-guard.test.ts rename to packages/core/database/src/__tests__/update-guard.test.ts diff --git a/packages/database/src/collection-importer.ts b/packages/core/database/src/collection-importer.ts similarity index 100% rename from packages/database/src/collection-importer.ts rename to packages/core/database/src/collection-importer.ts diff --git a/packages/database/src/collection.ts b/packages/core/database/src/collection.ts similarity index 100% rename from packages/database/src/collection.ts rename to packages/core/database/src/collection.ts diff --git a/packages/database/src/database.ts b/packages/core/database/src/database.ts similarity index 100% rename from packages/database/src/database.ts rename to packages/core/database/src/database.ts diff --git a/packages/database/src/fields/array-field.ts b/packages/core/database/src/fields/array-field.ts similarity index 100% rename from packages/database/src/fields/array-field.ts rename to packages/core/database/src/fields/array-field.ts diff --git a/packages/database/src/fields/belongs-to-field.ts b/packages/core/database/src/fields/belongs-to-field.ts similarity index 100% rename from packages/database/src/fields/belongs-to-field.ts rename to packages/core/database/src/fields/belongs-to-field.ts diff --git a/packages/database/src/fields/belongs-to-many-field.ts b/packages/core/database/src/fields/belongs-to-many-field.ts similarity index 100% rename from packages/database/src/fields/belongs-to-many-field.ts rename to packages/core/database/src/fields/belongs-to-many-field.ts diff --git a/packages/database/src/fields/boolean-field.ts b/packages/core/database/src/fields/boolean-field.ts similarity index 100% rename from packages/database/src/fields/boolean-field.ts rename to packages/core/database/src/fields/boolean-field.ts diff --git a/packages/database/src/fields/context-field.ts b/packages/core/database/src/fields/context-field.ts similarity index 100% rename from packages/database/src/fields/context-field.ts rename to packages/core/database/src/fields/context-field.ts diff --git a/packages/database/src/fields/date-field.ts b/packages/core/database/src/fields/date-field.ts similarity index 100% rename from packages/database/src/fields/date-field.ts rename to packages/core/database/src/fields/date-field.ts diff --git a/packages/database/src/fields/field.ts b/packages/core/database/src/fields/field.ts similarity index 100% rename from packages/database/src/fields/field.ts rename to packages/core/database/src/fields/field.ts diff --git a/packages/database/src/fields/has-inverse-field.ts b/packages/core/database/src/fields/has-inverse-field.ts similarity index 100% rename from packages/database/src/fields/has-inverse-field.ts rename to packages/core/database/src/fields/has-inverse-field.ts diff --git a/packages/database/src/fields/has-many-field.ts b/packages/core/database/src/fields/has-many-field.ts similarity index 100% rename from packages/database/src/fields/has-many-field.ts rename to packages/core/database/src/fields/has-many-field.ts diff --git a/packages/database/src/fields/has-one-field.ts b/packages/core/database/src/fields/has-one-field.ts similarity index 100% rename from packages/database/src/fields/has-one-field.ts rename to packages/core/database/src/fields/has-one-field.ts diff --git a/packages/database/src/fields/index.ts b/packages/core/database/src/fields/index.ts similarity index 100% rename from packages/database/src/fields/index.ts rename to packages/core/database/src/fields/index.ts diff --git a/packages/database/src/fields/json-field.ts b/packages/core/database/src/fields/json-field.ts similarity index 100% rename from packages/database/src/fields/json-field.ts rename to packages/core/database/src/fields/json-field.ts diff --git a/packages/database/src/fields/number-field.ts b/packages/core/database/src/fields/number-field.ts similarity index 100% rename from packages/database/src/fields/number-field.ts rename to packages/core/database/src/fields/number-field.ts diff --git a/packages/database/src/fields/password-field.ts b/packages/core/database/src/fields/password-field.ts similarity index 100% rename from packages/database/src/fields/password-field.ts rename to packages/core/database/src/fields/password-field.ts diff --git a/packages/database/src/fields/relation-field.ts b/packages/core/database/src/fields/relation-field.ts similarity index 100% rename from packages/database/src/fields/relation-field.ts rename to packages/core/database/src/fields/relation-field.ts diff --git a/packages/database/src/fields/sort-field.ts b/packages/core/database/src/fields/sort-field.ts similarity index 100% rename from packages/database/src/fields/sort-field.ts rename to packages/core/database/src/fields/sort-field.ts diff --git a/packages/database/src/fields/string-field.ts b/packages/core/database/src/fields/string-field.ts similarity index 100% rename from packages/database/src/fields/string-field.ts rename to packages/core/database/src/fields/string-field.ts diff --git a/packages/database/src/fields/text-field.ts b/packages/core/database/src/fields/text-field.ts similarity index 100% rename from packages/database/src/fields/text-field.ts rename to packages/core/database/src/fields/text-field.ts diff --git a/packages/database/src/fields/time-field.ts b/packages/core/database/src/fields/time-field.ts similarity index 100% rename from packages/database/src/fields/time-field.ts rename to packages/core/database/src/fields/time-field.ts diff --git a/packages/database/src/fields/uid-field.ts b/packages/core/database/src/fields/uid-field.ts similarity index 100% rename from packages/database/src/fields/uid-field.ts rename to packages/core/database/src/fields/uid-field.ts diff --git a/packages/database/src/fields/virtual-field.ts b/packages/core/database/src/fields/virtual-field.ts similarity index 100% rename from packages/database/src/fields/virtual-field.ts rename to packages/core/database/src/fields/virtual-field.ts diff --git a/packages/database/src/filter-parser.ts b/packages/core/database/src/filter-parser.ts similarity index 100% rename from packages/database/src/filter-parser.ts rename to packages/core/database/src/filter-parser.ts diff --git a/packages/database/src/index.ts b/packages/core/database/src/index.ts similarity index 100% rename from packages/database/src/index.ts rename to packages/core/database/src/index.ts diff --git a/packages/database/src/magic-attribute-model.ts b/packages/core/database/src/magic-attribute-model.ts similarity index 100% rename from packages/database/src/magic-attribute-model.ts rename to packages/core/database/src/magic-attribute-model.ts diff --git a/packages/database/src/mock-database.ts b/packages/core/database/src/mock-database.ts similarity index 100% rename from packages/database/src/mock-database.ts rename to packages/core/database/src/mock-database.ts diff --git a/packages/database/src/model-hook.ts b/packages/core/database/src/model-hook.ts similarity index 100% rename from packages/database/src/model-hook.ts rename to packages/core/database/src/model-hook.ts diff --git a/packages/database/src/model.ts b/packages/core/database/src/model.ts similarity index 100% rename from packages/database/src/model.ts rename to packages/core/database/src/model.ts diff --git a/packages/database/src/operators/array.ts b/packages/core/database/src/operators/array.ts similarity index 100% rename from packages/database/src/operators/array.ts rename to packages/core/database/src/operators/array.ts diff --git a/packages/database/src/operators/association.ts b/packages/core/database/src/operators/association.ts similarity index 100% rename from packages/database/src/operators/association.ts rename to packages/core/database/src/operators/association.ts diff --git a/packages/database/src/operators/date.ts b/packages/core/database/src/operators/date.ts similarity index 100% rename from packages/database/src/operators/date.ts rename to packages/core/database/src/operators/date.ts diff --git a/packages/database/src/operators/empty.ts b/packages/core/database/src/operators/empty.ts similarity index 100% rename from packages/database/src/operators/empty.ts rename to packages/core/database/src/operators/empty.ts diff --git a/packages/database/src/operators/index.ts b/packages/core/database/src/operators/index.ts similarity index 100% rename from packages/database/src/operators/index.ts rename to packages/core/database/src/operators/index.ts diff --git a/packages/database/src/operators/ne.ts b/packages/core/database/src/operators/ne.ts similarity index 100% rename from packages/database/src/operators/ne.ts rename to packages/core/database/src/operators/ne.ts diff --git a/packages/database/src/operators/string.ts b/packages/core/database/src/operators/string.ts similarity index 100% rename from packages/database/src/operators/string.ts rename to packages/core/database/src/operators/string.ts diff --git a/packages/database/src/operators/utils.ts b/packages/core/database/src/operators/utils.ts similarity index 100% rename from packages/database/src/operators/utils.ts rename to packages/core/database/src/operators/utils.ts diff --git a/packages/database/src/options-parser.ts b/packages/core/database/src/options-parser.ts similarity index 100% rename from packages/database/src/options-parser.ts rename to packages/core/database/src/options-parser.ts diff --git a/packages/database/src/playground.ts b/packages/core/database/src/playground.ts similarity index 100% rename from packages/database/src/playground.ts rename to packages/core/database/src/playground.ts diff --git a/packages/database/src/relation-repository/belongs-to-many-repository.ts b/packages/core/database/src/relation-repository/belongs-to-many-repository.ts similarity index 100% rename from packages/database/src/relation-repository/belongs-to-many-repository.ts rename to packages/core/database/src/relation-repository/belongs-to-many-repository.ts diff --git a/packages/database/src/relation-repository/belongs-to-repository.ts b/packages/core/database/src/relation-repository/belongs-to-repository.ts similarity index 100% rename from packages/database/src/relation-repository/belongs-to-repository.ts rename to packages/core/database/src/relation-repository/belongs-to-repository.ts diff --git a/packages/database/src/relation-repository/hasmany-repository.ts b/packages/core/database/src/relation-repository/hasmany-repository.ts similarity index 100% rename from packages/database/src/relation-repository/hasmany-repository.ts rename to packages/core/database/src/relation-repository/hasmany-repository.ts diff --git a/packages/database/src/relation-repository/hasone-repository.ts b/packages/core/database/src/relation-repository/hasone-repository.ts similarity index 100% rename from packages/database/src/relation-repository/hasone-repository.ts rename to packages/core/database/src/relation-repository/hasone-repository.ts diff --git a/packages/database/src/relation-repository/multiple-relation-repository.ts b/packages/core/database/src/relation-repository/multiple-relation-repository.ts similarity index 100% rename from packages/database/src/relation-repository/multiple-relation-repository.ts rename to packages/core/database/src/relation-repository/multiple-relation-repository.ts diff --git a/packages/database/src/relation-repository/relation-repository.ts b/packages/core/database/src/relation-repository/relation-repository.ts similarity index 100% rename from packages/database/src/relation-repository/relation-repository.ts rename to packages/core/database/src/relation-repository/relation-repository.ts diff --git a/packages/database/src/relation-repository/single-relation-repository.ts b/packages/core/database/src/relation-repository/single-relation-repository.ts similarity index 100% rename from packages/database/src/relation-repository/single-relation-repository.ts rename to packages/core/database/src/relation-repository/single-relation-repository.ts diff --git a/packages/database/src/relation-repository/types.ts b/packages/core/database/src/relation-repository/types.ts similarity index 100% rename from packages/database/src/relation-repository/types.ts rename to packages/core/database/src/relation-repository/types.ts diff --git a/packages/database/src/repository.ts b/packages/core/database/src/repository.ts similarity index 100% rename from packages/database/src/repository.ts rename to packages/core/database/src/repository.ts diff --git a/packages/database/src/transaction-decorator.ts b/packages/core/database/src/transaction-decorator.ts similarity index 100% rename from packages/database/src/transaction-decorator.ts rename to packages/core/database/src/transaction-decorator.ts diff --git a/packages/database/src/update-associations.ts b/packages/core/database/src/update-associations.ts similarity index 100% rename from packages/database/src/update-associations.ts rename to packages/core/database/src/update-associations.ts diff --git a/packages/database/src/update-guard.ts b/packages/core/database/src/update-guard.ts similarity index 100% rename from packages/database/src/update-guard.ts rename to packages/core/database/src/update-guard.ts diff --git a/packages/core/database/tsconfig.build.json b/packages/core/database/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/core/database/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/core/database/tsconfig.json b/packages/core/database/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/core/database/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-china-region/.npmignore b/packages/core/resourcer/.npmignore similarity index 100% rename from packages/plugin-china-region/.npmignore rename to packages/core/resourcer/.npmignore diff --git a/packages/resourcer/package.json b/packages/core/resourcer/package.json similarity index 96% rename from packages/resourcer/package.json rename to packages/core/resourcer/package.json index 091ae98db..3ed9eb824 100644 --- a/packages/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/resourcer", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/resourcer/src/__tests__/actions/demo0.js b/packages/core/resourcer/src/__tests__/actions/demo0.js similarity index 100% rename from packages/resourcer/src/__tests__/actions/demo0.js rename to packages/core/resourcer/src/__tests__/actions/demo0.js diff --git a/packages/resourcer/src/__tests__/actions/demo1.ts b/packages/core/resourcer/src/__tests__/actions/demo1.ts similarity index 100% rename from packages/resourcer/src/__tests__/actions/demo1.ts rename to packages/core/resourcer/src/__tests__/actions/demo1.ts diff --git a/packages/resourcer/src/__tests__/assign.test.ts b/packages/core/resourcer/src/__tests__/assign.test.ts similarity index 100% rename from packages/resourcer/src/__tests__/assign.test.ts rename to packages/core/resourcer/src/__tests__/assign.test.ts diff --git a/packages/resourcer/src/__tests__/koa.test.ts b/packages/core/resourcer/src/__tests__/koa.test.ts similarity index 100% rename from packages/resourcer/src/__tests__/koa.test.ts rename to packages/core/resourcer/src/__tests__/koa.test.ts diff --git a/packages/resourcer/src/__tests__/middlewares/demo0.js b/packages/core/resourcer/src/__tests__/middlewares/demo0.js similarity index 100% rename from packages/resourcer/src/__tests__/middlewares/demo0.js rename to packages/core/resourcer/src/__tests__/middlewares/demo0.js diff --git a/packages/resourcer/src/__tests__/middlewares/demo1.ts b/packages/core/resourcer/src/__tests__/middlewares/demo1.ts similarity index 100% rename from packages/resourcer/src/__tests__/middlewares/demo1.ts rename to packages/core/resourcer/src/__tests__/middlewares/demo1.ts diff --git a/packages/resourcer/src/__tests__/resourcer.test.ts b/packages/core/resourcer/src/__tests__/resourcer.test.ts similarity index 100% rename from packages/resourcer/src/__tests__/resourcer.test.ts rename to packages/core/resourcer/src/__tests__/resourcer.test.ts diff --git a/packages/resourcer/src/__tests__/resources/demo.ts b/packages/core/resourcer/src/__tests__/resources/demo.ts similarity index 100% rename from packages/resourcer/src/__tests__/resources/demo.ts rename to packages/core/resourcer/src/__tests__/resources/demo.ts diff --git a/packages/resourcer/src/__tests__/utils.test.ts b/packages/core/resourcer/src/__tests__/utils.test.ts similarity index 100% rename from packages/resourcer/src/__tests__/utils.test.ts rename to packages/core/resourcer/src/__tests__/utils.test.ts diff --git a/packages/resourcer/src/action.ts b/packages/core/resourcer/src/action.ts similarity index 100% rename from packages/resourcer/src/action.ts rename to packages/core/resourcer/src/action.ts diff --git a/packages/resourcer/src/assign.ts b/packages/core/resourcer/src/assign.ts similarity index 100% rename from packages/resourcer/src/assign.ts rename to packages/core/resourcer/src/assign.ts diff --git a/packages/resourcer/src/index.ts b/packages/core/resourcer/src/index.ts similarity index 100% rename from packages/resourcer/src/index.ts rename to packages/core/resourcer/src/index.ts diff --git a/packages/resourcer/src/middleware.ts b/packages/core/resourcer/src/middleware.ts similarity index 100% rename from packages/resourcer/src/middleware.ts rename to packages/core/resourcer/src/middleware.ts diff --git a/packages/resourcer/src/resource.ts b/packages/core/resourcer/src/resource.ts similarity index 100% rename from packages/resourcer/src/resource.ts rename to packages/core/resourcer/src/resource.ts diff --git a/packages/resourcer/src/resourcer.ts b/packages/core/resourcer/src/resourcer.ts similarity index 100% rename from packages/resourcer/src/resourcer.ts rename to packages/core/resourcer/src/resourcer.ts diff --git a/packages/resourcer/src/utils.ts b/packages/core/resourcer/src/utils.ts similarity index 100% rename from packages/resourcer/src/utils.ts rename to packages/core/resourcer/src/utils.ts diff --git a/packages/core/resourcer/tsconfig.build.json b/packages/core/resourcer/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/core/resourcer/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/core/resourcer/tsconfig.json b/packages/core/resourcer/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/core/resourcer/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/server/.gitignore b/packages/core/server/.gitignore similarity index 100% rename from packages/server/.gitignore rename to packages/core/server/.gitignore diff --git a/packages/plugin-client/.npmignore b/packages/core/server/.npmignore similarity index 100% rename from packages/plugin-client/.npmignore rename to packages/core/server/.npmignore diff --git a/packages/server/package.json b/packages/core/server/package.json similarity index 72% rename from packages/server/package.json rename to packages/core/server/package.json index 9e2f9d1ad..131d0c1ab 100644 --- a/packages/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", @@ -12,17 +12,18 @@ "dependencies": { "@koa/cors": "^3.1.0", "@koa/router": "^9.4.0", - "@nocobase/acl": "0.6.0-alpha.0", - "@nocobase/actions": "^0.6.0-alpha.0", - "@nocobase/database": "^0.6.0-alpha.0", - "@nocobase/resourcer": "^0.6.0-alpha.0", + "@nocobase/acl": "0.6.2-alpha.8", + "@nocobase/actions": "0.6.2-alpha.8", + "@nocobase/database": "0.6.2-alpha.8", + "@nocobase/resourcer": "0.6.2-alpha.8", "commander": "^8.1.0", "dotenv": "^8.2.0", "find-package-json": "^1.2.0", "i18next": "^21.3.2", "koa": "^2.13.4", "koa-bodyparser": "^4.3.0", - "koa-static": "^5.0.0" + "koa-static": "^5.0.0", + "lodash": "^4.17.21" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/server/src/__tests__/application.test.ts b/packages/core/server/src/__tests__/application.test.ts similarity index 95% rename from packages/server/src/__tests__/application.test.ts rename to packages/core/server/src/__tests__/application.test.ts index 8a03b6c73..d3c4838d2 100644 --- a/packages/server/src/__tests__/application.test.ts +++ b/packages/core/server/src/__tests__/application.test.ts @@ -4,6 +4,10 @@ import { Plugin } from '../plugin'; class MyPlugin extends Plugin { async load() {} + + getName(): string { + return 'MyPlugin'; + } } describe('application', () => { @@ -119,4 +123,6 @@ describe('application', () => { const response = await agent.get('/api/foos/1/bars'); expect(response.body).toEqual([1, 2]); }); + + it('should create application with plugins config', async () => {}); }); diff --git a/packages/core/server/src/__tests__/config.test.ts b/packages/core/server/src/__tests__/config.test.ts new file mode 100644 index 000000000..bbf3d957e --- /dev/null +++ b/packages/core/server/src/__tests__/config.test.ts @@ -0,0 +1,46 @@ +import * as path from 'path'; +import databaseConfiguration from './config/database'; +import userConfiguration from './config/plugins-options/users'; +import { readConfig } from '../read-config'; +import { PluginManager } from '../plugin-manager'; +import Application from '../application'; + +const configurationDir = path.join(__dirname, './config'); + +describe('config', () => { + it('should read configuration from directory', async () => { + const config = await readConfig(configurationDir); + expect(config['not-exists']).toBeUndefined(); + expect(config['database']).toEqual(databaseConfiguration); + expect(config['database']).toEqual(databaseConfiguration); + expect(config['plugins-options']['users']).toEqual(userConfiguration); + }); + + it('should create application from configuration', async () => { + const TestA = require('./plugins/test-a').default; + const TestB = require('./plugins/test-b').default; + + PluginManager.resolvePlugin = (name) => { + if (name === 'test-a') { + return TestA; + } + + if (name === 'test-b') { + return TestB; + } + }; + + const config = await readConfig(configurationDir); + + const app = new Application(config); + + const appPluginA = app.getPlugin('test-a'); + + expect(appPluginA).toBeInstanceOf(TestA); + + const appPluginB = app.getPlugin('test-b'); + + expect(appPluginB).toBeInstanceOf(TestB); + expect(appPluginB.options).toBeDefined(); + }); +}); diff --git a/packages/core/server/src/__tests__/config/database.ts b/packages/core/server/src/__tests__/config/database.ts new file mode 100644 index 000000000..0b843b524 --- /dev/null +++ b/packages/core/server/src/__tests__/config/database.ts @@ -0,0 +1,6 @@ +import { IDatabaseOptions } from '@nocobase/database'; + +export default { + dialect: 'sqlite', + storage: ':memory:', +} as IDatabaseOptions; diff --git a/packages/core/server/src/__tests__/config/plugins-options/drive.ts b/packages/core/server/src/__tests__/config/plugins-options/drive.ts new file mode 100644 index 000000000..19417793a --- /dev/null +++ b/packages/core/server/src/__tests__/config/plugins-options/drive.ts @@ -0,0 +1,8 @@ +export default { + oss: { + id: 'test-oss', + }, + aws: { + id: 'test-aws', + }, +}; diff --git a/packages/core/server/src/__tests__/config/plugins-options/users.ts b/packages/core/server/src/__tests__/config/plugins-options/users.ts new file mode 100644 index 000000000..90b1bb357 --- /dev/null +++ b/packages/core/server/src/__tests__/config/plugins-options/users.ts @@ -0,0 +1,3 @@ +export default { + jwtToken: '1234', +}; diff --git a/packages/core/server/src/__tests__/config/plugins.ts b/packages/core/server/src/__tests__/config/plugins.ts new file mode 100644 index 000000000..b5defc30e --- /dev/null +++ b/packages/core/server/src/__tests__/config/plugins.ts @@ -0,0 +1 @@ +export default ['test-a', ['test-b', { optionA: 'optionA' }]]; diff --git a/packages/core/server/src/__tests__/config/resourcer.ts b/packages/core/server/src/__tests__/config/resourcer.ts new file mode 100644 index 000000000..e69de29bb diff --git a/packages/server/src/__tests__/dataWrapping.test.ts b/packages/core/server/src/__tests__/dataWrapping.test.ts similarity index 100% rename from packages/server/src/__tests__/dataWrapping.test.ts rename to packages/core/server/src/__tests__/dataWrapping.test.ts diff --git a/packages/server/src/__tests__/i18next.test.ts b/packages/core/server/src/__tests__/i18next.test.ts similarity index 100% rename from packages/server/src/__tests__/i18next.test.ts rename to packages/core/server/src/__tests__/i18next.test.ts diff --git a/packages/server/src/__tests__/life-cycle.test.ts b/packages/core/server/src/__tests__/life-cycle.test.ts similarity index 100% rename from packages/server/src/__tests__/life-cycle.test.ts rename to packages/core/server/src/__tests__/life-cycle.test.ts diff --git a/packages/server/src/__tests__/multiple-application.test.ts b/packages/core/server/src/__tests__/multiple-application.test.ts similarity index 100% rename from packages/server/src/__tests__/multiple-application.test.ts rename to packages/core/server/src/__tests__/multiple-application.test.ts diff --git a/packages/server/src/__tests__/plugin.test.ts b/packages/core/server/src/__tests__/plugin.test.ts similarity index 100% rename from packages/server/src/__tests__/plugin.test.ts rename to packages/core/server/src/__tests__/plugin.test.ts diff --git a/packages/server/src/__tests__/plugins/plugin1.ts b/packages/core/server/src/__tests__/plugins/plugin1.ts similarity index 100% rename from packages/server/src/__tests__/plugins/plugin1.ts rename to packages/core/server/src/__tests__/plugins/plugin1.ts diff --git a/packages/server/src/__tests__/plugins/plugin2.ts b/packages/core/server/src/__tests__/plugins/plugin2.ts similarity index 100% rename from packages/server/src/__tests__/plugins/plugin2.ts rename to packages/core/server/src/__tests__/plugins/plugin2.ts diff --git a/packages/server/src/__tests__/plugins/plugin3.ts b/packages/core/server/src/__tests__/plugins/plugin3.ts similarity index 100% rename from packages/server/src/__tests__/plugins/plugin3.ts rename to packages/core/server/src/__tests__/plugins/plugin3.ts diff --git a/packages/core/server/src/__tests__/plugins/test-a.ts b/packages/core/server/src/__tests__/plugins/test-a.ts new file mode 100644 index 000000000..824760fdd --- /dev/null +++ b/packages/core/server/src/__tests__/plugins/test-a.ts @@ -0,0 +1,7 @@ +import { Plugin } from '../../plugin'; + +export default class TestA extends Plugin { + getName(): string { + return 'test-a'; + } +} diff --git a/packages/core/server/src/__tests__/plugins/test-b.ts b/packages/core/server/src/__tests__/plugins/test-b.ts new file mode 100644 index 000000000..6a4f07a73 --- /dev/null +++ b/packages/core/server/src/__tests__/plugins/test-b.ts @@ -0,0 +1,7 @@ +import { Plugin } from '../../plugin'; + +export default class TestB extends Plugin { + getName(): string { + return 'test-b'; + } +} diff --git a/packages/server/src/acl/available-action.ts b/packages/core/server/src/acl/available-action.ts similarity index 100% rename from packages/server/src/acl/available-action.ts rename to packages/core/server/src/acl/available-action.ts diff --git a/packages/server/src/acl/index.ts b/packages/core/server/src/acl/index.ts similarity index 100% rename from packages/server/src/acl/index.ts rename to packages/core/server/src/acl/index.ts diff --git a/packages/server/src/app-manager.ts b/packages/core/server/src/app-manager.ts similarity index 100% rename from packages/server/src/app-manager.ts rename to packages/core/server/src/app-manager.ts diff --git a/packages/server/src/application.ts b/packages/core/server/src/application.ts similarity index 87% rename from packages/server/src/application.ts rename to packages/core/server/src/application.ts index 3d7dd563b..87bda7dd5 100644 --- a/packages/server/src/application.ts +++ b/packages/core/server/src/application.ts @@ -9,11 +9,15 @@ import { i18n, InitOptions } from 'i18next'; import Koa from 'koa'; import { isBoolean } from 'lodash'; import { createACL } from './acl'; -import { createCli, createDatabase, createI18n, createResourcer, registerMiddlewares } from './helper'; +import { createCli } from './commands'; +import { createDatabase, createI18n, createResourcer, registerMiddlewares } from './helper'; import { Plugin } from './plugin'; import { PluginManager, InstallOptions } from './plugin-manager'; import { AppManager } from './app-manager'; +export type PluginConfiguration = string | [string, any]; +export type PluginsConfigurations = Array; + export interface ResourcerOptions { prefix?: string; } @@ -26,6 +30,7 @@ export interface ApplicationOptions { dataWrapping?: boolean; registerActions?: boolean; i18n?: i18n | InitOptions; + plugins?: PluginsConfigurations; } interface DefaultState { @@ -97,7 +102,7 @@ export class Application exten this.acl = createACL(); this.db = createDatabase(options); this.resourcer = createResourcer(options); - this.cli = createCli(this, options); + this.cli = createCli(this); this.i18n = createI18n(options); this.pm = new PluginManager({ @@ -111,12 +116,27 @@ export class Application exten if (options.registerActions !== false) { registerActions(this); } + + this.loadPluginConfig(options.plugins || []); } plugin(pluginClass: any, options?: O): Plugin { return this.pm.add(pluginClass, options); } + loadPluginConfig(pluginsConfigurations: PluginsConfigurations) { + for (let pluginConfiguration of pluginsConfigurations) { + if (typeof pluginConfiguration == 'string') { + pluginConfiguration = [pluginConfiguration, {}]; + } + + const plugin = PluginManager.resolvePlugin(pluginConfiguration[0]); + const pluginOptions = pluginConfiguration[1]; + + this.plugin(plugin, pluginOptions); + } + } + use( middleware: Koa.Middleware, options?: MiddlewareOptions, diff --git a/packages/core/server/src/commands/console.ts b/packages/core/server/src/commands/console.ts new file mode 100644 index 000000000..f303782e8 --- /dev/null +++ b/packages/core/server/src/commands/console.ts @@ -0,0 +1,16 @@ +const REPL = require('repl'); + +export default async ({ app }) => { + await app.start(); + const repl = (REPL.start('nocobase > ').context.app = app); + + repl.on('exit', async function (err) { + if (err) { + console.log(err); + process.exit(1); + } + + await app.stop(); + process.exit(0); + }); +}; diff --git a/packages/core/server/src/commands/create-plugin/create-plugin.ts b/packages/core/server/src/commands/create-plugin/create-plugin.ts new file mode 100644 index 000000000..b97749cea --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/create-plugin.ts @@ -0,0 +1,28 @@ +const chalk = require('chalk'); +const fse = require('fs-extra'); +const { join } = require('path'); +const createPackageJson = require('./resources/templates/package-json'); +const createPluginClass = require('./resources/templates/plugin'); + +export default async (name) => { + const pluginName = `plugin-${name}`; + + const pluginPath = join(process.cwd(), `packages/${pluginName}`); + const resourcePath = join(__dirname, 'resources'); + + console.log(`Creating a new NocoBase plugin at ${chalk.green(pluginPath)}.`); + await fse.copy(join(resourcePath, 'files'), pluginPath); + + await fse.outputFile(join(pluginPath, 'src/server/index.ts'), createPluginClass({ name })); + + // write server package.json + await fse.writeJson( + join(pluginPath, 'package.json'), + createPackageJson({ + name: pluginName, + }), + { + spaces: 2, + }, + ); +}; diff --git a/packages/core/server/src/commands/create-plugin/index.ts b/packages/core/server/src/commands/create-plugin/index.ts new file mode 100644 index 000000000..d6f28f1a0 --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/index.ts @@ -0,0 +1,5 @@ +const createPlugin = require('./create-plugin'); +export default ({ app, cliArgs }) => { + const name = cliArgs[0]; + createPlugin(name); +}; diff --git a/packages/core/server/src/commands/create-plugin/resources/files/server.js b/packages/core/server/src/commands/create-plugin/resources/files/server.js new file mode 100644 index 000000000..91f8b9f43 --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/resources/files/server.js @@ -0,0 +1 @@ +module.exports = require('./src/server'); diff --git a/packages/plugin-acl/tsconfig.json b/packages/core/server/src/commands/create-plugin/resources/files/tsconfig.json similarity index 100% rename from packages/plugin-acl/tsconfig.json rename to packages/core/server/src/commands/create-plugin/resources/files/tsconfig.json diff --git a/packages/core/server/src/commands/create-plugin/resources/templates/package-json.ts b/packages/core/server/src/commands/create-plugin/resources/templates/package-json.ts new file mode 100644 index 000000000..c871d66f0 --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/resources/templates/package-json.ts @@ -0,0 +1,10 @@ +export default ({ name }) => { + return { + name: name, + version: '0.1.0', + main: 'server.js', + dependencies: { + '@nocobase/server': '^0.6.0-alpha.0', + }, + }; +}; diff --git a/packages/core/server/src/commands/create-plugin/resources/templates/plugin-class.template b/packages/core/server/src/commands/create-plugin/resources/templates/plugin-class.template new file mode 100644 index 000000000..b88be1a23 --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/resources/templates/plugin-class.template @@ -0,0 +1,7 @@ +import { Plugin } from '@nocobase/server'; + +export default class Plugin<%= className %> extends Plugin { + getName(): string { + return 'plugin-<%= name %>'; + } +} diff --git a/packages/core/server/src/commands/create-plugin/resources/templates/plugin.ts b/packages/core/server/src/commands/create-plugin/resources/templates/plugin.ts new file mode 100644 index 000000000..075d623ba --- /dev/null +++ b/packages/core/server/src/commands/create-plugin/resources/templates/plugin.ts @@ -0,0 +1,13 @@ +import * as _ from 'lodash'; +import * as fs from 'fs'; +import * as path from 'path'; + +export default ({ name }) => { + const tmpl = fs.readFileSync(path.join(__dirname, 'plugin-class.template'), { encoding: 'utf-8' }); + const compile = _.template(tmpl); + + return compile({ + name, + className: _.startCase(_.camelCase(name)), + }); +}; diff --git a/packages/core/server/src/commands/db-sync.ts b/packages/core/server/src/commands/db-sync.ts new file mode 100644 index 000000000..6b0d98335 --- /dev/null +++ b/packages/core/server/src/commands/db-sync.ts @@ -0,0 +1,17 @@ +export default async ({ app, cliArgs }) => { + const [opts] = cliArgs; + console.log('db sync...'); + await app.db.sync( + opts.force + ? { + force: true, + alter: { + drop: true, + }, + } + : {}, + ); + await app.stop({ + cliArgs, + }); +}; diff --git a/packages/core/server/src/commands/index.ts b/packages/core/server/src/commands/index.ts new file mode 100644 index 000000000..a271fbf19 --- /dev/null +++ b/packages/core/server/src/commands/index.ts @@ -0,0 +1,34 @@ +import Application from '../application'; +import { Command } from 'commander'; + +export function createCli(app: Application) { + const program = new Command(); + + const runSubCommand = + (name) => + (...cliArgs) => { + const command = require(`./${name}`).default; + + Promise.resolve() + .then(() => { + return command({ app, cliArgs }); + }) + .catch((error) => { + console.error(error); + process.exit(1); + }); + }; + + program.command('start').description('start NocoBase application').action(runSubCommand('start')); + program.command('install').option('-f, --force').option('-c, --clean').action(runSubCommand('install')); + program.command('db:sync').option('-f, --force').action(runSubCommand('db-sync')); + program.command('console').action(runSubCommand('console')); + + program + .command('create-plugin') + .argument('', 'name of plugin') + .description('create NocoBase plugin') + .action(runSubCommand('create-plugin')); + + return program; +} diff --git a/packages/core/server/src/commands/install.ts b/packages/core/server/src/commands/install.ts new file mode 100644 index 000000000..d10ff649e --- /dev/null +++ b/packages/core/server/src/commands/install.ts @@ -0,0 +1,13 @@ +export default async ({ app, cliArgs }) => { + const [opts] = cliArgs; + await app.install({ + cliArgs, + clean: opts.clean, + sync: { + force: opts.force, + }, + }); + await app.stop({ + cliArgs, + }); +}; diff --git a/packages/core/server/src/commands/start.ts b/packages/core/server/src/commands/start.ts new file mode 100644 index 000000000..bb3a61de6 --- /dev/null +++ b/packages/core/server/src/commands/start.ts @@ -0,0 +1,15 @@ +export default async ({ app, cliArgs }) => { + const [opts] = cliArgs; + const port = opts.port || process.env.SERVER_PORT || 3000; + const host = opts.host || process.env.SERVER_HOST || '0.0.0.0'; + + await app.start({ + cliArgs, + listen: { + port, + host, + }, + }); + + console.log(`🚀 nocobase server had started at http://${host}:${port}`); +}; diff --git a/packages/server/src/helper.ts b/packages/core/server/src/helper.ts similarity index 62% rename from packages/server/src/helper.ts rename to packages/core/server/src/helper.ts index 510566e9d..5a32787e3 100644 --- a/packages/server/src/helper.ts +++ b/packages/core/server/src/helper.ts @@ -31,68 +31,6 @@ export function createResourcer(options: ApplicationOptions) { return new Resourcer({ ...options.resourcer }); } -export function createCli(app: Application, options: ApplicationOptions): Command { - const cli = new Command(); - - cli - .command('db:sync') - .option('-f, --force') - .action(async (...cliArgs) => { - const [opts] = cliArgs; - console.log('db sync...'); - await app.db.sync( - opts.force - ? { - force: true, - alter: { - drop: true, - }, - } - : {}, - ); - await app.stop({ - cliArgs, - }); - }); - - cli - .command('install') - .option('-f, --force') - .option('-c, --clean') - .action(async (...cliArgs) => { - const [opts] = cliArgs; - await app.install({ - cliArgs, - clean: opts.clean, - sync: { - force: opts.force, - }, - }); - await app.stop({ - cliArgs, - }); - }); - - cli - .command('start') - .option('-p, --port [port]') - .action(async (...cliArgs) => { - const [opts] = cliArgs; - const port = opts.port || 3000; - - await app.start({ - cliArgs, - listen: { - port, - }, - }); - - console.log(`http://localhost:${port}/`); - }); - - return cli; -} - export function registerMiddlewares(app: Application, options: ApplicationOptions) { if (options.bodyParser !== false) { app.use( diff --git a/packages/server/src/index.ts b/packages/core/server/src/index.ts similarity index 71% rename from packages/server/src/index.ts rename to packages/core/server/src/index.ts index a2242e721..a28a57ba3 100644 --- a/packages/server/src/index.ts +++ b/packages/core/server/src/index.ts @@ -1,5 +1,7 @@ export * from './application'; +export { PluginManager } from './plugin-manager'; export * as middlewares from './middlewares'; export * from './plugin'; export { Application as default } from './application'; export { AppManager } from './app-manager'; +export * from './read-config'; diff --git a/packages/server/src/middlewares/data-wrapping.ts b/packages/core/server/src/middlewares/data-wrapping.ts similarity index 100% rename from packages/server/src/middlewares/data-wrapping.ts rename to packages/core/server/src/middlewares/data-wrapping.ts diff --git a/packages/server/src/middlewares/index.ts b/packages/core/server/src/middlewares/index.ts similarity index 100% rename from packages/server/src/middlewares/index.ts rename to packages/core/server/src/middlewares/index.ts diff --git a/packages/server/src/middlewares/table2resource.ts b/packages/core/server/src/middlewares/table2resource.ts similarity index 100% rename from packages/server/src/middlewares/table2resource.ts rename to packages/core/server/src/middlewares/table2resource.ts diff --git a/packages/server/src/plugin-manager.ts b/packages/core/server/src/plugin-manager.ts similarity index 94% rename from packages/server/src/plugin-manager.ts rename to packages/core/server/src/plugin-manager.ts index a9864db29..6d0e1721c 100644 --- a/packages/server/src/plugin-manager.ts +++ b/packages/core/server/src/plugin-manager.ts @@ -65,4 +65,8 @@ export class PluginManager { await this.app.emitAsync('afterInstallPlugin', plugin, options); } } + + static resolvePlugin(pluginName: string) { + return require(pluginName).default; + } } diff --git a/packages/server/src/plugin.ts b/packages/core/server/src/plugin.ts similarity index 91% rename from packages/server/src/plugin.ts rename to packages/core/server/src/plugin.ts index 0bb8f9f6e..56847168a 100644 --- a/packages/server/src/plugin.ts +++ b/packages/core/server/src/plugin.ts @@ -38,11 +38,7 @@ export abstract class Plugin implements PluginInterface { this.options = options || ({} as any); } - getName(): string { - const path = require.main.children[require.main.children.length - 1].path; - - return ''; - } + public abstract getName(): string; beforeLoad() {} diff --git a/packages/core/server/src/read-config.ts b/packages/core/server/src/read-config.ts new file mode 100644 index 000000000..a567ca312 --- /dev/null +++ b/packages/core/server/src/read-config.ts @@ -0,0 +1,54 @@ +import lodash from 'lodash'; +import fs from 'fs'; +import path from 'path'; + +export async function readConfig(dir: string) { + const repository = new ConfigurationRepository(); + await loadConfiguration(dir, repository); + return repository.toObject(); +} + +export class ConfigurationRepository { + protected items = new Map(); + + get(key: string, defaultValue = undefined) { + if (this.items.has(key)) { + return this.items.get(key); + } + + return defaultValue; + } + + set(key: string, value: any) { + return this.items.set(key, value); + } + + toObject() { + const result = {}; + + for (const [key, value] of this.items.entries()) { + lodash.set(result, key, value); + } + + return result; + } +} + +export async function loadConfiguration(configurationDir: string, repository: ConfigurationRepository) { + const getConfigurationFiles = async (dir: string, prefix = []) => { + const files = await fs.promises.readdir(dir, { withFileTypes: true }); + for (const file of files) { + if (file.isDirectory()) { + await getConfigurationFiles(path.join(dir, file.name), [...prefix, file.name]); + } else { + const filePath = path.join(dir, file.name); + const keyName = path.parse(filePath).name; + const configuration = require(filePath).default; + + repository.set([...prefix, keyName].join('.'), configuration); + } + } + }; + + await getConfigurationFiles(configurationDir); +} diff --git a/packages/core/server/tsconfig.build.json b/packages/core/server/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/core/server/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/core/server/tsconfig.json b/packages/core/server/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/core/server/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/test/.gitignore b/packages/core/test/.gitignore similarity index 100% rename from packages/test/.gitignore rename to packages/core/test/.gitignore diff --git a/packages/plugin-collection-manager/.npmignore b/packages/core/test/.npmignore similarity index 100% rename from packages/plugin-collection-manager/.npmignore rename to packages/core/test/.npmignore diff --git a/packages/test/package.json b/packages/core/test/package.json similarity index 89% rename from packages/test/package.json rename to packages/core/test/package.json index 796f2ca36..9d7a82da9 100644 --- a/packages/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", @@ -10,7 +10,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "^0.6.0-alpha.0", + "@nocobase/server": "0.6.2-alpha.8", "@types/supertest": "^2.0.11", "mockjs": "^1.1.0", "mysql2": "^2.1.0", diff --git a/packages/test/src/index.ts b/packages/core/test/src/index.ts similarity index 100% rename from packages/test/src/index.ts rename to packages/core/test/src/index.ts diff --git a/packages/test/src/mockServer.ts b/packages/core/test/src/mockServer.ts similarity index 100% rename from packages/test/src/mockServer.ts rename to packages/core/test/src/mockServer.ts diff --git a/packages/core/test/tsconfig.build.json b/packages/core/test/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/core/test/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/core/test/tsconfig.json b/packages/core/test/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/core/test/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/utils/.gitignore b/packages/core/utils/.gitignore similarity index 100% rename from packages/utils/.gitignore rename to packages/core/utils/.gitignore diff --git a/packages/plugin-file-manager/.npmignore b/packages/core/utils/.npmignore similarity index 100% rename from packages/plugin-file-manager/.npmignore rename to packages/core/utils/.npmignore diff --git a/packages/utils/package.json b/packages/core/utils/package.json similarity index 94% rename from packages/utils/package.json rename to packages/core/utils/package.json index f38a9ed20..869f9da8f 100644 --- a/packages/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "MIT", diff --git a/packages/utils/src/index.ts b/packages/core/utils/src/index.ts similarity index 100% rename from packages/utils/src/index.ts rename to packages/core/utils/src/index.ts diff --git a/packages/utils/src/merge.ts b/packages/core/utils/src/merge.ts similarity index 100% rename from packages/utils/src/merge.ts rename to packages/core/utils/src/merge.ts diff --git a/packages/utils/src/mixin/AsyncEmitter.ts b/packages/core/utils/src/mixin/AsyncEmitter.ts similarity index 100% rename from packages/utils/src/mixin/AsyncEmitter.ts rename to packages/core/utils/src/mixin/AsyncEmitter.ts diff --git a/packages/utils/src/mixin/index.ts b/packages/core/utils/src/mixin/index.ts similarity index 100% rename from packages/utils/src/mixin/index.ts rename to packages/core/utils/src/mixin/index.ts diff --git a/packages/utils/src/registry.ts b/packages/core/utils/src/registry.ts similarity index 100% rename from packages/utils/src/registry.ts rename to packages/core/utils/src/registry.ts diff --git a/packages/utils/src/uid.ts b/packages/core/utils/src/uid.ts similarity index 100% rename from packages/utils/src/uid.ts rename to packages/core/utils/src/uid.ts diff --git a/packages/utils/src/umiConfig.ts b/packages/core/utils/src/umiConfig.ts similarity index 68% rename from packages/utils/src/umiConfig.ts rename to packages/core/utils/src/umiConfig.ts index d66b957f6..cdb3afafe 100644 --- a/packages/utils/src/umiConfig.ts +++ b/packages/core/utils/src/umiConfig.ts @@ -1,7 +1,7 @@ export function getUmiConfig() { - const { API_PORT, API_BASE_URL } = process.env; - const API_BASE_PATH = process.env.API_BASE_PATH || '/api/'; - const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${API_PORT}`; + const { SERVER_PORT, SERVER_BASE_URL } = process.env; + const SERVER_BASE_PATH = process.env.SERVER_BASE_PATH || '/api/'; + const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${SERVER_PORT}`; const LOCAL_STORAGE_BASE_URL = process.env.LOCAL_STORAGE_BASE_URL || '/uploads'; function getLocalStorageProxy() { @@ -19,15 +19,15 @@ export function getUmiConfig() { return { define: { - 'process.env.API_BASE_URL': API_BASE_URL || API_BASE_PATH, + 'process.env.SERVER_BASE_URL': SERVER_BASE_URL || SERVER_BASE_PATH, }, // only proxy when using `umi dev` // if the assets are built, will not proxy proxy: { - [API_BASE_PATH]: { + [SERVER_BASE_PATH]: { target: PROXY_TARGET_URL, changeOrigin: true, - pathRewrite: { [`^${API_BASE_PATH}`]: API_BASE_PATH }, + pathRewrite: { [`^${SERVER_BASE_PATH}`]: SERVER_BASE_PATH }, }, // for local storage ...getLocalStorageProxy(), diff --git a/packages/core/utils/tsconfig.build.json b/packages/core/utils/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/core/utils/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/core/utils/tsconfig.json b/packages/core/utils/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/core/utils/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-action-logs/tsconfig.build.json b/packages/plugin-action-logs/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-action-logs/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-action-logs/tsconfig.json b/packages/plugin-action-logs/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-action-logs/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-china-region/tsconfig.build.json b/packages/plugin-china-region/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-china-region/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-china-region/tsconfig.json b/packages/plugin-china-region/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-china-region/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-client/tsconfig.build.json b/packages/plugin-client/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-client/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-client/tsconfig.json b/packages/plugin-client/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-client/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-collection-manager/tsconfig.build.json b/packages/plugin-collection-manager/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-collection-manager/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-collection-manager/tsconfig.json b/packages/plugin-collection-manager/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-collection-manager/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-error-handler/tsconfig.build.json b/packages/plugin-error-handler/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-error-handler/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-error-handler/tsconfig.json b/packages/plugin-error-handler/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-error-handler/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-file-manager/tsconfig.build.json b/packages/plugin-file-manager/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-file-manager/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-file-manager/tsconfig.json b/packages/plugin-file-manager/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-file-manager/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-multiple-apps/tsconfig.build.json b/packages/plugin-multiple-apps/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-multiple-apps/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-multiple-apps/tsconfig.json b/packages/plugin-multiple-apps/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-multiple-apps/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-notifications/tsconfig.build.json b/packages/plugin-notifications/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-notifications/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-notifications/tsconfig.json b/packages/plugin-notifications/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-notifications/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-ui-routes-storage/tsconfig.build.json b/packages/plugin-ui-routes-storage/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-ui-routes-storage/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-ui-routes-storage/tsconfig.json b/packages/plugin-ui-routes-storage/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-ui-routes-storage/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-users/tsconfig.build.json b/packages/plugin-users/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/plugin-users/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-users/tsconfig.json b/packages/plugin-users/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-users/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-workflow/tsconfig.json b/packages/plugin-workflow/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/plugin-workflow/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/plugin-acl/package.json b/packages/plugins/acl/package.json similarity index 72% rename from packages/plugin-acl/package.json rename to packages/plugins/acl/package.json index c124d4926..b0148245f 100644 --- a/packages/plugin-acl/package.json +++ b/packages/plugins/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-acl", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "license": "MIT", "main": "./lib/index.js", @@ -11,13 +11,13 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/acl": "0.6.0-alpha.0", - "@nocobase/database": "0.6.0-alpha.0", - "@nocobase/server": "0.6.0-alpha.0" + "@nocobase/acl": "0.6.2-alpha.8", + "@nocobase/database": "0.6.2-alpha.8", + "@nocobase/server": "0.6.2-alpha.8" }, "repository": { "type": "git", "url": "git+https://github.com/nocobase/nocobase.git", - "directory": "packages/plugin-acl" + "directory": "packages/plugins/acl" } } diff --git a/packages/plugin-acl/src/__tests__/acl.test.ts b/packages/plugins/acl/src/__tests__/acl.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/acl.test.ts rename to packages/plugins/acl/src/__tests__/acl.test.ts diff --git a/packages/plugin-acl/src/__tests__/association-field.test.ts b/packages/plugins/acl/src/__tests__/association-field.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/association-field.test.ts rename to packages/plugins/acl/src/__tests__/association-field.test.ts diff --git a/packages/plugin-acl/src/__tests__/middleware.test.ts b/packages/plugins/acl/src/__tests__/middleware.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/middleware.test.ts rename to packages/plugins/acl/src/__tests__/middleware.test.ts diff --git a/packages/plugin-acl/src/__tests__/own.test.ts b/packages/plugins/acl/src/__tests__/own.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/own.test.ts rename to packages/plugins/acl/src/__tests__/own.test.ts diff --git a/packages/plugin-acl/src/__tests__/prepare.ts b/packages/plugins/acl/src/__tests__/prepare.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/prepare.ts rename to packages/plugins/acl/src/__tests__/prepare.ts diff --git a/packages/plugin-acl/src/__tests__/role-check.test.ts b/packages/plugins/acl/src/__tests__/role-check.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/role-check.test.ts rename to packages/plugins/acl/src/__tests__/role-check.test.ts diff --git a/packages/plugin-acl/src/__tests__/role-resource.test.ts b/packages/plugins/acl/src/__tests__/role-resource.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/role-resource.test.ts rename to packages/plugins/acl/src/__tests__/role-resource.test.ts diff --git a/packages/plugin-acl/src/__tests__/role.test.ts b/packages/plugins/acl/src/__tests__/role.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/role.test.ts rename to packages/plugins/acl/src/__tests__/role.test.ts diff --git a/packages/plugin-acl/src/__tests__/scope.test.ts b/packages/plugins/acl/src/__tests__/scope.test.ts similarity index 100% rename from packages/plugin-acl/src/__tests__/scope.test.ts rename to packages/plugins/acl/src/__tests__/scope.test.ts diff --git a/packages/plugin-acl/src/actions/available-actions.ts b/packages/plugins/acl/src/actions/available-actions.ts similarity index 100% rename from packages/plugin-acl/src/actions/available-actions.ts rename to packages/plugins/acl/src/actions/available-actions.ts diff --git a/packages/plugin-acl/src/actions/role-check.ts b/packages/plugins/acl/src/actions/role-check.ts similarity index 100% rename from packages/plugin-acl/src/actions/role-check.ts rename to packages/plugins/acl/src/actions/role-check.ts diff --git a/packages/plugin-acl/src/actions/role-collections.ts b/packages/plugins/acl/src/actions/role-collections.ts similarity index 100% rename from packages/plugin-acl/src/actions/role-collections.ts rename to packages/plugins/acl/src/actions/role-collections.ts diff --git a/packages/plugin-acl/src/collections/roles.ts b/packages/plugins/acl/src/collections/roles.ts similarity index 100% rename from packages/plugin-acl/src/collections/roles.ts rename to packages/plugins/acl/src/collections/roles.ts diff --git a/packages/plugin-acl/src/collections/rolesResources.ts b/packages/plugins/acl/src/collections/rolesResources.ts similarity index 100% rename from packages/plugin-acl/src/collections/rolesResources.ts rename to packages/plugins/acl/src/collections/rolesResources.ts diff --git a/packages/plugin-acl/src/collections/rolesResourcesActions.ts b/packages/plugins/acl/src/collections/rolesResourcesActions.ts similarity index 100% rename from packages/plugin-acl/src/collections/rolesResourcesActions.ts rename to packages/plugins/acl/src/collections/rolesResourcesActions.ts diff --git a/packages/plugin-acl/src/collections/rolesResourcesScopes.ts b/packages/plugins/acl/src/collections/rolesResourcesScopes.ts similarity index 100% rename from packages/plugin-acl/src/collections/rolesResourcesScopes.ts rename to packages/plugins/acl/src/collections/rolesResourcesScopes.ts diff --git a/packages/plugin-acl/src/index.ts b/packages/plugins/acl/src/index.ts similarity index 100% rename from packages/plugin-acl/src/index.ts rename to packages/plugins/acl/src/index.ts diff --git a/packages/plugin-acl/src/model/RoleModel.ts b/packages/plugins/acl/src/model/RoleModel.ts similarity index 100% rename from packages/plugin-acl/src/model/RoleModel.ts rename to packages/plugins/acl/src/model/RoleModel.ts diff --git a/packages/plugin-acl/src/model/RoleResourceActionModel.ts b/packages/plugins/acl/src/model/RoleResourceActionModel.ts similarity index 100% rename from packages/plugin-acl/src/model/RoleResourceActionModel.ts rename to packages/plugins/acl/src/model/RoleResourceActionModel.ts diff --git a/packages/plugin-acl/src/model/RoleResourceModel.ts b/packages/plugins/acl/src/model/RoleResourceModel.ts similarity index 100% rename from packages/plugin-acl/src/model/RoleResourceModel.ts rename to packages/plugins/acl/src/model/RoleResourceModel.ts diff --git a/packages/plugin-acl/src/server.ts b/packages/plugins/acl/src/server.ts similarity index 100% rename from packages/plugin-acl/src/server.ts rename to packages/plugins/acl/src/server.ts diff --git a/packages/plugin-acl/tsconfig.build.json b/packages/plugins/acl/tsconfig.build.json similarity index 80% rename from packages/plugin-acl/tsconfig.build.json rename to packages/plugins/acl/tsconfig.build.json index 0db344533..864ca372a 100644 --- a/packages/plugin-acl/tsconfig.build.json +++ b/packages/plugins/acl/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/plugin-system-settings/tsconfig.json b/packages/plugins/acl/tsconfig.json similarity index 69% rename from packages/plugin-system-settings/tsconfig.json rename to packages/plugins/acl/tsconfig.json index 67a583a32..968cf0372 100644 --- a/packages/plugin-system-settings/tsconfig.json +++ b/packages/plugins/acl/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } diff --git a/packages/plugin-multiple-apps/.npmignore b/packages/plugins/action-logs/.npmignore similarity index 100% rename from packages/plugin-multiple-apps/.npmignore rename to packages/plugins/action-logs/.npmignore diff --git a/packages/plugin-action-logs/package.json b/packages/plugins/action-logs/package.json similarity index 85% rename from packages/plugin-action-logs/package.json rename to packages/plugins/action-logs/package.json index 05f8e1ea1..798bb6ab6 100644 --- a/packages/plugin-action-logs/package.json +++ b/packages/plugins/action-logs/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-logs", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -9,7 +9,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-action-logs/src/__tests__/hook.test.ts b/packages/plugins/action-logs/src/__tests__/hook.test.ts similarity index 100% rename from packages/plugin-action-logs/src/__tests__/hook.test.ts rename to packages/plugins/action-logs/src/__tests__/hook.test.ts diff --git a/packages/plugin-action-logs/src/collections/action_changes.ts b/packages/plugins/action-logs/src/collections/action_changes.ts similarity index 100% rename from packages/plugin-action-logs/src/collections/action_changes.ts rename to packages/plugins/action-logs/src/collections/action_changes.ts diff --git a/packages/plugin-action-logs/src/collections/action_logs.ts b/packages/plugins/action-logs/src/collections/action_logs.ts similarity index 100% rename from packages/plugin-action-logs/src/collections/action_logs.ts rename to packages/plugins/action-logs/src/collections/action_logs.ts diff --git a/packages/plugin-action-logs/src/constants.ts b/packages/plugins/action-logs/src/constants.ts similarity index 100% rename from packages/plugin-action-logs/src/constants.ts rename to packages/plugins/action-logs/src/constants.ts diff --git a/packages/plugin-action-logs/src/hooks/after-create.ts b/packages/plugins/action-logs/src/hooks/after-create.ts similarity index 100% rename from packages/plugin-action-logs/src/hooks/after-create.ts rename to packages/plugins/action-logs/src/hooks/after-create.ts diff --git a/packages/plugin-action-logs/src/hooks/after-destroy.ts b/packages/plugins/action-logs/src/hooks/after-destroy.ts similarity index 100% rename from packages/plugin-action-logs/src/hooks/after-destroy.ts rename to packages/plugins/action-logs/src/hooks/after-destroy.ts diff --git a/packages/plugin-action-logs/src/hooks/after-update.ts b/packages/plugins/action-logs/src/hooks/after-update.ts similarity index 100% rename from packages/plugin-action-logs/src/hooks/after-update.ts rename to packages/plugins/action-logs/src/hooks/after-update.ts diff --git a/packages/plugin-action-logs/src/hooks/index.ts b/packages/plugins/action-logs/src/hooks/index.ts similarity index 100% rename from packages/plugin-action-logs/src/hooks/index.ts rename to packages/plugins/action-logs/src/hooks/index.ts diff --git a/packages/plugin-action-logs/src/index.ts b/packages/plugins/action-logs/src/index.ts similarity index 100% rename from packages/plugin-action-logs/src/index.ts rename to packages/plugins/action-logs/src/index.ts diff --git a/packages/plugin-action-logs/src/server.ts b/packages/plugins/action-logs/src/server.ts similarity index 100% rename from packages/plugin-action-logs/src/server.ts rename to packages/plugins/action-logs/src/server.ts diff --git a/packages/plugins/action-logs/tsconfig.build.json b/packages/plugins/action-logs/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/action-logs/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/action-logs/tsconfig.json b/packages/plugins/action-logs/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/action-logs/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-notifications/.npmignore b/packages/plugins/china-region/.npmignore similarity index 100% rename from packages/plugin-notifications/.npmignore rename to packages/plugins/china-region/.npmignore diff --git a/packages/plugin-china-region/package.json b/packages/plugins/china-region/package.json similarity index 87% rename from packages/plugin-china-region/package.json rename to packages/plugins/china-region/package.json index a3cf895a4..3c2edd7dd 100644 --- a/packages/plugin-china-region/package.json +++ b/packages/plugins/china-region/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-china-region", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -12,7 +12,7 @@ "china-division": "^2.4.0" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-china-region/src/collections/chinaRegions.ts b/packages/plugins/china-region/src/collections/chinaRegions.ts similarity index 100% rename from packages/plugin-china-region/src/collections/chinaRegions.ts rename to packages/plugins/china-region/src/collections/chinaRegions.ts diff --git a/packages/plugin-china-region/src/index.ts b/packages/plugins/china-region/src/index.ts similarity index 100% rename from packages/plugin-china-region/src/index.ts rename to packages/plugins/china-region/src/index.ts diff --git a/packages/plugin-china-region/src/server.ts b/packages/plugins/china-region/src/server.ts similarity index 100% rename from packages/plugin-china-region/src/server.ts rename to packages/plugins/china-region/src/server.ts diff --git a/packages/plugins/china-region/tsconfig.build.json b/packages/plugins/china-region/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/china-region/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/china-region/tsconfig.json b/packages/plugins/china-region/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/china-region/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-system-settings/.npmignore b/packages/plugins/client/.npmignore similarity index 100% rename from packages/plugin-system-settings/.npmignore rename to packages/plugins/client/.npmignore diff --git a/packages/plugin-client/package.json b/packages/plugins/client/package.json similarity index 79% rename from packages/plugin-client/package.json rename to packages/plugins/client/package.json index ed11c5707..c796e6951 100644 --- a/packages/plugin-client/package.json +++ b/packages/plugins/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-client", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -9,10 +9,10 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "^0.6.0-alpha.0" + "@nocobase/server": "0.6.2-alpha.8" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-client/src/index.ts b/packages/plugins/client/src/index.ts similarity index 100% rename from packages/plugin-client/src/index.ts rename to packages/plugins/client/src/index.ts diff --git a/packages/plugin-client/src/plugin.ts b/packages/plugins/client/src/plugin.ts similarity index 100% rename from packages/plugin-client/src/plugin.ts rename to packages/plugins/client/src/plugin.ts diff --git a/packages/plugins/client/tsconfig.build.json b/packages/plugins/client/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/client/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/client/tsconfig.json b/packages/plugins/client/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/client/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-ui-routes-storage/.npmignore b/packages/plugins/collection-manager/.npmignore similarity index 100% rename from packages/plugin-ui-routes-storage/.npmignore rename to packages/plugins/collection-manager/.npmignore diff --git a/packages/plugin-collection-manager/package.json b/packages/plugins/collection-manager/package.json similarity index 82% rename from packages/plugin-collection-manager/package.json rename to packages/plugins/collection-manager/package.json index 5f0c1536c..a76caa14a 100644 --- a/packages/plugin-collection-manager/package.json +++ b/packages/plugins/collection-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-collection-manager", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -8,9 +8,8 @@ "build:cjs": "tsc --project tsconfig.build.json", "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, - "dependencies": {}, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-collection-manager/src/__tests__/action.test.ts b/packages/plugins/collection-manager/src/__tests__/action.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/action.test.ts rename to packages/plugins/collection-manager/src/__tests__/action.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/beforeInitOptions.test.ts b/packages/plugins/collection-manager/src/__tests__/beforeInitOptions.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/beforeInitOptions.test.ts rename to packages/plugins/collection-manager/src/__tests__/beforeInitOptions.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/collections.repository.test.ts b/packages/plugins/collection-manager/src/__tests__/collections.repository.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/collections.repository.test.ts rename to packages/plugins/collection-manager/src/__tests__/collections.repository.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields.repository.test.ts b/packages/plugins/collection-manager/src/__tests__/fields.repository.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields.repository.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields.repository.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/belongsTo.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/belongsTo.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/belongsTo.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/belongsTo.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/belongsToMany.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/belongsToMany.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/belongsToMany.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/belongsToMany.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/children.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/children.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/children.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/children.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/hasMany.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/hasMany.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/hasMany.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/hasMany.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/hasOne.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/hasOne.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/hasOne.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/hasOne.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/fields/reverseField.test.ts b/packages/plugins/collection-manager/src/__tests__/fields/reverseField.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/fields/reverseField.test.ts rename to packages/plugins/collection-manager/src/__tests__/fields/reverseField.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/http-api/collections.test.ts b/packages/plugins/collection-manager/src/__tests__/http-api/collections.test.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/http-api/collections.test.ts rename to packages/plugins/collection-manager/src/__tests__/http-api/collections.test.ts diff --git a/packages/plugin-collection-manager/src/__tests__/index.ts b/packages/plugins/collection-manager/src/__tests__/index.ts similarity index 100% rename from packages/plugin-collection-manager/src/__tests__/index.ts rename to packages/plugins/collection-manager/src/__tests__/index.ts diff --git a/packages/plugin-collection-manager/src/collections/collections.ts b/packages/plugins/collection-manager/src/collections/collections.ts similarity index 100% rename from packages/plugin-collection-manager/src/collections/collections.ts rename to packages/plugins/collection-manager/src/collections/collections.ts diff --git a/packages/plugin-collection-manager/src/collections/fields.ts b/packages/plugins/collection-manager/src/collections/fields.ts similarity index 100% rename from packages/plugin-collection-manager/src/collections/fields.ts rename to packages/plugins/collection-manager/src/collections/fields.ts diff --git a/packages/plugin-collection-manager/src/hooks/afterCreateForReverseField.ts b/packages/plugins/collection-manager/src/hooks/afterCreateForReverseField.ts similarity index 100% rename from packages/plugin-collection-manager/src/hooks/afterCreateForReverseField.ts rename to packages/plugins/collection-manager/src/hooks/afterCreateForReverseField.ts diff --git a/packages/plugin-collection-manager/src/hooks/beforeCreateForChildrenCollection.ts b/packages/plugins/collection-manager/src/hooks/beforeCreateForChildrenCollection.ts similarity index 100% rename from packages/plugin-collection-manager/src/hooks/beforeCreateForChildrenCollection.ts rename to packages/plugins/collection-manager/src/hooks/beforeCreateForChildrenCollection.ts diff --git a/packages/plugin-collection-manager/src/hooks/beforeCreateForReverseField.ts b/packages/plugins/collection-manager/src/hooks/beforeCreateForReverseField.ts similarity index 100% rename from packages/plugin-collection-manager/src/hooks/beforeCreateForReverseField.ts rename to packages/plugins/collection-manager/src/hooks/beforeCreateForReverseField.ts diff --git a/packages/plugin-collection-manager/src/hooks/beforeInitOptions.ts b/packages/plugins/collection-manager/src/hooks/beforeInitOptions.ts similarity index 100% rename from packages/plugin-collection-manager/src/hooks/beforeInitOptions.ts rename to packages/plugins/collection-manager/src/hooks/beforeInitOptions.ts diff --git a/packages/plugin-collection-manager/src/hooks/index.ts b/packages/plugins/collection-manager/src/hooks/index.ts similarity index 100% rename from packages/plugin-collection-manager/src/hooks/index.ts rename to packages/plugins/collection-manager/src/hooks/index.ts diff --git a/packages/plugin-collection-manager/src/index.ts b/packages/plugins/collection-manager/src/index.ts similarity index 100% rename from packages/plugin-collection-manager/src/index.ts rename to packages/plugins/collection-manager/src/index.ts diff --git a/packages/plugin-collection-manager/src/models/collection.ts b/packages/plugins/collection-manager/src/models/collection.ts similarity index 100% rename from packages/plugin-collection-manager/src/models/collection.ts rename to packages/plugins/collection-manager/src/models/collection.ts diff --git a/packages/plugin-collection-manager/src/models/field.ts b/packages/plugins/collection-manager/src/models/field.ts similarity index 100% rename from packages/plugin-collection-manager/src/models/field.ts rename to packages/plugins/collection-manager/src/models/field.ts diff --git a/packages/plugin-collection-manager/src/models/index.ts b/packages/plugins/collection-manager/src/models/index.ts similarity index 100% rename from packages/plugin-collection-manager/src/models/index.ts rename to packages/plugins/collection-manager/src/models/index.ts diff --git a/packages/plugin-collection-manager/src/plugin.ts b/packages/plugins/collection-manager/src/plugin.ts similarity index 100% rename from packages/plugin-collection-manager/src/plugin.ts rename to packages/plugins/collection-manager/src/plugin.ts diff --git a/packages/plugin-collection-manager/src/repositories/collection-repository.ts b/packages/plugins/collection-manager/src/repositories/collection-repository.ts similarity index 100% rename from packages/plugin-collection-manager/src/repositories/collection-repository.ts rename to packages/plugins/collection-manager/src/repositories/collection-repository.ts diff --git a/packages/plugin-collection-manager/src/repositories/index.ts b/packages/plugins/collection-manager/src/repositories/index.ts similarity index 100% rename from packages/plugin-collection-manager/src/repositories/index.ts rename to packages/plugins/collection-manager/src/repositories/index.ts diff --git a/packages/plugins/collection-manager/tsconfig.build.json b/packages/plugins/collection-manager/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/collection-manager/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/collection-manager/tsconfig.json b/packages/plugins/collection-manager/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/collection-manager/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-error-handler/package.json b/packages/plugins/error-handler/package.json similarity index 88% rename from packages/plugin-error-handler/package.json rename to packages/plugins/error-handler/package.json index 03ee29132..19488b08f 100644 --- a/packages/plugin-error-handler/package.json +++ b/packages/plugins/error-handler/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-error-handler", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "description": "", "license": "MIT", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "^0.6.0-alpha.0" + "@nocobase/server": "0.6.2-alpha.8" }, "repository": { "type": "git", diff --git a/packages/plugin-error-handler/src/__tests__/render-error.test.ts b/packages/plugins/error-handler/src/__tests__/render-error.test.ts similarity index 100% rename from packages/plugin-error-handler/src/__tests__/render-error.test.ts rename to packages/plugins/error-handler/src/__tests__/render-error.test.ts diff --git a/packages/plugin-error-handler/src/error-handler.ts b/packages/plugins/error-handler/src/error-handler.ts similarity index 100% rename from packages/plugin-error-handler/src/error-handler.ts rename to packages/plugins/error-handler/src/error-handler.ts diff --git a/packages/plugin-error-handler/src/index.ts b/packages/plugins/error-handler/src/index.ts similarity index 100% rename from packages/plugin-error-handler/src/index.ts rename to packages/plugins/error-handler/src/index.ts diff --git a/packages/plugin-error-handler/src/locale/en_US.ts b/packages/plugins/error-handler/src/locale/en_US.ts similarity index 100% rename from packages/plugin-error-handler/src/locale/en_US.ts rename to packages/plugins/error-handler/src/locale/en_US.ts diff --git a/packages/plugin-error-handler/src/locale/zh_CN.ts b/packages/plugins/error-handler/src/locale/zh_CN.ts similarity index 100% rename from packages/plugin-error-handler/src/locale/zh_CN.ts rename to packages/plugins/error-handler/src/locale/zh_CN.ts diff --git a/packages/plugin-error-handler/src/server.ts b/packages/plugins/error-handler/src/server.ts similarity index 100% rename from packages/plugin-error-handler/src/server.ts rename to packages/plugins/error-handler/src/server.ts diff --git a/packages/plugins/error-handler/tsconfig.build.json b/packages/plugins/error-handler/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/error-handler/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/error-handler/tsconfig.json b/packages/plugins/error-handler/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/error-handler/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-ui-schema-storage/.npmignore b/packages/plugins/file-manager/.npmignore similarity index 100% rename from packages/plugin-ui-schema-storage/.npmignore rename to packages/plugins/file-manager/.npmignore diff --git a/packages/plugin-file-manager/package.json b/packages/plugins/file-manager/package.json similarity index 86% rename from packages/plugin-file-manager/package.json rename to packages/plugins/file-manager/package.json index f8ec0321b..1c00d727d 100644 --- a/packages/plugin-file-manager/package.json +++ b/packages/plugins/file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -10,7 +10,7 @@ }, "dependencies": { "@koa/multer": "^3.0.0", - "@nocobase/server": "^0.6.0-alpha.0", + "@nocobase/server": "0.6.2-alpha.8", "aws-sdk": "^2.2.32", "koa-static": "^5.0.0", "mime-match": "^1.0.2", @@ -19,7 +19,7 @@ "multer-s3": "^2.10.0" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0", + "@nocobase/test": "0.6.2-alpha.8", "@types/koa-multer": "^1.0.1", "@types/multer": "^1.4.5" }, diff --git a/packages/plugin-file-manager/src/__tests__/action.test.ts b/packages/plugins/file-manager/src/__tests__/action.test.ts similarity index 100% rename from packages/plugin-file-manager/src/__tests__/action.test.ts rename to packages/plugins/file-manager/src/__tests__/action.test.ts diff --git a/packages/plugin-file-manager/src/__tests__/files/image.jpg b/packages/plugins/file-manager/src/__tests__/files/image.jpg similarity index 100% rename from packages/plugin-file-manager/src/__tests__/files/image.jpg rename to packages/plugins/file-manager/src/__tests__/files/image.jpg diff --git a/packages/plugin-file-manager/src/__tests__/files/image.png b/packages/plugins/file-manager/src/__tests__/files/image.png similarity index 100% rename from packages/plugin-file-manager/src/__tests__/files/image.png rename to packages/plugins/file-manager/src/__tests__/files/image.png diff --git a/packages/plugin-file-manager/src/__tests__/files/text.txt b/packages/plugins/file-manager/src/__tests__/files/text.txt similarity index 100% rename from packages/plugin-file-manager/src/__tests__/files/text.txt rename to packages/plugins/file-manager/src/__tests__/files/text.txt diff --git a/packages/plugin-file-manager/src/__tests__/index.ts b/packages/plugins/file-manager/src/__tests__/index.ts similarity index 100% rename from packages/plugin-file-manager/src/__tests__/index.ts rename to packages/plugins/file-manager/src/__tests__/index.ts diff --git a/packages/plugin-file-manager/src/__tests__/storages/ali-oss.test.ts b/packages/plugins/file-manager/src/__tests__/storages/ali-oss.test.ts similarity index 100% rename from packages/plugin-file-manager/src/__tests__/storages/ali-oss.test.ts rename to packages/plugins/file-manager/src/__tests__/storages/ali-oss.test.ts diff --git a/packages/plugin-file-manager/src/__tests__/storages/s3.test.ts b/packages/plugins/file-manager/src/__tests__/storages/s3.test.ts similarity index 100% rename from packages/plugin-file-manager/src/__tests__/storages/s3.test.ts rename to packages/plugins/file-manager/src/__tests__/storages/s3.test.ts diff --git a/packages/plugin-file-manager/src/__tests__/tables/users.ts b/packages/plugins/file-manager/src/__tests__/tables/users.ts similarity index 100% rename from packages/plugin-file-manager/src/__tests__/tables/users.ts rename to packages/plugins/file-manager/src/__tests__/tables/users.ts diff --git a/packages/plugin-file-manager/src/actions/upload.ts b/packages/plugins/file-manager/src/actions/upload.ts similarity index 100% rename from packages/plugin-file-manager/src/actions/upload.ts rename to packages/plugins/file-manager/src/actions/upload.ts diff --git a/packages/plugin-file-manager/src/collections/attachments.ts b/packages/plugins/file-manager/src/collections/attachments.ts similarity index 100% rename from packages/plugin-file-manager/src/collections/attachments.ts rename to packages/plugins/file-manager/src/collections/attachments.ts diff --git a/packages/plugin-file-manager/src/collections/storages.ts b/packages/plugins/file-manager/src/collections/storages.ts similarity index 100% rename from packages/plugin-file-manager/src/collections/storages.ts rename to packages/plugins/file-manager/src/collections/storages.ts diff --git a/packages/plugin-file-manager/src/constants.ts b/packages/plugins/file-manager/src/constants.ts similarity index 100% rename from packages/plugin-file-manager/src/constants.ts rename to packages/plugins/file-manager/src/constants.ts diff --git a/packages/plugin-file-manager/src/index.ts b/packages/plugins/file-manager/src/index.ts similarity index 100% rename from packages/plugin-file-manager/src/index.ts rename to packages/plugins/file-manager/src/index.ts diff --git a/packages/plugin-file-manager/src/rules/index.ts b/packages/plugins/file-manager/src/rules/index.ts similarity index 100% rename from packages/plugin-file-manager/src/rules/index.ts rename to packages/plugins/file-manager/src/rules/index.ts diff --git a/packages/plugin-file-manager/src/rules/mimetype.ts b/packages/plugins/file-manager/src/rules/mimetype.ts similarity index 100% rename from packages/plugin-file-manager/src/rules/mimetype.ts rename to packages/plugins/file-manager/src/rules/mimetype.ts diff --git a/packages/plugin-file-manager/src/server.ts b/packages/plugins/file-manager/src/server.ts similarity index 100% rename from packages/plugin-file-manager/src/server.ts rename to packages/plugins/file-manager/src/server.ts diff --git a/packages/plugin-file-manager/src/storages/ali-oss.ts b/packages/plugins/file-manager/src/storages/ali-oss.ts similarity index 100% rename from packages/plugin-file-manager/src/storages/ali-oss.ts rename to packages/plugins/file-manager/src/storages/ali-oss.ts diff --git a/packages/plugin-file-manager/src/storages/index.ts b/packages/plugins/file-manager/src/storages/index.ts similarity index 100% rename from packages/plugin-file-manager/src/storages/index.ts rename to packages/plugins/file-manager/src/storages/index.ts diff --git a/packages/plugin-file-manager/src/storages/local.ts b/packages/plugins/file-manager/src/storages/local.ts similarity index 100% rename from packages/plugin-file-manager/src/storages/local.ts rename to packages/plugins/file-manager/src/storages/local.ts diff --git a/packages/plugin-file-manager/src/storages/s3.ts b/packages/plugins/file-manager/src/storages/s3.ts similarity index 100% rename from packages/plugin-file-manager/src/storages/s3.ts rename to packages/plugins/file-manager/src/storages/s3.ts diff --git a/packages/plugin-file-manager/src/utils.ts b/packages/plugins/file-manager/src/utils.ts similarity index 100% rename from packages/plugin-file-manager/src/utils.ts rename to packages/plugins/file-manager/src/utils.ts diff --git a/packages/plugins/file-manager/tsconfig.build.json b/packages/plugins/file-manager/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/file-manager/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/file-manager/tsconfig.json b/packages/plugins/file-manager/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/file-manager/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-users/.npmignore b/packages/plugins/multiple-apps/.npmignore similarity index 100% rename from packages/plugin-users/.npmignore rename to packages/plugins/multiple-apps/.npmignore diff --git a/packages/plugin-multiple-apps/package.json b/packages/plugins/multiple-apps/package.json similarity index 78% rename from packages/plugin-multiple-apps/package.json rename to packages/plugins/multiple-apps/package.json index 67324f370..ccad10e4a 100644 --- a/packages/plugin-multiple-apps/package.json +++ b/packages/plugins/multiple-apps/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-multiple-apps", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -9,8 +9,6 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "^0.6.0-alpha.0" - }, - "devDependencies": { + "@nocobase/server": "0.6.2-alpha.8" } } diff --git a/packages/plugin-multiple-apps/src/__tests__/mock-get-schema.test.ts b/packages/plugins/multiple-apps/src/__tests__/mock-get-schema.test.ts similarity index 100% rename from packages/plugin-multiple-apps/src/__tests__/mock-get-schema.test.ts rename to packages/plugins/multiple-apps/src/__tests__/mock-get-schema.test.ts diff --git a/packages/plugin-multiple-apps/src/__tests__/multiple-apps.test.ts b/packages/plugins/multiple-apps/src/__tests__/multiple-apps.test.ts similarity index 100% rename from packages/plugin-multiple-apps/src/__tests__/multiple-apps.test.ts rename to packages/plugins/multiple-apps/src/__tests__/multiple-apps.test.ts diff --git a/packages/plugin-multiple-apps/src/collections/application-plugins.ts b/packages/plugins/multiple-apps/src/collections/application-plugins.ts similarity index 100% rename from packages/plugin-multiple-apps/src/collections/application-plugins.ts rename to packages/plugins/multiple-apps/src/collections/application-plugins.ts diff --git a/packages/plugin-multiple-apps/src/collections/applications.ts b/packages/plugins/multiple-apps/src/collections/applications.ts similarity index 100% rename from packages/plugin-multiple-apps/src/collections/applications.ts rename to packages/plugins/multiple-apps/src/collections/applications.ts diff --git a/packages/plugin-multiple-apps/src/models/application.ts b/packages/plugins/multiple-apps/src/models/application.ts similarity index 100% rename from packages/plugin-multiple-apps/src/models/application.ts rename to packages/plugins/multiple-apps/src/models/application.ts diff --git a/packages/plugin-multiple-apps/src/server.ts b/packages/plugins/multiple-apps/src/server.ts similarity index 100% rename from packages/plugin-multiple-apps/src/server.ts rename to packages/plugins/multiple-apps/src/server.ts diff --git a/packages/plugins/multiple-apps/tsconfig.build.json b/packages/plugins/multiple-apps/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/multiple-apps/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/multiple-apps/tsconfig.json b/packages/plugins/multiple-apps/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/multiple-apps/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugin-workflow/.npmignore b/packages/plugins/notifications/.npmignore similarity index 100% rename from packages/plugin-workflow/.npmignore rename to packages/plugins/notifications/.npmignore diff --git a/packages/plugin-notifications/package.json b/packages/plugins/notifications/package.json similarity index 88% rename from packages/plugin-notifications/package.json rename to packages/plugins/notifications/package.json index 1806b2517..908e74201 100644 --- a/packages/plugin-notifications/package.json +++ b/packages/plugins/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -12,7 +12,7 @@ "nodemailer": "^6.6.1" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0", + "@nocobase/test": "0.6.2-alpha.8", "@types/nodemailer": "6.4.4", "nodemailer-mock": "^1.5.11" }, diff --git a/packages/plugin-notifications/src/__tests__/notifications.test.ts b/packages/plugins/notifications/src/__tests__/notifications.test.ts similarity index 100% rename from packages/plugin-notifications/src/__tests__/notifications.test.ts rename to packages/plugins/notifications/src/__tests__/notifications.test.ts diff --git a/packages/plugin-notifications/src/collections/notification_logs.ts b/packages/plugins/notifications/src/collections/notification_logs.ts similarity index 100% rename from packages/plugin-notifications/src/collections/notification_logs.ts rename to packages/plugins/notifications/src/collections/notification_logs.ts diff --git a/packages/plugin-notifications/src/collections/notification_services.ts b/packages/plugins/notifications/src/collections/notification_services.ts similarity index 100% rename from packages/plugin-notifications/src/collections/notification_services.ts rename to packages/plugins/notifications/src/collections/notification_services.ts diff --git a/packages/plugin-notifications/src/collections/notifications.ts b/packages/plugins/notifications/src/collections/notifications.ts similarity index 100% rename from packages/plugin-notifications/src/collections/notifications.ts rename to packages/plugins/notifications/src/collections/notifications.ts diff --git a/packages/plugin-notifications/src/index.ts b/packages/plugins/notifications/src/index.ts similarity index 100% rename from packages/plugin-notifications/src/index.ts rename to packages/plugins/notifications/src/index.ts diff --git a/packages/plugin-notifications/src/models/Notification.ts b/packages/plugins/notifications/src/models/Notification.ts similarity index 100% rename from packages/plugin-notifications/src/models/Notification.ts rename to packages/plugins/notifications/src/models/Notification.ts diff --git a/packages/plugin-notifications/src/models/NotificationLog.ts b/packages/plugins/notifications/src/models/NotificationLog.ts similarity index 100% rename from packages/plugin-notifications/src/models/NotificationLog.ts rename to packages/plugins/notifications/src/models/NotificationLog.ts diff --git a/packages/plugin-notifications/src/models/NotificationService.ts b/packages/plugins/notifications/src/models/NotificationService.ts similarity index 100% rename from packages/plugin-notifications/src/models/NotificationService.ts rename to packages/plugins/notifications/src/models/NotificationService.ts diff --git a/packages/plugin-notifications/src/models/index.ts b/packages/plugins/notifications/src/models/index.ts similarity index 100% rename from packages/plugin-notifications/src/models/index.ts rename to packages/plugins/notifications/src/models/index.ts diff --git a/packages/plugin-notifications/src/server.ts b/packages/plugins/notifications/src/server.ts similarity index 100% rename from packages/plugin-notifications/src/server.ts rename to packages/plugins/notifications/src/server.ts diff --git a/packages/plugins/notifications/tsconfig.build.json b/packages/plugins/notifications/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/notifications/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/notifications/tsconfig.json b/packages/plugins/notifications/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/notifications/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/resourcer/.npmignore b/packages/plugins/system-settings/.npmignore similarity index 100% rename from packages/resourcer/.npmignore rename to packages/plugins/system-settings/.npmignore diff --git a/packages/plugin-system-settings/package.json b/packages/plugins/system-settings/package.json similarity index 85% rename from packages/plugin-system-settings/package.json rename to packages/plugins/system-settings/package.json index 71283a2b0..6df2643ff 100644 --- a/packages/plugin-system-settings/package.json +++ b/packages/plugins/system-settings/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-system-settings", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -9,7 +9,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-system-settings/src/collections/systemSettings.ts b/packages/plugins/system-settings/src/collections/systemSettings.ts similarity index 100% rename from packages/plugin-system-settings/src/collections/systemSettings.ts rename to packages/plugins/system-settings/src/collections/systemSettings.ts diff --git a/packages/plugin-system-settings/src/index.ts b/packages/plugins/system-settings/src/index.ts similarity index 100% rename from packages/plugin-system-settings/src/index.ts rename to packages/plugins/system-settings/src/index.ts diff --git a/packages/plugin-system-settings/src/plugin.ts b/packages/plugins/system-settings/src/plugin.ts similarity index 100% rename from packages/plugin-system-settings/src/plugin.ts rename to packages/plugins/system-settings/src/plugin.ts diff --git a/packages/plugin-system-settings/tsconfig.build.json b/packages/plugins/system-settings/tsconfig.build.json similarity index 80% rename from packages/plugin-system-settings/tsconfig.build.json rename to packages/plugins/system-settings/tsconfig.build.json index 0db344533..864ca372a 100644 --- a/packages/plugin-system-settings/tsconfig.build.json +++ b/packages/plugins/system-settings/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/plugin-ui-schema-storage/tsconfig.json b/packages/plugins/system-settings/tsconfig.json similarity index 69% rename from packages/plugin-ui-schema-storage/tsconfig.json rename to packages/plugins/system-settings/tsconfig.json index 67a583a32..968cf0372 100644 --- a/packages/plugin-ui-schema-storage/tsconfig.json +++ b/packages/plugins/system-settings/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../../tsconfig.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "exclude": ["./esm/*", "./lib/*"] } diff --git a/packages/server/.npmignore b/packages/plugins/ui-routes-storage/.npmignore similarity index 100% rename from packages/server/.npmignore rename to packages/plugins/ui-routes-storage/.npmignore diff --git a/packages/plugin-ui-routes-storage/package.json b/packages/plugins/ui-routes-storage/package.json similarity index 87% rename from packages/plugin-ui-routes-storage/package.json rename to packages/plugins/ui-routes-storage/package.json index c3cbc6b46..1abaaed42 100644 --- a/packages/plugin-ui-routes-storage/package.json +++ b/packages/plugins/ui-routes-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-routes-storage", - "version": "0.5.0-alpha.38", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -12,7 +12,7 @@ "flat-to-nested": "^1.1.1" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-ui-routes-storage/src/actions/getAccessible.ts b/packages/plugins/ui-routes-storage/src/actions/getAccessible.ts similarity index 100% rename from packages/plugin-ui-routes-storage/src/actions/getAccessible.ts rename to packages/plugins/ui-routes-storage/src/actions/getAccessible.ts diff --git a/packages/plugin-ui-routes-storage/src/collections/uiRoutes.ts b/packages/plugins/ui-routes-storage/src/collections/uiRoutes.ts similarity index 100% rename from packages/plugin-ui-routes-storage/src/collections/uiRoutes.ts rename to packages/plugins/ui-routes-storage/src/collections/uiRoutes.ts diff --git a/packages/plugin-ui-routes-storage/src/index.ts b/packages/plugins/ui-routes-storage/src/index.ts similarity index 98% rename from packages/plugin-ui-routes-storage/src/index.ts rename to packages/plugins/ui-routes-storage/src/index.ts index 94e6fc395..fd4bc4e17 100644 --- a/packages/plugin-ui-routes-storage/src/index.ts +++ b/packages/plugins/ui-routes-storage/src/index.ts @@ -88,9 +88,11 @@ export class UiRoutesStoragePlugin extends Plugin { async load() { this.app.resourcer.registerActionHandler('uiRoutes:getAccessible', getAccessible); this.app.db.registerModels({ MagicAttributeModel }); - this.app.db.import({ + + await this.app.db.import({ directory: resolve(__dirname, 'collections'), }); + this.app.acl.use( skip({ resourceName: 'uiRoutes', diff --git a/packages/plugins/ui-routes-storage/tsconfig.build.json b/packages/plugins/ui-routes-storage/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/ui-routes-storage/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/ui-routes-storage/tsconfig.json b/packages/plugins/ui-routes-storage/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/ui-routes-storage/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/test/.npmignore b/packages/plugins/ui-schema-storage/.npmignore similarity index 100% rename from packages/test/.npmignore rename to packages/plugins/ui-schema-storage/.npmignore diff --git a/packages/plugin-ui-schema-storage/package.json b/packages/plugins/ui-schema-storage/package.json similarity index 83% rename from packages/plugin-ui-schema-storage/package.json rename to packages/plugins/ui-schema-storage/package.json index 71fafcf90..accba1535 100644 --- a/packages/plugin-ui-schema-storage/package.json +++ b/packages/plugins/ui-schema-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-schema-storage", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -8,10 +8,9 @@ "build:cjs": "tsc --project tsconfig.build.json", "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, - "dependencies": {}, "devDependencies": { "@formily/json-schema": "^2.0.15", - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" } diff --git a/packages/plugin-ui-schema-storage/src/__tests__/action.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/action.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/action.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/action.test.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/fixtures/data.ts b/packages/plugins/ui-schema-storage/src/__tests__/fixtures/data.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/fixtures/data.ts rename to packages/plugins/ui-schema-storage/src/__tests__/fixtures/data.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/fixtures/simple-schema.ts b/packages/plugins/ui-schema-storage/src/__tests__/fixtures/simple-schema.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/fixtures/simple-schema.ts rename to packages/plugins/ui-schema-storage/src/__tests__/fixtures/simple-schema.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/server-hook-impl.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/server-hook-impl.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/server-hook-impl.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/server-hook-impl.test.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/server-hook.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/server-hook.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/server-hook.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/server-hook.test.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/ui-schema-model.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/ui-schema-model.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/ui-schema-repository.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/ui-schema-repository.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository.test.ts diff --git a/packages/plugin-ui-schema-storage/src/__tests__/ui-schema.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema.test.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/__tests__/ui-schema.test.ts rename to packages/plugins/ui-schema-storage/src/__tests__/ui-schema.test.ts diff --git a/packages/plugin-ui-schema-storage/src/actions/ui-schema-action.ts b/packages/plugins/ui-schema-storage/src/actions/ui-schema-action.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/actions/ui-schema-action.ts rename to packages/plugins/ui-schema-storage/src/actions/ui-schema-action.ts diff --git a/packages/plugin-ui-schema-storage/src/collections/uiSchemaServerHooks.ts b/packages/plugins/ui-schema-storage/src/collections/uiSchemaServerHooks.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/collections/uiSchemaServerHooks.ts rename to packages/plugins/ui-schema-storage/src/collections/uiSchemaServerHooks.ts diff --git a/packages/plugin-ui-schema-storage/src/collections/uiSchemaTemplates.ts b/packages/plugins/ui-schema-storage/src/collections/uiSchemaTemplates.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/collections/uiSchemaTemplates.ts rename to packages/plugins/ui-schema-storage/src/collections/uiSchemaTemplates.ts diff --git a/packages/plugin-ui-schema-storage/src/collections/uiSchemaTreePath.ts b/packages/plugins/ui-schema-storage/src/collections/uiSchemaTreePath.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/collections/uiSchemaTreePath.ts rename to packages/plugins/ui-schema-storage/src/collections/uiSchemaTreePath.ts diff --git a/packages/plugin-ui-schema-storage/src/collections/uiSchemas.ts b/packages/plugins/ui-schema-storage/src/collections/uiSchemas.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/collections/uiSchemas.ts rename to packages/plugins/ui-schema-storage/src/collections/uiSchemas.ts diff --git a/packages/plugin-ui-schema-storage/src/dao/ui_schema_dao.ts b/packages/plugins/ui-schema-storage/src/dao/ui_schema_dao.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/dao/ui_schema_dao.ts rename to packages/plugins/ui-schema-storage/src/dao/ui_schema_dao.ts diff --git a/packages/plugin-ui-schema-storage/src/dao/ui_schema_node_dao.ts b/packages/plugins/ui-schema-storage/src/dao/ui_schema_node_dao.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/dao/ui_schema_node_dao.ts rename to packages/plugins/ui-schema-storage/src/dao/ui_schema_node_dao.ts diff --git a/packages/plugins/ui-schema-storage/src/helper.ts b/packages/plugins/ui-schema-storage/src/helper.ts new file mode 100644 index 000000000..e69de29bb diff --git a/packages/plugin-ui-schema-storage/src/index.ts b/packages/plugins/ui-schema-storage/src/index.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/index.ts rename to packages/plugins/ui-schema-storage/src/index.ts diff --git a/packages/plugin-ui-schema-storage/src/model.ts b/packages/plugins/ui-schema-storage/src/model.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/model.ts rename to packages/plugins/ui-schema-storage/src/model.ts diff --git a/packages/plugin-ui-schema-storage/src/repository.ts b/packages/plugins/ui-schema-storage/src/repository.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/repository.ts rename to packages/plugins/ui-schema-storage/src/repository.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/hooks/bind-menu-to-role.ts b/packages/plugins/ui-schema-storage/src/server-hooks/hooks/bind-menu-to-role.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/hooks/bind-menu-to-role.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/hooks/bind-menu-to-role.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/hooks/factory.ts b/packages/plugins/ui-schema-storage/src/server-hooks/hooks/factory.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/hooks/factory.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/hooks/factory.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/hooks/index.ts b/packages/plugins/ui-schema-storage/src/server-hooks/hooks/index.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/hooks/index.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/hooks/index.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/hooks/remove-parents-if-no-children.ts b/packages/plugins/ui-schema-storage/src/server-hooks/hooks/remove-parents-if-no-children.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/hooks/remove-parents-if-no-children.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/hooks/remove-parents-if-no-children.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/hooks/remove-schema.ts b/packages/plugins/ui-schema-storage/src/server-hooks/hooks/remove-schema.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/hooks/remove-schema.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/hooks/remove-schema.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/index.ts b/packages/plugins/ui-schema-storage/src/server-hooks/index.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/index.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/index.ts diff --git a/packages/plugin-ui-schema-storage/src/server-hooks/model.ts b/packages/plugins/ui-schema-storage/src/server-hooks/model.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server-hooks/model.ts rename to packages/plugins/ui-schema-storage/src/server-hooks/model.ts diff --git a/packages/plugin-ui-schema-storage/src/server.ts b/packages/plugins/ui-schema-storage/src/server.ts similarity index 100% rename from packages/plugin-ui-schema-storage/src/server.ts rename to packages/plugins/ui-schema-storage/src/server.ts diff --git a/packages/plugin-ui-schema-storage/tsconfig.build.json b/packages/plugins/ui-schema-storage/tsconfig.build.json similarity index 80% rename from packages/plugin-ui-schema-storage/tsconfig.build.json rename to packages/plugins/ui-schema-storage/tsconfig.build.json index 0db344533..864ca372a 100644 --- a/packages/plugin-ui-schema-storage/tsconfig.build.json +++ b/packages/plugins/ui-schema-storage/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/plugins/ui-schema-storage/tsconfig.json b/packages/plugins/ui-schema-storage/tsconfig.json new file mode 100644 index 000000000..968cf0372 --- /dev/null +++ b/packages/plugins/ui-schema-storage/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} diff --git a/packages/utils/.npmignore b/packages/plugins/users/.npmignore similarity index 100% rename from packages/utils/.npmignore rename to packages/plugins/users/.npmignore diff --git a/packages/plugin-users/package.json b/packages/plugins/users/package.json similarity index 87% rename from packages/plugin-users/package.json rename to packages/plugins/users/package.json index 12bc768c3..6224847cb 100644 --- a/packages/plugin-users/package.json +++ b/packages/plugins/users/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-users", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -12,7 +12,7 @@ "jsonwebtoken": "^8.5.1" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0", + "@nocobase/test": "0.6.2-alpha.8", "@types/jsonwebtoken": "^8.5.8" }, "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4" diff --git a/packages/plugin-users/src/__tests__/actions.test.ts b/packages/plugins/users/src/__tests__/actions.test.ts similarity index 100% rename from packages/plugin-users/src/__tests__/actions.test.ts rename to packages/plugins/users/src/__tests__/actions.test.ts diff --git a/packages/plugin-users/src/__tests__/fields.test.ts b/packages/plugins/users/src/__tests__/fields.test.ts similarity index 100% rename from packages/plugin-users/src/__tests__/fields.test.ts rename to packages/plugins/users/src/__tests__/fields.test.ts diff --git a/packages/plugin-users/src/__tests__/role.test.ts b/packages/plugins/users/src/__tests__/role.test.ts similarity index 100% rename from packages/plugin-users/src/__tests__/role.test.ts rename to packages/plugins/users/src/__tests__/role.test.ts diff --git a/packages/plugin-users/src/__tests__/setCurrentRole.test.ts b/packages/plugins/users/src/__tests__/setCurrentRole.test.ts similarity index 100% rename from packages/plugin-users/src/__tests__/setCurrentRole.test.ts rename to packages/plugins/users/src/__tests__/setCurrentRole.test.ts diff --git a/packages/plugin-users/src/__tests__/utils.ts b/packages/plugins/users/src/__tests__/utils.ts similarity index 100% rename from packages/plugin-users/src/__tests__/utils.ts rename to packages/plugins/users/src/__tests__/utils.ts diff --git a/packages/plugin-users/src/actions/users.ts b/packages/plugins/users/src/actions/users.ts similarity index 100% rename from packages/plugin-users/src/actions/users.ts rename to packages/plugins/users/src/actions/users.ts diff --git a/packages/plugin-users/src/collections/roles-users.ts b/packages/plugins/users/src/collections/roles-users.ts similarity index 100% rename from packages/plugin-users/src/collections/roles-users.ts rename to packages/plugins/users/src/collections/roles-users.ts diff --git a/packages/plugin-users/src/collections/users.ts b/packages/plugins/users/src/collections/users.ts similarity index 100% rename from packages/plugin-users/src/collections/users.ts rename to packages/plugins/users/src/collections/users.ts diff --git a/packages/plugin-users/src/index.ts b/packages/plugins/users/src/index.ts similarity index 100% rename from packages/plugin-users/src/index.ts rename to packages/plugins/users/src/index.ts diff --git a/packages/plugin-users/src/jwt-service.ts b/packages/plugins/users/src/jwt-service.ts similarity index 100% rename from packages/plugin-users/src/jwt-service.ts rename to packages/plugins/users/src/jwt-service.ts diff --git a/packages/plugin-users/src/middlewares/check.ts b/packages/plugins/users/src/middlewares/check.ts similarity index 100% rename from packages/plugin-users/src/middlewares/check.ts rename to packages/plugins/users/src/middlewares/check.ts diff --git a/packages/plugin-users/src/middlewares/index.ts b/packages/plugins/users/src/middlewares/index.ts similarity index 100% rename from packages/plugin-users/src/middlewares/index.ts rename to packages/plugins/users/src/middlewares/index.ts diff --git a/packages/plugin-users/src/middlewares/parseToken.ts b/packages/plugins/users/src/middlewares/parseToken.ts similarity index 100% rename from packages/plugin-users/src/middlewares/parseToken.ts rename to packages/plugins/users/src/middlewares/parseToken.ts diff --git a/packages/plugin-users/src/models/UserModel.ts b/packages/plugins/users/src/models/UserModel.ts similarity index 100% rename from packages/plugin-users/src/models/UserModel.ts rename to packages/plugins/users/src/models/UserModel.ts diff --git a/packages/plugin-users/src/server.ts b/packages/plugins/users/src/server.ts similarity index 99% rename from packages/plugin-users/src/server.ts rename to packages/plugins/users/src/server.ts index 7d022ffd0..f18207997 100644 --- a/packages/plugin-users/src/server.ts +++ b/packages/plugins/users/src/server.ts @@ -9,7 +9,7 @@ import { UserModel } from './models/UserModel'; export interface UserPluginConfig { jwt: JwtOptions; - installing: { + installing?: { adminNickname: string; adminEmail: string; adminPassword: string; diff --git a/packages/plugins/users/tsconfig.build.json b/packages/plugins/users/tsconfig.build.json new file mode 100644 index 000000000..9bdd87769 --- /dev/null +++ b/packages/plugins/users/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "./lib", + "declaration": true + }, + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/plugins/users/tsconfig.json b/packages/plugins/users/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/users/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/api/.npmignore b/packages/plugins/workflow/.npmignore similarity index 81% rename from packages/api/.npmignore rename to packages/plugins/workflow/.npmignore index d44041bb5..461574b2f 100644 --- a/packages/api/.npmignore +++ b/packages/plugins/workflow/.npmignore @@ -2,7 +2,6 @@ node_modules *.log docs __tests__ -jest.config.js tsconfig.json src .fatherrc.ts \ No newline at end of file diff --git a/packages/plugin-workflow/package.json b/packages/plugins/workflow/package.json similarity index 66% rename from packages/plugin-workflow/package.json rename to packages/plugins/workflow/package.json index bcdbe2bda..8aea16802 100644 --- a/packages/plugin-workflow/package.json +++ b/packages/plugins/workflow/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-workflow", - "version": "0.6.0-alpha.0", + "version": "0.6.2-alpha.8", "main": "lib/index.js", "license": "MIT", "scripts": { @@ -9,14 +9,14 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/actions": "^0.6.0-alpha.0", - "@nocobase/database": "^0.6.0-alpha.0", - "@nocobase/server": "^0.6.0-alpha.0", - "@nocobase/utils": "^0.6.0-alpha.0", + "@nocobase/actions": "0.6.2-alpha.8", + "@nocobase/database": "0.6.2-alpha.8", + "@nocobase/server": "0.6.2-alpha.8", + "@nocobase/utils": "0.6.2-alpha.8", "json-templates": "^4.2.0" }, "devDependencies": { - "@nocobase/test": "^0.6.0-alpha.0" + "@nocobase/test": "0.6.2-alpha.8" }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e" } diff --git a/packages/plugin-workflow/src/__tests__/collections/approvals.ts b/packages/plugins/workflow/src/__tests__/collections/approvals.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/collections/approvals.ts rename to packages/plugins/workflow/src/__tests__/collections/approvals.ts diff --git a/packages/plugin-workflow/src/__tests__/collections/posts.ts b/packages/plugins/workflow/src/__tests__/collections/posts.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/collections/posts.ts rename to packages/plugins/workflow/src/__tests__/collections/posts.ts diff --git a/packages/plugin-workflow/src/__tests__/execution.test.ts b/packages/plugins/workflow/src/__tests__/execution.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/execution.test.ts rename to packages/plugins/workflow/src/__tests__/execution.test.ts diff --git a/packages/plugin-workflow/src/__tests__/index.ts b/packages/plugins/workflow/src/__tests__/index.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/index.ts rename to packages/plugins/workflow/src/__tests__/index.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/calculation.test.ts b/packages/plugins/workflow/src/__tests__/instructions/calculation.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/calculation.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/calculation.test.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/condition.test.ts b/packages/plugins/workflow/src/__tests__/instructions/condition.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/condition.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/condition.test.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/create.test.ts b/packages/plugins/workflow/src/__tests__/instructions/create.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/create.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/create.test.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/destroy.test.ts b/packages/plugins/workflow/src/__tests__/instructions/destroy.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/destroy.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/destroy.test.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/query.test.ts b/packages/plugins/workflow/src/__tests__/instructions/query.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/query.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/query.test.ts diff --git a/packages/plugin-workflow/src/__tests__/instructions/update.test.ts b/packages/plugins/workflow/src/__tests__/instructions/update.test.ts similarity index 100% rename from packages/plugin-workflow/src/__tests__/instructions/update.test.ts rename to packages/plugins/workflow/src/__tests__/instructions/update.test.ts diff --git a/packages/plugin-workflow/src/actions/flow_nodes.ts b/packages/plugins/workflow/src/actions/flow_nodes.ts similarity index 100% rename from packages/plugin-workflow/src/actions/flow_nodes.ts rename to packages/plugins/workflow/src/actions/flow_nodes.ts diff --git a/packages/plugin-workflow/src/actions/index.ts b/packages/plugins/workflow/src/actions/index.ts similarity index 100% rename from packages/plugin-workflow/src/actions/index.ts rename to packages/plugins/workflow/src/actions/index.ts diff --git a/packages/plugin-workflow/src/calculators/index.ts b/packages/plugins/workflow/src/calculators/index.ts similarity index 100% rename from packages/plugin-workflow/src/calculators/index.ts rename to packages/plugins/workflow/src/calculators/index.ts diff --git a/packages/plugin-workflow/src/collections/executions.ts b/packages/plugins/workflow/src/collections/executions.ts similarity index 100% rename from packages/plugin-workflow/src/collections/executions.ts rename to packages/plugins/workflow/src/collections/executions.ts diff --git a/packages/plugin-workflow/src/collections/flow_nodes.ts b/packages/plugins/workflow/src/collections/flow_nodes.ts similarity index 100% rename from packages/plugin-workflow/src/collections/flow_nodes.ts rename to packages/plugins/workflow/src/collections/flow_nodes.ts diff --git a/packages/plugin-workflow/src/collections/jobs.ts b/packages/plugins/workflow/src/collections/jobs.ts similarity index 100% rename from packages/plugin-workflow/src/collections/jobs.ts rename to packages/plugins/workflow/src/collections/jobs.ts diff --git a/packages/plugin-workflow/src/collections/workflows.ts b/packages/plugins/workflow/src/collections/workflows.ts similarity index 100% rename from packages/plugin-workflow/src/collections/workflows.ts rename to packages/plugins/workflow/src/collections/workflows.ts diff --git a/packages/plugin-workflow/src/constants.ts b/packages/plugins/workflow/src/constants.ts similarity index 100% rename from packages/plugin-workflow/src/constants.ts rename to packages/plugins/workflow/src/constants.ts diff --git a/packages/plugin-workflow/src/index.ts b/packages/plugins/workflow/src/index.ts similarity index 100% rename from packages/plugin-workflow/src/index.ts rename to packages/plugins/workflow/src/index.ts diff --git a/packages/plugin-workflow/src/instructions/calculation.ts b/packages/plugins/workflow/src/instructions/calculation.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/calculation.ts rename to packages/plugins/workflow/src/instructions/calculation.ts diff --git a/packages/plugin-workflow/src/instructions/condition.ts b/packages/plugins/workflow/src/instructions/condition.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/condition.ts rename to packages/plugins/workflow/src/instructions/condition.ts diff --git a/packages/plugin-workflow/src/instructions/create.ts b/packages/plugins/workflow/src/instructions/create.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/create.ts rename to packages/plugins/workflow/src/instructions/create.ts diff --git a/packages/plugin-workflow/src/instructions/destroy.ts b/packages/plugins/workflow/src/instructions/destroy.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/destroy.ts rename to packages/plugins/workflow/src/instructions/destroy.ts diff --git a/packages/plugin-workflow/src/instructions/index.ts b/packages/plugins/workflow/src/instructions/index.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/index.ts rename to packages/plugins/workflow/src/instructions/index.ts diff --git a/packages/plugin-workflow/src/instructions/parallel.ts b/packages/plugins/workflow/src/instructions/parallel.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/parallel.ts rename to packages/plugins/workflow/src/instructions/parallel.ts diff --git a/packages/plugin-workflow/src/instructions/prompt.ts b/packages/plugins/workflow/src/instructions/prompt.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/prompt.ts rename to packages/plugins/workflow/src/instructions/prompt.ts diff --git a/packages/plugin-workflow/src/instructions/query.ts b/packages/plugins/workflow/src/instructions/query.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/query.ts rename to packages/plugins/workflow/src/instructions/query.ts diff --git a/packages/plugin-workflow/src/instructions/update.ts b/packages/plugins/workflow/src/instructions/update.ts similarity index 100% rename from packages/plugin-workflow/src/instructions/update.ts rename to packages/plugins/workflow/src/instructions/update.ts diff --git a/packages/plugin-workflow/src/models/Execution.ts b/packages/plugins/workflow/src/models/Execution.ts similarity index 100% rename from packages/plugin-workflow/src/models/Execution.ts rename to packages/plugins/workflow/src/models/Execution.ts diff --git a/packages/plugin-workflow/src/models/FlowNode.ts b/packages/plugins/workflow/src/models/FlowNode.ts similarity index 100% rename from packages/plugin-workflow/src/models/FlowNode.ts rename to packages/plugins/workflow/src/models/FlowNode.ts diff --git a/packages/plugin-workflow/src/models/Job.ts b/packages/plugins/workflow/src/models/Job.ts similarity index 100% rename from packages/plugin-workflow/src/models/Job.ts rename to packages/plugins/workflow/src/models/Job.ts diff --git a/packages/plugin-workflow/src/models/Workflow.ts b/packages/plugins/workflow/src/models/Workflow.ts similarity index 100% rename from packages/plugin-workflow/src/models/Workflow.ts rename to packages/plugins/workflow/src/models/Workflow.ts diff --git a/packages/plugin-workflow/src/server.ts b/packages/plugins/workflow/src/server.ts similarity index 100% rename from packages/plugin-workflow/src/server.ts rename to packages/plugins/workflow/src/server.ts diff --git a/packages/plugin-workflow/src/triggers/index.ts b/packages/plugins/workflow/src/triggers/index.ts similarity index 100% rename from packages/plugin-workflow/src/triggers/index.ts rename to packages/plugins/workflow/src/triggers/index.ts diff --git a/packages/plugin-workflow/src/triggers/model.ts b/packages/plugins/workflow/src/triggers/model.ts similarity index 100% rename from packages/plugin-workflow/src/triggers/model.ts rename to packages/plugins/workflow/src/triggers/model.ts diff --git a/packages/plugin-workflow/tsconfig.build.json b/packages/plugins/workflow/tsconfig.build.json similarity index 80% rename from packages/plugin-workflow/tsconfig.build.json rename to packages/plugins/workflow/tsconfig.build.json index f79660a89..3e1d1687c 100644 --- a/packages/plugin-workflow/tsconfig.build.json +++ b/packages/plugins/workflow/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "./lib", "declaration": true diff --git a/packages/plugins/workflow/tsconfig.json b/packages/plugins/workflow/tsconfig.json new file mode 100644 index 000000000..bf4bd3fa9 --- /dev/null +++ b/packages/plugins/workflow/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "exclude": ["./esm/*", "./lib/*"] +} \ No newline at end of file diff --git a/packages/resourcer/tsconfig.build.json b/packages/resourcer/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/resourcer/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/resourcer/tsconfig.json b/packages/resourcer/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/resourcer/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/server/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/server/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/test/tsconfig.build.json b/packages/test/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/test/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/test/tsconfig.json b/packages/test/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/test/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json deleted file mode 100644 index 8d3db734b..000000000 --- a/packages/utils/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "outDir": "./lib", - "declaration": true - }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json deleted file mode 100644 index e10a5305a..000000000 --- a/packages/utils/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["./esm/*", "./lib/*"] -} \ No newline at end of file diff --git a/tsconfig.jest.json b/tsconfig.jest.json index 99237bad7..327877eae 100644 --- a/tsconfig.jest.json +++ b/tsconfig.jest.json @@ -9,7 +9,15 @@ "module": "commonjs", "target": "es6", "paths": { - "@nocobase/*": ["./packages/*/src"] + "@nocobase/app-*": [ + "packages/app/*/src" + ], + "@nocobase/plugin-*": [ + "packages/plugins/*/src" + ], + "@nocobase/*": [ + "packages/core/*/src" + ] } }, "exclude": ["./packages/*/esm", "./packages/*/lib"] diff --git a/tsconfig.json b/tsconfig.json index ba9315620..858f21c0a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,15 @@ "downlevelIteration": true, "baseUrl": ".", "paths": { - "@nocobase/*": ["packages/*/src"] + "@nocobase/app-*": [ + "packages/app/*/src" + ], + "@nocobase/plugin-*": [ + "packages/plugins/*/src" + ], + "@nocobase/*": [ + "packages/core/*/src" + ] } } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 808b77b0e..8c57f1c05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2635,6 +2635,14 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" +"@nocobase/utils@^0.5.0-alpha.38": + version "0.5.0-alpha.38" + resolved "https://registry.npmjs.org/@nocobase/utils/-/utils-0.5.0-alpha.38.tgz#2e28fc6d3ac8658a4429809ef2bf83bdeb737e46" + integrity sha512-/ZWgwgqlE4EkB9LmE2zRcQORLztsjsa6jOpTTriAZDi4T9HLBpBha+FaCdfF3QNrn8SbDowK2IeECsix9c/N8w== + dependencies: + deepmerge "^4.2.2" + flat-to-nested "^1.1.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" @@ -4101,7 +4109,7 @@ ansi-styles@^5.0.0: resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -antd@^4.18.9: +antd@^4.18.9, antd@^4.19.5: version "4.19.5" resolved "https://registry.npmjs.org/antd/-/antd-4.19.5.tgz#38d08f3e1391a7a69c2ca76f50968bb12ec2ac93" integrity sha512-C4H/VJqlVO5iMvHZyiV27R8SbPs4jsOKCGPhDXIHUry/RnUCbMmVeQaPRfUIxSI1NbqDflsuQfevPtz1svyIlg== @@ -4497,6 +4505,13 @@ axios@^0.24.0: dependencies: follow-redirects "^1.14.4" +axios@^0.26.1: + version "0.26.1" + resolved "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== + dependencies: + follow-redirects "^1.14.8" + babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0: version "7.0.0-bridge.0" resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" @@ -4631,7 +4646,7 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -4678,6 +4693,15 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +bl@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + blessed@0.1.81: version "0.1.81" resolved "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129" @@ -4890,6 +4914,14 @@ buffer@4.9.2, buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -5106,7 +5138,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5267,6 +5299,11 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-spinners@^2.5.0: + version "2.6.1" + resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + cli-tableau@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/cli-tableau/-/cli-tableau-2.0.1.tgz#baa78d83e08a2d7ab79b7dad9406f0254977053f" @@ -5447,7 +5484,7 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -commander@*, commander@>=7.0.0, commander@^8.1.0: +commander@*, commander@>=7.0.0, commander@^8.1.0, commander@^8.2.0: version "8.3.0" resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== @@ -5875,12 +5912,12 @@ croner@~4.1.92: resolved "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz#6e373dc7bb3026fab2deb0d82685feef20796766" integrity sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ== -cross-env@^5.2.0: - version "5.2.1" - resolved "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d" - integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ== +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== dependencies: - cross-spawn "^6.0.5" + cross-spawn "^7.0.1" cross-spawn-async@^2.1.1: version "2.2.5" @@ -5899,7 +5936,7 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0, cross-spawn@^6.0.5: +cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -5910,7 +5947,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -7076,6 +7113,21 @@ exec-sh@^0.3.2: resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== +execa@5, execa@^5.0.0: + version "5.1.1" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + execa@^0.4.0, execa@~0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3" @@ -7142,21 +7194,6 @@ execa@^4.0.0, execa@^4.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - exenv@^1.2.0: version "1.2.2" resolved "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" @@ -7490,7 +7527,7 @@ flow-parser@0.*: resolved "https://registry.npmjs.org/flow-parser/-/flow-parser-0.164.0.tgz#455e16fdba12f24aa1d7631adacc524f1977b6ad" integrity sha512-aJWAhnazcz0o8xIbCW5LBTf+tnsAtLwaMSCcRqA15UTkPBY1Vq1vy1WEPKwcWsve5tos5kkOeCXgd/Nal+LUUQ== -follow-redirects@^1.14.0: +follow-redirects@^1.14.0, follow-redirects@^1.14.8: version "1.14.9" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== @@ -7575,6 +7612,15 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" +fs-extra@^10.0.1: + version "10.0.1" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" + integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -8459,7 +8505,7 @@ ieee754@1.1.13: resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -8940,6 +8986,11 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" @@ -10500,7 +10551,7 @@ log-driver@^1.2.7: resolved "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== -log-symbols@^4.0.0: +log-symbols@^4.0.0, log-symbols@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -12039,6 +12090,21 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -14032,6 +14098,15 @@ react-i18next@^11.15.1: html-escaper "^2.0.2" html-parse-stringify "^3.0.1" +react-i18next@^11.16.6: + version "11.16.6" + resolved "https://registry.npmjs.org/react-i18next/-/react-i18next-11.16.6.tgz#e8a07802c391a55e1528673201a2727994787641" + integrity sha512-qa76GnvAPafNSxKNN/XMhdCkVN/9Lm+BpzW5+6FE2ctYUemhbglP7oklGmYiJXlG24p9itqzlJDbCi3SNd3jzA== + dependencies: + "@babel/runtime" "^7.14.5" + html-escaper "^2.0.2" + html-parse-stringify "^3.0.1" + 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" @@ -14342,7 +14417,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0: +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -15956,7 +16031,7 @@ tar@^4, tar@^4.4.12: safe-buffer "^5.2.1" yallist "^3.1.1" -tar@^6.0.2, tar@^6.1.0: +tar@^6.0.2, tar@^6.1.0, tar@^6.1.11: version "6.1.11" resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -17036,7 +17111,7 @@ warning@^4.0.3: dependencies: loose-envify "^1.0.0" -wcwidth@^1.0.0: +wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=