diff --git a/docker/app-mysql/docker-compose.yml b/docker/app-mysql/docker-compose.yml index c8b42b6e3..3a7425ec6 100644 --- a/docker/app-mysql/docker-compose.yml +++ b/docker/app-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.7.2-alpha.2 + image: nocobase/nocobase:0.7.2-alpha.3 networks: - nocobase depends_on: diff --git a/docker/app-postgres/docker-compose.yml b/docker/app-postgres/docker-compose.yml index 0bace5a27..96c624724 100644 --- a/docker/app-postgres/docker-compose.yml +++ b/docker/app-postgres/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.7.2-alpha.2 + image: nocobase/nocobase:0.7.2-alpha.3 networks: - nocobase environment: diff --git a/docker/app-sqlite/docker-compose.yml b/docker/app-sqlite/docker-compose.yml index a6cb7d0d7..8f25e5c50 100644 --- a/docker/app-sqlite/docker-compose.yml +++ b/docker/app-sqlite/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: bridge services: app: - image: nocobase/nocobase:0.7.2-alpha.2 + image: nocobase/nocobase:0.7.2-alpha.3 networks: - nocobase environment: diff --git a/docker/nocobase/Dockerfile b/docker/nocobase/Dockerfile new file mode 100644 index 000000000..44deca914 --- /dev/null +++ b/docker/nocobase/Dockerfile @@ -0,0 +1,44 @@ +FROM node:16-stretch-slim as builder + +WORKDIR /app + +RUN cd /app \ + && yarn create nocobase-app my-nocobase-app -a -e APP_ENV=production \ + && cd /app/my-nocobase-app \ + && yarn install --production + +RUN cd /app \ + && rm -rf my-nocobase-app/packages/app/client/src/.umi \ + && rm -rf nocobase.tar.gz \ + && find ./my-nocobase-app/node_modules/china-division/dist -name '*.csv' -delete \ + && find ./my-nocobase-app/node_modules/china-division/dist -name '*.sqlite' -delete \ + && tar -zcvf ./nocobase.tar.gz -C /app/my-nocobase-app . + +FROM node:16-stretch-slim + +# COPY ./sources.list /etc/apt/sources.list +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && apt-get update && apt-get install -y nginx + +RUN rm -rf /etc/nginx/sites-enabled/default +COPY ./nocobase.conf /etc/nginx/sites-enabled/nocobase.conf +COPY --from=builder /app/nocobase.tar.gz /app/nocobase.tar.gz + +WORKDIR /app/nocobase + +COPY docker-entrypoint.sh /app/ +# COPY docker-entrypoint.sh /usr/local/bin/ +# ENTRYPOINT ["docker-entrypoint.sh"] + +CMD ["/app/docker-entrypoint.sh"] diff --git a/docker/nocobase/docker-entrypoint.sh b/docker/nocobase/docker-entrypoint.sh new file mode 100755 index 000000000..7ebf1defa --- /dev/null +++ b/docker/nocobase/docker-entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +nginx +echo 'nginx started'; + +if [ ! -d "/app/nocobase" ]; then + mkdir nocobase +fi + +if [ ! -f "/app/nocobase/package.json" ]; then + echo 'copying...' + tar -zxf /app/nocobase.tar.gz --absolute-names -C /app/nocobase +fi + +cd /app/nocobase && yarn nocobase db:auth --retry=30 +cd /app/nocobase && yarn nocobase install -s +cd /app/nocobase && yarn nocobase upgrade -S +cd /app/nocobase && yarn start + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/docker/nocobase/nocobase.conf b/docker/nocobase/nocobase.conf new file mode 100644 index 000000000..279852b0e --- /dev/null +++ b/docker/nocobase/nocobase.conf @@ -0,0 +1,25 @@ +server { + listen 80; + server_name _; + root /app/nocobase/packages/app/client/dist; + index index.html; + + location /storage/uploads/ { + alias /app/nocobase/storage/uploads/; + autoindex off; + } + + location / { + root /app/nocobase/packages/app/client/dist; + try_files $uri $uri/ /index.html; + } + + location ^~ /api/ { + proxy_pass http://127.0.0.1:13000/api/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } +} diff --git a/docker/nocobase/sources.list b/docker/nocobase/sources.list new file mode 100644 index 000000000..e5ad58841 --- /dev/null +++ b/docker/nocobase/sources.list @@ -0,0 +1,8 @@ +deb http://mirrors.aliyun.com/debian/ stretch main non-free contrib +deb-src http://mirrors.aliyun.com/debian/ stretch main non-free contrib +deb http://mirrors.aliyun.com/debian-security stretch/updates main +deb-src http://mirrors.aliyun.com/debian-security stretch/updates main +deb http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib +deb-src http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib +#deb http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib +#deb-src http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib \ No newline at end of file diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile deleted file mode 100644 index 05631f543..000000000 --- a/docker/node/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM node:12.20.0-stretch - -WORKDIR /app -# COPY . /app -RUN ls -a - -RUN npm config set registry https://registry.npmmirror.com -RUN yarn config set registry https://registry.npmmirror.com - -# RUN npm install -# RUN npm run bootstrap -# RUN npm run build - -# # Install app dependencies -# ENV NPM_CONFIG_LOGLEVEL warn -# RUN yarn install - -# # Show current folder structure in logs -RUN ls -a - -# CMD [ "npm", "run", "serve" ] diff --git a/lerna.json b/lerna.json index 1e6c501f8..1df08b7b6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/app/client/package.json b/packages/app/client/package.json index a0e7b37c0..f0a3d0111 100644 --- a/packages/app/client/package.json +++ b/packages/app/client/package.json @@ -1,9 +1,9 @@ { "name": "@nocobase/app-client", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "license": "MIT", "devDependencies": { - "@nocobase/client": "0.7.2-alpha.2" + "@nocobase/client": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/app/server/package.json b/packages/app/server/package.json index 8debc7655..a7f4a9223 100644 --- a/packages/app/server/package.json +++ b/packages/app/server/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/app-server", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "MIT", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/preset-nocobase": "0.7.2-alpha.2" + "@nocobase/preset-nocobase": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index 8239cf413..d5c8d0849 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/acl", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,7 +12,7 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "0.7.2-alpha.2", + "@nocobase/resourcer": "0.7.2-alpha.3", "json-templates": "^4.2.0" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index acee86dfc..864d3236a 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/actions", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,8 +12,8 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "0.7.2-alpha.2", - "@nocobase/resourcer": "0.7.2-alpha.2" + "@nocobase/database": "0.7.2-alpha.3", + "@nocobase/resourcer": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 34242fabe..2f4e04369 100755 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "Library build tool based on rollup.", "main": "lib/index.js", "bin": { diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 42256a18a..2844147bb 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -23,7 +23,7 @@ "serve": "^13.0.2" }, "devDependencies": { - "@nocobase/devtools": "0.7.2-alpha.2" + "@nocobase/devtools": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/core/cli/src/commands/upgrade.js b/packages/core/cli/src/commands/upgrade.js index d1504a33a..b4cf9f336 100644 --- a/packages/core/cli/src/commands/upgrade.js +++ b/packages/core/cli/src/commands/upgrade.js @@ -13,10 +13,10 @@ module.exports = (cli) => { .command('upgrade') .allowUnknownOption() .option('--raw') + .option('-S|--skip-code-update') .action(async (options) => { promptForTs(); - const version = await getVersion(); - if (options.raw) { + if (options.skipCodeUpdate) { await runAppCommand('upgrade'); return; } @@ -28,6 +28,7 @@ module.exports = (cli) => { if (!hasTsNode()) { return; } + const version = await getVersion(); await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']); const clientPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/client/package.json`); const serverPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/server/package.json`); diff --git a/packages/core/client/package.json b/packages/core/client/package.json index da3fe7c75..eb49158a1 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "license": "Apache-2.0", "licenses": [ { @@ -19,8 +19,8 @@ "@formily/antd": "2.0.20", "@formily/core": "2.0.20", "@formily/react": "2.0.20", - "@nocobase/sdk": "0.7.2-alpha.2", - "@nocobase/utils": "0.7.2-alpha.2", + "@nocobase/sdk": "0.7.2-alpha.3", + "@nocobase/utils": "0.7.2-alpha.3", "ahooks": "^3.0.5", "antd": "~4.19.5", "axios": "^0.26.1", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 1ac24a704..8ec0e63f7 100755 --- a/packages/core/create-nocobase-app/package.json +++ b/packages/core/create-nocobase-app/package.json @@ -1,6 +1,6 @@ { "name": "create-nocobase-app", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "src/index.js", "license": "Apache-2.0", "licenses": [ diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 373521be2..d9a248f23 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/database", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -12,7 +12,7 @@ } ], "dependencies": { - "@nocobase/utils": "0.7.2-alpha.2", + "@nocobase/utils": "0.7.2-alpha.3", "async-mutex": "^0.3.2", "deepmerge": "^4.2.2", "flat": "^5.0.2", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 946d5a08b..b759219a6 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/devtools", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -11,7 +11,7 @@ ], "main": "./src/index.js", "dependencies": { - "@nocobase/build": "0.7.2-alpha.2", + "@nocobase/build": "0.7.2-alpha.3", "@testing-library/react": "^12.1.2", "@types/jest": "^26.0.0", "@types/koa": "^2.13.4", diff --git a/packages/core/dumi-theme-nocobase/package.json b/packages/core/dumi-theme-nocobase/package.json index 3ba472fbc..2cadb32dc 100755 --- a/packages/core/dumi-theme-nocobase/package.json +++ b/packages/core/dumi-theme-nocobase/package.json @@ -1,6 +1,6 @@ { "name": "dumi-theme-nocobase", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "private": true, "files": [ "es", diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json index 7f0cca55c..c11b5e316 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/resourcer", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json index 03238eb0d..9cb8ef501 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "license": "Apache-2.0", "licenses": [ { diff --git a/packages/core/server/package.json b/packages/core/server/package.json index b3c8c746e..729d64083 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -13,10 +13,10 @@ "dependencies": { "@koa/cors": "^3.1.0", "@koa/router": "^9.4.0", - "@nocobase/acl": "0.7.2-alpha.2", - "@nocobase/actions": "0.7.2-alpha.2", - "@nocobase/database": "0.7.2-alpha.2", - "@nocobase/resourcer": "0.7.2-alpha.2", + "@nocobase/acl": "0.7.2-alpha.3", + "@nocobase/actions": "0.7.2-alpha.3", + "@nocobase/database": "0.7.2-alpha.3", + "@nocobase/resourcer": "0.7.2-alpha.3", "chalk": "^4.1.1", "commander": "^9.2.0", "find-package-json": "^1.2.0", diff --git a/packages/core/test/package.json b/packages/core/test/package.json index 9091e1312..051dbac63 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -11,7 +11,7 @@ } ], "dependencies": { - "@nocobase/server": "0.7.2-alpha.2", + "@nocobase/server": "0.7.2-alpha.3", "@types/supertest": "^2.0.11", "mockjs": "^1.1.0", "mysql2": "^2.3.3", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 65815bdf1..f9e4af56f 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", diff --git a/packages/plugins/acl/package.json b/packages/plugins/acl/package.json index c07ea3ab4..f233dc030 100644 --- a/packages/plugins/acl/package.json +++ b/packages/plugins/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-acl", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -12,9 +12,9 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/acl": "0.7.2-alpha.2", - "@nocobase/database": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/acl": "0.7.2-alpha.3", + "@nocobase/database": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/plugins/audit-logs/package.json b/packages/plugins/audit-logs/package.json index ef47c70af..35553bb50 100644 --- a/packages/plugins/audit-logs/package.json +++ b/packages/plugins/audit-logs/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-audit-logs", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "./lib/server/index.js", "types": "./lib/server/index.d.ts", "license": "Apache-2.0", @@ -11,11 +11,11 @@ } ], "dependencies": { - "@nocobase/client": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/client": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "40d079ceb4dadfd6a021ab44a42ef7f52f241745" } diff --git a/packages/plugins/china-region/package.json b/packages/plugins/china-region/package.json index a6acc9c7d..9e2cbc3e0 100644 --- a/packages/plugins/china-region/package.json +++ b/packages/plugins/china-region/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-china-region", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,12 +10,12 @@ } ], "dependencies": { - "@nocobase/client": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2", + "@nocobase/client": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3", "china-division": "^2.4.0" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "40d079ceb4dadfd6a021ab44a42ef7f52f241745" } diff --git a/packages/plugins/client/package.json b/packages/plugins/client/package.json index d0203f87a..968ec14bc 100644 --- a/packages/plugins/client/package.json +++ b/packages/plugins/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-client", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,10 +10,10 @@ } ], "dependencies": { - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/server": "0.7.2-alpha.3" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/collection-manager/package.json b/packages/plugins/collection-manager/package.json index 91e0b4144..3ab4ecaf6 100644 --- a/packages/plugins/collection-manager/package.json +++ b/packages/plugins/collection-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-collection-manager", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,7 +10,7 @@ } ], "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/error-handler/package.json b/packages/plugins/error-handler/package.json index f1b11c561..0706b20c8 100644 --- a/packages/plugins/error-handler/package.json +++ b/packages/plugins/error-handler/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-error-handler", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "description": "", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "types": "./lib/index.d.ts", "dependencies": { "@formily/json-schema": "^2.0.15", - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/server": "0.7.2-alpha.3" }, "repository": { "type": "git", diff --git a/packages/plugins/export/package.json b/packages/plugins/export/package.json index afa8f5d2d..d0009beae 100644 --- a/packages/plugins/export/package.json +++ b/packages/plugins/export/package.json @@ -1,10 +1,10 @@ { "name": "@nocobase/plugin-export", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/server/index.js", "dependencies": { - "@nocobase/client": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2", + "@nocobase/client": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3", "node-xlsx": "^0.16.1" }, "devDependencies": { diff --git a/packages/plugins/file-manager/package.json b/packages/plugins/file-manager/package.json index 1200075ea..c12d08b6d 100644 --- a/packages/plugins/file-manager/package.json +++ b/packages/plugins/file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -11,7 +11,7 @@ ], "dependencies": { "@koa/multer": "^3.0.0", - "@nocobase/server": "0.7.2-alpha.2", + "@nocobase/server": "0.7.2-alpha.3", "aws-sdk": "^2.2.32", "koa-static": "^5.0.0", "mime-match": "^1.0.2", @@ -21,7 +21,7 @@ "multer-s3": "^2.10.0" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2", + "@nocobase/test": "0.7.2-alpha.3", "@types/koa-multer": "^1.0.1", "@types/multer": "^1.4.5" }, diff --git a/packages/plugins/multi-app-manager/package.json b/packages/plugins/multi-app-manager/package.json index 2c0329fce..90bd66cb7 100644 --- a/packages/plugins/multi-app-manager/package.json +++ b/packages/plugins/multi-app-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-multi-app-manager", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,7 +10,7 @@ } ], "dependencies": { - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/server": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/notifications/package.json b/packages/plugins/notifications/package.json index e7f418c8c..19c5f63b9 100644 --- a/packages/plugins/notifications/package.json +++ b/packages/plugins/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "nodemailer": "^6.6.1" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2", + "@nocobase/test": "0.7.2-alpha.3", "@types/nodemailer": "6.4.4", "nodemailer-mock": "^1.5.11" }, diff --git a/packages/plugins/system-settings/package.json b/packages/plugins/system-settings/package.json index 83b23e78b..bf1d8e7f3 100644 --- a/packages/plugins/system-settings/package.json +++ b/packages/plugins/system-settings/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-system-settings", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,7 +10,7 @@ } ], "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/ui-routes-storage/package.json b/packages/plugins/ui-routes-storage/package.json index 829d98ba3..e6877a9be 100644 --- a/packages/plugins/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.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "flat-to-nested": "^1.1.1" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/ui-schema-storage/package.json b/packages/plugins/ui-schema-storage/package.json index a9061f0cf..07df03a77 100644 --- a/packages/plugins/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.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -11,7 +11,7 @@ ], "devDependencies": { "@formily/json-schema": "2.0.20", - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/plugins/users/package.json b/packages/plugins/users/package.json index 0e50fd6bc..f4a2e4b47 100644 --- a/packages/plugins/users/package.json +++ b/packages/plugins/users/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-users", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -13,7 +13,7 @@ "jsonwebtoken": "^8.5.1" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2", + "@nocobase/test": "0.7.2-alpha.3", "@types/jsonwebtoken": "^8.5.8", "json-templates": "^4.2.0" }, diff --git a/packages/plugins/workflow/package.json b/packages/plugins/workflow/package.json index 628f05a88..eb0935a9d 100644 --- a/packages/plugins/workflow/package.json +++ b/packages/plugins/workflow/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-workflow", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -10,17 +10,17 @@ } ], "dependencies": { - "@nocobase/actions": "0.7.2-alpha.2", - "@nocobase/client": "0.7.2-alpha.2", - "@nocobase/database": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2", - "@nocobase/utils": "0.7.2-alpha.2", + "@nocobase/actions": "0.7.2-alpha.3", + "@nocobase/client": "0.7.2-alpha.3", + "@nocobase/database": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3", + "@nocobase/utils": "0.7.2-alpha.3", "cron-parser": "4.4.0", "json-templates": "^4.2.0", "react-js-cron": "^1.4.0" }, "devDependencies": { - "@nocobase/test": "0.7.2-alpha.2" + "@nocobase/test": "0.7.2-alpha.3" }, "gitHead": "7e9556e489007577fc0ed89063b3a9ce2f9aae53" } diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 22e5d466e..e7179db1d 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/preset-nocobase", - "version": "0.7.2-alpha.2", + "version": "0.7.2-alpha.3", "license": "Apache-2.0", "licenses": [ { @@ -11,20 +11,20 @@ "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/plugin-acl": "0.7.2-alpha.2", - "@nocobase/plugin-audit-logs": "0.7.2-alpha.2", - "@nocobase/plugin-china-region": "0.7.2-alpha.2", - "@nocobase/plugin-client": "0.7.2-alpha.2", - "@nocobase/plugin-collection-manager": "0.7.2-alpha.2", - "@nocobase/plugin-error-handler": "0.7.2-alpha.2", - "@nocobase/plugin-export": "0.7.2-alpha.2", - "@nocobase/plugin-file-manager": "0.7.2-alpha.2", - "@nocobase/plugin-system-settings": "0.7.2-alpha.2", - "@nocobase/plugin-ui-routes-storage": "0.7.2-alpha.2", - "@nocobase/plugin-ui-schema-storage": "0.7.2-alpha.2", - "@nocobase/plugin-users": "0.7.2-alpha.2", - "@nocobase/plugin-workflow": "0.7.2-alpha.2", - "@nocobase/server": "0.7.2-alpha.2" + "@nocobase/plugin-acl": "0.7.2-alpha.3", + "@nocobase/plugin-audit-logs": "0.7.2-alpha.3", + "@nocobase/plugin-china-region": "0.7.2-alpha.3", + "@nocobase/plugin-client": "0.7.2-alpha.3", + "@nocobase/plugin-collection-manager": "0.7.2-alpha.3", + "@nocobase/plugin-error-handler": "0.7.2-alpha.3", + "@nocobase/plugin-export": "0.7.2-alpha.3", + "@nocobase/plugin-file-manager": "0.7.2-alpha.3", + "@nocobase/plugin-system-settings": "0.7.2-alpha.3", + "@nocobase/plugin-ui-routes-storage": "0.7.2-alpha.3", + "@nocobase/plugin-ui-schema-storage": "0.7.2-alpha.3", + "@nocobase/plugin-users": "0.7.2-alpha.3", + "@nocobase/plugin-workflow": "0.7.2-alpha.3", + "@nocobase/server": "0.7.2-alpha.3" }, "repository": { "type": "git",