Skip to content

Commit 3504e19

Browse files
chore: adjust the project structure (#3915)
* chore(vite): use the default outDir configuration * chore: rename folder tdesign-miniprogram-site to tdesign-miniprogram * chore: adjust the project structure * fix(site): fixed docs rendering * fix: fix lint * feat(site): support chat site * feat(chat): add pro-components folder * fix: fix lint * chore: remove @tencent/tvision * fix: fix spelling error * chore: update jest config * chore: fix pkg * chore: add publish files * docs: update README * chore(site): add ai chat routing * chore(site-chat): update vite config * chore: update scripts * ci: update tag-push.yml * chore: remove unused package * fix: fix build * feat(site-chat): exmple support mock file * feat(build): support alias * ci: update auto-release.yml * chore: temporarily remove pro-components related --------- Co-authored-by: 黎伟杰 <674416404@qq.com>
1 parent 23a992a commit 3504e19

File tree

512 files changed

+14237
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

512 files changed

+14237
-258
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module.exports = {
107107
},
108108
},
109109
{
110-
files: ['example/**', '**/_example/**'],
110+
files: ['packages/tdesign-miniprogram/example/**', '**/_example/**'],
111111
rules: {
112112
'no-console': 0,
113113
},

.github/workflows/auto-release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ jobs:
5757
env:
5858
BODY: ${{ github.event.comment.body }}
5959
run: |
60-
txt=$(cat packages/tdesign-miniprogram-site/CHANGELOG.md)
61-
echo "${txt%%##*}$BODY${txt##*---}" > packages/tdesign-miniprogram-site/CHANGELOG.md
60+
txt=$(cat packages/tdesign-miniprogram/CHANGELOG.md)
61+
chat_txt=$(cat packages/tdesign-miniprogram-chat/CHANGELOG.md)
62+
echo "${txt%%##*}$BODY${txt##*---}" > packages/tdesign-miniprogram/CHANGELOG.md
63+
echo "${chat_txt%%##*}$BODY${chat_txt##*---}" > packages/tdesign-miniprogram-chat/CHANGELOG.md
6264
git add .
6365
git config --local user.email "github-actions[bot]@users.noreply.github.com"
6466
git config --local user.name "github-actions[bot]"
@@ -78,7 +80,7 @@ jobs:
7880
token: ${{ secrets.PERSONAL_TOKEN }}
7981
- name: tag and push if needed
8082
run: |
81-
data=$(cat package.json)
83+
data=$(cat packages/tdesign-miniprogram/package.json)
8284
re="\"version\": \"([^\"]*)\""
8385
[[ $data =~ $re ]]
8486
echo "${BASH_REMATCH[1]}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

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

22-
- run: npm run build
22+
- run: pnpm run build
2323

2424
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
2727

28-
- run: npx pkg-pr-new publish --compact
28+
- run: pnpm dlx pkg-pr-new publish 'packages/tdesign-miniprogram' --compact

.github/workflows/pr-compressed-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
with:
1616
repo-token: '${{ secrets.GITHUB_TOKEN }}'
1717
install-script: 'npm install --force'
18-
pattern: './miniprogram_dist/**/*.{js,wxs,wxml,json}'
18+
pattern: './packages/tdesign-miniprogram/miniprogram_dist/**/*.{js,wxs,wxml,json}'

.github/workflows/tag-push.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ jobs:
2626
MINI_APP_PRIVATE_KEY: ${{ secrets.TDESIGN_MINI_KEY }}
2727
- id: publish
2828
name: publish NPM
29-
uses: JS-DevTools/npm-publish@v1
29+
uses: JS-DevTools/npm-publish@v4
3030
with:
31+
package: packages/tdesign-miniprogram
3132
token: ${{ secrets.TDESIGN_NPM_TOKEN }}
3233
tag: ${{ contains(github.ref_name, 'beta') && 'beta' || 'latest' }}
3334
- if: steps.publish.outputs.type != 'none'

.gitignore

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
_site
1+
dist
22
miniprogram_dist
3+
34
_wechatide
4-
dist
5-
/_example
6-
example/pages/*
7-
!example/pages/gulp-error
8-
!example/pages/home
9-
test/e2e
10-
test/unit
11-
test/unit-virtualHost
5+
_example
6+
!packages/components/**/_example/
7+
!packages/pro-components/**/_example/
8+
9+
packages/tdesign-miniprogram/example/pages/*
10+
!packages/tdesign-miniprogram/example/pages/gulp-error
11+
!packages/tdesign-miniprogram/example/pages/home
12+
13+
packages/tdesign-miniprogram/test/e2e
14+
packages/tdesign-miniprogram/test/unit
15+
packages/tdesign-miniprogram/test/unit-virtualHost
16+
1217
.DS_Store
1318
node_modules
1419
package-lock.json
@@ -27,5 +32,3 @@ yarn-error.log*
2732
*.njsproj
2833
*.sln
2934
*.sw*
30-
/tdesign-miniprogram
31-
m2w_dist

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: 贡献指南
3-
# description:
3+
# description:
44
spline: explain
55
---
66
## 开发规范
@@ -53,8 +53,8 @@ npm start
5353

5454
此时会同时启动 `dist``example` 的构建服务,对应的开发路径与构建路径分别为:
5555

56-
- `packages/components` -> `miniprogram_dist`
57-
- `packages/components/*/_example` -> `example` -> `_example`
56+
- `packages/components` -> `packages/tdesign-miniprogram/miniprogram_dist`
57+
- `packages/components/*/_example` -> `packages/tdesign-miniprogram/example` -> `_example`
5858

5959
使用微信开发者工具导入项目 `_example` 文件夹
6060

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,48 @@
11
{
22
"name": "tdesign-miniprogram",
3+
"private": true,
34
"packageManager": "pnpm@9.15.9",
4-
"purename": "tdesign",
5-
"version": "1.11.0-beta",
6-
"description": "tdesign-miniprogram",
7-
"title": "tdesign-miniprogram",
8-
"main": "miniprogram_dist/index.js",
9-
"miniprogram": "miniprogram_dist",
10-
"keywords": [
11-
"tdesign",
12-
"miniprogram"
13-
],
145
"repository": {
156
"type": "git",
167
"url": "https://github.com/Tencent/tdesign-miniprogram"
178
},
189
"homepage": "https://tdesign.tencent.com/miniprogram",
10+
"bugs": {
11+
"url": "https://github.com/Tencent/tdesign-miniprogram/issues"
12+
},
1913
"scripts": {
2014
"start": "npm run dev",
2115
"dev": "cross-env NODE_ENV=development gulp dev --gulpfile script/gulpfile.js --cwd ./",
2216
"build": "cross-env NODE_ENV=production gulp build --gulpfile script/gulpfile.js --cwd ./",
2317
"build:dist": "gulp --gulpfile script/gulpfile.dist.js --cwd ./",
2418
"build:example": "gulp --gulpfile script/gulpfile.example.js --cwd ./",
2519
"build:assets": "cross-env NODE_ENV=production gulp assets:build --gulpfile script/gulpfile.dist.js --cwd ./",
26-
"update:icons": "node script/update-icons.js",
27-
"update:css": "node script/generate-css-vars.js",
28-
"lintfix": "eslint '{packages,example}/**/*.{js,ts}' --fix",
29-
"lint": "eslint '{packages,example}/**/*.{js,ts}'",
30-
"format": "prettier {packages,example,script}/**/*.{js,ts,wxss,less,wxml,html,json,md,wxs} --write",
31-
"site": "pnpm -C packages/tdesign-miniprogram-site site",
32-
"site:dev": "pnpm -C packages/tdesign-miniprogram-site site:dev",
33-
"site:intranet": "pnpm -C packages/tdesign-miniprogram-site site:intranet",
34-
"site:prerender": "pnpm -C packages/tdesign-miniprogram-site site:prerender",
20+
"update:icons": "pnpm -C packages/tdesign-miniprogram/site update:icons",
21+
"update:css": "pnpm -C packages/tdesign-miniprogram/site update:css",
22+
"lintfix": "eslint '{packages/components,packages/tdesign-miniprogram/example}/**/*.{js,ts}' --fix",
23+
"lint": "eslint '{packages/components,packages/tdesign-miniprogram/example}/**/*.{js,ts}'",
24+
"format": "prettier {packages/components,packages/tdesign-miniprogram/example,script}/**/*.{js,ts,wxss,less,wxml,html,json,md,wxs} --write",
25+
"site": "pnpm -C packages/tdesign-miniprogram/site site",
26+
"site:dev": "pnpm -C packages/tdesign-miniprogram/site site:dev",
27+
"site:intranet": "pnpm -C packages/tdesign-miniprogram/site site:intranet",
28+
"site:prerender": "pnpm -C packages/tdesign-miniprogram/site site:prerender",
29+
"site-chat": "pnpm -C packages/tdesign-miniprogram-chat/site site",
30+
"site-chat:dev": "pnpm -C packages/tdesign-miniprogram-chat/site site:dev",
31+
"site-chat:intranet": "pnpm -C packages/tdesign-miniprogram-chat/site site:intranet",
32+
"site-chat:prerender": "pnpm -C packages/tdesign-miniprogram-chat/site site:prerender",
3533
"m2w": "sh ./script/m2w.sh",
36-
"cover": "pnpm -C test cover",
37-
"test": "pnpm -C test test",
38-
"test:snap-update": "pnpm -C test test:snap-update",
39-
"test:demo": "pnpm -C test test:demo",
40-
"test:unit": "pnpm -C test test:unit",
41-
"test:e2e": "pnpm -C test test:e2e",
42-
"badge": "node script/coverage-badge.js",
34+
"cover": "pnpm -C packages/tdesign-miniprogram/test cover",
35+
"test": "pnpm -C packages/tdesign-miniprogram/test test",
36+
"test:snap-update": "pnpm -C packages/tdesign-miniprogram/test test:snap-update",
37+
"test:demo": "pnpm -C packages/tdesign-miniprogram/test test:demo",
38+
"test:unit": "pnpm -C packages/tdesign-miniprogram/test test:unit",
39+
"test:e2e": "pnpm -C packages/tdesign-miniprogram/test test:e2e",
40+
"badge": "pnpm -C packages/tdesign-miniprogram/test badge",
4341
"prepare": "husky install",
4442
"generate": "gulp generate --gulpfile script/gulpfile.js --cwd ./",
4543
"changelog": "node script/generate-changelog.js",
4644
"robot": "publish-cli robot-msg",
47-
"qrcode": "node script/qrcode/index.js"
45+
"qrcode": "pnpm -C packages/tdesign-miniprogram/site qrcode"
4846
},
4947
"author": "tdesign",
5048
"license": "MIT",
@@ -92,9 +90,11 @@
9290
"less": "^4.1.1",
9391
"lint-staged": "^10.0.0-1",
9492
"lodash": "^4.17.21",
93+
"marked": "^16.1.2",
9594
"merge2": "^1.4.1",
9695
"miniprogram-api-typings": "^3.12.3",
9796
"miniprogram-automator": "^0.10.0",
97+
"miniprogram-computed": "^5.0.0",
9898
"miniprogram-simulate": "^1.6.0",
9999
"npm-run-all": "^4.1.5",
100100
"playwright": "^1.19.1",

packages/components/action-sheet/_example/align/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ActionSheet, ActionSheetTheme } from 'tdesign-miniprogram';
1+
import ActionSheet, { ActionSheetTheme } from 'tdesign-miniprogram/action-sheet';
22

33
Component({
44
methods: {

packages/components/action-sheet/_example/grid/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ActionSheet, ActionSheetTheme } from 'tdesign-miniprogram';
1+
import ActionSheet, { ActionSheetTheme } from 'tdesign-miniprogram/action-sheet';
22

33
const firstGrid = [
44
{

0 commit comments

Comments
 (0)