@seayoo-web/scripts 2.5.0 → 2.5.2

package/dist/node.js

@@ -295,7 +295,9 @@ class FooterBuilder {
     distDir,
     dataJsonFile,
     envFilePath,
-    injectFunction
+    injectFunction,
+    previewAfterDeploy,
+    deployDebug
   }) {
     __publicField(this, "codeBaseDir");
     __publicField(this, "envFilePath");
@@ -303,11 +305,15 @@ class FooterBuilder {
     __publicField(this, "dataJsonFile");
     __publicField(this, "injectFunction");
     __publicField(this, "$groups");
+    __publicField(this, "previewAfterDeploy");
+    __publicField(this, "deployDebug");
     this.codeBaseDir = codeBaseDir;
     this.envFilePath = envFilePath;
     this.distDir = distDir;
     this.dataJsonFile = dataJsonFile;
-    this.injectFunction = injectFunction;
+    this.previewAfterDeploy = !!previewAfterDeploy;
+    this.deployDebug = !!deployDebug;
+    this.injectFunction = injectFunction.replace(/^function[^(]*\(/, "function ABC(");
     this.$groups = readdirSync(codeBaseDir).filter((name) => {
       return statSync(resolve(codeBaseDir, name)).isDirectory();
     });
@@ -441,13 +447,14 @@ class FooterBuilder {
       return [];
     }
     const buildResult = [];
+    const templateName = template.replace(/.+\/(.+)\.html$/, "$1");
     for (const config of metaConfig) {
       const formattedHTML = format(html, deepMerge({}, payloadData || {}, config.payload || {})).replace(/<img [^>]*?src=""[^>]+>/gi, "").replace(/<a [^>]*?href=""[^>]+>(.*?)<\/a>/gi, "$1").replace(/<p class="">/gi, "<p>").replace(/(?:<p>\s*<\/p>|<section>\s*<\/section>|<div>\s*<\/div>)/gi, "");
       buildResult.push({
         deployTo: config.deployTo,
         group: template.replace(/\/.*$/, ""),
-        template,
-        filename: config.deployTo.replace(/^.*\//, ""),
+        template: templateName,
+        filename: config.deployTo.replace(/[\/.]/g, "-").replace(/\-js$/, ".js"),
         code: await this.combineToCode(config.enabledIn, style, script, formattedHTML)
       });
     }
@@ -458,7 +465,7 @@ class FooterBuilder {
       collapseWhitespace: true,
       removeComments: true,
       minifyJS: true
-    })).slice(8, -9).replace(/function injectFooter/, "function");
+    })).slice(8, -9).replace(/function ABC/, "function");
     return `(${func})(${JSON.stringify(enabledIn)},${JSON.stringify(style)},${JSON.stringify(script)},${JSON.stringify(html)})`;
   }
   async upload(deployTo, code, user, key) {
@@ -467,7 +474,8 @@ class FooterBuilder {
       deployTo,
       user,
       key,
-      preview: true
+      preview: this.previewAfterDeploy,
+      debug: this.deployDebug
     }).then(() => null).catch((err) => err instanceof Error ? err : new Error(err));
   }
   /**
@@ -502,13 +510,16 @@ class FooterBuilder {
    * - 其他文件变更则触发全量构建
    */
   startFileWatch() {
-    chokidar.watch(this.codeBaseDir).on("all", (event, path2) => {
-      if (event !== "addDir") {
-        if (path2.endsWith(".html")) {
-          this.buildAndOutput(path2.slice(4).replace(/\\/g, "/"));
-        } else {
-          this.buildAndOutput();
-        }
+    const src = this.codeBaseDir;
+    chokidar.watch(src).on("all", (event, path2) => {
+      if (event === "addDir") {
+        return;
+      }
+      const file = path2.startsWith(src) ? path2.slice(src.length + 1) : path2;
+      if (file.endsWith(".html")) {
+        this.buildAndOutput(file.replace(/\\/g, "/"));
+      } else {
+        this.buildAndOutput();
       }
     });
   }
@@ -538,52 +549,55 @@ class FooterBuilder {
         res.end();
         return;
       }
-      const fileDeployInfo = url.match(/deploy\/([^/]+)\/([^/]+)\/([^/]+)$/);
-      const templateDeployInfo = url.match(/deploy\/([^/]+)\/([^/]+)$/);
+      const templateDeployInfo = url.match(/deploy\/([^/]+)\/([^/]+)\/?\?target=(.+)$/);
+      if (!templateDeployInfo) {
+        res.writeHead(404, cosHeader);
+        res.write("参数错误，应该是 group/template?target=xxx");
+        res.end();
+        return;
+      }
       const user = this.getDeployUserKey();
-      if (fileDeployInfo || templateDeployInfo) {
-        if (!user) {
-          res.writeHead(403, cosHeader);
-          res.write("请先在根目录添加 .env.local 文件");
-          res.end();
-          return;
-        }
-        if (!user.user) {
-          res.writeHead(403, cosHeader);
-          res.write("请设置 .env.local 文件中 SY_DEPLOY_USER");
-          res.end();
-          return;
-        }
-        if (!user.key) {
-          res.writeHead(403, cosHeader);
-          res.write("请设置 .env.local 文件中 SY_DEPLOY_KEY");
-          res.end();
-          return;
-        }
-        const group = (fileDeployInfo == null ? void 0 : fileDeployInfo[1]) || (templateDeployInfo == null ? void 0 : templateDeployInfo[1]) || "";
-        const allGroups = this.groups;
-        if (!allGroups.includes(group)) {
-          res.writeHead(403, cosHeader);
-          res.write(`分组错误，没有 ${group}`);
-          res.end();
-          return;
-        }
-        const template = fileDeployInfo ? this.getTemplateFile(fileDeployInfo[1], fileDeployInfo[2]) : templateDeployInfo ? this.getTemplateFile(templateDeployInfo[1], templateDeployInfo[2]) : "";
-        const allTemplates = this.getAllTemplates();
-        if (!allTemplates.includes(template)) {
-          res.writeHead(403, cosHeader);
-          res.write(`模板错误，没有 ${template}`);
-          res.end();
-          return;
-        }
+      const group = templateDeployInfo[1];
+      const template = this.getTemplateFile(templateDeployInfo[1], templateDeployInfo[2]);
+      const target = templateDeployInfo[3];
+      if (!user) {
+        res.writeHead(403, cosHeader);
+        res.write("请先在根目录添加 .env.local 文件");
+        res.end();
+        return;
+      }
+      if (!user.user) {
+        res.writeHead(403, cosHeader);
+        res.write("请设置 .env.local 文件中 SY_DEPLOY_USER");
+        res.end();
+        return;
+      }
+      if (!user.key) {
+        res.writeHead(403, cosHeader);
+        res.write("请设置 .env.local 文件中 SY_DEPLOY_KEY");
+        res.end();
+        return;
+      }
+      const allGroups = this.groups;
+      if (!allGroups.includes(group)) {
+        res.writeHead(403, cosHeader);
+        res.write(`分组错误，没有 ${group}`);
+        res.end();
+        return;
+      }
+      const allTemplates = this.getAllTemplates();
+      if (!allTemplates.includes(template)) {
+        res.writeHead(403, cosHeader);
+        res.write(`模板错误，没有 ${template}`);
+        res.end();
+        return;
       }
-      if (fileDeployInfo) {
-        const buildResult = await this.coreBuild(this.getTemplateFile(fileDeployInfo[1], fileDeployInfo[2]));
-        const filename = `${fileDeployInfo[3].replace(/\.js$/, "")}.js`;
-        const data = buildResult.find((data2) => data2.filename === filename);
+      if (target.endsWith(".js")) {
+        const buildResult = await this.coreBuild(template);
+        const data = buildResult.find((data2) => data2.deployTo === target);
         if (!data) {
           res.writeHead(504, cosHeader);
-          res.write(`没有找到文件 ${filename}`);
+          res.write(`没有找到文件配置 ${target}`);
           res.end();
           return;
         }
@@ -593,8 +607,8 @@ class FooterBuilder {
         res.end();
         return;
       }
-      if (templateDeployInfo) {
-        const buildResult = await this.coreBuild(this.getTemplateFile(templateDeployInfo[1], templateDeployInfo[2]));
+      if (target === "all") {
+        const buildResult = await this.coreBuild(template);
         const success = [];
         const failed = [];
         for (const data of buildResult) {
@@ -617,8 +631,8 @@ class FooterBuilder {
         res.end();
         return;
       }
-      res.writeHead(404, { "Content-Type": "text/plain", ...cosHeader });
-      res.write("Api Not Found");
+      res.writeHead(400, { "Content-Type": "text/plain", ...cosHeader });
+      res.write("参数错误");
       res.end();
     });
     server.listen(port);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/scripts",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "scripts for seayoo web repos",
   "type": "module",
   "source": "index.ts",

package/types/src/footer.d.ts

@@ -5,12 +5,16 @@ export declare class FooterBuilder {
     private dataJsonFile;
     private injectFunction;
     private $groups;
-    constructor({ codeBaseDir, distDir, dataJsonFile, envFilePath, injectFunction, }: {
+    private previewAfterDeploy;
+    private deployDebug;
+    constructor({ codeBaseDir, distDir, dataJsonFile, envFilePath, injectFunction, previewAfterDeploy, deployDebug, }: {
         codeBaseDir: string;
         distDir: string;
         dataJsonFile: string;
         envFilePath: string;
         injectFunction: string;
+        previewAfterDeploy?: boolean;
+        deployDebug?: boolean;
     });
     get groups(): string[];
     private getDeployUserKey;