@taole/deploy-helper 0.6.6 → 0.7.1

package/index.mjs

@@ -17,8 +17,8 @@ const __dirname = path.dirname(__filename);
 
 const TEST_SERVER_HOST = "192.168.0.35";
 
-function fmtAssetsCommit(msg){
-    if(msg.startsWith("-#")){
+function fmtAssetsCommit(msg) {
+    if (msg.startsWith("-#")) {
         return msg;
     }
     return `-#DH-1 ${msg}`;
@@ -139,7 +139,7 @@ async function main() {
         console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
         console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
         console.log(`command: pipeline {pipelineName|pipelineId} [branch] 触发流水线{pipelineName|pipelineId}， 指定分支(可省略)`);
-        console.log(`command: offlinepkgrm {name} [mode] 删除离线包{name}， 指定模式(可省略，默认test)`);
+        console.log(`command: offlinepkgrm {name} {platform} [mode] 删除离线包{name}， 指定平台{platform}， 指定模式(可省略，默认test)`);
         process.exit(0);
     }
     log(`deploy-helper v${version} start`);
@@ -207,7 +207,12 @@ async function main() {
             log(`name参数不能为空`);
             process.exit(1);
         }
-        const mode = process.argv[4] || "test";
+        const platform = process.argv[4];
+        if (!platform) {
+            log(`platform参数不能为空`);
+            process.exit(1);
+        }
+        const mode = process.argv[5] || "test";
         if (!["prod", "test"].includes(mode)) {
             log(`mode参数只能是prod或test`);
             process.exit(1);
@@ -217,7 +222,7 @@ async function main() {
             log(`配置文件未配置离线包api接口, 请先配置`);
             process.exit(1);
         }
-        await syncOfflinePkgApi(userDeployHelperConfig, mode, { name, remove: true }, null);
+        await syncOfflinePkgApi(userDeployHelperConfig, mode, { name, remove: true, platform }, null);
         process.exit(0);
     }
     try {
@@ -253,11 +258,11 @@ async function main() {
             workDir: workDir,
             mode,
         });
-        if(!offlinePkgResult.canBuild && offlinePkgResult.errorMsg) {
+        if (!offlinePkgResult.canBuild && offlinePkgResult.errorMsg) {
             log(`${offlinePkgResult.errorMsg}`);
             process.exit(1);
         }
-        if(offlinePkgResult.canBuild) {
+        if (offlinePkgResult.canBuild) {
             await offlinePkgResult.hookPostBuild();
         }
 

package/lib/offlinePkg.mjs

@@ -53,7 +53,12 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
     const setPath = userDeployHelperConfig.offlineApi.set;
     const getUrl = `${apiDomain}${getPath}`;
     const setUrl = `${apiDomain}${setPath}`;
-    const nowRes = await fetch(getUrl);
+    const envPrefix = `${mode === "prod" ? "线上环境" : "测试环境"}[platform=${offlineConfig.platform}]`;
+    const nowRes = await fetch(getUrl, {
+        headers: {
+            platform: String(offlineConfig.platform),
+        }
+    });
     const nowData = await nowRes.json();
     let needSetData = true;
     let finalJsonData = null;
@@ -88,14 +93,21 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
         const setRes = await fetch(setUrl, {
             method: "POST",
             body: formdata,
+            headers: {
+                platform: String(offlineConfig.platform),
+            }
         });
         const setData = await setRes.json();
         if (!setData || setData.error !== 0) {
             throw new Error(`更新离线包列表失败, 更新离线包当前配置失败: ${setData.error_msg || "未知错误"}`);
         }
-        log(`${mode === "prod" ? "线上" : "测试"}环境离线包列表更新完成: ${JSON.stringify(setData)}`);
+        log(`${envPrefix}离线包列表更新完成: ${JSON.stringify(setData)}`);
         // 再次获取列表，确保更新成功
-        const nowRes2 = await fetch(getUrl);
+        const nowRes2 = await fetch(getUrl, {
+            headers: {
+                platform: String(offlineConfig.platform),
+            }
+        });
         const nowData2 = await nowRes2.json();
         if (!nowData2 || nowData2.error !== 0) {
             throw new Error(`再次获取离线包列表失败, 获取离线包当前配置失败: ${nowData2.error_msg || "未知错误"}`);
@@ -104,10 +116,11 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
     }
 
     const packages = finalJsonData.packages || [];
-    console.log(`${mode === "prod" ? "线上" : "测试"}环境当前离线包列表:`, packages.map(item => ({ ...item, items: '省略' + item.items.length + '个条目' })));
+    console.log(`${envPrefix}当前离线包列表:`, packages.map(item => ({ ...item, items: '省略' + item.items.length + '个条目' })));
 }
 
 /**
+ * @deprecated 不再需要这个函数, 如果插件使用的是@taole/vite-plugin-dynamic-base, 则不需要这个函数
  * hack
  * 由于vite-plugin-dynamic-base插件和legacy插件同时使用, 生存的入口文件中代码有点问题,这里直接修改有问题的代码
  */
@@ -149,10 +162,16 @@ export function checkOfflinePkg(config) {
     const offlineConfig = getJsonConfig(config.workDir, "offline.config.json");
     if (offlineConfig) {
         offlineConfig.distDir = offlineConfig.distDir || "dist";
+        offlineConfig.platform = offlineConfig.platform || 3; // 3,4是点点
     }
     const packageJson = getJsonConfig(config.workDir, "package.json");
     const userDeployHelperConfig = getUserDeployHelperConfig();
     const distPath = join(config.workDir, offlineConfig && offlineConfig.distDir ? offlineConfig.distDir : "dist");
+    const allDeps = {
+        ...packageJson.devDependencies,
+        ...packageJson.dependencies,
+    };
+    const useOldPDB = !!allDeps['vite-plugin-dynamic-base'];
 
     // 如果offlineConfig.remove为true，则不构建离线包
     const willRemovePkg = offlineConfig && offlineConfig.name && offlineConfig.remove === true && offlineConfig.skip !== true;
@@ -162,7 +181,9 @@ export function checkOfflinePkg(config) {
             canBuild: true,
             errorMsg: "",
             hookPostBuild: async () => {
-                fixEntryHtml(config, offlineConfig);
+                if (useOldPDB) {
+                    fixEntryHtml(config, offlineConfig);
+                }
                 log(`开始删除离线包${offlineConfig.name}`);
                 await syncApi(userDeployHelperConfig, config.mode, offlineConfig, null);
             }
@@ -181,13 +202,8 @@ export function checkOfflinePkg(config) {
         errorMsg = "啊没有package.json?";
         canBuildOfflinePkg = false;
     } else {
-        // 暂时不检查这个
-        const allDeps = {
-            ...packageJson.devDependencies,
-            ...packageJson.dependencies,
-        };
-        if (!allDeps['@vitejs/plugin-legacy'] || !allDeps['vite-plugin-dynamic-base']) {
-            errorMsg = "检查到项目中未安装依赖@vitejs/plugin-legacy和vite-plugin-dynamic-base, 请先安装依赖并调整构建代码以支持离线化，相关文档：https://alidocs.dingtalk.com/i/nodes/ydxXB52LJqexwD71F9K5XNMrJqjMp697?doc_type=wiki_doc";
+        if (!allDeps['@vitejs/plugin-legacy'] || (!allDeps['vite-plugin-dynamic-base'] && !allDeps['@taole/vite-plugin-dynamic-base'])) {
+            errorMsg = "检查到项目中未安装依赖@vitejs/plugin-legacy和@taole/vite-plugin-dynamic-base, 请先安装依赖并调整构建代码以支持离线化，相关文档：https://alidocs.dingtalk.com/i/nodes/ydxXB52LJqexwD71F9K5XNMrJqjMp697?doc_type=wiki_doc";
             canBuildOfflinePkg = false;
         }
     }
@@ -210,7 +226,9 @@ export function checkOfflinePkg(config) {
             canBuild: true,
             errorMsg: "",
             hookPostBuild: async () => {
-                fixEntryHtml(config, offlineConfig);
+                if (useOldPDB) {
+                    fixEntryHtml(config, offlineConfig);
+                }
             }
         }
     }
@@ -221,9 +239,11 @@ export function checkOfflinePkg(config) {
         }
     }
     const hookPostBuild = async () => {
-        if(!offlineConfig || !config) return;
+        if (!offlineConfig || !config) return;
         // 在构建完成后，执行一些操作
-        fixEntryHtml(config, offlineConfig);
+        if (useOldPDB) {
+            fixEntryHtml(config, offlineConfig);
+        }
         // 开始进行打包流程
         const offlinePkgDir = join(config.workDir, "./offlinepkgDist");
         if (fs.existsSync(offlinePkgDir)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.6.6",
+  "version": "0.7.1",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",