diff --git a/designer-demo/package.json b/designer-demo/package.json index c96fc7bdcc..508f66cfed 100644 --- a/designer-demo/package.json +++ b/designer-demo/package.json @@ -1,7 +1,7 @@ { "name": "designer-demo", "private": true, - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "type": "module", "scripts": { "dev": "cross-env VITE_THEME=light vite", diff --git a/mockServer/package.json b/mockServer/package.json index bc9bcf3a29..72f0786b6b 100644 --- a/mockServer/package.json +++ b/mockServer/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-mock", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/package.json b/package.json index 69f335f60b..8ddedd70e5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "pub:prerelease": "pnpm run build:plugin && pnpm run build:alpha && pnpm lerna version prerelease --preid beta --no-push --yes && lerna publish from-package --pre-dist-tag beta --yes", "setup": "node ./scripts/setup.js", "splitMaterials": "node ./scripts/splitMaterials.mjs", - "buildMaterials": "node ./scripts/buildMaterials.mjs" + "buildMaterials": "node ./scripts/buildMaterials.mjs", + "updateTemplate": "node ./scripts/updateTemplate.mjs" }, "devDependencies": { "@babel/eslint-parser": "^7.21.3", diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json index 69b0b80c90..5c65c1b6c3 100644 --- a/packages/block-compiler/package.json +++ b/packages/block-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-block-compiler", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json index 93a8168ac0..e9d5ca78e9 100644 --- a/packages/blockToWebComponentTemplate/package.json +++ b/packages/blockToWebComponentTemplate/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-block-build", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "translate block to webcomponent template", "main": "./dist/web-components.es.js", "type": "module", diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json index 6e38c3c5bc..9b4a00e9c6 100644 --- a/packages/build/vite-config/package.json +++ b/packages/build/vite-config/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-config", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "type": "module", "main": "./index.js", diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json index 8ac0a3ca21..01e6712115 100644 --- a/packages/build/vite-plugin-meta-comments/package.json +++ b/packages/build/vite-plugin-meta-comments/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-plugin-meta-comments", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "type": "module", "main": "dist/index.cjs", diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json index c1c09f3d48..2fd82dc434 100644 --- a/packages/builtinComponent/package.json +++ b/packages/builtinComponent/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-builtin-component", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "main": "dist/index.mjs", "module": "dist/index.mjs", diff --git a/packages/canvas/package.json b/packages/canvas/package.json index 12d1e69553..dbf036d7bb 100644 --- a/packages/canvas/package.json +++ b/packages/canvas/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-canvas", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/common/package.json b/packages/common/package.json index 643df53700..a7cde96459 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-common", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/configurator/package.json b/packages/configurator/package.json index ffaebc1d26..1c79e4ef94 100644 --- a/packages/configurator/package.json +++ b/packages/configurator/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-configurator", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "main": "dist/index.js", "module": "dist/index.js", diff --git a/packages/design-core/package.json b/packages/design-core/package.json index e363793ab0..538396ee14 100644 --- a/packages/design-core/package.json +++ b/packages/design-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "type": "module", "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.", "homepage": "https://opentiny.design/tiny-engine", diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json index 6dc312cda0..fa176879c2 100644 --- a/packages/engine-cli/package.json +++ b/packages/engine-cli/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-cli", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "main": "dist/index.js", "scripts": { diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json index 42ac898df9..4697e20e56 100644 --- a/packages/engine-cli/template/designer/package.json +++ b/packages/engine-cli/template/designer/package.json @@ -1,20 +1,20 @@ { - "name": "designer-demo-template", + "name": "designer-demo", "private": true, "version": "0.0.0", "type": "module", "scripts": { "dev": "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'", - "serve:frontend": "cross-env VITE_THEME=light vite", - "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js", "build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha", - "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod" + "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod", + "serve:frontend": "cross-env VITE_THEME=light vite", + "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js" }, "dependencies": { - "@opentiny/tiny-engine": "^2.1.0", - "@opentiny/tiny-engine-theme-dark": "^2.1.0", - "@opentiny/tiny-engine-theme-light": "^2.1.0", - "@opentiny/tiny-engine-utils": "^2.1.0", + "@opentiny/tiny-engine": "2.2.0-rc.1", + "@opentiny/tiny-engine-theme-dark": "2.2.0-rc.1", + "@opentiny/tiny-engine-theme-light": "2.2.0-rc.1", + "@opentiny/tiny-engine-utils": "2.2.0-rc.1", "@opentiny/vue": "~3.14.0", "@opentiny/vue-design-smb": "~3.14.0", "@opentiny/vue-icon": "~3.14.0", @@ -25,11 +25,11 @@ "vue": "^3.4.21" }, "devDependencies": { - "@opentiny/tiny-engine-mock": "^2.1.0", - "@opentiny/tiny-engine-vite-config": "^2.1.0", + "@opentiny/tiny-engine-mock": "2.2.0-rc.1", + "@opentiny/tiny-engine-vite-config": "2.2.0-rc.1", "@vitejs/plugin-vue": "^5.1.2", "cross-env": "^7.0.3", - "concurrently": "^8.2.0", - "vite": "^5.4.2" + "vite": "^5.4.2", + "concurrently": "^8.2.0" } } diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js index 41a914705e..2e2fcacb1a 100644 --- a/packages/engine-cli/template/designer/registry.js +++ b/packages/engine-cli/template/designer/registry.js @@ -101,7 +101,20 @@ export default { Lang, ViewSetting ], - plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot], + plugins: [ + Materials, + Tree, + Page, + [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }], + Datasource, + Bridge, + I18n, + Script, + State, + Schema, + Help, + Robot + ], dsls: [{ id: 'engine.dsls.dslvue' }], settings: [Props, Styles, Events], canvas: Canvas diff --git a/packages/engine-cli/template/designer/vite.config.js b/packages/engine-cli/template/designer/vite.config.js index 9dd2864eb6..f90c69aff1 100644 --- a/packages/engine-cli/template/designer/vite.config.js +++ b/packages/engine-cli/template/designer/vite.config.js @@ -7,6 +7,7 @@ export default defineConfig((configEnv) => { viteConfigEnv: configEnv, root: __dirname, iconDirs: [path.resolve(__dirname, './node_modules/@opentiny/tiny-engine/assets/')], + useSourceAlias: false, envDir: './env' }) diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 7d1578d00b..4706549391 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-i18n-host", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/layout/package.json b/packages/layout/package.json index dc105123db..adc911cff2 100644 --- a/packages/layout/package.json +++ b/packages/layout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-layout", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "scripts": { "build": "vite build" }, diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json index 796d357827..b1f7dabbca 100644 --- a/packages/plugins/block/package.json +++ b/packages/plugins/block/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-block", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json index 134597efeb..653fc5cb94 100644 --- a/packages/plugins/bridge/package.json +++ b/packages/plugins/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-bridge", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json index e963df5d82..3c3f42d86a 100644 --- a/packages/plugins/datasource/package.json +++ b/packages/plugins/datasource/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-datasource", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json index 7ec65e35fa..b8d51982d3 100644 --- a/packages/plugins/help/package.json +++ b/packages/plugins/help/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-help", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index eb418fafd2..b8c3cc9642 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-i18n", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json index a1d080c6dc..671ba21ad3 100644 --- a/packages/plugins/materials/package.json +++ b/packages/plugins/materials/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-materials", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json index a818907698..2f1adf6730 100644 --- a/packages/plugins/page/package.json +++ b/packages/plugins/page/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-page", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json index 0e6cf946a1..93cac2dcc6 100644 --- a/packages/plugins/robot/package.json +++ b/packages/plugins/robot/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-robot", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json index 1a8d87ee37..3c8655c68d 100644 --- a/packages/plugins/schema/package.json +++ b/packages/plugins/schema/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-schema", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json index c63e848501..8a6706d4ce 100644 --- a/packages/plugins/script/package.json +++ b/packages/plugins/script/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-script", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json index b3e4c71024..e2183f1f1f 100644 --- a/packages/plugins/state/package.json +++ b/packages/plugins/state/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-state", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json index 0bb519d96e..6c2bbc8e72 100644 --- a/packages/plugins/tree/package.json +++ b/packages/plugins/tree/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tree", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json index 5b729738fa..16fe447205 100644 --- a/packages/plugins/tutorial/package.json +++ b/packages/plugins/tutorial/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tutorial", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/register/package.json b/packages/register/package.json index 45d74fc9b6..a2f5085d2d 100644 --- a/packages/register/package.json +++ b/packages/register/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-meta-register", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "description": "", "type": "module", "main": "dist/index.js", diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json index 7e0ea1c9ce..4737aac96c 100644 --- a/packages/settings/design/package.json +++ b/packages/settings/design/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-design", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json index 5d82ed8f8b..19e11a0937 100644 --- a/packages/settings/events/package.json +++ b/packages/settings/events/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-events", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json index 619eb18e10..f304f0b441 100644 --- a/packages/settings/panel/package.json +++ b/packages/settings/panel/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-settings-panel", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json index 891b691700..8bd2e79a38 100644 --- a/packages/settings/props/package.json +++ b/packages/settings/props/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-props", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json index f7ca002844..22f4eb337c 100644 --- a/packages/settings/styles/package.json +++ b/packages/settings/styles/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-styles", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/svgs/package.json b/packages/svgs/package.json index c18100e6d5..9b78041e66 100644 --- a/packages/svgs/package.json +++ b/packages/svgs/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-svgs", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json index 821c669cf6..5085b4d72a 100644 --- a/packages/theme/base/package.json +++ b/packages/theme/base/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-base", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json index fd1041d2fb..e91eea5688 100644 --- a/packages/theme/dark/package.json +++ b/packages/theme/dark/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-dark", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json index 904f8fe88c..fff43f34e4 100644 --- a/packages/theme/light/package.json +++ b/packages/theme/light/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-light", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json index d05fca77e3..b99478fd71 100644 --- a/packages/toolbars/breadcrumb/package.json +++ b/packages/toolbars/breadcrumb/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-breadcrumb", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json index dcd22058e7..75c1743106 100644 --- a/packages/toolbars/clean/package.json +++ b/packages/toolbars/clean/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-clean", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json index f6b85f0760..b1f3790c66 100644 --- a/packages/toolbars/collaboration/package.json +++ b/packages/toolbars/collaboration/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-collaboration", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json index 4c0120e577..e2dcb6bea9 100644 --- a/packages/toolbars/fullscreen/package.json +++ b/packages/toolbars/fullscreen/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-fullscreen", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json index c3f1e46e5e..96bc22913b 100644 --- a/packages/toolbars/generate-code/package.json +++ b/packages/toolbars/generate-code/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-generate-code", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json index c76eb34490..1a58dbf2c9 100644 --- a/packages/toolbars/lang/package.json +++ b/packages/toolbars/lang/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lang", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json index d19c6b36d5..351722e883 100644 --- a/packages/toolbars/layout/package.json +++ b/packages/toolbars/layout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-layout", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json index e78a72f87e..3f4522a755 100644 --- a/packages/toolbars/lock/package.json +++ b/packages/toolbars/lock/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lock", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json index 014b2124e1..93924c6eba 100644 --- a/packages/toolbars/logo/package.json +++ b/packages/toolbars/logo/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-logo", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json index 49245a1475..93f6cb6de5 100644 --- a/packages/toolbars/logout/package.json +++ b/packages/toolbars/logout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-logout", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json index 69cdeec6b5..e07a7b2a8e 100644 --- a/packages/toolbars/media/package.json +++ b/packages/toolbars/media/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-media", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json index 396c819332..b63d36fe93 100644 --- a/packages/toolbars/preview/package.json +++ b/packages/toolbars/preview/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-preview", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json index ab8c4c3c60..cd1405522e 100644 --- a/packages/toolbars/redoundo/package.json +++ b/packages/toolbars/redoundo/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-redoundo", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json index b0db341eec..de7c1abd40 100644 --- a/packages/toolbars/refresh/package.json +++ b/packages/toolbars/refresh/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-refresh", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json index c358f18163..d7f05a615e 100644 --- a/packages/toolbars/save/package.json +++ b/packages/toolbars/save/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-save", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json index d996a49a2b..851e58eaad 100644 --- a/packages/toolbars/setting/package.json +++ b/packages/toolbars/setting/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-setting", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/view-setting/package.json b/packages/toolbars/view-setting/package.json index 3b50fa8ed8..e591af8875 100644 --- a/packages/toolbars/view-setting/package.json +++ b/packages/toolbars/view-setting/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-view-setting", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index b4b6728249..4e9d89c0b6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-utils", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json index 32092705c9..91a93b72be 100644 --- a/packages/vue-generator/package.json +++ b/packages/vue-generator/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-dsl-vue", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json index 7358aa1e74..2efefc7652 100644 --- a/packages/webcomponent/package.json +++ b/packages/webcomponent/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-webcomponent-core", - "version": "2.2.0-rc.0", + "version": "2.2.0-rc.1", "publishConfig": { "access": "public" }, diff --git a/scripts/updateTemplate.mjs b/scripts/updateTemplate.mjs new file mode 100644 index 0000000000..e35847408f --- /dev/null +++ b/scripts/updateTemplate.mjs @@ -0,0 +1,109 @@ +import fs from 'fs-extra' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import Logger from './logger.mjs' +import pkg from '../packages/design-core/package.json' assert { type: 'json' } + +const logger = new Logger('updateTemplate') + +const __filename = fileURLToPath(import.meta.url) +const __dirname = path.dirname(__filename) + +const templateSrcPath = path.resolve(__dirname, '../designer-demo') +const templateDistPath = path.resolve(__dirname, '../packages/engine-cli/template/designer') + +const ignoreFolder = ['node_modules', 'dist', 'temp', 'tmp'] + +const filter = (src, _dest) => { + if (ignoreFolder.some((item) => src.includes(item))) { + return false + } + return true +} + +async function copyTemplate() { + const templateBackupPath = path.resolve(templateDistPath, '../designer_backup') + if (await fs.pathExists(templateBackupPath)) { + await fs.remove(templateBackupPath) + } + // 先备份原目录 + if (await fs.pathExists(templateDistPath)) { + await fs.move(templateDistPath, templateBackupPath) + } + try { + // 删除cli template内容 + if (await fs.pathExists(templateDistPath)) { + await fs.remove(templateDistPath) + } + // 复制designer-demo + await fs.copy(templateSrcPath, templateDistPath, { filter }) + await fs.remove(templateBackupPath) + } catch (error) { + logger.error(error) + // 复制错误时恢复 + if (await fs.pathExists(templateBackupPath)) { + await fs.move(templateBackupPath, templateDistPath) + } + } finally { + if (await fs.pathExists(templateBackupPath)) { + await fs.remove(templateBackupPath) + } + } +} + +async function updatePkgJson() { + const { version } = pkg + const pkgJsonPath = path.resolve(templateDistPath, 'package.json') + if ((await fs.pathExists(pkgJsonPath)) === false) { + return + } + const pkgData = await fs.readJSON(pkgJsonPath) + pkgData.version = '0.0.0' + + const defaultScripts = { + dev: "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'", + 'serve:frontend': 'cross-env VITE_THEME=light vite', + 'serve:mock': 'node node_modules/@opentiny/tiny-engine-mock/dist/app.js', + 'build:alpha': 'cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha', + build: 'cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod' + } + + Object.entries(defaultScripts).forEach(([name, value]) => { + pkgData.scripts[name] = value + }) + + pkgData.devDependencies['concurrently'] = '^8.2.0' + + const updateDependencyVersions = (deps) => { + Object.keys(deps) + .filter((name) => name.includes('@opentiny/tiny-engine')) + .forEach((name) => { + deps[name] = version + }) + } + updateDependencyVersions(pkgData.dependencies) + updateDependencyVersions(pkgData.devDependencies) + + await fs.writeJSON(pkgJsonPath, pkgData, { spaces: 2 }) +} + +async function modifyViteConfig() { + const viteConfigPath = path.resolve(templateDistPath, 'vite.config.js') + if (await fs.exists(viteConfigPath)) { + const fileContent = await fs.readFile(viteConfigPath, { encoding: 'utf-8' }) + const aliasRegexp = /useSourceAlias: *true/ + if (aliasRegexp.test(fileContent)) { + const newFileContent = fileContent.replace(aliasRegexp, 'useSourceAlias: false') + await fs.writeFile(viteConfigPath, newFileContent) + } + } +} + +// 同步design-demo代码到CLI模板，避免模板未更新或版本号未修改 +async function main() { + await copyTemplate() + await updatePkgJson() + await modifyViteConfig() +} + +main()