diff --git a/CHANGELOG.md b/CHANGELOG.md index f694b25b..5dfcb206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# [1.2.0-beta.25](https://github.com/Tencent/tmagic-editor/compare/v1.2.0-beta.24...v1.2.0-beta.25) (2022-12-07) + + +### Bug Fixes + +* **cli:** 异步组件返回应该是个函数 ([138614a](https://github.com/Tencent/tmagic-editor/commit/138614a57adaf11b46b86f95c70df00975903c7b)) +* **cli:** 插件不支持ts的问题 ([ccb4e67](https://github.com/Tencent/tmagic-editor/commit/ccb4e675ab8e33cafb5374f9db4c602c380ccc31)) +* **playground:** 加载组件表单配置资源失败 ([ba20eb8](https://github.com/Tencent/tmagic-editor/commit/ba20eb8cf1aebc735d75c6fb2f3023f0c61b8360)) + + + # [1.2.0-beta.24](https://github.com/Tencent/tmagic-editor/compare/v1.2.0-beta.23...v1.2.0-beta.24) (2022-12-07) diff --git a/package.json b/package.json index b86c474f..327ab55d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "tmagic", "private": true, "packageManager": "pnpm@7.1.9", diff --git a/packages/cli/package.json b/packages/cli/package.json index 62132416..47828909 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/cli", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/core/package.json b/packages/core/package.json index ab592c2c..25730d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/core", "type": "module", "sideEffects": [ @@ -36,7 +36,7 @@ "vue" ], "dependencies": { - "@tmagic/schema": "1.2.0-beta.24", + "@tmagic/schema": "1.2.0-beta.25", "events": "^3.3.0", "lodash-es": "^4.17.21" }, diff --git a/packages/design/package.json b/packages/design/package.json index 59376c92..6e8ed487 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/design", "type": "module", "sideEffects": [ diff --git a/packages/editor/package.json b/packages/editor/package.json index 8bac7a13..a175f061 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/editor", "type": "module", "sideEffects": [ @@ -46,12 +46,12 @@ "dependencies": { "@babel/core": "^7.18.0", "@element-plus/icons-vue": "^2.0.9", - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/design": "1.2.0-beta.24", - "@tmagic/form": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/stage": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/design": "1.2.0-beta.25", + "@tmagic/form": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/stage": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "buffer": "^6.0.3", "color": "^3.1.3", "events": "^3.3.0", @@ -63,8 +63,8 @@ "vue": "^3.2.37" }, "peerDependencies": { - "@tmagic/design": "1.2.0-beta.24", - "@tmagic/form": "1.2.0-beta.24", + "@tmagic/design": "1.2.0-beta.25", + "@tmagic/form": "1.2.0-beta.25", "monaco-editor": "^0.34.0", "vue": "^3.2.37" }, diff --git a/packages/element-plus-adapter/package.json b/packages/element-plus-adapter/package.json index 5aa85395..e5eadebb 100644 --- a/packages/element-plus-adapter/package.json +++ b/packages/element-plus-adapter/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/element-plus-adapter", "type": "module", "sideEffects": [ diff --git a/packages/form/package.json b/packages/form/package.json index d3abb508..7776d1a3 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/form", "type": "module", "sideEffects": [ @@ -36,8 +36,8 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.9", - "@tmagic/design": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/design": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "lodash-es": "^4.17.21", "sortablejs": "^1.14.0", "vue": "^3.2.37" diff --git a/packages/schema/package.json b/packages/schema/package.json index c71af340..1a7d0c87 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/schema", "type": "module", "sideEffects": false, diff --git a/packages/stage/package.json b/packages/stage/package.json index 826d1ee1..02738ef1 100644 --- a/packages/stage/package.json +++ b/packages/stage/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/stage", "type": "module", "sideEffects": [ @@ -30,9 +30,9 @@ }, "dependencies": { "@scena/guides": "^0.17.0", - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "events": "^3.3.0", "keycon": "^1.1.2", "lodash-es": "^4.17.21", diff --git a/packages/table/package.json b/packages/table/package.json index dcd33b22..2daaa414 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/table", "type": "module", "sideEffects": [ @@ -33,14 +33,14 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "dependencies": { - "@tmagic/design": "1.2.0-beta.24", - "@tmagic/form": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/design": "1.2.0-beta.25", + "@tmagic/form": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "lodash-es": "^4.17.21", "vue": "^3.2.37" }, "peerDependencies": { - "@tmagic/form": "1.2.0-beta.24", + "@tmagic/form": "1.2.0-beta.25", "vue": "^3.2.37" }, "devDependencies": { diff --git a/packages/ui-react/package.json b/packages/ui-react/package.json index 785af06b..68a1540e 100644 --- a/packages/ui-react/package.json +++ b/packages/ui-react/package.json @@ -1,6 +1,6 @@ { "name": "@tmagic/ui-react", - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "type": "module", "main": "src/index.ts", "engines": { @@ -14,8 +14,8 @@ "react:build": "tsc && vite build" }, "dependencies": { - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", "qrcode": "^1.5.0", "react": "^17.0.0", "react-dom": "^17.0.0" diff --git a/packages/ui-vue2/package.json b/packages/ui-vue2/package.json index daa06596..ed6ee347 100644 --- a/packages/ui-vue2/package.json +++ b/packages/ui-vue2/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/ui-vue2", "type": "module", "main": "src/index.ts", @@ -11,9 +11,9 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "dependencies": { - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "qrcode": "^1.5.0", "vue": "^2.7.4" }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 17581877..292fea70 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/ui", "type": "module", "main": "src/index.ts", @@ -12,9 +12,9 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "dependencies": { - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "delegate": "^3.2.0", "qrcode": "^1.5.0", "tiny-emitter": "^2.1.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 771f40cb..59bc8a19 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "name": "@tmagic/utils", "type": "module", "main": "dist/tmagic-utils.umd.cjs", @@ -25,7 +25,7 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "dependencies": { - "@tmagic/schema": "1.2.0-beta.24", + "@tmagic/schema": "1.2.0-beta.25", "dayjs": "^1.11.4" }, "devDependencies": { diff --git a/playground/package.json b/playground/package.json index 8a0c944d..3d74d84f 100644 --- a/playground/package.json +++ b/playground/package.json @@ -1,6 +1,6 @@ { "name": "tmagic-playground", - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "type": "module", "private": true, "scripts": { @@ -13,13 +13,13 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.9", - "@tmagic/design": "1.2.0-beta.24", - "@tmagic/editor": "1.2.0-beta.24", - "@tmagic/element-plus-adapter": "1.2.0-beta.24", - "@tmagic/form": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/stage": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/design": "1.2.0-beta.25", + "@tmagic/editor": "1.2.0-beta.25", + "@tmagic/element-plus-adapter": "1.2.0-beta.25", + "@tmagic/form": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/stage": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "element-plus": "^2.2.19", "monaco-editor": "^0.34.0", "serialize-javascript": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab62802d..1ce7ce67 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -107,7 +107,7 @@ importers: packages/core: specifiers: - '@tmagic/schema': 1.2.0-beta.24 + '@tmagic/schema': 1.2.0-beta.25 '@types/events': ^3.0.0 '@types/lodash-es': ^4.17.4 '@types/node': ^15.12.4 @@ -157,12 +157,12 @@ importers: specifiers: '@babel/core': ^7.18.0 '@element-plus/icons-vue': ^2.0.9 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/design': 1.2.0-beta.24 - '@tmagic/form': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/stage': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/design': 1.2.0-beta.25 + '@tmagic/form': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/stage': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/events': ^3.0.0 '@types/lodash-es': ^4.17.4 '@types/node': ^15.12.4 @@ -239,8 +239,8 @@ importers: specifiers: '@babel/core': ^7.18.0 '@element-plus/icons-vue': ^2.0.9 - '@tmagic/design': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/design': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/lodash-es': ^4.17.4 '@types/node': ^15.12.4 '@types/sortablejs': ^1.10.7 @@ -293,9 +293,9 @@ importers: packages/stage: specifiers: '@scena/guides': ^0.17.0 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/events': ^3.0.0 '@types/lodash-es': ^4.17.4 '@types/node': ^15.12.4 @@ -329,9 +329,9 @@ importers: packages/table: specifiers: - '@tmagic/design': 1.2.0-beta.24 - '@tmagic/form': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/design': 1.2.0-beta.25 + '@tmagic/form': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/color': ^3.0.1 '@types/lodash-es': ^4.17.4 '@types/node': ^15.12.4 @@ -369,9 +369,9 @@ importers: packages/ui: specifiers: '@testing-library/vue': ^6.4.2 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/qrcode': ^1.4.2 '@vue/compiler-sfc': ^3.2.37 '@vue/test-utils': ^2.0.0 @@ -395,8 +395,8 @@ importers: packages/ui-react: specifiers: - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 '@types/react': ^17.0.37 '@types/react-dom': ^17.0.11 qrcode: ^1.5.0 @@ -416,9 +416,9 @@ importers: packages/ui-vue2: specifiers: - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 qrcode: ^1.5.0 vite: ^3.1.3 vue: ^2.7.4 @@ -435,7 +435,7 @@ importers: packages/utils: specifiers: - '@tmagic/schema': 1.2.0-beta.24 + '@tmagic/schema': 1.2.0-beta.25 '@types/node': ^15.12.4 dayjs: ^1.11.4 rimraf: ^3.0.2 @@ -453,13 +453,13 @@ importers: playground: specifiers: '@element-plus/icons-vue': ^2.0.9 - '@tmagic/design': 1.2.0-beta.24 - '@tmagic/editor': 1.2.0-beta.24 - '@tmagic/element-plus-adapter': 1.2.0-beta.24 - '@tmagic/form': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/stage': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/design': 1.2.0-beta.25 + '@tmagic/editor': 1.2.0-beta.25 + '@tmagic/element-plus-adapter': 1.2.0-beta.25 + '@tmagic/form': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/stage': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/node': ^15.12.4 '@types/serialize-javascript': ^5.0.1 '@vitejs/plugin-legacy': ^2.2.0 @@ -505,12 +505,12 @@ importers: runtime/react: specifiers: - '@tmagic/cli': 1.2.0-beta.24 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/stage': 1.2.0-beta.24 - '@tmagic/ui-react': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/cli': 1.2.0-beta.25 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/stage': 1.2.0-beta.25 + '@tmagic/ui-react': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/react': ^17.0.37 '@types/react-dom': ^17.0.11 '@vitejs/plugin-legacy': ^2.2.0 @@ -544,12 +544,12 @@ importers: runtime/vue2: specifiers: - '@tmagic/cli': 1.2.0-beta.24 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/stage': 1.2.0-beta.24 - '@tmagic/ui-vue2': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/cli': 1.2.0-beta.25 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/stage': 1.2.0-beta.25 + '@tmagic/ui-vue2': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/events': ^3.0.0 '@vitejs/plugin-legacy': ^2.2.0 '@vitejs/plugin-vue2': ^1.1.2 @@ -585,12 +585,12 @@ importers: runtime/vue3: specifiers: - '@tmagic/cli': 1.2.0-beta.24 - '@tmagic/core': 1.2.0-beta.24 - '@tmagic/schema': 1.2.0-beta.24 - '@tmagic/stage': 1.2.0-beta.24 - '@tmagic/ui': 1.2.0-beta.24 - '@tmagic/utils': 1.2.0-beta.24 + '@tmagic/cli': 1.2.0-beta.25 + '@tmagic/core': 1.2.0-beta.25 + '@tmagic/schema': 1.2.0-beta.25 + '@tmagic/stage': 1.2.0-beta.25 + '@tmagic/ui': 1.2.0-beta.25 + '@tmagic/utils': 1.2.0-beta.25 '@types/node': ^15.12.4 '@vitejs/plugin-legacy': ^2.2.0 '@vitejs/plugin-vue': ^3.1.0 diff --git a/runtime/react/package.json b/runtime/react/package.json index c204b667..3014ff5b 100644 --- a/runtime/react/package.json +++ b/runtime/react/package.json @@ -1,6 +1,6 @@ { "name": "runtime-react", - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "type": "module", "private": true, "scripts": { @@ -21,12 +21,12 @@ "build:event:admin": "vite build --config build.vite.config.ts --mode event:admin" }, "dependencies": { - "@tmagic/cli": "1.2.0-beta.24", - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/ui-react": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/stage": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/cli": "1.2.0-beta.25", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/ui-react": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/stage": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "axios": "^0.25.0", "terser": "^5.14.2", "react": "^17.0.2", diff --git a/runtime/vue2/package.json b/runtime/vue2/package.json index aaf9111f..c87deebc 100644 --- a/runtime/vue2/package.json +++ b/runtime/vue2/package.json @@ -1,6 +1,6 @@ { "name": "runtime-vue2", - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "type": "module", "private": true, "scripts": { @@ -21,12 +21,12 @@ "build:event:admin": "vite build --config build.vite.config.ts --mode event:admin" }, "dependencies": { - "@tmagic/cli": "1.2.0-beta.24", - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/ui-vue2": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/stage": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/cli": "1.2.0-beta.25", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/ui-vue2": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/stage": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "axios": "^0.25.0", "terser": "^5.14.2", "vue": "^2.7.4" diff --git a/runtime/vue3/package.json b/runtime/vue3/package.json index daa16a70..6acaa690 100644 --- a/runtime/vue3/package.json +++ b/runtime/vue3/package.json @@ -1,6 +1,6 @@ { "name": "runtime-vue3", - "version": "1.2.0-beta.24", + "version": "1.2.0-beta.25", "type": "module", "private": true, "scripts": { @@ -21,12 +21,12 @@ "build:event:admin": "vite build --config build.vite.config.ts --mode event:admin" }, "dependencies": { - "@tmagic/cli": "1.2.0-beta.24", - "@tmagic/core": "1.2.0-beta.24", - "@tmagic/ui": "1.2.0-beta.24", - "@tmagic/schema": "1.2.0-beta.24", - "@tmagic/stage": "1.2.0-beta.24", - "@tmagic/utils": "1.2.0-beta.24", + "@tmagic/cli": "1.2.0-beta.25", + "@tmagic/core": "1.2.0-beta.25", + "@tmagic/ui": "1.2.0-beta.25", + "@tmagic/schema": "1.2.0-beta.25", + "@tmagic/stage": "1.2.0-beta.25", + "@tmagic/utils": "1.2.0-beta.25", "@vitejs/plugin-legacy": "^2.2.0", "@vitejs/plugin-vue-jsx": "^1.3.10", "axios": "^0.25.0",