feat: dist打包前检查

.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}}

.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 * * *'

.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
+            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}}

build-dev.trigger

@@ -1 +0,0 @@
-2

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

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';
 
 /**

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 })

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';

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";

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',

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',

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',

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',

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',

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',

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），大写字母开头，驼峰命名

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({

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({

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',

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({

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";
 

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()

trigger/release.trigger

@@ -0,0 +1 @@
+01:50