Skip to content

Commit ad5c1a0

Browse files
RylanBotRylanBot
committed
Merge remote-tracking branch 'origin' into refactor/theme
2 parents 7426d7a + 579ba9d commit ad5c1a0

File tree

15 files changed

+71
-76
lines changed

15 files changed

+71
-76
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424

2525
- uses: actions/setup-node@v4
2626
with:
27-
node-version: 18
27+
node-version-file: .node-version
2828

2929
- run: pnpm install
3030

31-
- run: pnpm --filter 'tdesign-site-components' --filter 'tdesign-theme-generator' run build
31+
- run: pnpm --filter '@tdesign/site-components' --filter 'tdesign-theme-generator' run build
3232

3333
- run: pnpm dlx pkg-pr-new publish './packages/components' './packages/theme-generator'
3434

@@ -49,7 +49,7 @@ jobs:
4949

5050
- uses: actions/setup-node@v4
5151
with:
52-
node-version: 18
52+
node-version-file: .node-version
5353

5454
- run: pnpm install
5555

‎.github/workflows/preview-publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: pkg-pr-new
5151
id: pkg
5252
run: |
53-
echo "pkg_tdesign_site_components=https://pkg.pr.new/Tencent/tdesign/tdesign-site-components@${{ steps.pr.outputs.id }}" >> $GITHUB_OUTPUT
53+
echo "pkg_tdesign_site_components=https://pkg.pr.new/Tencent/tdesign/@tdesign/site-components@${{ steps.pr.outputs.id }}" >> $GITHUB_OUTPUT
5454
echo "pkg_tdesign_theme_generator=https://pkg.pr.new/Tencent/tdesign/tdesign-theme-generator@${{ steps.pr.outputs.id }}" >> $GITHUB_OUTPUT
5555
5656
tdesign-site:
@@ -111,7 +111,7 @@ jobs:
111111

112112
- run: pnpm install
113113

114-
- name: install tdesign-site-components from pkg-pr-new
114+
- name: install @tdesign/site-components from pkg-pr-new
115115
run: pnpm add ${{ needs.preview-context.outputs.pkg_tdesign_site_components }}
116116
working-directory: packages/tdesign-react/site
117117

@@ -143,7 +143,7 @@ jobs:
143143

144144
- run: pnpm install
145145

146-
- name: install tdesign-site-components from pkg-pr-new
146+
- name: install @tdesign/site-components from pkg-pr-new
147147
run: pnpm add ${{ needs.preview-context.outputs.pkg_tdesign_site_components }}
148148
working-directory: packages/tdesign-vue-next/site
149149

@@ -175,7 +175,7 @@ jobs:
175175

176176
- run: pnpm install
177177

178-
- name: install tdesign-site-components from pkg-pr-new
178+
- name: install @tdesign/site-components from pkg-pr-new
179179
run: pnpm add ${{ needs.preview-context.outputs.pkg_tdesign_site_components }}
180180
working-directory: packages/tdesign-vue-next-chat/site
181181

‎.github/workflows/publish-site-components.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ jobs:
2020

2121
- uses: actions/setup-node@v4
2222
with:
23-
node-version: 18
23+
node-version-file: .node-version
2424

2525
- run: pnpm install
2626

27-
- run: pnpm -F tdesign-site-components run build
27+
- run: pnpm -F @tdesign/site-components run build
2828

2929
- name: Publish Package
3030
run: |
3131
npm config set "//registry.npmjs.org/:_authToken" "${NPM_TOKEN}"
32-
pnpm -F tdesign-site-components publish
32+
pnpm -F @tdesign/site-components publish
3333
env:
3434
NPM_TOKEN: ${{ secrets.TDESIGN_NPM_TOKEN }}
3535

36-
auto-upgrade-tdesign-site-components:
36+
auto-upgrade-@tdesign/site-components:
3737
needs: publish-site-components
3838
runs-on: ubuntu-latest
3939
steps:
40-
- name: upgrade tdesign-site-components
40+
- name: upgrade @tdesign/site-components
4141
uses: TDesignOteam/tdesign-pr-trigger-action@develop
4242
with:
4343
token: ${{ secrets.TDESIGN_BOT_TOKEN }}
4444
trigger: /upgrade-deps
45-
deps: tdesign-site-components
45+
deps: '@tdesign/site-components'
4646
package-manager: pnpm

‎.github/workflows/publish-theme-generator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- uses: actions/setup-node@v4
2222
with:
23-
node-version: 18
23+
node-version-file: .node-version
2424

2525
- run: pnpm install
2626

‎.github/workflows/pull-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v4
3131
- uses: actions/setup-node@v4
3232
with:
33-
node-version: 18
33+
node-version-file: .node-version
3434
- run: node ./services/update-components-notice.js
3535
- run: sleep 3s
3636
- run: |

‎.github/workflows/service-update-schedule.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: actions/setup-node@v4
1818
with:
19-
node-version: 18
19+
node-version-file: .node-version
2020
- run: node ./services/update-components-notice.js
2121
- run: sleep 3s
2222
- run: |

‎.node-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"private": true,
33
"packageManager": "[email protected]",
44
"scripts": {
5-
"dev:components": "pnpm run --filter 'tdesign-site-components' dev",
5+
"dev:components": "pnpm run --filter '@tdesign/site-components' dev",
66
"dev:site": "pnpm run build:components && pnpm run --filter 'tdesign-site' dev",
77
"dev:theme-generator": "pnpm run --filter 'tdesign-theme-generator' dev",
8-
"build:components": "pnpm run --filter 'tdesign-site-components' build",
8+
"build:components": "pnpm run --filter '@tdesign/site-components' build",
99
"build:theme-generator": "pnpm run --filter 'tdesign-theme-generator' build",
1010
"build-watch:theme-generator": "pnpm run --filter 'tdesign-theme-generator' build:watch",
1111
"site": "npm run build:components && cd site && npm run build",

‎packages/components/LICENSE‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
MIT License
2+
3+
Copyright (c) 2021-present TDesign
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎packages/components/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ npm build
1919
### 📦 Usage
2020

2121
```javascript
22-
// import tdesign-site-components es module and style
23-
import "tdesign-site-components";
24-
import "tdesign-site-components/lib/styles/style.css";
22+
// import @tdesign/site-components es module and style
23+
import "@tdesign/site-components";
24+
import "@tdesign/site-components/lib/styles/style.css";
2525

2626
// splice webcomponents into pages
2727
<td-doc-layout>

0 commit comments

Comments
 (0)