Merge remote-tracking branch 'origin' into refactor/theme

Author: RylanBot

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

@@ -3,12 +3,12 @@ on:
   push:
     branches: [main]
     paths:
-      - 'packages/components/**'
+      - 'packages/site-components/**'
       - 'packages/theme-generator/**'
   pull_request:
     branches: [main]
     paths:
-      - 'packages/components/**'
+      - 'packages/site-components/**'
       - 'packages/theme-generator/**'
       - 'site/**'
 
@@ -30,7 +30,7 @@ jobs:
 
       - run: pnpm --filter '@tdesign/site-components' --filter 'tdesign-theme-generator' run build
 
-      - run: pnpm dlx pkg-pr-new publish './packages/components' './packages/theme-generator'
+      - run: pnpm dlx pkg-pr-new publish './packages/site-components' './packages/theme-generator'
 
   build-site:
     if: github.repository == 'Tencent/tdesign' && github.event_name == 'pull_request'

.github/workflows/preview-publish.yml

@@ -250,21 +250,25 @@ jobs:
           repository: Tencent/tdesign-miniprogram
           submodules: recursive
 
+      - uses: pnpm/action-setup@v4
+ 
       - uses: actions/setup-node@v4
         with:
           node-version: 18
 
-      - run: npm install
+      - run: pnpm install
 
-      - run: npm install --save-dev ${{ needs.preview-context.outputs.pkg_tdesign_site_components }}
+      - run: pnpm add ${{ needs.preview-context.outputs.pkg_tdesign_site_components }}
+        working-directory: packages/tdesign-miniprogram/site
 
-      - run: npm install --save-dev ${{ needs.preview-context.outputs.pkg_tdesign_theme_generator }}
+      - run: pnpm add ${{ needs.preview-context.outputs.pkg_tdesign_theme_generator }}
+        working-directory: packages/tdesign-miniprogram/site
 
-      - run: npm run site:intranet
+      - run: pnpm -C packages/tdesign-miniprogram/site site:preview
 
       - run: |
           export DEPLOY_DOMAIN=${{ needs.preview-context.outputs.tdesign_miniprogram_domain }}
-          npx surge --project _site --domain $DEPLOY_DOMAIN --token ${{ secrets.TDESIGN_SURGE_TOKEN }}
+          npx surge --project packages/tdesign-miniprogram/site/dist --domain $DEPLOY_DOMAIN --token ${{ secrets.TDESIGN_SURGE_TOKEN }}
 
   preview-comment:
     if: always()

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

@@ -5,7 +5,7 @@ on:
     branches: [main]
     types: [closed]
     paths:
-      - packages/components/package.json
+      - packages/site-components/package.json
 
   workflow_dispatch:
 
@@ -25,15 +25,15 @@ jobs:
       - run: pnpm install
 
       - run: pnpm -F @tdesign/site-components run build
-      
+
       - name: Publish Package
         run: |
           npm config set "//registry.npmjs.org/:_authToken" "${NPM_TOKEN}"
           pnpm -F @tdesign/site-components publish
         env:
           NPM_TOKEN: ${{ secrets.TDESIGN_NPM_TOKEN }}
 
-  auto-upgrade-@tdesign/site-components:
+  auto-upgrade-tdesign-site-components:
     needs: publish-site-components
     runs-on: ubuntu-latest
     steps:

.github/workflows/publish.yml

@@ -72,6 +72,6 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git status
           git fetch origin
-          git merge origin/develop
+          git merge origin/develop -X theirs
           git push origin main
       

packages/auto-release-collection/src/constants.ts

@@ -21,7 +21,8 @@ export const submodules = {
   },
   'tdesign-miniprogram': {
     title: '## Miniprogram for WeChat 发布',
-    changelogUrl: 'https://raw.githubusercontent.com/Tencent/tdesign-miniprogram/refs/heads/main/CHANGELOG.md',
+    changelogUrl:
+      'https://raw.githubusercontent.com/Tencent/tdesign-miniprogram/refs/heads/main/packages/tdesign-miniprogram/CHANGELOG.md',
     tagPrefix: '',
     repo: 'Tencent/tdesign-miniprogram',
   },