@taole/deploy-helper 0.6.4 → 0.6.6

package/lib/offlinePkg.mjs

@@ -104,9 +104,27 @@ 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(`${mode === "prod" ? "线上" : "测试"}环境当前离线包列表:`, packages.map(item => ({ ...item, items: '省略' + item.items.length + '个条目' })));
 }
 
+/**
+ * hack
+ * 由于vite-plugin-dynamic-base插件和legacy插件同时使用, 生存的入口文件中代码有点问题,这里直接修改有问题的代码
+ */
+function fixEntryHtml(config, offlineConfig) {
+    if (!offlineConfig || !config) return;
+    const entryHtmlPath = join(config.workDir, offlineConfig.distDir, "index.html");
+    if (!fs.existsSync(entryHtmlPath)) {
+        throw new Error(`构建产物${entryHtmlPath}不存在`);
+    }
+    const markLine = "} else if (item.tagName == 'script') {";
+    const replaceLine = `} else if (item.tagName == 'script')/*injected by deploy-helper*/{
+if(item.attrs.id=='vite-legacy-polyfill')childNode.onload=function(){System.import(window.__dynamic_base__ + document.getElementById('vite-legacy-entry').getAttribute('data-src'))};
+`;
+    let entryHtml = fs.readFileSync(entryHtmlPath, "utf-8");
+    entryHtml = entryHtml.replace(markLine, replaceLine);
+    fs.writeFileSync(entryHtmlPath, entryHtml);
+}
 
 /**
  * @typedef {Object} CheckOfflinePkgResult
@@ -134,15 +152,17 @@ export function checkOfflinePkg(config) {
     }
     const packageJson = getJsonConfig(config.workDir, "package.json");
     const userDeployHelperConfig = getUserDeployHelperConfig();
-    const distPath = join(config.workDir, offlineConfig.distDir);
+    const distPath = join(config.workDir, offlineConfig && offlineConfig.distDir ? offlineConfig.distDir : "dist");
 
     // 如果offlineConfig.remove为true，则不构建离线包
     const willRemovePkg = offlineConfig && offlineConfig.name && offlineConfig.remove === true && offlineConfig.skip !== true;
+    const willSkip = !offlineConfig || !offlineConfig.name || offlineConfig.skip === true;
     if (willRemovePkg) {
         return {
             canBuild: true,
             errorMsg: "",
             hookPostBuild: async () => {
+                fixEntryHtml(config, offlineConfig);
                 log(`开始删除离线包${offlineConfig.name}`);
                 await syncApi(userDeployHelperConfig, config.mode, offlineConfig, null);
             }
@@ -151,8 +171,8 @@ export function checkOfflinePkg(config) {
     if (!fs.existsSync(distPath)) {
         errorMsg = `构建产物${distPath}不存在, 请先构建项目`;
         canBuildOfflinePkg = false;
-    } else if (!offlineConfig || !offlineConfig.name || offlineConfig.skip === true) {
-        errorMsg = ""; // 没有离线包配置文件，跳过构建离线包
+    } else if (offlineConfig && !offlineConfig.name) {
+        errorMsg = "离线包配置文件中未配置name, 请先配置";
         canBuildOfflinePkg = false;
     } else if (!userDeployHelperConfig || !userDeployHelperConfig.offlineApi || !userDeployHelperConfig.offlineApi.get || !userDeployHelperConfig.offlineApi.set) {
         errorMsg = "未配置离线包接口, 请移步看配置文档: https://alidocs.dingtalk.com/i/nodes/R1zknDm0WRkbz13oHn0LDz3ZVBQEx5rG?doc_type=wiki_doc";
@@ -171,41 +191,39 @@ export function checkOfflinePkg(config) {
             canBuildOfflinePkg = false;
         }
     }
-    if (!canBuildOfflinePkg) {
-        return {
-            canBuild: canBuildOfflinePkg,
-            errorMsg: errorMsg,
-        }
-    }
     let ossToken = "";
     if (canBuildOfflinePkg) {
         ossToken = getOssToken();
         if (!ossToken) {
             errorMsg = "获取ossToken失败";
             canBuildOfflinePkg = false;
+        }
+    }
+    if (willSkip) {
+        if (!offlineConfig) {
             return {
-                canBuild: canBuildOfflinePkg,
-                errorMsg: errorMsg,
+                canBuild: false,
+                errorMsg: ""
+            }
+        }
+        return {
+            canBuild: true,
+            errorMsg: "",
+            hookPostBuild: async () => {
+                fixEntryHtml(config, offlineConfig);
             }
         }
     }
+    if (!canBuildOfflinePkg) {
+        return {
+            canBuild: false,
+            errorMsg: errorMsg
+        }
+    }
     const hookPostBuild = async () => {
+        if(!offlineConfig || !config) return;
         // 在构建完成后，执行一些操作
-        // hack
-        // 由于vite-plugin-dynamic-base插件和legacy插件同时使用, 生存的入口文件中代码有点问题,这里直接修改有问题的代码
-        // 暂时解决加载问题
-        const entryHtmlPath = join(config.workDir, offlineConfig.distDir, "index.html");
-        if (!fs.existsSync(entryHtmlPath)) {
-            throw new Error(`构建产物${entryHtmlPath}不存在`);
-        }
-        const markLine = "} else if (item.tagName == 'script') {";
-        const replaceLine = `${markLine}
-if(item.attrs.id=='vite-legacy-polyfill')childNode.onload=function(){System.import(window.__dynamic_base__ + document.getElementById('vite-legacy-entry').getAttribute('data-src'))};
-`;
-        let entryHtml = fs.readFileSync(entryHtmlPath, "utf-8");
-        entryHtml = entryHtml.replace(markLine, replaceLine);
-        fs.writeFileSync(entryHtmlPath, entryHtml);
-
+        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.4",
+  "version": "0.6.6",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",