From 062a267a6f5c0fe172579f615502168e0d2463bf Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 25 May 2023 12:47:16 +0800
Subject: [PATCH] chore: pre publish

---
 packages/core/pipeline/package.json             |  4 ++--
 packages/core/pipeline/rollup.config.js         | 16 ++++++++++------
 packages/plugins/plugin-aliyun/package.json     |  4 ++--
 packages/plugins/plugin-aliyun/rollup.config.js | 12 ++++++++++--
 packages/plugins/plugin-all/package.json        |  4 ++--
 packages/plugins/plugin-all/rollup.config.js    | 12 ++++++++++--
 packages/plugins/plugin-cert/package.json       |  4 ++--
 packages/plugins/plugin-cert/rollup.config.js   | 12 ++++++++++--
 packages/plugins/plugin-host/package.json       |  4 ++--
 packages/plugins/plugin-host/rollup.config.js   | 12 ++++++++++--
 packages/plugins/plugin-huawei/package.json     |  4 ++--
 packages/plugins/plugin-huawei/rollup.config.js | 12 ++++++++++--
 packages/plugins/plugin-tencent/package.json    |  4 ++--
 .../plugins/plugin-tencent/rollup.config.js     | 12 ++++++++++--
 packages/plugins/plugin-util/package.json       |  4 ++--
 packages/plugins/plugin-util/rollup.config.js   | 17 ++++++++++-------
 packages/ui/certd-server/src/controller/home.ts |  2 +-
 17 files changed, 97 insertions(+), 42 deletions(-)

diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json
index a11e0725..6e350d3f 100644
--- a/packages/core/pipeline/package.json
+++ b/packages/core/pipeline/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/pipeline.mjs",
-  "types": "./dist/d/index.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/pipeline.mjs",
diff --git a/packages/core/pipeline/rollup.config.js b/packages/core/pipeline/rollup.config.js
index 79d1fe15..35d39643 100644
--- a/packages/core/pipeline/rollup.config.js
+++ b/packages/core/pipeline/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
@@ -31,9 +39,5 @@ module.exports = {
     "@certd/plugin-host",
     "@certd/plugin-tencent",
     "@certd/plugin-util",
-    "log4js",
-    "@midwayjs/core",
-    "@midwayjs/decorator",
-    "reflect-metadata",
   ],
 };
diff --git a/packages/plugins/plugin-aliyun/package.json b/packages/plugins/plugin-aliyun/package.json
index 683ac7db..db50bb43 100644
--- a/packages/plugins/plugin-aliyun/package.json
+++ b/packages/plugins/plugin-aliyun/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-aliyun.mjs",
-  "types": "./dist/es/plugin-aliyun.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-aliyun.mjs",
diff --git a/packages/plugins/plugin-aliyun/rollup.config.js b/packages/plugins/plugin-aliyun/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-aliyun/rollup.config.js
+++ b/packages/plugins/plugin-aliyun/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json
index b1e0583f..1cdc3cb8 100644
--- a/packages/plugins/plugin-all/package.json
+++ b/packages/plugins/plugin-all/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-all.mjs",
-  "types": "./dist/es/plugin-all.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-all.mjs",
diff --git a/packages/plugins/plugin-all/rollup.config.js b/packages/plugins/plugin-all/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-all/rollup.config.js
+++ b/packages/plugins/plugin-all/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json
index e918e635..7b83b3a6 100644
--- a/packages/plugins/plugin-cert/package.json
+++ b/packages/plugins/plugin-cert/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-cert.mjs",
-  "types": "./dist/es/plugin-cert.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-cert.mjs",
diff --git a/packages/plugins/plugin-cert/rollup.config.js b/packages/plugins/plugin-cert/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-cert/rollup.config.js
+++ b/packages/plugins/plugin-cert/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-host/package.json b/packages/plugins/plugin-host/package.json
index 2778478c..36aa45b2 100644
--- a/packages/plugins/plugin-host/package.json
+++ b/packages/plugins/plugin-host/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-host.mjs",
-  "types": "./dist/es/plugin-host.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-host.mjs",
diff --git a/packages/plugins/plugin-host/rollup.config.js b/packages/plugins/plugin-host/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-host/rollup.config.js
+++ b/packages/plugins/plugin-host/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-huawei/package.json b/packages/plugins/plugin-huawei/package.json
index def13391..fc32c62f 100644
--- a/packages/plugins/plugin-huawei/package.json
+++ b/packages/plugins/plugin-huawei/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-huawei.mjs",
-  "types": "./dist/es/plugin-huawei.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-huawei.mjs",
diff --git a/packages/plugins/plugin-huawei/rollup.config.js b/packages/plugins/plugin-huawei/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-huawei/rollup.config.js
+++ b/packages/plugins/plugin-huawei/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-tencent/package.json b/packages/plugins/plugin-tencent/package.json
index 7d810a9d..27596e02 100644
--- a/packages/plugins/plugin-tencent/package.json
+++ b/packages/plugins/plugin-tencent/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-tencent.mjs",
-  "types": "./dist/es/plugin-tencent.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-tencent.mjs",
diff --git a/packages/plugins/plugin-tencent/rollup.config.js b/packages/plugins/plugin-tencent/rollup.config.js
index 4614e1be..35d39643 100644
--- a/packages/plugins/plugin-tencent/rollup.config.js
+++ b/packages/plugins/plugin-tencent/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -14,7 +15,14 @@ module.exports = {
     resolve(),
     // 识别 commonjs 模式第三方依赖
     commonjs(),
-    rollupTypescript(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
+    }),
     json(),
     terser(),
   ],
