Skip to content

Commit 4d5cf43

Browse files
liweijie0812liweijie0812
authored
chore: pnpm catalogs (#4176)
* parent a85070b author 黎伟杰 <674416404@qq.com> 1767924819 +0800 committer 黎伟杰 <674416404@qq.com> 1768290413 +0800 parent a85070b author 黎伟杰 <674416404@qq.com> 1767924819 +0800 committer 黎伟杰 <674416404@qq.com> 1768290317 +0800 chore: pnpm catalogs chore: fix ci chore: fix ci chore: fix ci chore: 删除无效依赖 chore: 删除无效依赖 chore: uni相关依赖归集统一 chore: miniprogram相关依赖归集统一 chore: 调整 build uniapp 时机 fix(slider): 修复受控模式下陷入死循环问题 (#4170) * fix(slider): 修复受控模式下陷入死循环问题 * fix: 修复单测问题 feat(SideBarItem): improve the display logic for prefix and suffix elements of activated items (#4175) docs(uniapp): update site overview (#4173) feat(QRCode): added the init func (#4174) * feat(QRCode): added the init func * chore: use this.createSelectorQuery() instead chore: update build uniap script (#4179) * chore: update build uniap script * chore: update name chore: 废弃文件移除 chore: update package.json chore: upgrade husky to v9 chore: update .husky chore: update deps chore: 整理tdesign 依赖 chore: update deps chore: update deps chore: update deps chore: update deps chore: update deps chore: update deps chore: remove husky chore: remove husky chore: revert chore: update deps chore: update deps ci(pkg-pr-new): update build chore: fix build chore: update deps chore: update deps chore: update deps ci: new auto release (#4180) * ci: new auto release * ci: new auto release * chore: update pr template * chore: fix build chore: add pr changelog (#4181) chore(site): example of separating chat and basic components (#4177) * chore: example of separating chat and basic components * chore(site): update liveUrl for chat site 同步 uniapp 最近改动 (#4187) * chore: 同步uni-app最近改动 * chore: 修复引入问题 chore: update deps chore: update deps chore: update deps fix(collapse): 修复深色模式下面板左侧图标颜色错误 (#4185) * fix(collapse): 修复深色模式下图标颜色 * fix(collapse): 修复深色模式下图标颜色 * fix(CollapsePanel): add --td-collapse-left-icon-color * feat(CollapsePanel): add --td-collapse-disabled-color --------- Co-authored-by: anlyyao <anly_yaw@163.com> chore(uniapp): sync npm version (#4188) * chore(uni): sync npm version * chore: fix ci * chore: fix ci fix(collapse): 修复深色模式下面板左侧图标颜色错误 (#4185) * fix(collapse): 修复深色模式下图标颜色 * fix(collapse): 修复深色模式下图标颜色 * fix(CollapsePanel): add --td-collapse-left-icon-color * feat(CollapsePanel): add --td-collapse-disabled-color --------- Co-authored-by: anlyyao <anly_yaw@163.com> chore(uniapp): sync npm version (#4188) * chore(uni): sync npm version * chore: fix ci * chore: fix ci chore: update deps chore: update deps chore: update deps chore: update deps chore: update deps chore: update deps chore: update deps fix(slider): 修复受控模式下陷入死循环问题 (#4170) * fix(slider): 修复受控模式下陷入死循环问题 * fix: 修复单测问题 feat(SideBarItem): improve the display logic for prefix and suffix elements of activated items (#4175) feat(QRCode): added the init func (#4174) * feat(QRCode): added the init func * chore: use this.createSelectorQuery() instead chore: update build uniap script (#4179) * chore: update build uniap script * chore: update name ci: new auto release (#4180) * ci: new auto release * ci: new auto release * chore: update pr template * chore: fix build chore: add pr changelog (#4181) chore(site): example of separating chat and basic components (#4177) * chore: example of separating chat and basic components * chore(site): update liveUrl for chat site fix(collapse): 修复深色模式下面板左侧图标颜色错误 (#4185) * fix(collapse): 修复深色模式下图标颜色 * fix(collapse): 修复深色模式下图标颜色 * fix(CollapsePanel): add --td-collapse-left-icon-color * feat(CollapsePanel): add --td-collapse-disabled-color --------- Co-authored-by: anlyyao <anly_yaw@163.com> chore(uniapp): sync npm version (#4188) * chore(uni): sync npm version * chore: fix ci * chore: fix ci * chore: revert change * chore: pnpm catalogs * chore: shamefullyHoist 配置移动 pnpm-workspace.yaml * chore: 升级 eslint 到 v8 * chore: 统一eslint 相关依赖版本 * chore: 统一 eslint-plugin-prettier 依赖版本 * chore: 统一 vue 依赖版本 * chore: 统一 vite 依赖版本 * chore: 统一 typescript 相关依赖版本 * chore: 统一 stylelint-config-standard 依赖版本 * chore: 统一 eslint-plugin-vue 依赖版本 * chore: 统一 @vue/runtime-core 依赖版本 * chore: 统一 vue-router 依赖版本 * chore: 统一 vitest 相关依赖版本
1 parent 385ad67 commit 4d5cf43

25 files changed

Lines changed: 898 additions & 758 deletions

File tree

‎.eslintrc.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ module.exports = {
2323
parserOptions: {
2424
ecmaVersion: 2018,
2525
sourceType: 'module',
26-
ecmaFeatures: {
27-
impliedStrict: true,
28-
},
2926
},
3027
env: {
3128
browser: true,

‎.github/workflows/pkg-pr-new.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ jobs:
1919

2020
- uses: ./.github/actions/install-dep
2121

22-
- run: pnpm run build
23-
24-
- run: pnpm run uniapp build:npm
22+
- run: pnpm exec run-p build 'uniapp build:npm'
2523

2624
- uses: actions/setup-node@v4
2725
with:

‎.husky/commit-msg‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
#!/bin/sh
2-
[ -n "$CI" ] && exit 0
3-
. "$(dirname "$0")/_/husky.sh"
4-
51
npx --no-install commitlint --edit ""

‎.husky/pre-commit‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
#!/bin/sh
2-
[ -n "$CI" ] && exit 0
3-
. "$(dirname "$0")/_/husky.sh"
4-
51
npx lint-staged && log_emails=$(git config user.email) && if [[ ${log_emails} =~ '@tencent.com' ]];then echo 本地提交邮箱 $log_emails 校验非法，需要本地更改重新提交 && exit 2;else echo 邮箱 $log_emails 校验通过;fi

‎.husky/prepare-commit-msg‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
#!/bin/sh
2-
[[ "$(uname -a)" = *"MINGW64"* ]] && exit 0
3-
[ -n "$CI" ] && exit 0
4-
. "$(dirname "$0")/_/husky.sh"
5-
6-
exec < /dev/tty && npx git-cz --hook || true
1+
npx git-cz --hook || true

‎.npmignore‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.npmrc‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎package.json‎

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tdesign-miniprogram-mono",
33
"private": true,
4-
"packageManager": "pnpm@9.15.9",
4+
"packageManager": "pnpm@10.27.0",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/Tencent/tdesign-miniprogram"
@@ -40,7 +40,7 @@
4040
"test:unit": "pnpm -C packages/tdesign-miniprogram/test test:unit",
4141
"test:e2e": "pnpm -C packages/tdesign-miniprogram/test test:e2e",
4242
"badge": "pnpm -C packages/tdesign-miniprogram/test badge",
43-
"prepare": "husky install",
43+
"prepare": "husky",
4444
"generate": "gulp generate --gulpfile script/gulpfile.js --cwd ./",
4545
"changelog": "node script/generate-changelog.js",
4646
"robot": "publish-cli robot-msg",
@@ -52,65 +52,64 @@
5252
"author": "tdesign",
5353
"license": "MIT",
5454
"devDependencies": {
55-
"@babel/core": "^7.12.10",
56-
"@babel/plugin-proposal-decorators": "^7.18.9",
57-
"@babel/plugin-transform-class-properties": "^7.22.3",
58-
"@babel/preset-env": "^7.12.11",
59-
"@babel/preset-typescript": "^7.12.7",
60-
"@commitlint/cli": "^16.0.2",
61-
"@commitlint/config-conventional": "^16.0.0",
62-
"@types/node": "^20.14.11",
63-
"@typescript-eslint/eslint-plugin": "^5.6.0",
64-
"@typescript-eslint/parser": "~5.35.0",
65-
"@vue/compiler-sfc": "^3.2.4",
66-
"axios": "^1.1.3",
67-
"commitizen": "^4.2.4",
68-
"cross-env": "^7.0.2",
69-
"cz-conventional-changelog": "^3.3.0",
70-
"dayjs": "^1.10.7",
71-
"del": "^6.1.1",
72-
"eslint": "^7.0.0",
73-
"eslint-config-airbnb-base": "^14.2.1",
74-
"eslint-config-prettier": "^6.11.0",
75-
"eslint-plugin-import": "^2.24.2",
76-
"eslint-plugin-prettier": "^4.0.0",
77-
"get-intrinsic": "1.3.0",
78-
"glob": "^8.1.0",
79-
"gulp": "^4.0.2",
80-
"gulp-changed": "^4.0.2",
81-
"gulp-clean-css": "^4.3.0",
82-
"gulp-htmlmin": "^5.0.1",
83-
"gulp-if": "^3.0.0",
84-
"gulp-insert": "^0.5.0",
85-
"gulp-jsonminify": "^1.1.0",
86-
"gulp-less": "^5.0.0",
87-
"gulp-mp-npm": "^1.9.7",
88-
"gulp-plumber": "^1.2.1",
89-
"gulp-rename": "^2.0.0",
90-
"gulp-replace": "^1.0.0",
91-
"gulp-replace-task": "^2.0.1",
92-
"gulp-sourcemaps": "^3.0.0",
93-
"gulp-terser": "^2.1.0",
94-
"gulp-typescript": "^6.0.0-alpha.1",
95-
"husky": "^7.0.4",
96-
"less": "^4.1.1",
97-
"lint-staged": "^10.0.0-1",
98-
"lodash": "^4.17.21",
99-
"marked": "^16.1.2",
100-
"merge2": "^1.4.1",
101-
"miniprogram-api-typings": "^3.12.3",
102-
"miniprogram-automator": "^0.10.0",
103-
"miniprogram-computed": "^5.0.0",
104-
"miniprogram-simulate": "^1.6.0",
105-
"npm-run-all": "^4.1.5",
106-
"playwright": "^1.19.1",
107-
"prettier": "^2.0.5",
108-
"standard-changelog": "^2.0.27",
109-
"stylelint": "^13.13.1",
110-
"tdesign-publish-cli": "^0.0.12",
111-
"tinycolor2": "^1.4.2",
112-
"tslib": "^2.8.1",
113-
"typescript": "~4.7.2"
55+
"@babel/core": "catalog:",
56+
"@babel/plugin-proposal-decorators": "catalog:",
57+
"@babel/plugin-transform-class-properties": "catalog:",
58+
"@babel/preset-env": "catalog:",
59+
"@babel/preset-typescript": "catalog:",
60+
"@commitlint/cli": "catalog:",
61+
"@commitlint/config-conventional": "catalog:",
62+
"@types/node": "catalog:",
63+
"@typescript-eslint/eslint-plugin": "catalog:",
64+
"@typescript-eslint/parser": "catalog:",
65+
"@vue/compiler-sfc": "catalog:",
66+
"commitizen": "catalog:",
67+
"cross-env": "catalog:",
68+
"cz-conventional-changelog": "catalog:",
69+
"dayjs": "catalog:",
70+
"del": "catalog:",
71+
"eslint": "catalog:",
72+
"eslint-config-airbnb-base": "catalog:",
73+
"eslint-config-prettier": "catalog:",
74+
"eslint-plugin-import": "catalog:",
75+
"eslint-plugin-prettier": "catalog:",
76+
"get-intrinsic": "catalog:",
77+
"glob": "catalog:",
78+
"gulp": "catalog:",
79+
"gulp-changed": "catalog:",
80+
"gulp-clean-css": "catalog:",
81+
"gulp-htmlmin": "catalog:",
82+
"gulp-if": "catalog:",
83+
"gulp-insert": "catalog:",
84+
"gulp-jsonminify": "catalog:",
85+
"gulp-less": "catalog:",
86+
"gulp-mp-npm": "catalog:",
87+
"gulp-plumber": "catalog:",
88+
"gulp-rename": "catalog:",
89+
"gulp-replace": "catalog:",
90+
"gulp-replace-task": "catalog:",
91+
"gulp-sourcemaps": "catalog:",
92+
"gulp-terser": "catalog:",
93+
"gulp-typescript": "catalog:",
94+
"husky": "catalog:",
95+
"less": "catalog:",
96+
"lint-staged": "catalog:",
97+
"lodash": "catalog:",
98+
"marked": "catalog:",
99+
"merge2": "catalog:",
100+
"miniprogram-api-typings": "catalog:miniprogram",
101+
"miniprogram-automator": "catalog:miniprogram",
102+
"miniprogram-computed": "catalog:miniprogram",
103+
"miniprogram-simulate": "catalog:miniprogram",
104+
"npm-run-all2": "catalog:",
105+
"playwright": "catalog:",
106+
"prettier": "catalog:",
107+
"standard-changelog": "catalog:",
108+
"stylelint": "catalog:",
109+
"tdesign-publish-cli": "catalog:tdesign",
110+
"tinycolor2": "catalog:",
111+
"tslib": "catalog:",
112+
"typescript": "catalog:"
114113
},
115114
"config": {
116115
"commitizen": {

‎packages/components/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"main": "index.ts",
66
"license": "MIT",
77
"devDependencies": {
8-
"dayjs": "^1.10.7",
9-
"tinycolor2": "^1.4.2",
10-
"tslib": "^2.8.1",
11-
"miniprogram-simulate": "^1.6.0"
8+
"dayjs": "catalog:",
9+
"tinycolor2": "catalog:",
10+
"tslib": "catalog:",
11+
"miniprogram-simulate": "catalog:miniprogram"
1212
}
1313
}

‎packages/tdesign-miniprogram-chat/site/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
},
1212
"license": "MIT",
1313
"dependencies": {
14-
"vue": "^3.5.20",
15-
"vue-router": "^4.0.11"
14+
"vue": "catalog:",
15+
"vue-router": "catalog:"
1616
},
1717
"devDependencies": {
18-
"@rollup/plugin-node-resolve": "^13.3.0",
19-
"@tdesign/site-components": "^0.18.0-alpha.7",
20-
"@tdesign/theme-generator": "^1.2.0",
21-
"@types/prismjs": "^1.26.5",
22-
"@vitejs/plugin-vue": "^5.2.4",
23-
"@vitejs/plugin-vue-jsx": "^4.2.0",
24-
"axios": "^1.1.3",
25-
"gray-matter": "^4.0.3",
26-
"playwright": "^1.19.1",
27-
"prismjs": "^1.24.1",
28-
"vite": "^6.2.3",
29-
"vite-plugin-tdoc": "^2.0.1"
18+
"@rollup/plugin-node-resolve": "catalog:",
19+
"@tdesign/site-components": "catalog:tdesign",
20+
"@tdesign/theme-generator": "catalog:tdesign",
21+
"@types/prismjs": "catalog:",
22+
"@vitejs/plugin-vue": "catalog:",
23+
"@vitejs/plugin-vue-jsx": "catalog:",
24+
"axios": "catalog:",
25+
"gray-matter": "catalog:",
26+
"playwright": "catalog:",
27+
"prismjs": "catalog:",
28+
"vite": "catalog:",
29+
"vite-plugin-tdoc": "catalog:"
3030
}
3131
}

0 commit comments

Comments
 (0)