diff --git a/packages/cli/package.json b/packages/cli/package.json index a8b77c0d..54029159 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -35,5 +35,13 @@ "devDependencies": { "@types/fs-extra": "^11.0.4", "@types/node": "^18.19.0" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/core/package.json b/packages/core/package.json index 937ea4d4..e3d751b9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -41,17 +41,22 @@ "events": "^3.3.0", "lodash-es": "^4.17.21" }, - "peerDependencies": { - "@tmagic/data-source": "workspace:*", - "@tmagic/schema": "workspace:*", - "@tmagic/utils": "workspace:*" - }, "devDependencies": { "@types/events": "^3.0.0", "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/data-source": "workspace:*", + "@tmagic/schema": "workspace:*", + "@tmagic/utils": "workspace:*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/data-source/package.json b/packages/data-source/package.json index c4d071ea..545358eb 100644 --- a/packages/data-source/package.json +++ b/packages/data-source/package.json @@ -39,16 +39,21 @@ "events": "^3.3.0", "lodash-es": "^4.17.21" }, - "peerDependencies": { - "@tmagic/schema": "workspace:*", - "@tmagic/utils": "workspace:*" - }, "devDependencies": { "@types/events": "^3.0.0", "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", "tsc-alias": "^1.8.5", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/schema": "workspace:*", + "@tmagic/utils": "workspace:*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/dep/package.json b/packages/dep/package.json index 09be1a7b..6469a739 100644 --- a/packages/dep/package.json +++ b/packages/dep/package.json @@ -30,14 +30,19 @@ "type": "git", "url": "https://github.com/Tencent/tmagic-editor.git" }, - "peerDependencies": { - "@tmagic/schema": "workspace:*", - "@tmagic/utils": "workspace:*" - }, "devDependencies": { "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/schema": "workspace:*", + "@tmagic/utils": "workspace:*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/dep/src/types.ts b/packages/dep/src/types.ts index 324d2be0..ba5b5f5e 100644 --- a/packages/dep/src/types.ts +++ b/packages/dep/src/types.ts @@ -1,4 +1,4 @@ -import { DepData } from '@tmagic/schema'; +import type { DepData } from '@tmagic/schema'; import type Target from './Target'; diff --git a/packages/design/package.json b/packages/design/package.json index 2e521100..477e59cc 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -37,17 +37,22 @@ "vue3", "typescript" ], - "peerDependencies": { - "vue": "^3.4.27" - }, "devDependencies": { "@types/node": "^18.19.0", "@vitejs/plugin-vue": "^5.0.4", "@vue/compiler-sfc": "^3.4.27", "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11", "vue-tsc": "^2.0.16" + }, + "peerDependencies": { + "vue": "^3.4.27", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/editor/package.json b/packages/editor/package.json index 12ac84a0..0958fa37 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -59,16 +59,6 @@ "moveable": "^0.53.0", "serialize-javascript": "^6.0.0" }, - "peerDependencies": { - "@tmagic/core": "workspace:*", - "@tmagic/design": "workspace:*", - "@tmagic/form": "workspace:*", - "@tmagic/schema": "workspace:*", - "@tmagic/stage": "workspace:*", - "@tmagic/utils": "workspace:*", - "monaco-editor": "^0.48.0", - "vue": "^3.4.27" - }, "devDependencies": { "@types/events": "^3.0.0", "@types/lodash-es": "^4.17.4", @@ -81,8 +71,23 @@ "sass": "^1.77.0", "tsc-alias": "^1.8.5", "type-fest": "^4.10.3", - "typescript": "^5.4.2", "vite": "^5.2.11", "vue-tsc": "^2.0.16" + }, + "peerDependencies": { + "@tmagic/core": "workspace:*", + "@tmagic/design": "workspace:*", + "@tmagic/form": "workspace:*", + "@tmagic/schema": "workspace:*", + "@tmagic/stage": "workspace:*", + "@tmagic/utils": "workspace:*", + "monaco-editor": "^0.48.0", + "vue": "^3.4.27", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/element-plus-adapter/package.json b/packages/element-plus-adapter/package.json index 6b3f5557..7c889dc0 100644 --- a/packages/element-plus-adapter/package.json +++ b/packages/element-plus-adapter/package.json @@ -37,14 +37,19 @@ "vue3", "typescript" ], - "peerDependencies": { - "@tmagic/design": "workspace:*", - "element-plus": "^2.6.1" - }, "devDependencies": { "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/design": "workspace:*", + "element-plus": "^2.6.1", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/form/package.json b/packages/form/package.json index be339a62..d1b9590d 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -41,11 +41,6 @@ "lodash-es": "^4.17.21", "sortablejs": "^1.15.2" }, - "peerDependencies": { - "@tmagic/design": "workspace:*", - "@tmagic/utils": "workspace:*", - "vue": "^3.4.27" - }, "devDependencies": { "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", @@ -55,8 +50,18 @@ "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", "sass": "^1.77.0", - "typescript": "^5.4.2", "vite": "^5.2.11", "vue-tsc": "^2.0.16" + }, + "peerDependencies": { + "@tmagic/design": "workspace:*", + "@tmagic/utils": "workspace:*", + "vue": "^3.4.27", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/schema/package.json b/packages/schema/package.json index b72743a7..14db315b 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -31,7 +31,14 @@ "devDependencies": { "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/stage/package.json b/packages/stage/package.json index b902e584..c3607944 100644 --- a/packages/stage/package.json +++ b/packages/stage/package.json @@ -38,18 +38,23 @@ "moveable": "^0.53.0", "moveable-helper": "^0.4.0" }, - "peerDependencies": { - "@tmagic/core": "workspace:*", - "@tmagic/schema": "workspace:*", - "@tmagic/utils": "workspace:*" - }, "devDependencies": { "@types/events": "^3.0.0", "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", "rimraf": "^3.0.2", "sass": "^1.77.0", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/core": "workspace:*", + "@tmagic/schema": "workspace:*", + "@tmagic/utils": "workspace:*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/table/package.json b/packages/table/package.json index fa971904..0c92244c 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -37,12 +37,6 @@ "dependencies": { "lodash-es": "^4.17.21" }, - "peerDependencies": { - "@tmagic/design": "workspace:*", - "@tmagic/form": "workspace:*", - "@tmagic/utils": "workspace:*", - "vue": "^3.4.27" - }, "devDependencies": { "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", @@ -51,8 +45,19 @@ "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", "sass": "^1.77.0", - "typescript": "^5.4.2", "vite": "^5.2.11", "vue-tsc": "^2.0.16" + }, + "peerDependencies": { + "@tmagic/design": "workspace:*", + "@tmagic/form": "workspace:*", + "@tmagic/utils": "workspace:*", + "vue": "^3.4.27", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/tdesign-vue-next-adapter/package.json b/packages/tdesign-vue-next-adapter/package.json index 5fcacea2..d74f9441 100644 --- a/packages/tdesign-vue-next-adapter/package.json +++ b/packages/tdesign-vue-next-adapter/package.json @@ -37,18 +37,23 @@ "vue3", "typescript" ], - "peerDependencies": { - "@tmagic/design": "workspace:*", - "tdesign-vue-next": "^1.8.1", - "vue": "^3.4.27" - }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.4", "@vue/compiler-sfc": "^3.4.27", "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11", "vue-tsc": "^2.0.16" + }, + "peerDependencies": { + "@tmagic/design": "workspace:*", + "tdesign-vue-next": "^1.8.1", + "vue": "^3.4.27", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/utils/package.json b/packages/utils/package.json index c15b1efd..83d9004a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -34,14 +34,19 @@ "dayjs": "^1.11.11", "lodash-es": "^4.17.21" }, - "peerDependencies": { - "@tmagic/schema": "workspace:*" - }, "devDependencies": { "@types/lodash-es": "^4.17.4", "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "typescript": "^5.4.2", "vite": "^5.2.11" + }, + "peerDependencies": { + "@tmagic/schema": "workspace:*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } } diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 2a003c63..ca070800 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -25,8 +25,6 @@ import { NodeType } from '@tmagic/schema'; export * from './dom'; -dayjs.extend(utc); - export const sleep = (ms: number): Promise => new Promise((resolve) => { const timer = setTimeout(() => { @@ -45,6 +43,7 @@ export const datetimeFormatter = ( if (['x', 'timestamp'].includes(format)) { time = dayjs(v).valueOf(); } else if ((typeof v === 'string' && v.includes('Z')) || v.constructor === Date) { + dayjs.extend(utc); // UTC字符串时间或Date对象格式化为北京时间 time = dayjs(v).utcOffset(8).format(format); } else { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a14e43d..2686df7f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -146,6 +146,9 @@ importers: tslib: specifier: ^2.6.2 version: 2.6.2 + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/fs-extra': specifier: ^11.0.4 @@ -171,6 +174,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/events': specifier: ^3.0.0 @@ -184,9 +190,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -211,6 +214,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/events': specifier: ^3.0.0 @@ -224,9 +230,6 @@ importers: tsc-alias: specifier: ^1.8.5 version: 1.8.5 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -239,6 +242,9 @@ importers: '@tmagic/utils': specifier: workspace:* version: link:../utils + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/node': specifier: ^18.19.0 @@ -246,15 +252,15 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) packages/design: dependencies: + typescript: + specifier: '*' + version: 5.4.2 vue: specifier: ^3.4.27 version: 3.4.27(typescript@5.4.2) @@ -274,9 +280,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -343,6 +346,9 @@ importers: serialize-javascript: specifier: ^6.0.0 version: 6.0.0 + typescript: + specifier: '*' + version: 5.4.2 vue: specifier: ^3.4.27 version: 3.4.27(typescript@5.4.2) @@ -380,9 +386,6 @@ importers: type-fest: specifier: ^4.10.3 version: 4.11.1 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -398,6 +401,9 @@ importers: element-plus: specifier: ^2.6.1 version: 2.6.1(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.2)))(vue@3.4.27(typescript@5.4.2)) + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/node': specifier: ^18.19.0 @@ -405,9 +411,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -429,6 +432,9 @@ importers: sortablejs: specifier: ^1.15.2 version: 1.15.2 + typescript: + specifier: '*' + version: 5.4.2 vue: specifier: ^3.4.27 version: 3.4.27(typescript@5.4.2) @@ -457,9 +463,6 @@ importers: sass: specifier: ^1.77.0 version: 1.77.0 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -468,6 +471,10 @@ importers: version: 2.0.16(typescript@5.4.2) packages/schema: + dependencies: + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/node': specifier: ^18.19.0 @@ -475,9 +482,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -511,6 +515,9 @@ importers: moveable-helper: specifier: ^0.4.0 version: 0.4.0(scenejs@1.9.4) + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/events': specifier: ^3.0.0 @@ -527,9 +534,6 @@ importers: sass: specifier: ^1.77.0 version: 1.77.0 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -548,6 +552,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 + typescript: + specifier: '*' + version: 5.4.2 vue: specifier: ^3.4.27 version: 3.4.27(typescript@5.4.2) @@ -573,9 +580,6 @@ importers: sass: specifier: ^1.77.0 version: 1.77.0 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -591,6 +595,9 @@ importers: tdesign-vue-next: specifier: ^1.8.1 version: 1.8.1(vue@3.4.27(typescript@5.4.2)) + typescript: + specifier: '*' + version: 5.4.2 vue: specifier: ^3.4.27 version: 3.4.27(typescript@5.4.2) @@ -607,9 +614,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0) @@ -718,6 +722,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 + typescript: + specifier: '*' + version: 5.4.2 devDependencies: '@types/lodash-es': specifier: ^4.17.4 @@ -728,9 +735,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.2 - version: 5.4.2 vite: specifier: ^5.2.11 version: 5.2.11(@types/node@18.19.3)(sass@1.77.0)(terser@5.31.0)