diff --git a/packages/plugins/plugin-util/package.json b/packages/plugins/plugin-util/package.json
index e65f2b49..93ae8c27 100644
--- a/packages/plugins/plugin-util/package.json
+++ b/packages/plugins/plugin-util/package.json
@@ -3,8 +3,8 @@
   "private": false,
   "version": "1.0.3",
   "main": "./src/index.ts",
-  "module": "./dist/plugin-util.mjs",
-  "types": "./dist/es/plugin-util.d.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "publishConfig": {
     "main": "./dist/bundle.js",
     "module": "./dist/plugin-util.mjs",
diff --git a/packages/plugins/plugin-util/rollup.config.js b/packages/plugins/plugin-util/rollup.config.js
index ca63f8df..35d39643 100644
--- a/packages/plugins/plugin-util/rollup.config.js
+++ b/packages/plugins/plugin-util/rollup.config.js
@@ -1,6 +1,7 @@
 const resolve = require("@rollup/plugin-node-resolve");
 const commonjs = require("@rollup/plugin-commonjs");
-const rollupTypescript = require("rollup-plugin-typescript2");
+//const Typescript = require("rollup-plugin-typescript2");
+const Typescript = require("@rollup/plugin-typescript");
 const json = require("@rollup/plugin-json");
 const terser = require("@rollup/plugin-terser");
 module.exports = {
@@ -13,11 +14,15 @@ module.exports = {
     // 解析第三方依赖
     resolve(),
     // 识别 commonjs 模式第三方依赖
-    commonjs({
-      // dynamicRequireTargets: true,
-      ignoreDynamicRequires: true,
+    commonjs(),
+    Typescript({
+      target: "esnext",
+      rootDir: "src",
+      declaration: true,
+      declarationDir: "dist/d",
+      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      allowSyntheticDefaultImports: true,
     }),
-    rollupTypescript(),
     json(),
     terser(),
   ],
@@ -34,7 +39,5 @@ module.exports = {
     "@certd/plugin-host",
     "@certd/plugin-tencent",
     "@certd/plugin-util",
-    "@certd/plugin-util",
-    "kubernetes-client",
   ],
 };
diff --git a/packages/ui/certd-server/src/controller/home.ts b/packages/ui/certd-server/src/controller/home.ts
index 6aa5a9a7..89d2895a 100755
--- a/packages/ui/certd-server/src/controller/home.ts
+++ b/packages/ui/certd-server/src/controller/home.ts
@@ -1,7 +1,7 @@
 import { Controller, Get, Provide } from '@midwayjs/decorator';
 
 @Provide()
-@Controller('/')
+@Controller('/hello')
 export class HomeController {
   @Get('/')
   async home(): Promise<string> {