From 8f6e5bd24b3b65fbfcba36c08f532a3abad2d606 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 28 Sep 2025 11:02:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20dist=E6=89=93=E5=8C=85=E5=89=8D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-image.yml | 34 +---------- .github/workflows/deploy-demo.yml | 9 +-- ...d-image-for-test.yml => release-image.yml} | 56 ++++++++++++------ build-dev.trigger | 1 - .../src/user/addon/service/addon-service.ts | 2 +- .../user/pipeline/sub-domain-controller.ts | 2 +- .../auto/auto-e-pipeline-emitter-register.ts | 2 +- .../modules/cert/service/domain-service.ts | 2 +- .../cname/service/cname-record-service.ts | 2 +- .../plugin/deploy-to-apig/index.ts | 2 +- .../plugin/deploy-to-apigateway/index.ts | 2 +- .../plugin/deploy-to-cdn/index.ts | 2 +- .../plugin/deploy-to-dcdn/index.ts | 2 +- .../plugin/deploy-to-oss/index.ts | 2 +- .../plugins/plugin-deploy-to-cloudfront.ts | 2 +- .../plugin-demo/plugins/plugin-test.ts | 2 +- .../plugins/plugin-deploy-to-cdn.ts | 2 +- .../plugins/plugin-update-cert.ts | 2 +- .../plugin/deploy-to-cdn/index.ts | 2 +- .../plugins/plugin-depoy-to-cdn.ts | 2 +- .../plugins/plugin-deploy-to-cdn.ts | 2 +- publish-check.js | 57 ++++++++++++++++++- build.trigger => trigger/build.trigger | 0 deploy.trigger => trigger/deploy.trigger | 0 trigger/release.trigger | 1 + 25 files changed, 117 insertions(+), 75 deletions(-) rename .github/workflows/{build-image-for-test.yml => release-image.yml} (66%) delete mode 100644 build-dev.trigger rename build.trigger => trigger/build.trigger (100%) rename deploy.trigger => trigger/deploy.trigger (100%) create mode 100644 trigger/release.trigger diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index c648873e..45ab6ad7 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -3,7 +3,7 @@ on: push: branches: ['v2-dev'] paths: - - "build.trigger" + - "trigger/build.trigger" # schedule: # - # 国际时间 19:17 执行，北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间 @@ -68,7 +68,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -82,34 +82,4 @@ jobs: push: true context: ./packages/ui/ tags: | - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}} - greper/certd:latest - greper/certd:${{steps.get_certd_version.outputs.result}} - ghcr.io/${{ github.repository }}:latest - ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}} - - name: Build armv7 - uses: docker/build-push-action@v6 - with: - platforms: linux/arm/v7 - push: true - context: ./packages/ui/ - tags: | - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7 - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7 - greper/certd:armv7 - greper/certd:${{steps.get_certd_version.outputs.result}}-armv7 - ghcr.io/${{ github.repository }}:armv7 - ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7 - -# - name: Build agent -# uses: docker/build-push-action@v6 -# with: -# platforms: linux/amd64,linux/arm64 -# push: true -# context: ./packages/ui/agent/ -# tags: | -# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:latest -# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:${{steps.get_certd_version.outputs.result}} -# greper/certd-agent:latest -# greper/certd-agent:${{steps.get_certd_version.outputs.result}} diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 50fdeca7..8126c1cc 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -1,14 +1,15 @@ name: deploy-demo on: - push: - branches: ['v2-dev'] - paths: - - "deploy.trigger" +# push: +# branches: ['v2-dev'] +# paths: +# - "trigger/deploy.trigger" workflow_run: workflows: [ "build-image" ] types: - completed + # schedule: # - # 国际时间 19:17 执行，北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间 # - cron: '17 19 * * *' diff --git a/.github/workflows/build-image-for-test.yml b/.github/workflows/release-image.yml similarity index 66% rename from .github/workflows/build-image-for-test.yml rename to .github/workflows/release-image.yml index 85aa3472..0261bdbd 100644 --- a/.github/workflows/build-image-for-test.yml +++ b/.github/workflows/release-image.yml @@ -1,9 +1,13 @@ -name: build-image-for-test +name: build-image-for-release on: - push: - branches: ['v2-dev'] - paths: - - "build-dev.trigger" +# push: +# branches: ['v2-dev'] +# paths: +# - "builder/release.trigger" +# workflow_run: +# workflows: [ "build-image" ] +# types: +# - completed # schedule: # - # 国际时间 19:17 执行，北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间 @@ -20,7 +24,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - ref: v2-dev + lfs: true - name: get_certd_version id: get_certd_version @@ -75,17 +79,19 @@ jobs: username: ${{ secrets.dockerhub_username }} password: ${{ secrets.dockerhub_password }} -# - name: Build default platforms -# uses: docker/build-push-action@v6 -# with: -# platforms: linux/amd64,linux/arm64 -# push: true -# context: ./packages/ui/ -# tags: | -# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-dev:latest -# greper/certd-dev:latest -# ghcr.io/${{ github.repository }}:dev-latest - + - name: Build default platforms + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64 + push: true + context: ./packages/ui/ + tags: | + registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest + registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}} + greper/certd:latest + greper/certd:${{steps.get_certd_version.outputs.result}} + ghcr.io/${{ github.repository }}:latest + ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}} - name: Build armv7 uses: docker/build-push-action@v6 with: @@ -96,4 +102,18 @@ jobs: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7 registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7 greper/certd:armv7 - greper/certd:${{steps.get_certd_version.outputs.result}}-armv7 \ No newline at end of file + greper/certd:${{steps.get_certd_version.outputs.result}}-armv7 + ghcr.io/${{ github.repository }}:armv7 + ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7 + +# - name: Build agent +# uses: docker/build-push-action@v6 +# with: +# platforms: linux/amd64,linux/arm64 +# push: true +# context: ./packages/ui/agent/ +# tags: | +# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:latest +# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:${{steps.get_certd_version.outputs.result}} +# greper/certd-agent:latest +# greper/certd-agent:${{steps.get_certd_version.outputs.result}} diff --git a/build-dev.trigger b/build-dev.trigger deleted file mode 100644 index 0cfbf088..00000000 --- a/build-dev.trigger +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/packages/libs/lib-server/src/user/addon/service/addon-service.ts b/packages/libs/lib-server/src/user/addon/service/addon-service.ts index 11da789c..1fe64812 100644 --- a/packages/libs/lib-server/src/user/addon/service/addon-service.ts +++ b/packages/libs/lib-server/src/user/addon/service/addon-service.ts @@ -5,7 +5,7 @@ import { AddonDefine, BaseService, PageReq, PermissionException, ValidateExcepti import { addonRegistry, newAddon } from "../api/index.js"; import { AddonEntity } from "../entity/addon.js"; import { http, logger, utils } from "@certd/basic"; -import { TaskServiceBuilder } from "@certd/ui-server/dist/modules/pipeline/service/getter/task-service-getter.js"; +import { TaskServiceBuilder } from "@certd/ui-server"; /** * Addon diff --git a/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts index 76dae741..63a55c55 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts @@ -1,7 +1,7 @@ import {ALL, Body, Controller, Inject, Post, Provide, Query} from '@midwayjs/core'; import {Constants, CrudController} from '@certd/lib-server'; import {SubDomainService} from "../../../modules/pipeline/service/sub-domain-service.js"; -import {DomainParser} from '@certd/plugin-cert/dist/dns-provider/domain-parser.js'; +import {DomainParser} from '@certd/plugin-cert'; import { SubDomainsGetter } from '../../../modules/pipeline/service/getter/sub-domain-getter.js'; /** diff --git a/packages/ui/certd-server/src/modules/auto/auto-e-pipeline-emitter-register.ts b/packages/ui/certd-server/src/modules/auto/auto-e-pipeline-emitter-register.ts index 3185239f..eb420fa6 100644 --- a/packages/ui/certd-server/src/modules/auto/auto-e-pipeline-emitter-register.ts +++ b/packages/ui/certd-server/src/modules/auto/auto-e-pipeline-emitter-register.ts @@ -2,7 +2,7 @@ import { Autoload, Init, Inject, Scope, ScopeEnum } from "@midwayjs/core"; import { CertInfoService } from "../monitor/index.js"; import { pipelineEmitter } from "@certd/pipeline"; import { CertInfo, EVENT_CERT_APPLY_SUCCESS } from "@certd/plugin-cert"; -import { PipelineEvent } from "@certd/pipeline/dist/service/emit.js"; +import { PipelineEvent } from "@certd/pipeline"; @Autoload() @Scope(ScopeEnum.Request, { allowDowngrade: true }) diff --git a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts index 2c8ec6e7..189bf70f 100644 --- a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts +++ b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts @@ -4,7 +4,7 @@ import {In, Not, Repository} from 'typeorm'; import {AccessService, BaseService} from '@certd/lib-server'; import {DomainEntity} from '../entity/domain.js'; import {SubDomainService} from "../../pipeline/service/sub-domain-service.js"; -import {DomainParser} from "@certd/plugin-cert/dist/dns-provider/domain-parser.js"; +import {DomainParser} from "@certd/plugin-cert"; import {DomainVerifiers} from "@certd/plugin-cert"; import { SubDomainsGetter } from '../../pipeline/service/getter/sub-domain-getter.js'; import { CnameRecordService } from '../../cname/service/cname-record-service.js'; diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts index 47ae605a..3e8d6326 100644 --- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts +++ b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts @@ -17,7 +17,7 @@ import { getAuthoritativeDnsResolver, walkTxtRecord } from "@certd/acme-client"; import { CnameProviderService } from "./cname-provider-service.js"; import { CnameProviderEntity } from "../entity/cname-provider.js"; import { CommonDnsProvider } from "./common-provider.js"; -import { DomainParser } from "@certd/plugin-cert/dist/dns-provider/domain-parser.js"; +import { DomainParser } from "@certd/plugin-cert"; import punycode from "punycode.js"; import { SubDomainService } from "../../pipeline/service/sub-domain-service.js"; import { SubDomainsGetter } from "../../pipeline/service/getter/sub-domain-getter.js"; diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts index a949b397..8340dadd 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts @@ -6,7 +6,7 @@ import { createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { CertApplyPluginNames, CertInfo, CertReader } from "@certd/plugin-cert"; -import {optionsUtils} from "@certd/basic/dist/utils/util.options.js"; +import {optionsUtils} from "@certd/basic"; @IsTaskPlugin({ name: 'DeployCertToAliyunApig', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts index 6bd45e4a..0cce821e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts @@ -1,7 +1,7 @@ import {AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput} from '@certd/pipeline'; import {AliyunAccess, createCertDomainGetterInputDefine, createRemoteSelectInputDefine} from "@certd/plugin-lib"; import {CertApplyPluginNames, CertInfo} from '@certd/plugin-cert'; -import {optionsUtils} from "@certd/basic/dist/utils/util.options.js"; +import {optionsUtils} from "@certd/basic"; @IsTaskPlugin({ name: 'DeployCertToAliyunApiGateway', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts index 76f38f0c..962b5539 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { AliyunAccess, AliyunClient, AliyunSslClient, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; -import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; +import { optionsUtils } from '@certd/basic'; import { CertApplyPluginNames, CertReader } from "@certd/plugin-cert"; @IsTaskPlugin({ name: 'DeployCertToAliyunCDN', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts index 47d8d016..e64c2515 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts @@ -8,7 +8,7 @@ import { } from "@certd/plugin-lib"; import { CertInfo } from '@certd/plugin-cert'; import { CertApplyPluginNames} from '@certd/plugin-cert'; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; @IsTaskPlugin({ name: 'DeployCertToAliyunDCDN', title: '阿里云-部署证书至DCDN', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts index 629bd315..8f330fd1 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts @@ -7,7 +7,7 @@ import { } from '@certd/plugin-lib'; import {CertInfo, CertReader} from '@certd/plugin-cert'; import { CertApplyPluginNames} from '@certd/plugin-cert'; -import {optionsUtils} from "@certd/basic/dist/utils/util.options.js"; +import {optionsUtils} from "@certd/basic"; import {isArray} from "lodash-es"; @IsTaskPlugin({ name: 'DeployCertToAliyunOSS', diff --git a/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts b/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts index 1d66bae7..bb608102 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts @@ -3,7 +3,7 @@ import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { AwsAccess, AwsRegions } from "../access.js"; import { AwsAcmClient } from "../libs/aws-acm-client.js"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; @IsTaskPlugin({ name: 'AwsDeployToCloudFront', diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts index 11b13964..f08f39c8 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo, CertReader } from '@certd/plugin-cert'; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; -import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; +import { optionsUtils } from '@certd/basic'; import { CertApplyPluginNames} from '@certd/plugin-cert'; @IsTaskPlugin({ //命名规范，插件类型+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名 diff --git a/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-deploy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-deploy-to-cdn.ts index a5f7069e..4f658732 100644 --- a/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-deploy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-deploy-to-cdn.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; import { JDCloudAccess } from "../access.js"; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-update-cert.ts b/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-update-cert.ts index e8a81057..928450a6 100644 --- a/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-update-cert.ts +++ b/packages/ui/certd-server/src/plugins/plugin-jdcloud/plugins/plugin-update-cert.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; import { JDCloudAccess } from "../access.js"; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts index 4e46f15a..5516c2a9 100644 --- a/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine, QiniuAccess, QiniuClient } from '@certd/plugin-lib'; import { CertInfo } from '@certd/plugin-cert'; -import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; +import { optionsUtils } from '@certd/basic'; import { CertApplyPluginNames} from '@certd/plugin-cert'; @IsTaskPlugin({ name: 'QiniuDeployCertToCDN', diff --git a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts index 15584b1f..1680d026 100644 --- a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts @@ -2,7 +2,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { UpyunAccess } from "../access.js"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; import { UpyunClient } from "../client.js"; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-cdn.ts index c16411c0..123eb967 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-cdn.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; -import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; +import { optionsUtils } from "@certd/basic"; import { VolcengineAccess } from "../access.js"; import { VolcengineCdnClient } from "../cdn-client.js"; diff --git a/publish-check.js b/publish-check.js index a24c308b..2e9ebb38 100644 --- a/publish-check.js +++ b/publish-check.js @@ -1,6 +1,7 @@ import fs from 'fs' import childProcess from 'child_process'; +import { join } from "path"; function check(){ const gitAdd = fs.readFileSync("./node_modules/@lerna-lite/version/dist/lib/git-add.js","utf-8") if(gitAdd.indexOf("('git', ['add', '.']") > -1){ @@ -21,7 +22,7 @@ function check(){ function checkDist(){ - function scanDir(root,excludes){ + function scanDir(root,excludes,stopDirName = "src"){ //扫描文件,忽略node_modules const files = fs.readdirSync(root) const dirs = [] @@ -30,12 +31,62 @@ function checkDist(){ continue; } const filePath = join(root, file); + + if (!fs.statSync(filePath).isDirectory()) { + continue; + } + + if(file === stopDirName){ + dirs.push(filePath) + continue; + } + + const res = scanDir(filePath,excludes,stopDirName) + for (const item of res){ + dirs.push(item) + } } - console.log("检查",file) + return dirs + } + + const srcDirs = scanDir("./packages",["node_modules",".git","dist","certd-client"],"src") + + console.log("检查dist",srcDirs) + + //检查包含 import xxx from "*/dist/*" + const hasDistFiles = [] + for (const srcDir of srcDirs) { + const files = fs.readdirSync(srcDir,{recursive:true}) + for (const file of files) { + + const filePath = join(srcDir, file); + if(!file.endsWith(".ts")){ + continue; + } + const content = fs.readFileSync(filePath,"utf-8") + const lines = content.split("\n") + for (const line of lines) { + if( line.indexOf("@certd")>-1 && line.indexOf("dist") > -1){ + hasDistFiles.push({ + filepath:filePath, + line: line + }) + break; + } + } + } + } + + if(hasDistFiles.length > 0){ + console.error("dist文件被引用") + console.error(hasDistFiles) + throw new Error("dist文件被引用") + } else { + console.log("dist检查通过 √") } } checkDist() -// check() +check() diff --git a/build.trigger b/trigger/build.trigger similarity index 100% rename from build.trigger rename to trigger/build.trigger diff --git a/deploy.trigger b/trigger/deploy.trigger similarity index 100% rename from deploy.trigger rename to trigger/deploy.trigger diff --git a/trigger/release.trigger b/trigger/release.trigger new file mode 100644 index 00000000..f5702a3e --- /dev/null +++ b/trigger/release.trigger @@ -0,0 +1 @@ +01:50