Merge branch 'opentiny:develop' into develop

Author: betterdancing

mockServer/src/assets/json/appinfo.json

@@ -1684,21 +1684,6 @@
       "created_at": "2022-07-01T03:21:19.000Z",
       "updated_at": "2022-07-01T03:21:19.000Z"
     },
-    {
-      "id": 146,
-      "name": "npm",
-      "type": "function",
-      "content": {
-        "type": "JSFunction",
-        "value": "''"
-      },
-      "app": 1,
-      "category": "utils",
-      "created_by": null,
-      "updated_by": null,
-      "created_at": "2022-08-29T06:54:02.000Z",
-      "updated_at": "2023-01-05T01:00:52.000Z"
-    },
     {
       "id": 102,
       "name": "Pager",

mockServer/src/mock/get/app-center/apps/extension/list.json

@@ -66,19 +66,6 @@
       "created_at": "2022-07-01T03:21:19.000Z",
       "updated_at": "2022-07-01T03:21:19.000Z"
     },
-    {
-      "id": 146,
-      "name": "npm",
-      "type": "function",
-      "content": {
-        "type": "JSFunction",
-        "value": "''"
-      },
-      "app": 1,
-      "category": "utils",
-      "created_at": "2022-08-29T06:54:02.000Z",
-      "updated_at": "2023-01-05T01:00:52.000Z"
-    },
     {
       "id": 102,
       "name": "Pager",

mockServer/src/mock/get/app-center/v1/apps/schema/1.json

@@ -2158,14 +2158,6 @@
           "main": ""
         }
       },
-      {
-        "name": "npm",
-        "type": "function",
-        "content": {
-          "type": "JSFunction",
-          "value": "''"
-        }
-      },
       {
         "name": "Pager",
         "type": "npm",

packages/builtinComponent/package.json

@@ -4,6 +4,7 @@
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -27,7 +28,8 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.2",
     "@vitejs/plugin-vue-jsx": "^4.0.1",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "vite-plugin-dts": "^4.5.4"
   },
   "peerDependencies": {
     "@opentiny/vue": "^3.20.0",

packages/builtinComponent/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["./index.ts", "./src/**/*.ts", "./src/**/*.tsx", "./src/**/*.vue"]
+}

packages/builtinComponent/vite.config.ts

@@ -14,9 +14,18 @@ import path from 'path'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'
 import vitePluginCssInjectedByJs from 'vite-plugin-css-injected-by-js'
+import dts from 'vite-plugin-dts'
 
 export default defineConfig({
-  plugins: [vue(), vueJsx(), vitePluginCssInjectedByJs()],
+  plugins: [
+    vue(),
+    vueJsx(),
+    vitePluginCssInjectedByJs(),
+    dts({
+      tsconfigPath: path.resolve(__dirname, './tsconfig.json'),
+      rollupTypes: true
+    })
+  ],
   publicDir: false,
   build: {
     sourcemap: true,

packages/design-core/src/init.js

@@ -151,4 +151,6 @@ export const init = async ({
 
   app.mount(selector)
   appMounted?.({ app })
+
+  return app
 }

packages/design-core/src/preview/src/main.js

@@ -30,4 +30,6 @@ export const initPreview = ({ registry, lifeCycles = {} }) => {
   initSvgs(app)
 
   app.mount('#app')
+
+  return app
 }

packages/design-core/src/preview/src/preview/importMap.js

@@ -10,13 +10,13 @@
  *
  */
 
-import { useEnv } from '@opentiny/tiny-engine-meta-register'
+import { useEnv, getMergeMeta } from '@opentiny/tiny-engine-meta-register'
 import { importMapConfig as importMapJSON } from '@opentiny/tiny-engine-common/js/importMap'
 
 const importMap = {}
 const opentinyVueVersion = '~3.20'
 
-function replacePlaceholder(v) {
+function replacePlaceholder(v, k) {
   const {
     VITE_CDN_TYPE,
     VITE_CDN_DOMAIN,
@@ -28,6 +28,14 @@ function replacePlaceholder(v) {
   const versionDelimiter = VITE_CDN_TYPE === 'npmmirror' && !isLocalBundle ? '/' : '@'
   const fileDelimiter = VITE_CDN_TYPE === 'npmmirror' && !isLocalBundle ? '/files' : ''
   const cdnDomain = isLocalBundle ? BASE_URL + VITE_LOCAL_IMPORT_PATH : VITE_CDN_DOMAIN
+  const customImportMap = getMergeMeta('engine.config')?.importMap
+
+  if (customImportMap?.imports?.[k]) {
+    return customImportMap.imports[k]
+      .replace('${VITE_CDN_DOMAIN}', cdnDomain)
+      .replace('${versionDelimiter}', versionDelimiter)
+      .replace('${fileDelimiter}', fileDelimiter)
+  }
 
   return v
     .replace('${VITE_CDN_DOMAIN}', cdnDomain)
@@ -38,7 +46,7 @@ function replacePlaceholder(v) {
 
 export const getImportMap = (scripts = {}) => {
   importMap.imports = {
-    ...Object.fromEntries(Object.entries(importMapJSON.imports).map(([k, v]) => [k, replacePlaceholder(v)])),
+    ...Object.fromEntries(Object.entries(importMapJSON.imports).map(([k, v]) => [k, replacePlaceholder(v, k)])),
     ...scripts
   }
 

packages/i18n/package.json

@@ -15,6 +15,7 @@
   "type": "module",
   "main": "dist/lowcode-design-i18n-host.umd.js",
   "module": "dist/lowcode-design-i18n-host.es.js",
+  "types": "dist/lowcode-design-i18n-host.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/opentiny/tiny-engine",
@@ -28,7 +29,8 @@
   "homepage": "https://opentiny.design/tiny-engine",
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.2",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "vite-plugin-dts": "^4.5.4"
   },
   "peerDependencies": {
     "vue": "^3.4.15",