diff --git a/package.json b/package.json index 7b7c9562..990df712 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dev": "node scripts/build.js --watch", "build": "node scripts/build.js", "ver": "lerna version --conventional-prerelease --no-changelog --no-commit-hooks --no-private", - "release": "node scripts/build.js && lerna publish from-git", + "release": "node scripts/build.js && lerna publish from-git --dist-tag legacy", "docs:dev": "vuepress dev docs --clean-cache", "docs:build": "vuepress build docs --clean-cache", "docs:build-pages": "BASE=/fes.js/ vuepress build docs --clean-cache", diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index d526bce9..67b66200 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -51,7 +51,7 @@ "@fesjs/plugin-layout": "^4.0.0", "@fesjs/plugin-model": "^2.0.0", "@fesjs/plugin-enums": "^2.0.0", - "@fesjs/fes-design": "^0.5.0", + "@fesjs/fes-design": ">=0.5.0 <2.0.0", "vue": "^3.2.37", "core-js": "^3.27.0" }, diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index 6ead1f35..896fc88f 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "@fesjs/fes": "^2.0.0", - "@fesjs/fes-design": "^0.5.0", + "@fesjs/fes-design": ">=0.5.0 <2.0.0", "vue": "^3.2.37" } } diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index 116cbaa2..f50a145a 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -32,7 +32,7 @@ }, "peerDependencies": { "@fesjs/fes": "^2.0.0", - "@fesjs/fes-design": "^0.5.0", + "@fesjs/fes-design": ">=0.5.0 <2.0.0", "vue": "^3.2.37" } } diff --git a/packages/fes-plugin-qiankun/examples/app1/package.json b/packages/fes-plugin-qiankun/examples/app1/package.json index f5104b70..9659fa1b 100644 --- a/packages/fes-plugin-qiankun/examples/app1/package.json +++ b/packages/fes-plugin-qiankun/examples/app1/package.json @@ -48,7 +48,7 @@ "dependencies": { "@fesjs/fes": "^2.0.0", "vue": "^3.2.37", - "@fesjs/fes-design": "^0.5.0" + "@fesjs/fes-design": ">=0.5.0 <2.0.0" }, "private": true } \ No newline at end of file diff --git a/packages/fes-plugin-qiankun/examples/main/package.json b/packages/fes-plugin-qiankun/examples/main/package.json index 5972ff22..86c2ddfb 100644 --- a/packages/fes-plugin-qiankun/examples/main/package.json +++ b/packages/fes-plugin-qiankun/examples/main/package.json @@ -48,7 +48,7 @@ "dependencies": { "@fesjs/fes": "^2.0.0", "vue": "^3.2.37", - "@fesjs/fes-design": "^0.5.0" + "@fesjs/fes-design": ">=0.5.0 <2.0.0" }, "private": true } \ No newline at end of file diff --git a/packages/fes-plugin-qiankun/package.json b/packages/fes-plugin-qiankun/package.json index 8b507497..e175a2e2 100644 --- a/packages/fes-plugin-qiankun/package.json +++ b/packages/fes-plugin-qiankun/package.json @@ -39,7 +39,7 @@ }, "peerDependencies": { "@fesjs/fes": "^2.0.0", - "@fesjs/fes-design": "^0.5.0", + "@fesjs/fes-design": ">=0.5.0 <2.0.0", "vue": "^3.2.37" } } diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index 174eec5c..babd77bf 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -61,7 +61,7 @@ "@fesjs/plugin-windicss": "^2.0.0", "@fesjs/plugin-pinia": "^2.0.0", "@fesjs/plugin-watermark": "^2.0.0", - "@fesjs/fes-design": "^0.5.0", + "@fesjs/fes-design": "^0.8.0", "vue": "^3.2.37", "vuex": "^4.0.0", "pinia": "^2.0.11" diff --git a/yarn.lock b/yarn.lock index 55be15a1..5da42182 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1441,36 +1441,42 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fesjs/fes-design@^0.5.0": - version "0.5.22" - resolved "https://registry.npmmirror.com/@fesjs/fes-design/-/fes-design-0.5.22.tgz" - integrity sha512-5XpZizpWt0AMWN++uZXoueR2SkLg18vYduduLDYDHWxdk5+Xl9AeYWG5WZJyPAHCAalU8A2ZBR0D/hm+RpP/jQ== +"@fesjs/fes-design@^0.8.0": + version "0.8.7" + resolved "https://registry.npmmirror.com/@fesjs/fes-design/-/fes-design-0.8.7.tgz#232fb830a61fd681d5723a13f6eb77fbb829febe" + integrity sha512-j9oDbaiywNLE6TrH0F/c1+BFt8nIVSBvfMf9JN/GBaoa5DwOYzWHOP+YlRZDw26YgnhHMUj5zXAZ1NdcHPdlaQ== dependencies: "@babel/runtime" "^7.16.3" - "@floating-ui/dom" "^0.4.2" + "@floating-ui/dom" "^1.2.9" "@juggle/resize-observer" "^3.3.1" "@types/lodash-es" "^4.17.5" - "@types/normalize-wheel" "^1.0.0" - "@vue/shared" "^3.2.19" - "@vueuse/core" "^6.7.5" - async-validator "^4.0.1" + "@vue/shared" "^3.2.24" + "@vueuse/core" "^9.6.0" + async-validator "^4.0.7" csstype "^3.0.10" date-fns "^2.28.0" lodash-es "^4.17.21" - normalize-wheel "^1.0.1" stickybits "^3.7.9" -"@floating-ui/core@^0.6.2": - version "0.6.2" - resolved "https://registry.npmmirror.com/@floating-ui/core/-/core-0.6.2.tgz" - integrity sha512-jktYRmZwmau63adUG3GKOAVCofBXkk55S/zQ94XOorAHhwqFIOFAy1rSp2N0Wp6/tGbe9V3u/ExlGZypyY17rg== - -"@floating-ui/dom@^0.4.2": - version "0.4.5" - resolved "https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.4.5.tgz" - integrity sha512-b+prvQgJt8pieaKYMSJBXHxX/DYwdLsAWxKYqnO5dO2V4oo/TYBZJAUQCVNjTWWsrs6o4VDrNcP9+E70HAhJdw== +"@floating-ui/core@^1.4.2": + version "1.5.0" + resolved "https://registry.npmmirror.com/@floating-ui/core/-/core-1.5.0.tgz#5c05c60d5ae2d05101c3021c1a2a350ddc027f8c" + integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg== dependencies: - "@floating-ui/core" "^0.6.2" + "@floating-ui/utils" "^0.1.3" + +"@floating-ui/dom@^1.2.9": + version "1.5.3" + resolved "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa" + integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA== + dependencies: + "@floating-ui/core" "^1.4.2" + "@floating-ui/utils" "^0.1.3" + +"@floating-ui/utils@^0.1.3": + version "0.1.4" + resolved "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d" + integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA== "@gar/promisify@^1.0.1": version "1.1.3" @@ -3028,11 +3034,6 @@ resolved "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@types/normalize-wheel@^1.0.0": - version "1.0.1" - resolved "https://registry.npmmirror.com/@types/normalize-wheel/-/normalize-wheel-1.0.1.tgz" - integrity sha512-3YBVyWfiwIGDcQY+2ZeT3LxyApYnV3PrysjIKeNkQtT9Q9eq2mcPPcqSCYR4v/FhYJ9xtZNhXMKNxCn6ukLsXQ== - "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz" @@ -3112,6 +3113,11 @@ resolved "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.3.tgz" integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== +"@types/web-bluetooth@^0.0.16": + version "0.0.16" + resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8" + integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== + "@types/webpack-env@^1.16.3": version "1.18.0" resolved "https://registry.npmmirror.com/@types/webpack-env/-/webpack-env-1.18.0.tgz" @@ -3244,7 +3250,7 @@ "@vue/compiler-ssr" "3.2.47" "@vue/shared" "3.2.47" -"@vue/shared@3.2.47", "@vue/shared@^3.2.19", "@vue/shared@^3.2.24": +"@vue/shared@3.2.47", "@vue/shared@^3.2.24": version "3.2.47" resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz" integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== @@ -3534,14 +3540,6 @@ ora "^5.4.1" upath "^2.0.1" -"@vueuse/core@^6.7.5": - version "6.9.2" - resolved "https://registry.npmmirror.com/@vueuse/core/-/core-6.9.2.tgz" - integrity sha512-FRwl4ccSFuHZBHLGgS9TMv/+Dd6XFaL4o9nph2qtgQIV+z29RBFokw08XjHfykiENRzB01MjYHJ7iRUnsIFQXg== - dependencies: - "@vueuse/shared" "6.9.2" - vue-demi "*" - "@vueuse/core@^7.1.2": version "7.7.1" resolved "https://registry.npmmirror.com/@vueuse/core/-/core-7.7.1.tgz" @@ -3550,13 +3548,21 @@ "@vueuse/shared" "7.7.1" vue-demi "*" -"@vueuse/shared@6.9.2": - version "6.9.2" - resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-6.9.2.tgz" - integrity sha512-lAiMh6XROs0kSKVd0Yb/6GKoQMxC1fYrFDi6opvQWISPtcqRNluRrQxLUZ3WTI78ovtoKRLktjhkFAtydcfFDg== +"@vueuse/core@^9.6.0": + version "9.13.0" + resolved "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4" + integrity sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw== dependencies: + "@types/web-bluetooth" "^0.0.16" + "@vueuse/metadata" "9.13.0" + "@vueuse/shared" "9.13.0" vue-demi "*" +"@vueuse/metadata@9.13.0": + version "9.13.0" + resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz#bc25a6cdad1b1a93c36ce30191124da6520539ff" + integrity sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ== + "@vueuse/shared@7.7.1": version "7.7.1" resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-7.7.1.tgz" @@ -3564,6 +3570,13 @@ dependencies: vue-demi "*" +"@vueuse/shared@9.13.0": + version "9.13.0" + resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz#089ff4cc4e2e7a4015e57a8f32e4b39d096353b9" + integrity sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw== + dependencies: + vue-demi "*" + "@webank/eslint-config-webank@0.3.1": version "0.3.1" resolved "https://registry.npmmirror.com/@webank/eslint-config-webank/-/eslint-config-webank-0.3.1.tgz" @@ -4161,9 +4174,9 @@ async-limiter@~1.0.0: resolved "https://registry.npmmirror.com/async-limiter/-/async-limiter-1.0.1.tgz" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async-validator@^4.0.1: +async-validator@^4.0.7: version "4.2.5" - resolved "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz" + resolved "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339" integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg== async@^2.6.4: @@ -10247,11 +10260,6 @@ normalize-url@^6.0.1, normalize-url@^6.1.0: resolved "https://registry.npmmirror.com/normalize-url/-/normalize-url-6.1.0.tgz" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -normalize-wheel@^1.0.1: - version "1.0.1" - resolved "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz" - integrity sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA== - npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.npmmirror.com/npm-bundled/-/npm-bundled-1.1.2.tgz"