diff --git a/.gitignore b/.gitignore index e25a0d53..9f828c73 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ types .temp .cache +temp # local env files .env.local diff --git a/.husky/pre-commit b/.husky/pre-commit index f0f5bb37..68d8d979 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -3,4 +3,4 @@ npx lint-staged -pnpm --filter "@tmagic/*" check:type +pnpm check:type diff --git a/package.json b/package.json index 59226928..5b3847fd 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "packageManager": "pnpm@9.6.0", "scripts": { "bootstrap": "pnpm i && pnpm build", - "clean:top": "rimraf */**/dist */**/types */dist coverage dwt*", + "clean:top": "rimraf */**/dist */**/types */dist coverage dwt* temp", "clean:modules": "rimraf node_modules **/node_modules **/**/node_modules", "clean:all": "pnpm clean:top && pnpm clean:modules", "lint": "eslint . --ext .js,.vue,.ts,.tsx", @@ -17,7 +17,9 @@ "pg:vue2": "pnpm playground:vue2", "playground:react": "pnpm --filter \"runtime-react\" build:libs && pnpm --filter \"runtime-react\" --filter \"tmagic-playground\" dev:react", "pg:react": "pnpm playground:react", - "build": "node scripts/build.mjs", + "build": "pnpm build:dst && pnpm --filter \"@tmagic/*\" build", + "build:dst": "pnpm --filter \"@tmagic/cli\" build && tsc -p tsconfig.build-browser.json && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build-vue.json && rollup -c rollup.dts.config.js && rimraf temp", + "check:type": "tsc --incremental --noEmit -p tsconfig.check.json", "build:playground": "pnpm --filter \"runtime-vue3\" build && pnpm --filter \"tmagic-playground\" build", "docs:dev": "vitepress dev docs", "docs:serve": "vitepress serve docs", @@ -43,6 +45,7 @@ "devDependencies": { "@commitlint/cli": "^18.2.0", "@commitlint/config-conventional": "^18.1.0", + "@rollup/plugin-alias": "^5.1.0", "@types/node": "^18.19.0", "@typescript-eslint/eslint-plugin": "^5.57.1", "@typescript-eslint/parser": "^5.57.1", @@ -71,6 +74,8 @@ "prettier": "^2.8.7", "recast": "^0.20.4", "rimraf": "^3.0.2", + "rollup": "^4.17.2", + "rollup-plugin-dts": "^6.1.1", "semver": "^7.3.7", "serialize-javascript": "^6.0.0", "shx": "^0.3.4", @@ -78,7 +83,8 @@ "vite": "^5.3.5", "vitepress": "1.2.2", "vitest": "^2.0.3", - "vue": "^3.4.35" + "vue": "^3.4.35", + "vue-tsc": "^2.0.19" }, "config": { "commitizen": { diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index af5e3629..acf72a68 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -5,6 +5,7 @@ "rootDir": "./src", "outDir": "./lib", "declaration": true, + "types": ["node"], }, "include": ["./src"], } diff --git a/packages/core/package.json b/packages/core/package.json index d8ed1462..7ab084a4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -24,10 +24,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "check:type": "tsc --noEmit --project tsconfig.build.json", - "clear:type": "rimraf ./types" + "build": "vite build" }, "engines": { "node": ">=18" diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/core/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/core/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/data-source/package.json b/packages/data-source/package.json index 574e6b8e..9a95e750 100644 --- a/packages/data-source/package.json +++ b/packages/data-source/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build --mode=es && vite build --mode=umd", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json && tsc-alias -p tsconfig.build.json", - "check:type": "tsc --noEmit --project tsconfig.build.json", - "clear:type": "rimraf ./types" + "build": "vite build --mode=es && vite build --mode=umd" }, "engines": { "node": ">=18" @@ -41,14 +38,8 @@ "events": "^3.3.0", "lodash-es": "^4.17.21" }, - "devDependencies": { - "@types/events": "^3.0.0", - "@types/lodash-es": "^4.17.4", - "@types/node": "^18.19.0", - "tsc-alias": "^1.8.5", - "vite": "^5.3.5" - }, "peerDependencies": { + "@tmagic/core": "workspace:*", "@tmagic/schema": "workspace:*", "@tmagic/utils": "workspace:*", "typescript": "*" @@ -57,5 +48,12 @@ "typescript": { "optional": true } + }, + "devDependencies": { + "@types/events": "^3.0.0", + "@types/lodash-es": "^4.17.4", + "@types/node": "^18.19.0", + "tsc-alias": "^1.8.5", + "vite": "^5.3.5" } } diff --git a/packages/data-source/tsconfig.build.json b/packages/data-source/tsconfig.build.json deleted file mode 100644 index 41dfc935..00000000 --- a/packages/data-source/tsconfig.build.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "outDir": "./types", - "paths": { - "@data-source/*": ["src/*"], - }, - }, - "include": [ - "src" - ], -} diff --git a/packages/data-source/tsconfig.json b/packages/data-source/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/data-source/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/dep/package.json b/packages/dep/package.json index 0cc6f649..d531da67 100644 --- a/packages/dep/package.json +++ b/packages/dep/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "check:type": "tsc --noEmit --project tsconfig.build.json", - "clear:type": "rimraf ./types" + "build": "vite build" }, "engines": { "node": ">=18" diff --git a/packages/dep/tsconfig.build.json b/packages/dep/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/dep/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/dep/tsconfig.json b/packages/dep/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/dep/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/design/package.json b/packages/design/package.json index a643579f..fa18abf3 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": " vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "vue-tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -45,8 +42,7 @@ "@vue/compiler-sfc": "^3.4.27", "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" }, "peerDependencies": { "vue": "^3.4.35", diff --git a/packages/design/src/Popover.vue b/packages/design/src/Popover.vue index 75a54648..3fdec213 100644 --- a/packages/design/src/Popover.vue +++ b/packages/design/src/Popover.vue @@ -18,7 +18,7 @@ defineOptions({ name: 'TMPopover', }); -const props = withDefaults(defineProps(), { visible: null }); +const props = defineProps(); const ui = getConfig('components')?.popover; diff --git a/packages/design/src/types.ts b/packages/design/src/types.ts index 444abe8c..8e358193 100644 --- a/packages/design/src/types.ts +++ b/packages/design/src/types.ts @@ -231,7 +231,7 @@ export interface PopoverProps { content?: string; disabled?: boolean; popperClass?: string; - visible?: boolean | null; + visible?: boolean; } export interface RadioProps { diff --git a/packages/design/tsconfig.build.json b/packages/design/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/design/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/design/tsconfig.json b/packages/design/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/design/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/editor/package.json b/packages/editor/package.json index f5bb8ed1..a84714e6 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -29,10 +29,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json && tsc-alias -p tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "vue-tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -78,8 +75,7 @@ "sass": "^1.77.0", "tsc-alias": "^1.8.5", "type-fest": "^4.10.3", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" }, "peerDependencies": { "@tmagic/core": "workspace:*", diff --git a/packages/editor/tsconfig.build.json b/packages/editor/tsconfig.build.json deleted file mode 100644 index 56574cba..00000000 --- a/packages/editor/tsconfig.build.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "outDir": "./types", - "paths": { - "@editor/*": ["src/*"], - }, - }, - "include": [ - "src" - ], -} diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/editor/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/element-plus-adapter/package.json b/packages/element-plus-adapter/package.json index d14203e0..da5f5776 100644 --- a/packages/element-plus-adapter/package.json +++ b/packages/element-plus-adapter/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" diff --git a/packages/element-plus-adapter/tsconfig.build.json b/packages/element-plus-adapter/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/element-plus-adapter/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/element-plus-adapter/tsconfig.json b/packages/element-plus-adapter/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/element-plus-adapter/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/form/package.json b/packages/form/package.json index def801ab..f16707d1 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -29,10 +29,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "vue-tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -56,8 +53,7 @@ "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", "sass": "^1.77.0", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" }, "peerDependencies": { "@tmagic/design": "workspace:*", diff --git a/packages/form/src/shims-vue.d.ts b/packages/form/src/shims-vue.d.ts deleted file mode 100644 index 30030494..00000000 --- a/packages/form/src/shims-vue.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.vue' { - import { DefineComponent } from 'vue'; - - const component: DefineComponent<{}, {}, any>; - export default component; -} diff --git a/packages/form/tsconfig.build.json b/packages/form/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/form/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/form/tsconfig.json b/packages/form/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/form/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/schema/package.json b/packages/schema/package.json index 87c2b486..7e305a08 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -19,10 +19,7 @@ "src" ], "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -38,7 +35,6 @@ "vite": "^5.3.5" }, "peerDependencies": { - "@types/events": "^3.0.0", "typescript": "*" }, "peerDependenciesMeta": { diff --git a/packages/schema/tsconfig.build.json b/packages/schema/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/schema/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/schema/tsconfig.json b/packages/schema/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/schema/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/stage/package.json b/packages/stage/package.json index e59b123c..86ab74de 100644 --- a/packages/stage/package.json +++ b/packages/stage/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" diff --git a/packages/stage/tsconfig.build.json b/packages/stage/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/stage/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/stage/tsconfig.json b/packages/stage/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/stage/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/table/package.json b/packages/table/package.json index 2e05246c..f05d579b 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -27,10 +27,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "vue-tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -50,8 +47,7 @@ "@vue/test-utils": "^2.4.6", "rimraf": "^3.0.2", "sass": "^1.77.0", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" }, "peerDependencies": { "@tmagic/design": "workspace:*", diff --git a/packages/table/src/shims-vue.d.ts b/packages/table/src/shims-vue.d.ts deleted file mode 100644 index 30030494..00000000 --- a/packages/table/src/shims-vue.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.vue' { - import { DefineComponent } from 'vue'; - - const component: DefineComponent<{}, {}, any>; - export default component; -} diff --git a/packages/table/tsconfig.build.json b/packages/table/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/table/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/table/tsconfig.json b/packages/table/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/table/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/tdesign-vue-next-adapter/package.json b/packages/tdesign-vue-next-adapter/package.json index bb5f956f..09e08300 100644 --- a/packages/tdesign-vue-next-adapter/package.json +++ b/packages/tdesign-vue-next-adapter/package.json @@ -20,10 +20,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "tsc --noEmit --project tsconfig.build.json" + "build": "vite build" }, "engines": { "node": ">=18" @@ -44,12 +41,11 @@ "@vue/compiler-sfc": "^3.4.27", "@types/node": "^18.19.0", "rimraf": "^3.0.2", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" }, "peerDependencies": { "@tmagic/design": "workspace:*", - "tdesign-vue-next": "^1.8.1", + "tdesign-vue-next": "^1.9.8", "vue": "^3.4.35", "typescript": "*" }, diff --git a/packages/tdesign-vue-next-adapter/src/Tree.vue b/packages/tdesign-vue-next-adapter/src/Tree.vue deleted file mode 100644 index 14c72cb6..00000000 --- a/packages/tdesign-vue-next-adapter/src/Tree.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - diff --git a/packages/tdesign-vue-next-adapter/src/index.ts b/packages/tdesign-vue-next-adapter/src/index.ts index 53764fe1..db9585d3 100644 --- a/packages/tdesign-vue-next-adapter/src/index.ts +++ b/packages/tdesign-vue-next-adapter/src/index.ts @@ -37,7 +37,6 @@ import { Tag as TTag, TimePicker as TTimePicker, Tooltip as TTooltip, - TreeNodeModel, Upload as TUpload, } from 'tdesign-vue-next'; @@ -80,7 +79,6 @@ import type { TagProps, TimePickerProps, TooltipProps, - TreeProps, UploadProps, } from '@tmagic/design'; @@ -90,7 +88,6 @@ import Input from './Input.vue'; import Popover from './Popover.vue'; import Scrollbar from './Scrollbar.vue'; import TableColumn from './TableColumn.vue'; -import Tree from './Tree.vue'; const adapter: any = { message: MessagePlugin, @@ -487,32 +484,6 @@ const adapter: any = { }), }, - tree: { - component: Tree, - props: (props: TreeProps) => ({ - ...props, - data: props.data, - draggable: props.draggable, - activable: props.highlightCurrent, - activeMultiple: props.highlightCurrent, - defaultActived: props.defaultCheckedKeys, - checkable: props.showCheckbox, - empty: props.emptyText, - expandAll: props.defaultExpandAll, - checkStrictly: props.checkStrictly, - load: props.load, - keys: props.props, - }), - listeners: { - click(context: { node: TreeNodeModel; e: MouseEvent }) { - return { - node: context.node, - data: context.node.data, - }; - }, - }, - }, - upload: { component: TUpload, props: (props: UploadProps) => ({ diff --git a/packages/tdesign-vue-next-adapter/tsconfig.build.json b/packages/tdesign-vue-next-adapter/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/tdesign-vue-next-adapter/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/tdesign-vue-next-adapter/tsconfig.json b/packages/tdesign-vue-next-adapter/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/tdesign-vue-next-adapter/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/packages/ui-react/tsconfig.json b/packages/ui-react/tsconfig.json deleted file mode 100644 index 1e3030e9..00000000 --- a/packages/ui-react/tsconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "lib": ["DOM", "DOM.Iterable", "ESNext"], - "allowJs": false, - "skipLibCheck": false, - "esModuleInterop": false, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "module": "ESNext", - "moduleResolution": "Node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react", - "baseUrl": ".", - "paths": { - // 内部模块都指向 src/index.ts, 会有更好的代码跳转体验. - "@tmagic/*": ["../packages/*"], - }, - }, - "include": ["./src"] -} diff --git a/packages/ui/package.json b/packages/ui/package.json index 6bb63147..2a2686a0 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -13,10 +13,7 @@ "types" ], "scripts": { - "build": "rimraf ./dist && npm run build:type && node scripts/build.mjs", - "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "vue-tsc --noEmit --project tsconfig.build.json" + "build": "node scripts/build.mjs" }, "engines": { "node": ">=18" @@ -46,7 +43,6 @@ "@types/qrcode": "^1.4.2", "@vue/compiler-sfc": "^3.4.27", "rimraf": "^3.0.2", - "vite": "^5.3.5", - "vue-tsc": "^2.0.19" + "vite": "^5.3.5" } } diff --git a/packages/ui/tsconfig.build.json b/packages/ui/tsconfig.build.json deleted file mode 100644 index 9c60f26d..00000000 --- a/packages/ui/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "rootDir": "./src", - "sourceMap": false, - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "outDir": "./types", - "paths": {}, - }, - "include": ["./src"], -} diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json deleted file mode 100644 index a80ed035..00000000 --- a/packages/ui/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, - "exclude": [ - "**/dist/**/*" - ], -} diff --git a/packages/utils/package.json b/packages/utils/package.json index 81c1ef2b..63ac2d82 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -23,10 +23,7 @@ ], "license": "Apache-2.0", "scripts": { - "build": "rimraf ./dist && npm run build:type && vite build --mode=es && vite build --mode=umd", - "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", - "clear:type": "rimraf ./types", - "check:type": "tsc --noEmit --project tsconfig.build.json" + "build": "vite build --mode=es && vite build --mode=umd" }, "engines": { "node": ">=18" diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json deleted file mode 100644 index c9476221..00000000 --- a/packages/utils/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "declarationDir": "types", - "forceConsistentCasingInFileNames": true, - "paths": {}, - }, - "include": [ - "src" - ], -} diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json deleted file mode 100644 index 6c40cf1e..00000000 --- a/packages/utils/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": "../..", - }, -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5d08e5d1..225b0f32 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: '@commitlint/config-conventional': specifier: ^18.1.0 version: 18.6.3 + '@rollup/plugin-alias': + specifier: ^5.1.0 + version: 5.1.0(rollup@4.19.2) '@types/node': specifier: ^18.19.0 version: 18.19.42 @@ -98,6 +101,12 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 + rollup: + specifier: ^4.17.2 + version: 4.19.2 + rollup-plugin-dts: + specifier: ^6.1.1 + version: 6.1.1(rollup@4.19.2)(typescript@5.5.4) semver: specifier: ^7.3.7 version: 7.6.3 @@ -122,6 +131,9 @@ importers: vue: specifier: ^3.4.35 version: 3.4.35(typescript@5.5.4) + vue-tsc: + specifier: ^2.0.19 + version: 2.0.29(typescript@5.5.4) packages/cli: dependencies: @@ -196,6 +208,9 @@ importers: packages/data-source: dependencies: + '@tmagic/core': + specifier: workspace:* + version: link:../core '@tmagic/dep': specifier: workspace:* version: link:../dep @@ -283,9 +298,6 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/editor: dependencies: @@ -395,9 +407,6 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/element-plus-adapter: dependencies: @@ -475,15 +484,9 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/schema: dependencies: - '@types/events': - specifier: ^3.0.0 - version: 3.0.3 typescript: specifier: '*' version: 5.5.4 @@ -598,9 +601,6 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/tdesign-vue-next-adapter: dependencies: @@ -608,7 +608,7 @@ importers: specifier: workspace:* version: link:../design tdesign-vue-next: - specifier: ^1.8.1 + specifier: ^1.9.8 version: 1.9.8(vue@3.4.35(typescript@5.5.4)) typescript: specifier: '*' @@ -632,9 +632,6 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/ui: dependencies: @@ -672,9 +669,6 @@ importers: vite: specifier: ^5.3.5 version: 5.3.5(@types/node@18.19.42)(sass@1.77.8)(terser@5.31.3) - vue-tsc: - specifier: ^2.0.19 - version: 2.0.29(typescript@5.5.4) packages/ui-react: dependencies: @@ -2206,6 +2200,15 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + '@rollup/plugin-alias@5.1.0': + resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + '@rollup/pluginutils@4.2.1': resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} @@ -5264,6 +5267,13 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true + rollup-plugin-dts@6.1.1: + resolution: {integrity: sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==} + engines: {node: '>=16'} + peerDependencies: + rollup: ^3.29.4 || ^4 + typescript: ^4.5 || ^5.0 + rollup-plugin-external-globals@0.10.0: resolution: {integrity: sha512-RXlupZrmn97AaaS5dWnktkjM+Iy+od0E+8L0mUkMIs3iuoUXNJebueQocQKV7Ircd54fSGGmkBaXwNzY05J1yQ==} peerDependencies: @@ -5399,6 +5409,10 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} + slash@4.0.0: + resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} + engines: {node: '>=12'} + slice-ansi@3.0.0: resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==} engines: {node: '>=8'} @@ -7379,6 +7393,12 @@ snapshots: '@popperjs/core@2.11.8': {} + '@rollup/plugin-alias@5.1.0(rollup@4.19.2)': + dependencies: + slash: 4.0.0 + optionalDependencies: + rollup: 4.19.2 + '@rollup/pluginutils@4.2.1': dependencies: estree-walker: 2.0.2 @@ -10812,6 +10832,14 @@ snapshots: dependencies: glob: 7.2.3 + rollup-plugin-dts@6.1.1(rollup@4.19.2)(typescript@5.5.4): + dependencies: + magic-string: 0.30.11 + rollup: 4.19.2 + typescript: 5.5.4 + optionalDependencies: + '@babel/code-frame': 7.24.7 + rollup-plugin-external-globals@0.10.0(rollup@4.19.2): dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.19.2) @@ -10983,6 +11011,8 @@ snapshots: slash@3.0.0: {} + slash@4.0.0: {} + slice-ansi@3.0.0: dependencies: ansi-styles: 4.3.0 diff --git a/rollup.dts.config.js b/rollup.dts.config.js new file mode 100644 index 00000000..9d630acc --- /dev/null +++ b/rollup.dts.config.js @@ -0,0 +1,50 @@ +import alias from '@rollup/plugin-alias'; +import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; +import dts from 'rollup-plugin-dts'; + +if (!existsSync('temp')) { + console.warn( + 'no temp dts files found. run `tsc -p tsconfig.build-browser.json && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build-vue.json` first.', + ); + process.exit(1); +} + +removeScss('temp/editor/src/index.d.ts'); +removeScss('temp/form/src/index.d.ts'); + +const packages = readdirSync('temp'); +const targets = process.env.TARGETS ? process.env.TARGETS.split(',') : null; +const targetPackages = targets ? packages.filter((pkg) => targets.includes(pkg)) : packages; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +export default targetPackages.map((pkg) => ({ + input: `./temp/${pkg}/src/index.d.ts`, + output: { + file: `packages/${pkg}/types/index.d.ts`, + format: 'es', + }, + plugins: [ + alias({ + entries: [ + { find: /^@form/, replacement: path.join(__dirname, `./temp/form/src`) }, + { find: /^@editor/, replacement: path.join(__dirname, `./temp/editor/src`) }, + { find: /^@data-source/, replacement: path.join(__dirname, `./temp/data-source/src`) }, + ], + }), + dts(), + ], + onwarn(warning, warn) { + // during dts rollup, everything is externalized by default + if (warning.code === 'UNRESOLVED_IMPORT' && !warning.exporter?.startsWith('.')) { + return; + } + warn(warning); + }, +})); + +function removeScss(path) { + writeFileSync(path, readFileSync(path).toString().replace(`import './theme/index.scss';`, '')); +} diff --git a/packages/design/src/shims-vue.d.ts b/runtime/tmagic-form/shims-vue.d.ts similarity index 100% rename from packages/design/src/shims-vue.d.ts rename to runtime/tmagic-form/shims-vue.d.ts diff --git a/runtime/vue-runtime-help/tsconfig.build.json b/runtime/vue-runtime-help/tsconfig.build.json index 250b6831..ea5ec8de 100644 --- a/runtime/vue-runtime-help/tsconfig.build.json +++ b/runtime/vue-runtime-help/tsconfig.build.json @@ -4,7 +4,8 @@ "rootDir": "./src", "outDir": "./dist", "declaration": true, - "sourceMap": false + "sourceMap": false, + "types": ["node"], }, "include": ["./src"], } diff --git a/runtime/vue-runtime-help/tsconfig.json b/runtime/vue-runtime-help/tsconfig.json index 5252874b..d32895bd 100644 --- a/runtime/vue-runtime-help/tsconfig.json +++ b/runtime/vue-runtime-help/tsconfig.json @@ -2,5 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "baseUrl": "./", + "types": ["node"], }, } diff --git a/scripts/build.mjs b/scripts/build.mjs deleted file mode 100644 index a9211164..00000000 --- a/scripts/build.mjs +++ /dev/null @@ -1,32 +0,0 @@ -import execa from 'execa'; -import minimist from 'minimist'; - -const { type } = minimist(process.argv.slice(2)); - -const run = (bin, args, opts = {}) => execa(bin, args, { stdio: 'inherit', ...opts }); - -const build = (pkg) => run('pnpm', ['--filter', `@tmagic/${pkg}`, type ? 'build:type' : 'build']); - -const main = async () => { - // 按照依赖顺序构建 - build('cli'); - - await Promise.all([ - (async () => { - for (const pkg of ['schema', 'utils', 'dep', 'data-source', 'core', 'stage']) { - await build(pkg); - } - })(), - (async () => { - for (const pkg of ['design', 'element-plus-adapter', 'tdesign-vue-next-adapter']) { - await build(pkg); - } - })(), - ]); - - for (const pkg of ['form', 'table', 'editor', 'vue-runtime-help', 'tmagic-form-runtime', 'ui']) { - await build(pkg); - } -}; - -main(); diff --git a/packages/editor/src/shims-vue.d.ts b/shims-vue.d.ts similarity index 100% rename from packages/editor/src/shims-vue.d.ts rename to shims-vue.d.ts diff --git a/tsconfig.build-browser.json b/tsconfig.build-browser.json new file mode 100644 index 00000000..ce6e4997 --- /dev/null +++ b/tsconfig.build-browser.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "declaration": true, + "emitDeclarationOnly": true, + "stripInternal": true + }, + "include": [ + "packages/core/src", + "packages/data-source/src", + "packages/dep/src", + "packages/schema/src", + "packages/stage/src", + "packages/utils/src", + "packages/element-plus-adapter/src", + ] +} diff --git a/tsconfig.build-vue.json b/tsconfig.build-vue.json new file mode 100644 index 00000000..87546a28 --- /dev/null +++ b/tsconfig.build-vue.json @@ -0,0 +1,15 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "declaration": true, + "emitDeclarationOnly": true, + "stripInternal": true + }, + "include": [ + "packages/design/src", + "packages/editor/src", + "packages/form/src", + "packages/table/src", + "packages/tdesign-vue-next-adapter/src", + ] +} diff --git a/tsconfig.check.json b/tsconfig.check.json new file mode 100644 index 00000000..a0ad80a2 --- /dev/null +++ b/tsconfig.check.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "packages/core/src", + "packages/data-source/src", + "packages/dep/src", + "packages/schema/src", + "packages/stage/src", + "packages/utils/src", + "packages/element-plus-adapter/src", + "packages/design/src", + "packages/editor/src", + "packages/form/src", + "packages/table/src", + "packages/tdesign-vue-next-adapter/src", + ] +} diff --git a/tsconfig.json b/tsconfig.json index 5d7e8ce2..bf378a9f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,7 @@ { "compilerOptions": { + "baseUrl": ".", + "outDir": "temp", "target": "ESNext", "module": "ESNext", "strict": true, @@ -14,7 +16,6 @@ "resolveJsonModule": true, "sourceMap": true, "useDefineForClassFields": true, - "baseUrl": ".", "lib": ["ESNext", "DOM"], "paths": { // 内部模块都指向 src/index.ts, 会有更好的代码跳转体验. @@ -28,6 +29,7 @@ "types": [ "node", "vite/client", + "./shims-vue", ], }, "exclude": [