lichunn · hexqi · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024
diff --git a/designer-demo/canvas.html b/designer-demo/canvas.html
@@ -260,6 +260,6 @@
         <div><span></span></div>
       </div>
     </div>
-    <script type="module" src="./src/canvas.js"></script>
+    <script type="module" src="/src/canvas.js"></script>
   </body>
 </html>
diff --git a/packages/design-core/.env.alpha → designer-demo/env/.env.alpha b/packages/design-core/.env.alpha → designer-demo/env/.env.alpha
diff --git a/packages/design-core/.env.development → designer-demo/env/.env.development b/packages/design-core/.env.development → designer-demo/env/.env.development
diff --git a/packages/design-core/.env.prod → designer-demo/env/.env.production b/packages/design-core/.env.prod → designer-demo/env/.env.production
diff --git a/designer-demo/package.json b/designer-demo/package.json
@@ -4,18 +4,26 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "vite build"
+    "dev": "cross-env VITE_THEME=light vite",
+    "build": "cross-env VITE_THEME=light vite build"
   },
   "dependencies": {
     "vue": "^3.4.21",
     "@opentiny/tiny-engine": "workspace:^",
     "@opentiny/tiny-engine-entry": "workspace:^",
-    "@opentiny/tiny-engine-configurator": "workspace:*"
+    "@opentiny/tiny-engine-configurator": "workspace:*",
+    "@opentiny/tiny-engine-theme-dark": "workspace:*",
+    "@opentiny/tiny-engine-theme-light": "workspace:*",
+    "@opentiny/vue": "~3.14.0",
+    "@opentiny/vue-design-smb": "~3.14.0",
+    "@opentiny/vue-renderless": "~3.14.0",
+    "@opentiny/vue-theme": "~3.14.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",
+    "cross-env": "^7.0.3",
     "vite": "^5.2.7",
+    "@opentiny/tiny-engine-vite-config": "workspace:^",
     "@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:^"
   }
 }
diff --git a/packages/design-core/preview.html → designer-demo/preview.html b/packages/design-core/preview.html → designer-demo/preview.html
@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="./src/preview/src/main.js"></script>
+    <script type="module" src="./src/preview.js"></script>
   </body>
 </html>
diff --git a/designer-demo/public/favicon.ico b/designer-demo/public/favicon.ico
diff --git a/packages/design-core/public/mock/bundle.json → designer-demo/public/mock/bundle.json b/packages/design-core/public/mock/bundle.json → designer-demo/public/mock/bundle.json
diff --git a/designer-demo/registry.js b/designer-demo/registry.js
@@ -10,107 +10,93 @@
  *
  */
 
