diff --git a/.github/workflows/preview-site-build.yml b/.github/workflows/preview-site-build.yml index 07c400976..6924d26c7 100644 --- a/.github/workflows/preview-site-build.yml +++ b/.github/workflows/preview-site-build.yml @@ -16,13 +16,13 @@ jobs: path: pr-id.txt retention-days: 5 - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: node-version: 18 @@ -39,13 +39,13 @@ jobs: tdesign-miniprogram-chat-site: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: node-version: 18 @@ -58,3 +58,49 @@ jobs: name: tdesign-miniprogram-chat-site path: packages/tdesign-miniprogram-chat/site/dist retention-days: 5 + + tdesign-uniapp-site: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + with: + submodules: recursive + + - uses: pnpm/action-setup@v4 + + - uses: actions/setup-node@v6 + with: + node-version: 18 + + - run: pnpm install + + - run: pnpm -C packages/tdesign-uniapp/site run site:preview + + - uses: actions/upload-artifact@v4 + with: + name: tdesign-uniapp-site + path: packages/tdesign-uniapp/site/dist + retention-days: 5 + + tdesign-uniapp-chat-site: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + with: + submodules: recursive + + - uses: pnpm/action-setup@v4 + + - uses: actions/setup-node@v6 + with: + node-version: 18 + + - run: pnpm install + + - run: pnpm -C packages/tdesign-uniapp-chat/site run site:preview + + - uses: actions/upload-artifact@v4 + with: + name: tdesign-uniapp-chat-site + path: packages/tdesign-uniapp-chat/site/dist + retention-days: 5 diff --git a/.github/workflows/preview-site-publish.yml b/.github/workflows/preview-site-publish.yml index 6f6afbbc0..1595d9361 100644 --- a/.github/workflows/preview-site-publish.yml +++ b/.github/workflows/preview-site-publish.yml @@ -15,9 +15,11 @@ jobs: pr_id: ${{ steps.pr.outputs.id }} tdesign_miniprogram_domain: ${{ steps.tdesign-miniprogram-domain.outputs.tdesign_miniprogram_domain }} tdesign_miniprogram_chat_domain: ${{ steps.tdesign-miniprogram-chat-domain.outputs.tdesign_miniprogram_chat_domain }} + tdesign_uniapp_domain: ${{ steps.tdesign-uniapp-domain.outputs.tdesign_uniapp_domain }} + tdesign_uniapp_chat_domain: ${{ steps.tdesign-uniapp-chat-domain.outputs.tdesign_uniapp_chat_domain }} steps: - name: Download pr id - uses: dawidd6/action-download-artifact@v8 + uses: dawidd6/action-download-artifact@v12 with: workflow: ${{ github.event.workflow_run.workflow_id }} run_id: ${{ github.event.workflow_run.id }} @@ -40,7 +42,7 @@ jobs: runs-on: ubuntu-latest needs: preview-context steps: - - uses: dawidd6/action-download-artifact@v8 + - uses: dawidd6/action-download-artifact@v12 with: workflow: ${{ github.event.workflow_run.workflow_id }} run_id: ${{ github.event.workflow_run.id }} @@ -54,7 +56,7 @@ jobs: runs-on: ubuntu-latest needs: preview-context steps: - - uses: dawidd6/action-download-artifact@v8 + - uses: dawidd6/action-download-artifact@v12 with: workflow: ${{ github.event.workflow_run.workflow_id }} run_id: ${{ github.event.workflow_run.id }} @@ -63,12 +65,42 @@ jobs: export DEPLOY_DOMAIN=${{ needs.preview-context.outputs.tdesign_miniprogram_chat_domain }} npx surge --project ./ --domain $DEPLOY_DOMAIN --token ${{ secrets.TDESIGN_SURGE_TOKEN }} + tdesign-uniapp: + if: github.event.workflow_run.conclusion == 'success' + runs-on: ubuntu-latest + needs: preview-context + steps: + - uses: dawidd6/action-download-artifact@v12 + with: + workflow: ${{ github.event.workflow_run.workflow_id }} + run_id: ${{ github.event.workflow_run.id }} + name: tdesign-uniapp-site + - run: | + export DEPLOY_DOMAIN=${{ needs.preview-context.outputs.tdesign_uniapp_domain }} + npx surge --project ./ --domain $DEPLOY_DOMAIN --token ${{ secrets.TDESIGN_SURGE_TOKEN }} + + tdesign-uniapp-chat: + if: github.event.workflow_run.conclusion == 'success' + runs-on: ubuntu-latest + needs: preview-context + steps: + - uses: dawidd6/action-download-artifact@v12 + with: + workflow: ${{ github.event.workflow_run.workflow_id }} + run_id: ${{ github.event.workflow_run.id }} + name: tdesign-uniapp-chat-site + - run: | + export DEPLOY_DOMAIN=${{ needs.preview-context.outputs.tdesign_uniapp_chat_domain }} + npx surge --project ./ --domain $DEPLOY_DOMAIN --token ${{ secrets.TDESIGN_SURGE_TOKEN }} + preview-comment: if: always() needs: - preview-context - tdesign-miniprogram - tdesign-miniprogram-chat + - tdesign-uniapp + - tdesign-uniapp-chat runs-on: ubuntu-latest steps: - name: jobs report @@ -79,6 +111,8 @@ jobs: const pr_id = ${{ needs.preview-context.outputs.pr_id }}; const tdesign_miniprogram_domain = "${{ needs.preview-context.outputs.tdesign_miniprogram_domain }}"; const tdesign_miniprogram_chat_domain = "${{ needs.preview-context.outputs.tdesign_miniprogram_chat_domain }}"; + const tdesign_uniapp_domain = "${{ needs.preview-context.outputs.tdesign_uniapp_domain }}"; + const tdesign_uniapp_chat_domain = "${{ needs.preview-context.outputs.tdesign_uniapp_chat_domain }}"; const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({ owner: context.repo.owner, @@ -90,6 +124,8 @@ jobs: const tdesign = { "tdesign-miniprogram": { status: "", report_url: "" }, "tdesign-miniprogram-chat": { status: "", report_url: "" }, + "tdesign-uniapp": { status: "", report_url: "" }, + "tdesign-uniapp-chat": { status: "", report_url: "" }, }; const preview_success = `完成`; const preview_failure = `失败`; diff --git a/packages/tdesign-uniapp-chat/site/package.json b/packages/tdesign-uniapp-chat/site/package.json index eac33960f..632a1015b 100644 --- a/packages/tdesign-uniapp-chat/site/package.json +++ b/packages/tdesign-uniapp-chat/site/package.json @@ -1,5 +1,6 @@ { "name": "tdesign-uniapp-chat-site", + "type": "module", "private": "true", "version": "0.0.1", "description": "site of tdesign-uniapp-chat", diff --git a/packages/tdesign-uniapp-chat/site/vite.config.ts b/packages/tdesign-uniapp-chat/site/vite.config.ts index 0429f06c2..2935e999f 100644 --- a/packages/tdesign-uniapp-chat/site/vite.config.ts +++ b/packages/tdesign-uniapp-chat/site/vite.config.ts @@ -2,7 +2,6 @@ import * as path from 'path'; import { defineConfig, loadEnv } from 'vite'; import vue from '@vitejs/plugin-vue'; import vueJsx from '@vitejs/plugin-vue-jsx'; -import { removeLastSlash } from 't-comm/es/slash/slash'; // import changelog2Json from './web/plugins/changelog-to-json'; import tdocPlugin from './web/plugins/plugin-tdoc'; @@ -43,7 +42,7 @@ export default ({ mode }) => { }) { console.log('[experimental] ', hostType, hostId, type, filename); - return `${removeLastSlash(vueAppBase)}/${filename}`; + return path.join(vueAppBase, filename) }, }, } : {}; diff --git a/packages/tdesign-uniapp-chat/site/web/test-coverage.js b/packages/tdesign-uniapp-chat/site/web/test-coverage.js index 3ae43ce91..4ecb73ab0 100644 --- a/packages/tdesign-uniapp-chat/site/web/test-coverage.js +++ b/packages/tdesign-uniapp-chat/site/web/test-coverage.js @@ -1,4 +1,4 @@ -module.exports = { +export default { util: { statements: '48.86%', branches: '71.42%', functions: '22.22%', lines: '48.86%' }, actionSheet: { statements: '85.39%', branches: '89.33%', functions: '94.28%', lines: '85.39%' }, avatar: { statements: '95.21%', branches: '93.75%', functions: '76.92%', lines: '95.21%' }, diff --git a/packages/tdesign-uniapp/site/package.json b/packages/tdesign-uniapp/site/package.json index 5420b2961..e4cbee800 100644 --- a/packages/tdesign-uniapp/site/package.json +++ b/packages/tdesign-uniapp/site/package.json @@ -1,6 +1,7 @@ { "name": "tdesign-uniapp-site", "private": "true", + "type": "module", "version": "0.0.1", "description": "site of tdesign-uniapp", "author": "novlan1", diff --git a/packages/tdesign-uniapp/site/vite.config.ts b/packages/tdesign-uniapp/site/vite.config.ts index fab5ccc5f..b59dc93d1 100644 --- a/packages/tdesign-uniapp/site/vite.config.ts +++ b/packages/tdesign-uniapp/site/vite.config.ts @@ -2,7 +2,6 @@ import * as path from 'path'; import { defineConfig, loadEnv } from 'vite'; import vue from '@vitejs/plugin-vue'; import vueJsx from '@vitejs/plugin-vue-jsx'; -import { removeLastSlash } from 't-comm/es/slash/slash'; // import changelog2Json from './web/plugins/changelog-to-json'; import tdocPlugin from './web/plugins/plugin-tdoc'; @@ -34,20 +33,28 @@ const ENV_PREFIX = ['VITE_', 'VUE_APP']; export default ({ mode }) => { const env = loadEnv(mode, root, ENV_PREFIX); const vueAppBase = env.VUE_APP_PUBLICPATH; - const experimentalConfig = vueAppBase ? { - experimental: { - renderBuiltUrl(filename: string, { hostId, hostType, type }: { - hostId: string; - hostType: string; - type: string; - }) { - console.log('[experimental] ', hostType, hostId, type, filename); + const experimentalConfig = vueAppBase + ? { + experimental: { + renderBuiltUrl( + filename: string, + { + hostId, + hostType, + type, + }: { + hostId: string; + hostType: string; + type: string; + }, + ) { + console.log('[experimental] ', hostType, hostId, type, filename); - return `${removeLastSlash(vueAppBase)}/${filename}`; + return path.join(vueAppBase, filename); + }, }, - }, - } : {}; - + } + : {}; const result = defineConfig({ base: publicPathMap[mode], diff --git a/packages/tdesign-uniapp/site/web/test-coverage.js b/packages/tdesign-uniapp/site/web/test-coverage.js index 3ae43ce91..4ecb73ab0 100644 --- a/packages/tdesign-uniapp/site/web/test-coverage.js +++ b/packages/tdesign-uniapp/site/web/test-coverage.js @@ -1,4 +1,4 @@ -module.exports = { +export default { util: { statements: '48.86%', branches: '71.42%', functions: '22.22%', lines: '48.86%' }, actionSheet: { statements: '85.39%', branches: '89.33%', functions: '94.28%', lines: '85.39%' }, avatar: { statements: '95.21%', branches: '93.75%', functions: '76.92%', lines: '95.21%' },