From 37ebe14e362b5945ec52a38914949f30976d6d08 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Thu, 6 Jun 2024 05:29:44 -0700
Subject: [PATCH 1/3] feat: merge lowcodeconfig with registry, migrate alias
 config to demo

---
 designer-demo/registry.js                     |  5 ++
 designer-demo/vite.config.js                  | 59 ++++++++++++++
 .../canvas/src/components/render/runner.js    |  4 +-
 packages/common/component/LifeCycles.vue      |  7 +-
 packages/controller/adapter.js                |  4 +-
 packages/controller/src/hooks/useBlock.js     |  6 +-
 packages/controller/src/hooks/useResource.js  |  5 +-
 packages/controller/src/hooks/useSaveLocal.js |  7 +-
 packages/controller/src/index.js              |  3 +-
 packages/design-core/config/lowcode.config.js |  2 +-
 packages/design-core/registry.js              | 58 +++++++++++++-
 packages/design-core/src/App.vue              |  6 ++
 packages/design-core/src/init.js              |  6 +-
 packages/design-core/src/preview/src/App.vue  |  6 +-
 packages/design-core/src/theme/dark.js        |  1 +
 packages/design-core/src/theme/light.js       |  1 +
 packages/design-core/vite.config.js           | 76 +------------------
 packages/plugins/block/src/BlockSetting.vue   |  9 ++-
 packages/plugins/bridge/src/BridgeSetting.vue |  5 +-
 .../datasource/src/DataSourceTemplate.vue     |  4 +-
 packages/plugins/i18n/src/Main.vue            |  5 +-
 packages/plugins/materials/src/block/http.js  | 11 ++-
 packages/plugins/page/src/PageHistory.vue     |  7 +-
 .../props/src/components/groups/LifeCycle.vue |  7 +-
 packages/toolbars/generate-vue/src/Main.vue   | 14 +---
 packages/toolbars/logo/src/Main.vue           |  5 +-
 packages/toolbars/preview/src/Main.vue        |  7 +-
 27 files changed, 193 insertions(+), 137 deletions(-)
 create mode 100644 packages/design-core/src/theme/dark.js
 create mode 100644 packages/design-core/src/theme/light.js