+import {
+  Breadcrumb,
+  Fullscreen,
+  Lang,
+  Checkinout,
+  Logo,
+  Media,
+  Redoundo,
+  Save,
+  Clean,
+  Preview,
+  GenerateVue,
+  Refresh,
+  Collaboration,
+  Setting,
+  Materials,
+  Data,
+  Script,
+  Tree,
+  Help,
+  Schema,
+  Page,
+  I18n,
+  Bridge,
+  Block,
+  Datasource,
+  Robot,
+  Props,
+  Events,
+  Styles,
+  Layout,
+  CanvasContainer, 
+  CanvasFooter
+} from '@opentiny/tiny-engine'
+
 export default {
   config: {
     id: 'engine.config',
-    theme: 'light',
-    material: [],
+    theme: import.meta.env.VITE_THEME || 'light',
+    material: ['/mock/bundle.json'],
+    scripts: [],
+    styles: []
   },
-  layout: { id: 'engine.layout' },
-  toolbars: [
-    {
-      id: 'engine.toolbars.logo'
-    },
-    {
-      id: 'engine.toolbars.breadcrumb'
-    },
-    {
-      id: 'engine.toolbars.media'
-    },
+  layout: Layout,
+  themes: [
     {
-      id: 'engine.toolbars.collaboration'
+      id: 'engine.theme.light'
     },
     {
-      id: 'engine.toolbars.clean'
-    },
-    {
-      id: 'engine.toolbars.refresh'
-    },
-    {
-      id: 'engine.toolbars.save'
-    },
-    {
-      id: 'engine.toolbars.generate-vue'
-    },
-    {
-      id: 'engine.toolbars.preview'
-    },
-    {
-      id: 'engine.toolbars.redoundo'
-    },
-    {
-      id: 'engine.toolbars.fullscreen'
-    },
-    {
-      id: 'engine.toolbars.lock'
-    },
-    {
-      id: 'engine.toolbars.setting'
-    },
-    {
-      id: 'engine.toolbars.lang'
+      id: 'engine.theme.dark'
     }
   ],
+  toolbars: [
+    Logo,
+    Breadcrumb,
+    Media,
+    Collaboration,
+    Clean,
+    Refresh,
+    Save,
+    GenerateVue,
+    Preview,
+    Redoundo,
+    Fullscreen,
+    Checkinout,
+    Setting,
+    Lang
+  ],
   plugins: [
-    {
-      id: 'engine.plugins.materials'
-    },
-    {
-      id: 'engine.plugins.outlinetree'
-    },
-    {
-      id: 'engine.plugins.appmanage'
-    },
-    {
-      id: 'engine.plugins.blockmanage'
-    },
-    {
-      id: 'engine.plugins.collections'
-    },
-    {
-      id: 'engine.plugins.bridge'
-    },
-    {
-      id: 'engine.plugins.i18n'
-    },
-    {
-      id: 'engine.plugins.pagecontroller'
-    },
-    {
-      id: 'engine.plugins.state'
-    },
-    {
-      id: 'engine.plugins.schema'
-    },
-    {
-      id: 'engine.plugins.editorhelp'
-    },
-    {
-      id: 'engine.plugins.robot'
-    }
+    Materials,
+    Tree,
+    Page,
+    Block,
+    Datasource,
+    Bridge,
+    I18n,
+    Script,
+    Data,
+    Schema,
+    Help,
+    Robot
   ],
   dsls: [{ id: 'engine.dsls.dslvue' }],
   settings: [
-    {
-      id: 'engine.setting.props'
-    },
-    {
-      id: 'engine.setting.styles'
-    },
-    {
-      id: 'engine.setting.event'
-    }
+    Props,
+    Styles,
+    Events
   ],
-  canvas: {},
-  utils: { id: 'engine.utils' }
+  canvas: { CanvasContainer, CanvasFooter }
 }
diff --git a/designer-demo/src/main.js b/designer-demo/src/main.js
@@ -13,6 +13,13 @@
 // 导入@opentiny/tiny-engine时，内部的依赖包也会逐个导入，可能会执行useComplie，此时需要templateHashMap。所以需要先执行一次defineEntry
 import { registry } from './defineEntry.js'
 import { init } from '@opentiny/tiny-engine'
+import { initHook, HOOK_NAME } from '@opentiny/tiny-engine-entry'
 import { configurators } from './configurators.js'
+import 'virtual:svg-icons-register'
+import '@opentiny/tiny-engine-theme'
 
-init({ registry, configurators })
+const beforeAppCreate = () => {
+  initHook(HOOK_NAME.useEnv, import.meta.env)
+}
+
+init({ registry, configurators, lifeCycles: { beforeAppCreate } })
diff --git a/designer-demo/src/preview.js b/designer-demo/src/preview.js
@@ -0,0 +1,15 @@
+/**
+ * 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.
+ *
+ */
+
+import { initPreview } from '@opentiny/tiny-engine'
+
+initPreview({ registry: { config: { id : 'engine.config', theme: 'light' } } })
diff --git a/designer-demo/vite.config.js b/designer-demo/vite.config.js
@@ -1,11 +1,18 @@
 import path from 'node:path'
-import { defineConfig, mergeConfig } from 'vite'
-import getDefaultConfig from '@opentiny/tiny-engine/vite.config.js'
+import { defineConfig, mergeConfig, loadEnv } from 'vite'
+import { getDefaultConfig } from '@opentiny/tiny-engine-vite-config'
 
 export default defineConfig((options) => {
-  const defaultConfig = getDefaultConfig(options)
+  const envDir = path.resolve(process.cwd(), 'env')
+  const extOptions = {
+    ...loadEnv(options.mode, envDir, 'VITE_'),
+    iconDirs: [path.resolve(__dirname, './node_modules/@opentiny/tiny-engine/assets/')]
+  }
+  const defaultConfig = getDefaultConfig(options, extOptions)
 
   const devAlias = {
+    '@opentiny/tiny-engine/canvas': path.resolve(__dirname, '../packages/design-core/src/canvas/canvas.js'),
+    '@opentiny/tiny-engine': path.resolve(__dirname, '../packages/design-core/index.js'),
     '@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'),
@@ -56,17 +63,23 @@ export default defineConfig((options) => {
     '@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')
+    '@opentiny/tiny-engine-configurator': path.resolve(__dirname, '../packages/configurator/src/index.js'),
+    '@opentiny/tiny-engine-theme': ['light', 'dark'].includes(extOptions.VITE_THEME)
+    ? path.resolve(process.cwd(), `../packages/theme/${extOptions.VITE_THEME}/index.less`)
+    // ? path.resolve(process.cwd(), `./node_modules/@opentiny/tiny-engine-theme-${extOptions.VITE_THEME}/dist/style.css`)
+    : ''
   }
 
   const config = {
+    envDir,
+    publicDir: path.resolve(__dirname, './public'),
     server: {
       port: 8090
     },
     resolve: {
       alias: devAlias
     }
   }
-
+  
   return mergeConfig(defaultConfig, config)
 })
diff --git a/packages/build/vite-config/index.js b/packages/build/vite-config/index.js
@@ -0,0 +1,2 @@
+export { default as getDefaultConfig } from './src/default-config.js'
+export { default as metaCommentsPlugin } from '@opentiny/tiny-engine-vite-plugin-meta-comments'
diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json
@@ -0,0 +1,65 @@
+{
+  "name": "@opentiny/tiny-engine-vite-config",
+  "version": "1.0.0",
+  "description": "",
+  "type": "module",
+  "main": "./index.js",
+  "module": "./index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": ""
+  },
+  "dependencies": {
+    "@babel/core": "~7.23.2",
+    "@babel/generator": "~7.23.2",
+    "@babel/parser": "~7.23.2",
+    "@babel/traverse": "~7.23.2",
+    "@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:^",
+    "@babel/eslint-parser": "^7.21.3",
+    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "@types/node": "^18.0.0",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "assert": "^2.0.0",
+    "buffer": "^6.0.3",
+    "cross-env": "^7.0.3",
+    "esbuild-plugin-copy": "^2.1.1",
+    "eslint": "^8.38.0",
+    "eslint-plugin-vue": "^8.0.0",
+    "fs-extra": "^10.1.0",
+    "husky": "^8.0.0",
+    "lerna": "^7.2.0",
+    "less": "^4.1.2",
+    "lint-staged": "^13.2.0",
+    "path": "^0.12.7",
+    "rimraf": "^3.0.2",
+    "rollup-plugin-polyfill-node": "^0.12.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-visualizer": "^5.8.3",
+    "shelljs": "^0.8.5",
+    "svg-sprite-loader": "^6.0.11",
+    "vite": "^4.3.7",
+    "vite-plugin-monaco-editor": "^1.1.0",
+    "vite-plugin-static-copy": "^0.16.0",
+    "vite-plugin-svg-icons": "^2.0.1",
+    "vue-eslint-parser": "^8.0.1"
+  },
+  "keywords": [],
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/opentiny/tiny-engine",
+    "directory": "packages/build/vite-config"
+  },
+  "bugs": {
+    "url": "https://github.com/opentiny/tiny-engine/issues"
+  },
+  "author": "OpenTiny Team",
+  "license": "MIT",
+  "homepage": "https://opentiny.design/tiny-engine"
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export { default as getDefaultConfig } from './src/default-config.js'
		export { default as metaCommentsPlugin } from '@opentiny/tiny-engine-vite-plugin-meta-comments'