From dac110931b0ff3d913b61e2c203b723e5718ea4c Mon Sep 17 00:00:00 2001 From: chenos Date: Tue, 25 Jun 2024 12:44:51 +0800 Subject: [PATCH] chore: update dependencies (#4747) * chore: update dependencies * fix: @formily/antd-v5 --- packages/core/client/package.json | 2 +- packages/core/server/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-workflow-mailer/package.json | 4 +- .../plugin-workflow-request/package.json | 4 +- storage/.gitignore | 3 +- storage/verdaccio/config.yaml | 213 ++++++++++++++++++ storage/verdaccio/htpasswd | 1 + yarn.lock | 48 ---- 10 files changed, 222 insertions(+), 59 deletions(-) create mode 100644 storage/verdaccio/config.yaml create mode 100644 storage/verdaccio/htpasswd diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 1441560ee1..26dcb3eeda 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -16,7 +16,7 @@ "@dnd-kit/modifiers": "^6.0.0", "@dnd-kit/sortable": "^6.0.0", "@emotion/css": "^11.7.1", - "@formily/antd-v5": "^1.1.9", + "@formily/antd-v5": "1.1.9", "@formily/core": "^2.2.27", "@formily/grid": "^2.2.27", "@formily/json-schema": "^2.2.27", diff --git a/packages/core/server/package.json b/packages/core/server/package.json index 044d3da0fd..caec764b37 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -5,7 +5,7 @@ "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@formily/json-schema": "2.2.27", + "@formily/json-schema": "2.x", "@hapi/topo": "^6.0.0", "@koa/cors": "^3.1.0", "@koa/multer": "^3.0.2", diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json index b323d97378..22df6f959c 100644 --- a/packages/plugins/@nocobase/plugin-gantt/package.json +++ b/packages/plugins/@nocobase/plugin-gantt/package.json @@ -9,7 +9,7 @@ "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/block-gantt", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-gantt", - "dependencies": { + "devDependencies": { "antd-style": "3.4.5" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json index ca807122db..7549ae7aa9 100644 --- a/packages/plugins/@nocobase/plugin-kanban/package.json +++ b/packages/plugins/@nocobase/plugin-kanban/package.json @@ -14,7 +14,7 @@ "@nocobase/server": "1.x", "@nocobase/test": "1.x" }, - "dependencies": { + "devDependencies": { "react-intersection-observer": "^9.8.1" }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1", diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json index 8da1f1e15d..3cd8d685b4 100644 --- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json @@ -9,10 +9,8 @@ "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-smtp-mailer", - "dependencies": { - "nodemailer": "6.9.13" - }, "devDependencies": { + "nodemailer": "6.9.13", "antd": "5.x", "react": "18.x" }, diff --git a/packages/plugins/@nocobase/plugin-workflow-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 4947f34989..aed3ed7629 100644 --- a/packages/plugins/@nocobase/plugin-workflow-request/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json @@ -9,11 +9,9 @@ "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-request", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-request", - "dependencies": { - "axios": "^0.26.1" - }, "devDependencies": { "antd": "5.x", + "axios": "^0.26.1", "react": "18.x", "react-i18next": "^11.15.1" }, diff --git a/storage/.gitignore b/storage/.gitignore index 1beec137cd..5206e47082 100644 --- a/storage/.gitignore +++ b/storage/.gitignore @@ -3,4 +3,5 @@ tmp app.watch.ts /e2e nocobase.conf -app-upgrading \ No newline at end of file +app-upgrading +/verdaccio/storage \ No newline at end of file diff --git a/storage/verdaccio/config.yaml b/storage/verdaccio/config.yaml new file mode 100644 index 0000000000..9ea782f2f8 --- /dev/null +++ b/storage/verdaccio/config.yaml @@ -0,0 +1,213 @@ +# +# This is the default configuration file. It allows all users to do anything, +# please read carefully the documentation and best practices to +# improve security. +# +# Look here for more config file examples: +# https://github.com/verdaccio/verdaccio/tree/5.x/conf +# +# Read about the best practices +# https://verdaccio.org/docs/best + +# path to a directory with all packages +storage: ./storage +# path to a directory with plugins to include +plugins: ./plugins + +# https://verdaccio.org/docs/webui +web: + title: Verdaccio + # comment out to disable gravatar support + # gravatar: false + # by default packages are ordercer ascendant (asc|desc) + # sort_packages: asc + # convert your UI to the dark side + # darkMode: true + # html_cache: true + # by default all features are displayed + # login: true + # showInfo: true + # showSettings: true + # In combination with darkMode you can force specific theme + # showThemeSwitch: true + # showFooter: true + # showSearch: true + # showRaw: true + # showDownloadTarball: true + # HTML tags injected after manifest + # scriptsBodyAfter: + # - '' + # HTML tags injected before ends + # metaScripts: + # - '' + # - '' + # - '' + # HTML tags injected first child at + # bodyBefore: + # - '
html before webpack scripts
' + # Public path for template manifest scripts (only manifest) + # publicPath: http://somedomain.org/ + +# https://verdaccio.org/docs/configuration#authentication +auth: + htpasswd: + file: ./htpasswd + # Maximum amount of users allowed to register, defaults to "+inf". + # You can set this to -1 to disable registration. + # max_users: 1000 + # Hash algorithm, possible options are: "bcrypt", "md5", "sha1", "crypt". + # algorithm: bcrypt # by default is crypt, but is recommended use bcrypt for new installations + # Rounds number for "bcrypt", will be ignored for other algorithms. + # rounds: 10 + +# https://verdaccio.org/docs/configuration#uplinks +# a list of other known repositories we can talk to +uplinks: + npmjs: + url: https://registry.npmjs.org/ + +# Learn how to protect your packages +# https://verdaccio.org/docs/protect-your-dependencies/ +# https://verdaccio.org/docs/configuration#packages +packages: + '@nocobase/*': + # scoped packages + access: $all + publish: $all + unpublish: $all + + 'create-nocobase-app': + # scoped packages + access: $all + publish: $all + unpublish: $all + + '@*/*': + # scoped packages + access: $all + publish: $authenticated + unpublish: $authenticated + proxy: npmjs + + '**': + # allow all users (including non-authenticated users) to read and + # publish all packages + # + # you can specify usernames/groupnames (depending on your auth plugin) + # and three keywords: "$all", "$anonymous", "$authenticated" + access: $all + + # allow all known users to publish/publish packages + # (anyone can register by default, remember?) + publish: $authenticated + unpublish: $authenticated + + # if package is not available locally, proxy requests to 'npmjs' registry + proxy: npmjs + +# To improve your security configuration and avoid dependency confusion +# consider removing the proxy property for private packages +# https://verdaccio.org/docs/best#remove-proxy-to-increase-security-at-private-packages + +# https://verdaccio.org/docs/configuration#server +# You can specify HTTP/1.1 server keep alive timeout in seconds for incoming connections. +# A value of 0 makes the http server behave similarly to Node.js versions prior to 8.0.0, which did not have a keep-alive timeout. +# WORKAROUND: Through given configuration you can workaround following issue https://github.com/verdaccio/verdaccio/issues/301. Set to 0 in case 60 is not enough. +server: + keepAliveTimeout: 60 + # Allow `req.ip` to resolve properly when Verdaccio is behind a proxy or load-balancer + # See: https://expressjs.com/en/guide/behind-proxies.html + # trustProxy: '127.0.0.1' + +# https://verdaccio.org/docs/configuration#offline-publish +# publish: +# allow_offline: false + +# https://verdaccio.org/docs/configuration#url-prefix +# url_prefix: /verdaccio/ +# VERDACCIO_PUBLIC_URL='https://somedomain.org'; +# url_prefix: '/my_prefix' +# // url -> https://somedomain.org/my_prefix/ +# VERDACCIO_PUBLIC_URL='https://somedomain.org'; +# url_prefix: '/' +# // url -> https://somedomain.org/ +# VERDACCIO_PUBLIC_URL='https://somedomain.org/first_prefix'; +# url_prefix: '/second_prefix' +# // url -> https://somedomain.org/second_prefix/' + +# https://verdaccio.org/docs/configuration#security +# security: +# api: +# legacy: true +# # recomended set to true for older installations +# migrateToSecureLegacySignature: true +# jwt: +# sign: +# expiresIn: 29d +# verify: +# someProp: [value] +# web: +# sign: +# expiresIn: 1h # 1 hour by default +# verify: +# someProp: [value] + +# https://verdaccio.org/docs/configuration#user-rate-limit +# userRateLimit: +# windowMs: 50000 +# max: 1000 + +# https://verdaccio.org/docs/configuration#max-body-size +# max_body_size: 10mb + +# https://verdaccio.org/docs/configuration#listen-port +# listen: +# - localhost:4873 # default value +# - http://localhost:4873 # same thing +# - 0.0.0.0:4873 # listen on all addresses (INADDR_ANY) +# - https://example.org:4873 # if you want to use https +# - "[::1]:4873" # ipv6 +# - unix:/tmp/verdaccio.sock # unix socket + +# The HTTPS configuration is useful if you do not consider use a HTTP Proxy +# https://verdaccio.org/docs/configuration#https +# https: +# key: ./path/verdaccio-key.pem +# cert: ./path/verdaccio-cert.pem +# ca: ./path/verdaccio-csr.pem + +# https://verdaccio.org/docs/configuration#proxy +# http_proxy: http://something.local/ +# https_proxy: https://something.local/ + +# https://verdaccio.org/docs/configuration#notifications +# notify: +# method: POST +# headers: [{ "Content-Type": "application/json" }] +# endpoint: https://usagge.hipchat.com/v2/room/3729485/notification?auth_token=mySecretToken +# content: '{"color":"green","message":"New package published: * {{ name }}*","notify":true,"message_format":"text"}' + +middlewares: + audit: + enabled: true + +# https://verdaccio.org/docs/logger +# log settings +log: { type: stdout, format: pretty, level: http } +#experiments: +# # support for npm token command +# token: false +# # disable writing body size to logs, read more on ticket 1912 +# bytesin_off: false +# # enable tarball URL redirect for hosting tarball with a different server, the tarball_url_redirect can be a template string +# tarball_url_redirect: 'https://mycdn.com/verdaccio/${packageName}/${filename}' +# # the tarball_url_redirect can be a function, takes packageName and filename and returns the url, when working with a js configuration file +# tarball_url_redirect(packageName, filename) { +# const signedUrl = // generate a signed url +# return signedUrl; +# } + +# translate your registry, api i18n not available yet +# i18n: +# list of the available translations https://github.com/verdaccio/verdaccio/blob/master/packages/plugins/ui-theme/src/i18n/ABOUT_TRANSLATIONS.md +# web: en-US diff --git a/storage/verdaccio/htpasswd b/storage/verdaccio/htpasswd new file mode 100644 index 0000000000..45be3e2df7 --- /dev/null +++ b/storage/verdaccio/htpasswd @@ -0,0 +1 @@ +nocobase:u/b9wA2ORbux2:autocreated 2024-06-25T03:58:23.923Z diff --git a/yarn.lock b/yarn.lock index c0014115e8..77ea0ac795 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3507,15 +3507,6 @@ classnames "^2.2.6" react-sticky-box "^1.0.2" -"@formily/core@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/core/-/core-2.2.27.tgz#9ccb51650a713f27997e6823a5a980c9e013f461" - integrity sha512-f8e4f/WlimOA7zN1ARmiRKMlIpsIH00XxT7NWAE7EV3DO2B6sq6gSq9GDc5JLwHqhiyJBAIPzUdfmIpRLwPxyQ== - dependencies: - "@formily/reactive" "2.2.27" - "@formily/shared" "2.2.27" - "@formily/validator" "2.2.27" - "@formily/core@2.3.0", "@formily/core@2.x", "@formily/core@^2.2.0", "@formily/core@^2.2.27": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/core/-/core-2.3.0.tgz#2d9c09ec7579dc11cfd4d8f2f20fb0a56504e180" @@ -3533,15 +3524,6 @@ "@formily/reactive" "2.3.0" "@juggle/resize-observer" "^3.3.1" -"@formily/json-schema@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/json-schema/-/json-schema-2.2.27.tgz#553ae190bf847944f3c3567516a263bdea6c3dfd" - integrity sha512-YqtpPp9bmXO28iw10ZLT5KCAqipr2SwPrzfskUJ/Oa8O3xZi64+9TMVPylX73cBe49lVaOgFiQPNAljLudeveg== - dependencies: - "@formily/core" "2.2.27" - "@formily/reactive" "2.2.27" - "@formily/shared" "2.2.27" - "@formily/json-schema@2.3.0", "@formily/json-schema@2.x", "@formily/json-schema@^2.2.0", "@formily/json-schema@^2.2.27": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/json-schema/-/json-schema-2.3.0.tgz#95bd78533540093da526628520d21b2a470d5180" @@ -3551,11 +3533,6 @@ "@formily/reactive" "2.3.0" "@formily/shared" "2.3.0" -"@formily/path@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/path/-/path-2.2.27.tgz#384f207533a2bdc84d700d4b7ef46ca6d664db15" - integrity sha512-svpYARx1N72Rzg4l9D10SpDljUjCqkFD3ogbnsLNUxO8Rh2oSmn0dw63VDYOw43RX61qHmD3VYAnGxdCv5HJ8w== - "@formily/path@2.3.0": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/path/-/path-2.3.0.tgz#1cb71389ad39fd30e323b7f35f96cb35f12e304f" @@ -3587,29 +3564,11 @@ "@formily/reactive" "2.3.0" hoist-non-react-statics "^3.3.2" -"@formily/reactive@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/reactive/-/reactive-2.2.27.tgz#b67e6a0573910f0e57729b235a7bd1fe9b3e20ad" - integrity sha512-ksdA4uIw3WMo0FmHcGsyqZgPwhujVgtXqxiWPSV+Tc2eEoJrInZhr15Q0IeTQ6glMh8izNsb19YK+PphBHwXGg== - "@formily/reactive@2.3.0", "@formily/reactive@2.x", "@formily/reactive@^2.2.0", "@formily/reactive@^2.2.27": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/reactive/-/reactive-2.3.0.tgz#95582dfcf97c42410454ef7df0c247514bd4446e" integrity sha512-8QYApPL/GvATIP/9K3UeICJNuCaLq99NLlNLEuBsE7cIk2hFiFhWP7vnLtWBdorqeQZNYZ6lzSuau2Ndogu+Dw== -"@formily/shared@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/shared/-/shared-2.2.27.tgz#cc7dd95a4abc15d6d4d541f863052afedb1c72ca" - integrity sha512-3gMvcx0318VLkIgwdqYhHVE9uU6K5D0MKr75esDRL908jZ1wWy+/Qt/UNmBfdDdCtWBP6F/E/VGSBUBOue7Bqw== - dependencies: - "@formily/path" "2.2.27" - camel-case "^4.1.1" - lower-case "^2.0.1" - no-case "^3.0.4" - param-case "^3.0.4" - pascal-case "^3.1.1" - upper-case "^2.0.1" - "@formily/shared@2.3.0", "@formily/shared@2.x", "@formily/shared@^2.2.0", "@formily/shared@^2.2.27": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/shared/-/shared-2.3.0.tgz#4423c3dfad0d1017cab1e3c6c8fd34004e0a9664" @@ -3623,13 +3582,6 @@ pascal-case "^3.1.1" upper-case "^2.0.1" -"@formily/validator@2.2.27": - version "2.2.27" - resolved "https://registry.npmmirror.com/@formily/validator/-/validator-2.2.27.tgz#e970108b5f39ad2a7a265eb782d3973e36a6cd3a" - integrity sha512-RSkNQY/IGtVKTYxqz6/64UO5RPAWBLOtKb2oRTLlWwEAaoMFkkZkdKERzv1z05oMCp53hGt6f9psgfLXaNUmMQ== - dependencies: - "@formily/shared" "2.2.27" - "@formily/validator@2.3.0", "@formily/validator@^2.2.27": version "2.3.0" resolved "https://registry.npmmirror.com/@formily/validator/-/validator-2.3.0.tgz#a04b94f7a18ac1a490c1e273eb0c2acd6662d6c2"