diff --git a/designer-demo/registry.js b/designer-demo/registry.js
index e31418546..bdba8cab5 100644
--- a/designer-demo/registry.js
+++ b/designer-demo/registry.js
@@ -11,6 +11,11 @@
  */
 
 export default {
+  config: {
+    id: 'engine.config',
+    theme: 'dark',
+    material: [],
+  },
   layout: { id: 'engine.layout' },
   toolbars: [
     {
diff --git a/designer-demo/vite.config.js b/designer-demo/vite.config.js
index 1a424c307..becb8ba82 100644
--- a/designer-demo/vite.config.js
+++ b/designer-demo/vite.config.js
@@ -1,11 +1,70 @@
+import path from 'node:path'
 import { defineConfig, mergeConfig } from 'vite'
 import getDefaultConfig from '@opentiny/tiny-engine/vite.config.js'
 
 export default defineConfig((options) => {
   const defaultConfig = getDefaultConfig(options)
+
+  const devAlias = {
+    '@opentiny/tiny-engine-controller/js': path.resolve(__dirname, '../packages/controller/js'),
+    '@opentiny/tiny-engine-common/component': path.resolve(__dirname, '../packages/common/component'),
+    '@opentiny/tiny-engine-common': path.resolve(__dirname, '../packages/common/index.js'),
+    '@opentiny/tiny-engine-controller/utils': path.resolve(__dirname, '../packages/controller/utils.js'),
+    '@opentiny/tiny-engine-controller/adapter': path.resolve(__dirname, '../packages/controller/adapter.js'),
+    '@opentiny/tiny-engine-controller': path.resolve(__dirname, '../packages/controller/src/index.js'),
+    '@opentiny/tiny-engine-plugin-materials': path.resolve(__dirname, '../packages/plugins/materials/index.js'),
+    '@opentiny/tiny-engine-plugin-block': path.resolve(__dirname, '../packages/plugins/block/index.js'),
+    '@opentiny/tiny-engine-plugin-data': path.resolve(__dirname, '../packages/plugins/data/index.js'),
+    '@opentiny/tiny-engine-plugin-datasource': path.resolve(__dirname, '../packages/plugins/datasource/index.js'),
+    '@opentiny/tiny-engine-plugin-script': path.resolve(__dirname, '../packages/plugins/script/index.js'),
+    '@opentiny/tiny-engine-plugin-tree': path.resolve(__dirname, '../packages/plugins/tree/index.js'),
+    '@opentiny/tiny-engine-plugin-help': path.resolve(__dirname, '../packages/plugins/help/index.js'),
+    '@opentiny/tiny-engine-plugin-schema': path.resolve(__dirname, '../packages/plugins/schema/index.js'),
+    '@opentiny/tiny-engine-plugin-page': path.resolve(__dirname, '../packages/plugins/page/index.js'),
+    '@opentiny/tiny-engine-plugin-i18n': path.resolve(__dirname, '../packages/plugins/i18n/index.js'),
+    '@opentiny/tiny-engine-plugin-bridge': path.resolve(__dirname, '../packages/plugins/bridge/index.js'),
+    '@opentiny/tiny-engine-plugin-tutorial': path.resolve(__dirname, '../packages/plugins/tutorial/index.js'),
+    '@opentiny/tiny-engine-plugin-robot': path.resolve(__dirname, '../packages/plugins/robot/index.js'),
+    '@opentiny/tiny-engine-settings-panel': path.resolve(__dirname, '../packages/settings/panel/index.js'),
+    '@opentiny/tiny-engine-setting-events': path.resolve(__dirname, '../packages/settings/events/index.js'),
+    '@opentiny/tiny-engine-setting-props': path.resolve(__dirname, '../packages/settings/props/index.js'),
+    '@opentiny/tiny-engine-setting-styles': path.resolve(__dirname, '../packages/settings/styles/index.js'),
+    '@opentiny/tiny-engine-toolbar-breadcrumb': path.resolve(__dirname, '../packages/toolbars/breadcrumb/index.js'),
+    '@opentiny/tiny-engine-toolbar-fullscreen': path.resolve(__dirname, '../packages/toolbars/fullscreen/index.js'),
+    '@opentiny/tiny-engine-toolbar-lang': path.resolve(__dirname, '../packages/toolbars/lang/index.js'),
+    '@opentiny/tiny-engine-toolbar-layout': path.resolve(__dirname, '../packages/toolbars/layout/index.js'),
+    '@opentiny/tiny-engine-toolbar-checkinout': path.resolve(__dirname, '../packages/toolbars/lock/index.js'),
+    '@opentiny/tiny-engine-toolbar-logo': path.resolve(__dirname, '../packages/toolbars/logo/index.js'),
+    '@opentiny/tiny-engine-toolbar-logout': path.resolve(__dirname, '../packages/toolbars/logout/index.js'),
+    '@opentiny/tiny-engine-toolbar-media': path.resolve(__dirname, '../packages/toolbars/media/index.js'),
+    '@opentiny/tiny-engine-toolbar-preview': path.resolve(__dirname, '../packages/toolbars/preview/index.js'),
+    '@opentiny/tiny-engine-toolbar-generate-vue': path.resolve(__dirname, '../packages/toolbars/generate-vue/index.js'),
+    '@opentiny/tiny-engine-toolbar-refresh': path.resolve(__dirname, '../packages/toolbars/refresh/index.js'),
+    '@opentiny/tiny-engine-toolbar-redoundo': path.resolve(__dirname, '../packages/toolbars/redoundo/index.js'),
+    '@opentiny/tiny-engine-toolbar-clean': path.resolve(__dirname, '../packages/toolbars/clean/index.js'),
+    '@opentiny/tiny-engine-toolbar-save': path.resolve(__dirname, '../packages/toolbars/save/index.js'),
+    '@opentiny/tiny-engine-toolbar-setting': path.resolve(__dirname, '../packages/toolbars/setting/index.js'),
+    '@opentiny/tiny-engine-toolbar-collaboration': path.resolve(__dirname, '../packages/toolbars/collaboration/index.js'),
+    '@opentiny/tiny-engine-theme-dark': path.resolve(__dirname, '../packages/theme/dark/index.less'),
+    '@opentiny/tiny-engine-theme-light': path.resolve(__dirname, '../packages/theme/light/index.less'),
+    '@opentiny/tiny-engine-svgs': path.resolve(__dirname, '../packages/svgs/index.js'),
+    '@opentiny/tiny-engine-http': path.resolve(__dirname, '../packages/http/src/index.js'),
+    '@opentiny/tiny-engine-canvas': path.resolve(__dirname, '../packages/canvas/src/index.js'),
+    '@opentiny/tiny-engine-utils': path.resolve(__dirname, '../packages/utils/src/index.js'),
+    '@opentiny/tiny-engine-webcomponent-core': path.resolve(__dirname, '../packages/webcomponent/src/lib.js'),
+    '@opentiny/tiny-engine-i18n-host': path.resolve(__dirname, '../packages/i18n/src/lib.js'),
+    '@opentiny/tiny-engine-builtin-component': path.resolve(__dirname, '../packages/builtinComponent/index.js'),
+    '@opentiny/tiny-engine-entry': path.resolve(__dirname, '../packages/entry/src/index.js'),
+    '@opentiny/tiny-engine-layout': path.resolve(__dirname, '../packages/layout/index.js'),
+    '@opentiny/tiny-engine-configurator': path.resolve(__dirname, '../packages/configurator/src/index.js')
+  }
+
   const config = {
     server: {
       port: 8090
+    },
+    resolve: {
+      alias: devAlias
     }
   }
 
diff --git a/packages/canvas/src/components/render/runner.js b/packages/canvas/src/components/render/runner.js
index 93d9902db..aa0210f87 100644
--- a/packages/canvas/src/components/render/runner.js
+++ b/packages/canvas/src/components/render/runner.js
@@ -134,8 +134,8 @@ const create = () => {
 
 export const createRender = (config) => {
   initRenderContext()
-  const { dslMode, canvasOptions } = config
-  const { styles = [], scripts = [] } = canvasOptions[dslMode]
+
+  const { styles = [], scripts = [] } = config.canvasDependencies
   const { styles: thirdStyles = [], scripts: thirdScripts = [] } = window.thirdPartyDeps || {}
 
   Promise.all([
diff --git a/packages/common/component/LifeCycles.vue b/packages/common/component/LifeCycles.vue
index c7abdcd28..cff2d6a37 100644
--- a/packages/common/component/LifeCycles.vue
+++ b/packages/common/component/LifeCycles.vue
@@ -78,7 +78,8 @@
 <script lang="jsx">
 import { reactive, ref, watchEffect, onBeforeUnmount } from 'vue'
 import { Button, DialogBox, Popover, Search, Alert } from '@opentiny/vue'
-import { getGlobalConfig, useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-controller'
+import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { theme } from '@opentiny/tiny-engine-controller/adapter'
 import MetaListItems from './MetaListItems.vue'
 import { iconYes } from '@opentiny/vue-icon'
@@ -112,9 +113,9 @@ export default {
     const { confirm } = useModal()
     const { getPageContent } = usePage()
 
-    const lifeCycles = getGlobalConfig()?.lifeCyclesOptions[getGlobalConfig()?.dslMode]
+    const lifeCycles = getMergeMeta('engine.config')?.lifeCyclesOptions[getMergeMeta('engine.config')?.dslMode]
 
-    const lifeCycleTips = getGlobalConfig()?.lifeCycleTips[getGlobalConfig()?.dslMode]
+    const lifeCycleTips = getMergeMeta('engine.config')?.lifeCycleTips[getMergeMeta('engine.config')?.dslMode]
 
     const state = reactive({
       showPopover: true,
diff --git a/packages/controller/adapter.js b/packages/controller/adapter.js
index 403b66e08..069156b46 100644
--- a/packages/controller/adapter.js
+++ b/packages/controller/adapter.js
@@ -11,7 +11,7 @@
  */
 
 import { toRaw } from 'vue'
-import { getGlobalConfig } from './src/globalConfig'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 
 /**
  * 将画布pageSchema对象转换成编辑器中的string
@@ -55,7 +55,7 @@ export const string2Obj = (string) => {
  */
 
 export const theme = () => {
-  const theme = getGlobalConfig()?.theme?.includes('dark') ? 'vs-dark' : 'vs'
+  const theme = getMergeMeta('engine.config').theme?.includes('dark') ? 'vs-dark' : 'vs'
 
   return theme
 }
diff --git a/packages/controller/src/hooks/useBlock.js b/packages/controller/src/hooks/useBlock.js
index fe3be2caa..b8991bd1e 100644
--- a/packages/controller/src/hooks/useBlock.js
+++ b/packages/controller/src/hooks/useBlock.js
@@ -16,10 +16,10 @@ import { extend, copyArray } from '@opentiny/vue-renderless/common/object'
 import { format } from '@opentiny/vue-renderless/common/date'
 import { remove } from '@opentiny/vue-renderless/common/array'
 import { constants } from '@opentiny/tiny-engine-utils'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { getCanvasStatus } from '../../js/canvas'
 import { ast2String, parseExpression } from '../../js/ast'
 import { getCssObjectFromStyleStr } from '../../js/css'
-import { getGlobalConfig } from '../globalConfig'
 import {
   HOOK_NAME,
   initHook,
@@ -332,7 +332,7 @@ const createBlock = ({ name_cn, label, path, categories }) => {
     histories: [],
     categories,
     public: BLOCK_OPENNESS.Open,
-    framework: getGlobalConfig()?.dslMode,
+    framework: getMergeMeta('engine.config')?.dslMode,
     content: {
       ...extend(true, {}, DEFAULT_BLOCK),
       fileName: label,
@@ -354,7 +354,7 @@ const createEmptyBlock = ({ name_cn, label, path, categories }) => {
     label,
     categories,
     public: BLOCK_OPENNESS.Open,
-    framework: getGlobalConfig()?.dslMode,
+    framework: getMergeMeta('engine.config')?.dslMode,
     content: {
       ...extend(true, {}, DEFAULT_BLOCK),
       fileName: label
diff --git a/packages/controller/src/hooks/useResource.js b/packages/controller/src/hooks/useResource.js
index 012b4ac6f..08b006f7e 100644
--- a/packages/controller/src/hooks/useResource.js
+++ b/packages/controller/src/hooks/useResource.js
@@ -11,10 +11,10 @@
  */
 
 import { reactive } from 'vue'
-import { getGlobalConfig } from '../globalConfig'
 import { useHttp } from '@opentiny/tiny-engine-http'
 import { utils, constants } from '@opentiny/tiny-engine-utils'
 import { meta as BuiltinComponentMaterials } from '@opentiny/tiny-engine-builtin-component'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { getCanvasStatus } from '../../js/canvas'
 import useNotify from '../components/useNotify'
 import {
@@ -250,8 +250,7 @@ const getConfigureMap = () => {
 }
 
 const fetchMaterial = async () => {
-  const { dslMode, canvasOptions } = getGlobalConfig()
-  const bundleUrls = canvasOptions[dslMode].material
+  const bundleUrls = getMergeMeta('engine.config')?.material || []
   const materials = await Promise.allSettled(bundleUrls.map((url) => http.get(url)))
 
   materials.forEach((response) => {
diff --git a/packages/controller/src/hooks/useSaveLocal.js b/packages/controller/src/hooks/useSaveLocal.js
index 3e47e2105..f7c8ab22d 100644
--- a/packages/controller/src/hooks/useSaveLocal.js
+++ b/packages/controller/src/hooks/useSaveLocal.js
@@ -11,9 +11,8 @@
  */
 
 import { Modal } from '@opentiny/vue'
+import { HOOK_NAME, initHook, useCanvas, getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { VITE_ORIGIN } from '../../js/environments'
-import { getGlobalConfig } from '../globalConfig'
-import { HOOK_NAME, initHook, useCanvas } from '@opentiny/tiny-engine-entry'
 
 // 获取当前页面的全量信息
 
@@ -28,7 +27,7 @@ const confirmSaveLocal = async () => {
     api: `${VITE_ORIGIN}/app-service/api/pages/code/${currentPageId}`,
     pageName: currentPageName,
     pageId: currentPageId,
-    platformId: getGlobalConfig()?.platformId
+    platformId: getMergeMeta('engine.config')?.platformId
   })
 
   if (savePage.error) {
@@ -53,7 +52,7 @@ const savePageLocal = async () => {
   const fileExistRes = await bridge.callHandler('page-is-exist', {
     pageName: currentPageName || currentPage.name,
     pageId: currentPageId || currentPage.id,
-    platformId: getGlobalConfig()?.platformId
+    platformId: getMergeMeta('engine.config')?.platformId
   })
 
   // 查询本地文件失败：存在同名文件 / 接口报错
diff --git a/packages/controller/src/index.js b/packages/controller/src/index.js
index f8626e88f..077010f8b 100644
--- a/packages/controller/src/index.js
+++ b/packages/controller/src/index.js
@@ -12,7 +12,6 @@
 
 import './hooks/mountHooks'
 import useMessage from './useMessage'
-import { getGlobalConfig, setGlobalConfig } from './globalConfig'
 import useData from './useData'
 export { default as metaData } from '../meta'
 import example from './example'
@@ -42,4 +41,4 @@ export {
   useCustom
 } from '@opentiny/tiny-engine-entry'
 
-export { getGlobalConfig, setGlobalConfig, useNotify, useData, useMessage, useModal }
+export { useNotify, useData, useMessage, useModal }
diff --git a/packages/design-core/config/lowcode.config.js b/packages/design-core/config/lowcode.config.js
index 01c0697ca..75ec8443e 100644
--- a/packages/design-core/config/lowcode.config.js
+++ b/packages/design-core/config/lowcode.config.js
@@ -37,7 +37,7 @@ export default {
     HTML: {},
     Flowchart: {}
   },
-
+  // TODO: 声明周期相关配置拆分到页面管理的配置项里面
   // 生命周期函数
   lifeCyclesOptions: {
     Angular: [
diff --git a/packages/design-core/registry.js b/packages/design-core/registry.js
index 41b7b6a02..4824fa66f 100644
--- a/packages/design-core/registry.js
+++ b/packages/design-core/registry.js
@@ -42,9 +42,63 @@ import Props from '@opentiny/tiny-engine-setting-props'
 import Events from '@opentiny/tiny-engine-setting-events'
 import Styles from '@opentiny/tiny-engine-setting-styles'
 
-import '@opentiny/tiny-engine-theme'
-
 export default {
+  config: {
+    id: 'engine.config',
+    // TODO: 主题支持传入主题 package 或者是 url。
+    theme: 'light',
+    // 物料链接
+    material: [],
+    // 画布依赖的 script、styles 链接。TODO: 解耦后添加默认 tinyvue 的链接
+    canvasDependencies: {
+      styles: [],
+      scripts: []
+    },
+    dslMode: 'Vue',
+    platformId: 918,
+    // TODO: 声明周期相关配置拆分到页面管理的配置项里面
+    // 生命周期函数
+    lifeCyclesOptions: {
+      Angular: [
+        '_constructor_',
+        'ngOnInit',
+        'ngOnChanges',
+        'ngDoCheck',
+        'ngAfterContentInit',
+        'ngAfterContentChecked',
+        'ngAfterViewInit',
+        'ngAfterViewChecked',
+        'ngOnDestroy'
+      ],
+      Vue: [
+        'setup',
+        'onBeforeMount',
+        'onMounted',
+        'onBeforeUpdate',
+        'onUpdated',
+        'onBeforeUnmount',
+        'onUnmounted',
+        'onErrorCaptured',
+        'onActivated',
+        'onDeactivated'
+      ],
+      HTML: [],
+      React: [
+        'componentWillMount',
+        'componentDidMount',
+        'componentWillReceiveProps',
+        'shouldComponentUpdate',
+        'componentWillUpdate',
+        'componentDidUpdate',
+        'componentWillUnmount'
+      ]
+    },
+
+    // 生命周期使用提示
+    lifeCycleTips: {
+      Vue: '通过Vue解构出来的方法都可以在setup这里使用，比如watch、computed、watchEffect等'
+    }
+  },
   layout: { id: 'engine.layout' },
   toolbars: [
     Logo,
diff --git a/packages/design-core/src/App.vue b/packages/design-core/src/App.vue
index a0ce17a56..bacaf8f57 100644
--- a/packages/design-core/src/App.vue
+++ b/packages/design-core/src/App.vue
@@ -40,12 +40,17 @@ import blockPlugin from '@opentiny/tiny-engine-plugin-block'
 import materials from '@opentiny/tiny-engine-plugin-materials'
 import { useBroadcastChannel } from '@vueuse/core'
 import { constants } from '@opentiny/tiny-engine-utils'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 
 const { message } = useModal()
 const { requestInitBlocks } = blockPlugin.api
 const { fetchGroups } = materials.api
 const { BROADCAST_CHANNEL } = constants
 
+const config = getMergeMeta('engine.config')
+
+import(`./theme/${config.theme}.js`)
+
 export default {
   name: 'TinyLowCode',
   components: {
@@ -177,3 +182,4 @@ export default {
   }
 }
 </style>
+./theme/light.js
diff --git a/packages/design-core/src/init.js b/packages/design-core/src/init.js
index c25885f1b..f3b426456 100644
--- a/packages/design-core/src/init.js
+++ b/packages/design-core/src/init.js
@@ -12,9 +12,7 @@
 
 import { createApp } from 'vue'
 import initSvgs from '@opentiny/tiny-engine-svgs'
-import { setGlobalConfig } from '@opentiny/tiny-engine-controller'
 import i18n from '@opentiny/tiny-engine-controller/js/i18n'
-import globalConfig from '../config/lowcode.config'
 import { initMonitor } from '@opentiny/tiny-engine-controller/js/monitor'
 import { injectGlobalComponents } from '@opentiny/tiny-engine-common'
 import { initHttp } from '@opentiny/tiny-engine-http'
@@ -48,8 +46,8 @@ const defaultLifeCycles = {
       initMonitor(import.meta.env.VITE_ERROR_MONITOR_URL)
     }
 
-    window.TinyGlobalConfig = globalConfig
-    setGlobalConfig(globalConfig)
+    // 这里暴露到 window 是为了让 canvas 可以读取
+    window.TinyGlobalConfig = newRegistry.config || {}
   },
   appCreated: ({ app }) => {
     initSvgs(app)
diff --git a/packages/design-core/src/preview/src/App.vue b/packages/design-core/src/preview/src/App.vue
index bc57e710b..d1ccc2333 100644
--- a/packages/design-core/src/preview/src/App.vue
+++ b/packages/design-core/src/preview/src/App.vue
@@ -4,10 +4,14 @@
 </template>
 
 <script>
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { useDebugSwitch } from './preview/debugSwitch'
 import Preview from './preview/Preview.vue'
 import Toolbar from './Toolbar.vue'
-import '@opentiny/tiny-engine-theme'
+
+const config = getMergeMeta('engine.config')
+
+import(`../../theme/${config.theme}.js`)
 
 export default {
   components: {
diff --git a/packages/design-core/src/theme/dark.js b/packages/design-core/src/theme/dark.js
new file mode 100644
index 000000000..f610c1fa5
--- /dev/null
+++ b/packages/design-core/src/theme/dark.js
@@ -0,0 +1 @@
+import '@opentiny/tiny-engine-theme-dark'
diff --git a/packages/design-core/src/theme/light.js b/packages/design-core/src/theme/light.js
new file mode 100644
index 000000000..5a76eb90b
--- /dev/null
+++ b/packages/design-core/src/theme/light.js
@@ -0,0 +1 @@
+import '@opentiny/tiny-engine-theme-light'
diff --git a/packages/design-core/vite.config.js b/packages/design-core/vite.config.js
index 7adcf25a6..6ab4fd3d6 100644
--- a/packages/design-core/vite.config.js
+++ b/packages/design-core/vite.config.js
@@ -1,5 +1,4 @@
 import { defineConfig, loadEnv } from 'vite'
-
 import path from 'path'
 import vue from '@vitejs/plugin-vue'
 import monacoEditorPluginCjs from 'vite-plugin-monaco-editor'
@@ -8,7 +7,6 @@ import nodeGlobalsPolyfillPluginCjs from '@esbuild-plugins/node-globals-polyfill
 import nodeModulesPolyfillPluginCjs from '@esbuild-plugins/node-modules-polyfill'
 import nodePolyfill from 'rollup-plugin-polyfill-node'
 import esbuildCopy from 'esbuild-plugin-copy'
-import lowcodeConfig from './config/lowcode.config.js'
 import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 import { importmapPlugin } from './scripts/externalDeps.js'
 import visualizerCjs from 'rollup-plugin-visualizer'
@@ -149,70 +147,6 @@ const importMapVersions = {
   tinyVue: '~3.14'
 }
 
-const devAlias = {
-  '@opentiny/tiny-engine-controller/js': path.resolve(__dirname, '../controller/js'),
-  '@opentiny/tiny-engine-common/component': path.resolve(__dirname, '../common/component'),
-  '@opentiny/tiny-engine-common': path.resolve(__dirname, '../common/index.js'),
-  '@opentiny/tiny-engine-controller/utils': path.resolve(__dirname, '../controller/utils.js'),
-  '@opentiny/tiny-engine-controller/adapter': path.resolve(__dirname, '../controller/adapter.js'),
-  '@opentiny/tiny-engine-controller': path.resolve(__dirname, '../controller/src/index.js'),
-  '@opentiny/tiny-engine-plugin-materials': path.resolve(__dirname, '../plugins/materials/index.js'),
-  '@opentiny/tiny-engine-plugin-block': path.resolve(__dirname, '../plugins/block/index.js'),
-  '@opentiny/tiny-engine-plugin-data': path.resolve(__dirname, '../plugins/data/index.js'),
-  '@opentiny/tiny-engine-plugin-datasource': path.resolve(__dirname, '../plugins/datasource/index.js'),
-  '@opentiny/tiny-engine-plugin-script': path.resolve(__dirname, '../plugins/script/index.js'),
-  '@opentiny/tiny-engine-plugin-tree': path.resolve(__dirname, '../plugins/tree/index.js'),
-  '@opentiny/tiny-engine-plugin-help': path.resolve(__dirname, '../plugins/help/index.js'),
-  '@opentiny/tiny-engine-plugin-schema': path.resolve(__dirname, '../plugins/schema/index.js'),
-  '@opentiny/tiny-engine-plugin-page': path.resolve(__dirname, '../plugins/page/index.js'),
-  '@opentiny/tiny-engine-plugin-i18n': path.resolve(__dirname, '../plugins/i18n/index.js'),
-  '@opentiny/tiny-engine-plugin-bridge': path.resolve(__dirname, '../plugins/bridge/index.js'),
-  '@opentiny/tiny-engine-plugin-tutorial': path.resolve(__dirname, '../plugins/tutorial/index.js'),
-  '@opentiny/tiny-engine-plugin-robot': path.resolve(__dirname, '../plugins/robot/index.js'),
-  '@opentiny/tiny-engine-settings-panel': path.resolve(__dirname, '../settings/panel/index.js'),
-  '@opentiny/tiny-engine-setting-events': path.resolve(__dirname, '../settings/events/index.js'),
-  '@opentiny/tiny-engine-setting-props': path.resolve(__dirname, '../settings/props/index.js'),
-  '@opentiny/tiny-engine-setting-styles': path.resolve(__dirname, '../settings/styles/index.js'),
-  '@opentiny/tiny-engine-toolbar-breadcrumb': path.resolve(__dirname, '../toolbars/breadcrumb/index.js'),
-  '@opentiny/tiny-engine-toolbar-fullscreen': path.resolve(__dirname, '../toolbars/fullscreen/index.js'),
-  '@opentiny/tiny-engine-toolbar-lang': path.resolve(__dirname, '../toolbars/lang/index.js'),
-  '@opentiny/tiny-engine-toolbar-layout': path.resolve(__dirname, '../toolbars/layout/index.js'),
-  '@opentiny/tiny-engine-toolbar-checkinout': path.resolve(__dirname, '../toolbars/lock/index.js'),
-  '@opentiny/tiny-engine-toolbar-logo': path.resolve(__dirname, '../toolbars/logo/index.js'),
-  '@opentiny/tiny-engine-toolbar-logout': path.resolve(__dirname, '../toolbars/logout/index.js'),
-  '@opentiny/tiny-engine-toolbar-media': path.resolve(__dirname, '../toolbars/media/index.js'),
-  '@opentiny/tiny-engine-toolbar-preview': path.resolve(__dirname, '../toolbars/preview/index.js'),
-  '@opentiny/tiny-engine-toolbar-generate-vue': path.resolve(__dirname, '../toolbars/generate-vue/index.js'),
-  '@opentiny/tiny-engine-toolbar-refresh': path.resolve(__dirname, '../toolbars/refresh/index.js'),
-  '@opentiny/tiny-engine-toolbar-redoundo': path.resolve(__dirname, '../toolbars/redoundo/index.js'),
-  '@opentiny/tiny-engine-toolbar-clean': path.resolve(__dirname, '../toolbars/clean/index.js'),
-  '@opentiny/tiny-engine-toolbar-save': path.resolve(__dirname, '../toolbars/save/index.js'),
-  '@opentiny/tiny-engine-toolbar-setting': path.resolve(__dirname, '../toolbars/setting/index.js'),
-  '@opentiny/tiny-engine-toolbar-collaboration': path.resolve(__dirname, '../toolbars/collaboration/index.js'),
-  '@opentiny/tiny-engine-theme-dark': path.resolve(__dirname, '../theme/dark/index.less'),
-  '@opentiny/tiny-engine-theme-light': path.resolve(__dirname, '../theme/light/index.less'),
-  '@opentiny/tiny-engine-svgs': path.resolve(__dirname, '../svgs/index.js'),
-  '@opentiny/tiny-engine-http': path.resolve(__dirname, '../http/src/index.js'),
-  '@opentiny/tiny-engine-canvas': path.resolve(__dirname, '../canvas/src/index.js'),
-  '@opentiny/tiny-engine-theme': path.resolve(__dirname, `../theme/${lowcodeConfig.theme}/index.less`),
-  '@opentiny/tiny-engine-utils': path.resolve(__dirname, '../utils/src/index.js'),
-  '@opentiny/tiny-engine-webcomponent-core': path.resolve(__dirname, '../webcomponent/src/lib.js'),
-  '@opentiny/tiny-engine-i18n-host': path.resolve(__dirname, '../i18n/src/lib.js'),
-  '@opentiny/tiny-engine-builtin-component': path.resolve(__dirname, '../builtinComponent/index.js'),
-  '@opentiny/tiny-engine-entry': path.resolve(__dirname, '../entry/src/index.js'),
-  '@opentiny/tiny-engine-layout': path.resolve(__dirname, '../layout/index.js'),
-  '@opentiny/tiny-engine-configurator': path.resolve(__dirname, '../configurator/src/index.js')
-}
-
-const prodAlias = {
-  '@opentiny/tiny-engine-theme': path.resolve(
-    __dirname,
-    `node_modules/@opentiny/tiny-engine-theme-${lowcodeConfig.theme}/dist/style.css`
-  )
-}
-
-const commonAlias = {}
-
 export default defineConfig(({ command = 'serve', mode = 'serve' }) => {
   const {
     VITE_CDN_DOMAIN = 'https://npm.onmicrosoft.cn',
@@ -263,17 +197,9 @@ export default defineConfig(({ command = 'serve', mode = 'serve' }) => {
       replacement: `${VITE_CDN_DOMAIN}/vue@${importMapVersions.vue}/dist/vue.runtime.esm-browser.js`
     }
 
-    config.resolve.alias = [
-      ...(isLocalImportMap ? [] : [devVueAlias]),
-      ...Object.entries({ ...commonAlias, ...devAlias }).map(([find, replacement]) => ({
-        find,
-        replacement
-      }))
-    ]
+    config.resolve.alias = [...(isLocalImportMap ? [] : [devVueAlias])]
   } else {
     // command === 'build'
-    config.resolve.alias = { ...commonAlias, ...prodAlias }
-
     if (mode === 'prod') {
       config.build.minify = true
       config.build.sourcemap = false
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index 3dc43e94b..cbe6eff6a 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -78,7 +78,8 @@
 <script lang="jsx">
 import { reactive, ref, watch, watchEffect, computed } from 'vue'
 import { Button as TinyButton, Collapse as TinyCollapse, CollapseItem as TinyCollapseItem } from '@opentiny/vue'
-import { getGlobalConfig, useModal } from '@opentiny/tiny-engine-controller'
+import { useModal } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { BlockHistoryList, PluginSetting, CloseIcon, SvgButton } from '@opentiny/tiny-engine-common'
 import { previewBlock } from '@opentiny/tiny-engine-controller/js/preview'
 import { LifeCycles } from '@opentiny/tiny-engine-common'
@@ -243,8 +244,8 @@ export default {
         previewBlock({
           id: item.blockId,
           history: item.id,
-          framework: getGlobalConfig()?.dslMode,
-          platform: getGlobalConfig()?.platformId
+          framework: getMergeMeta('engine.config')?.dslMode,
+          platform: getMergeMeta('engine.config')?.platformId
         })
     }
 
@@ -273,7 +274,7 @@ export default {
       editBlock,
       blockConfigForm,
       deployTips: DEPLOY_TIPS,
-      globalConfig: getGlobalConfig(),
+      globalConfig: getMergeMeta('engine.config'),
       onMouseLeave,
       handleClick,
       handleShowGuide
diff --git a/packages/plugins/bridge/src/BridgeSetting.vue b/packages/plugins/bridge/src/BridgeSetting.vue
index 406224909..6c139580e 100644
--- a/packages/plugins/bridge/src/BridgeSetting.vue
+++ b/packages/plugins/bridge/src/BridgeSetting.vue
@@ -122,8 +122,9 @@ import {
   getResourceNamesByType
 } from './js/resource'
 import { VueMonaco as MonacoEditor, PluginSetting, SvgButton } from '@opentiny/tiny-engine-common'
-import { useApp, getGlobalConfig, useModal, useNotify } from '@opentiny/tiny-engine-controller'
+import { useApp, useModal, useNotify } from '@opentiny/tiny-engine-controller'
 import { theme } from '@opentiny/tiny-engine-controller/adapter'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 
 const isOpen = ref(false)
 
@@ -175,7 +176,7 @@ export default {
       content: {},
       status: computed(() => getActionType() === ACTION_TYPE.Edit),
       category: computed(() => getCategory() === RESOURCE_CATEGORY.Npm),
-      mode: computed(() => getGlobalConfig()?.dslMode !== 'Vue'),
+      mode: computed(() => getMergeMeta('engine.config')?.dslMode !== 'Vue'),
       isInstance: false,
       title: computed(() => {
         const action = getActionType() === ACTION_TYPE.Edit ? '编辑' : '添加'
diff --git a/packages/plugins/datasource/src/DataSourceTemplate.vue b/packages/plugins/datasource/src/DataSourceTemplate.vue
index 1b1f44096..69815a2c1 100644
--- a/packages/plugins/datasource/src/DataSourceTemplate.vue
+++ b/packages/plugins/datasource/src/DataSourceTemplate.vue
@@ -18,8 +18,8 @@
 <script>
 import { reactive, onMounted } from 'vue'
 import { Button } from '@opentiny/vue'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { fetchTemplates } from './js/http'
-import { getGlobalConfig } from '@opentiny/tiny-engine-controller'
 
 export default {
   components: {
@@ -27,7 +27,7 @@ export default {
   },
   emits: ['select'],
   setup(props, { emit }) {
-    const platformId = getGlobalConfig()?.platformId
+    const platformId = getMergeMeta('engine.config')?.platformId
 
     const state = reactive({
       templates: []
diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
index 9382de958..57a7ba4f9 100644
--- a/packages/plugins/i18n/src/Main.vue
+++ b/packages/plugins/i18n/src/Main.vue
@@ -124,7 +124,8 @@ import useClipboard from 'vue-clipboard3'
 import { Grid, GridColumn, Input, Popover, Button, FileUpload, Loading, Tooltip, Select } from '@opentiny/vue'
 import { iconLoadingShadow } from '@opentiny/vue-icon'
 import { PluginPanel, LinkButton, SearchEmpty } from '@opentiny/tiny-engine-common'
-import { useTranslate, useApp, useModal, getGlobalConfig, useHelp } from '@opentiny/tiny-engine-controller'
+import { useTranslate, useApp, useModal, useHelp } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { utils } from '@opentiny/tiny-engine-utils'
 import { useHttp } from '@opentiny/tiny-engine-http'
 import { BASE_URL } from '@opentiny/tiny-engine-controller/js/environments'
@@ -148,7 +149,7 @@ export default {
     const SvgIcon = resolveComponent('SvgIcon')
     const lightSpinnerIcon = iconLoadingShadow()
     const darkSpinnerIcon = () => <SvgIcon name="loading" />
-    const isLightTheme = getGlobalConfig().theme === 'light'
+    const isLightTheme = getMergeMeta('engine.config').theme === 'light'
     const { getLangs, i18nResource, currentLanguage, getI18nData } = useTranslate()
     const { toClipboard } = useClipboard()
     const fullLangList = computed(() => {
diff --git a/packages/plugins/materials/src/block/http.js b/packages/plugins/materials/src/block/http.js
index 513bf7b72..2977fca39 100644
--- a/packages/plugins/materials/src/block/http.js
+++ b/packages/plugins/materials/src/block/http.js
@@ -10,8 +10,9 @@
  *
  */
 
-import { getGlobalConfig, useApp } from '@opentiny/tiny-engine-controller'
+import { useApp } from '@opentiny/tiny-engine-controller'
 import { useHttp } from '@opentiny/tiny-engine-http'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 const http = useHttp()
 
 const getParams = (obj) => {
@@ -37,7 +38,7 @@ export const fetchGroupBlocks = ({ groupId, value }) =>
   http.get(
     `/material-center/api/block${getParams({
       groups: groupId,
-      framework: getGlobalConfig()?.dslMode,
+      framework: getMergeMeta('engine.config')?.dslMode,
       label_contains: value
     })}`
   )
@@ -51,7 +52,7 @@ export const fetchGroupBlocksByIds = async ({ groupIds }) => {
 
   // 所有分组下面可能会有区块重复，需要去重
   const blockIdSet = new Set()
-  const dslMode = getGlobalConfig()?.dslMode
+  const dslMode = getMergeMeta('engine.config')?.dslMode
 
   const blocks = blockGroups
     .map((group) => group.blocks.map((block) => ({ ...block, groupId: group.id, groupName: group.name })))
@@ -76,7 +77,9 @@ export const fetchGroupBlocksById = async ({ groupId }) => {
 
   let data = blockGroup?.[0]?.blocks || []
 
-  data = data.filter((block) => block.framework === getGlobalConfig()?.dslMode).map((item) => ({ ...item, groupId }))
+  data = data
+    .filter((block) => block.framework === getMergeMeta('engine.config')?.dslMode)
+    .map((item) => ({ ...item, groupId }))
 
   return data
 }
diff --git a/packages/plugins/page/src/PageHistory.vue b/packages/plugins/page/src/PageHistory.vue
index 58c60567c..aed315597 100644
--- a/packages/plugins/page/src/PageHistory.vue
+++ b/packages/plugins/page/src/PageHistory.vue
@@ -6,7 +6,8 @@
 import { ref, watchEffect } from 'vue'
 import { BlockHistoryList } from '@opentiny/tiny-engine-common'
 import { previewPage } from '@opentiny/tiny-engine-controller/js/preview'
-import { getGlobalConfig, usePage, useBlock, useEditorInfo, useModal } from '@opentiny/tiny-engine-controller'
+import { usePage, useBlock, useEditorInfo, useModal } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { fetchPageHistory } from './http.js'
 
 export default {
@@ -56,8 +57,8 @@ export default {
         previewPage({
           id: item.page,
           history: item.id,
-          framework: getGlobalConfig()?.dslMode,
-          platform: getGlobalConfig()?.platformId
+          framework: getMergeMeta('engine.config')?.dslMode,
+          platform: getMergeMeta('engine.config')?.platformId
         })
     }
 
diff --git a/packages/settings/props/src/components/groups/LifeCycle.vue b/packages/settings/props/src/components/groups/LifeCycle.vue
index e7d73f595..5bc9ac800 100644
--- a/packages/settings/props/src/components/groups/LifeCycle.vue
+++ b/packages/settings/props/src/components/groups/LifeCycle.vue
@@ -74,7 +74,8 @@
 import { getCurrentInstance, reactive, toRefs } from 'vue'
 import { Button, DialogBox, Modal, Popover, Search, Tooltip } from '@opentiny/vue'
 import { VueMonaco } from '@opentiny/tiny-engine-common'
-import { useCanvas, getGlobalConfig } from '@opentiny/tiny-engine-controller'
+import { useCanvas } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { theme } from '@opentiny/tiny-engine-controller/adapter'
 import { iconAdd, IconDel, iconSetting, iconYes } from '@opentiny/vue-icon'
 
@@ -102,7 +103,7 @@ export default {
       showDialog: false,
       title: '',
       showEditor: false,
-      lifeCycles: getGlobalConfig()?.lifeCyclesOptions[getGlobalConfig()?.dslMode],
+      lifeCycles: getMergeMeta('engine.config')?.lifeCyclesOptions[getMergeMeta('engine.config')?.dslMode],
       bindLifeCycles: pageState.pageSchema?.lifeCycles || {},
       options: {
         roundedSelection: true,
@@ -118,7 +119,7 @@ export default {
 
     const search = (value) => {
       if (!value) {
-        state.lifeCycles = getGlobalConfig()?.lifeCyclesOptions[getGlobalConfig()?.dslMode]
+        state.lifeCycles = getMergeMeta('engine.config')?.lifeCyclesOptions[getMergeMeta('engine.config')?.dslMode]
         return
       }
 
diff --git a/packages/toolbars/generate-vue/src/Main.vue b/packages/toolbars/generate-vue/src/Main.vue
index 75d38dca7..54644616e 100644
--- a/packages/toolbars/generate-vue/src/Main.vue
+++ b/packages/toolbars/generate-vue/src/Main.vue
@@ -23,14 +23,8 @@
 <script>
 import { reactive } from 'vue'
 import { Popover } from '@opentiny/vue'
-import {
-  getGlobalConfig,
-  useBlock,
-  useCanvas,
-  useNotify,
-  useLayout,
-  useEditorInfo
-} from '@opentiny/tiny-engine-controller'
+import { useBlock, useCanvas, useNotify, useLayout, useEditorInfo } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { fs } from '@opentiny/tiny-engine-utils'
 import { useHttp } from '@opentiny/tiny-engine-http'
 import { generateApp, parseRequiredBlocks } from '@opentiny/tiny-engine-dsl-vue'
@@ -62,8 +56,8 @@ export default {
     const getParams = () => {
       const { getSchema } = useCanvas().canvasApi.value
       const params = {
-        framework: getGlobalConfig()?.dslMode,
-        platform: getGlobalConfig()?.platformId,
+        framework: getMergeMeta('engine.config')?.dslMode,
+        platform: getMergeMeta('engine.config')?.platformId,
         pageInfo: {
           schema: getSchema()
         }
diff --git a/packages/toolbars/logo/src/Main.vue b/packages/toolbars/logo/src/Main.vue
index cd25ac374..c2c0b9e42 100644
--- a/packages/toolbars/logo/src/Main.vue
+++ b/packages/toolbars/logo/src/Main.vue
@@ -111,7 +111,8 @@ import {
   Tooltip as TinyTooltip
 } from '@opentiny/vue'
 import { iconHelpCircle } from '@opentiny/vue-icon'
-import { useLayout, useApp, getGlobalConfig, useModal } from '@opentiny/tiny-engine-controller'
+import { useLayout, useApp, useModal } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 import { useHttp } from '@opentiny/tiny-engine-http'
 import { isDevelopEnv } from '@opentiny/tiny-engine-controller/js/environments'
 
@@ -145,7 +146,7 @@ const tipBoxVisibility = ref(false)
 let tipText = ref('发布成功')
 const form = ref(null)
 const menus = ref(
-  getGlobalConfig()?.dslMode === 'Angular' ? [] : [{ name: '应用发布', code: 'publishApp', icon: 'news' }]
+  getMergeMeta('engine.config')?.dslMode === 'Angular' ? [] : [{ name: '应用发布', code: 'publishApp', icon: 'news' }]
 )
 
 const repalceTrim = (e) => {
diff --git a/packages/toolbars/preview/src/Main.vue b/packages/toolbars/preview/src/Main.vue
index 9403f88c1..769952c8f 100644
--- a/packages/toolbars/preview/src/Main.vue
+++ b/packages/toolbars/preview/src/Main.vue
@@ -17,7 +17,8 @@
 <script>
 import { Popover } from '@opentiny/vue'
 import { previewPage, previewBlock } from '@opentiny/tiny-engine-controller/js/preview'
-import { getGlobalConfig, useBlock, useCanvas, useLayout, useNotify } from '@opentiny/tiny-engine-controller'
+import { useBlock, useCanvas, useLayout, useNotify } from '@opentiny/tiny-engine-controller'
+import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 
 export default {
   components: {
@@ -44,8 +45,8 @@ export default {
       }
 
       const params = {
-        framework: getGlobalConfig()?.dslMode,
-        platform: getGlobalConfig()?.platformId,
+        framework: getMergeMeta('engine.config')?.dslMode,
+        platform: getMergeMeta('engine.config')?.platformId,
         pageInfo: {
           schema: canvasApi.value?.getSchema?.()
         }

From 923c44563fab99952a6ca002b993bcc9e351eef4 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Thu, 6 Jun 2024 20:01:17 -0700
Subject: [PATCH 2/3] fix: delete useless config file

---
 designer-demo/registry.js                     |  2 +-
 packages/controller/src/globalConfig.js       | 19 ----
 packages/design-core/config/lowcode.config.js | 97 -------------------
 packages/design-core/src/App.vue              |  1 -
 4 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 packages/controller/src/globalConfig.js
 delete mode 100644 packages/design-core/config/lowcode.config.js

diff --git a/designer-demo/registry.js b/designer-demo/registry.js
index bdba8cab5..74a2a839e 100644
--- a/designer-demo/registry.js
+++ b/designer-demo/registry.js
@@ -13,7 +13,7 @@
 export default {
   config: {
     id: 'engine.config',
-    theme: 'dark',
+    theme: 'light',
     material: [],
   },
   layout: { id: 'engine.layout' },
diff --git a/packages/controller/src/globalConfig.js b/packages/controller/src/globalConfig.js
deleted file mode 100644
index 062d379ed..000000000
--- a/packages/controller/src/globalConfig.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Copyright (c) 2023 - present TinyEngine Authors.
-* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
-*
-* Use of this source code is governed by an MIT-style license.
-*
-* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
-* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
-* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
-*
-*/
-
-let globalConfig = null
-
-export const getGlobalConfig = () => globalConfig
-
-export const setGlobalConfig = (config) => {
-  globalConfig = config
-}
diff --git a/packages/design-core/config/lowcode.config.js b/packages/design-core/config/lowcode.config.js
deleted file mode 100644
index 75ec8443e..000000000
--- a/packages/design-core/config/lowcode.config.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2023 - present TinyEngine Authors.
- * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export default {
-  // 编辑器主题类型， 取值：dark暗色系，light浅色系, 对应的npm包名为：@opentiny/tiny-engine-theme-${theme}, 暗色主题名需要以dark开头
-  theme: 'light',
-
-  // 当前面板技术栈类型，DSL转义参数， 其取值有: Angular、React、HTML、Vue、Flowchart
-  dslMode: 'Vue',
-
-  // DSL 代码转换的服务地址
-  dslHost: '',
-
-  // 工具栏配置: Array<string>类型，当前取值:
-  toolbarOptions: [],
-
-  // 插件栏配置：Array<string>类型，当前取值：
-  pluginOptions: [],
-
-  canvasOptions: {
-    Angular: {},
-    Vue: {
-      material: ['/mock/bundle.json'],
-      scripts: [],
-      styles: ['/tiny-vue.css']
-    },
-    React: {},
-    HTML: {},
-    Flowchart: {}
-  },
-  // TODO: 声明周期相关配置拆分到页面管理的配置项里面
-  // 生命周期函数
-  lifeCyclesOptions: {
-    Angular: [
-      '_constructor_',
-      'ngOnInit',
-      'ngOnChanges',
-      'ngDoCheck',
-      'ngAfterContentInit',
-      'ngAfterContentChecked',
-      'ngAfterViewInit',
-      'ngAfterViewChecked',
-      'ngOnDestroy'
-    ],
-    Vue: [
-      'setup',
-      'onBeforeMount',
-      'onMounted',
-      'onBeforeUpdate',
-      'onUpdated',
-      'onBeforeUnmount',
-      'onUnmounted',
-      'onErrorCaptured',
-      'onActivated',
-      'onDeactivated'
-    ],
-    HTML: [],
-    React: [
-      'componentWillMount',
-      'componentDidMount',
-      'componentWillReceiveProps',
-      'shouldComponentUpdate',
-      'componentWillUpdate',
-      'componentDidUpdate',
-      'componentWillUnmount'
-    ]
-  },
-
-  // 生命周期使用提示
-  lifeCycleTips: {
-    Vue: '通过Vue解构出来的方法都可以在setup这里使用，比如watch、computed、watchEffect等'
-  },
-
-  // 设计器服务的host
-  platformHost: '',
-
-  // 发布应用host
-  appHost: '',
-
-  // 物料服务的host
-  materialHost: '',
-
-  // 当前 editor 实例绑定的设计器id
-  platformId: 897,
-
-  // 是否默认导入布局组件
-  defaultImportLayout: 1
-}
diff --git a/packages/design-core/src/App.vue b/packages/design-core/src/App.vue
index bacaf8f57..699e2b201 100644
--- a/packages/design-core/src/App.vue
+++ b/packages/design-core/src/App.vue
@@ -182,4 +182,3 @@ export default {
   }
 }
 </style>
-./theme/light.js

From b918ad4a3d39747e1788922fb23a92cfb536bbbd Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Thu, 6 Jun 2024 20:24:00 -0700
Subject: [PATCH 3/3] fix(theme): load theme pkg ASAP

---
 packages/design-core/src/App.vue | 5 -----
 packages/design-core/src/init.js | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/design-core/src/App.vue b/packages/design-core/src/App.vue
index 699e2b201..a0ce17a56 100644
--- a/packages/design-core/src/App.vue
+++ b/packages/design-core/src/App.vue
@@ -40,17 +40,12 @@ import blockPlugin from '@opentiny/tiny-engine-plugin-block'
 import materials from '@opentiny/tiny-engine-plugin-materials'
 import { useBroadcastChannel } from '@vueuse/core'
 import { constants } from '@opentiny/tiny-engine-utils'
-import { getMergeMeta } from '@opentiny/tiny-engine-entry'
 
 const { message } = useModal()
 const { requestInitBlocks } = blockPlugin.api
 const { fetchGroups } = materials.api
 const { BROADCAST_CHANNEL } = constants
 
-const config = getMergeMeta('engine.config')
-
-import(`./theme/${config.theme}.js`)
-
 export default {
   name: 'TinyLowCode',
   components: {
diff --git a/packages/design-core/src/init.js b/packages/design-core/src/init.js
index f3b426456..d7ca59ea2 100644
--- a/packages/design-core/src/init.js
+++ b/packages/design-core/src/init.js
@@ -37,6 +37,9 @@ const defaultLifeCycles = {
     // 在common层注入合并后的注册表
     defineEntry(newRegistry)
 
+    // 加载主题样式，尽早加载
+    import(`./theme/${newRegistry.config.theme}.js`)
+
     initHttp({ env: import.meta.env })
 
     // eslint-disable-next-line no-new