@seayoo-web/scripts 2.5.1 → 2.5.3

package/dist/index.js

@@ -73,6 +73,7 @@ function getBuildEnv(command, mode, onlyBuild, requireSentryToken, ignoreSentryT
   const s = `${EnvPrefix}SENTRY_AUTH_TOKEN`;
   const u = `${EnvPrefix}DEPLOY_USER`;
   const k = `${EnvPrefix}DEPLOY_KEY`;
+  const p = `${EnvPrefix}_SERVER_PORT`;
   const paths = process.cwd().replace(/\\/g, "/").split("/");
   const execDirWithPackage = paths.slice(-2).join("/");
   const execDir = paths.slice(-1)[0];
@@ -87,6 +88,8 @@ function getBuildEnv(command, mode, onlyBuild, requireSentryToken, ignoreSentryT
     process.exit(1);
   }
   envConfig.page = execDirWithPackage;
+  const port = +envs[p];
+  if (port) envConfig.port = port;
   if (onlyBuild) {
     return envConfig;
   }
@@ -157,6 +160,10 @@ function definePageBuildConfig(option) {
     ...optionReset
   } = option || {};
   const { alias, ...resolveReset } = resolve;
+  if (server.port) {
+    console.warn(`ServerPort 不允许直接修改，请使用环境变量 ${EnvPrefix}_SERVER_PORT 设置`);
+    delete server.port;
+  }
   return async function({ command, mode }) {
     var _a, _b, _c;
     const justBuild = mode === "build";
@@ -268,6 +275,7 @@ function definePageBuildConfig(option) {
       },
       server: {
         open: true,
+        port: envs.port,
         ...server
       },
       ...optionReset,

package/dist/node.js

@@ -454,7 +454,7 @@ class FooterBuilder {
         deployTo: config.deployTo,
         group: template.replace(/\/.*$/, ""),
         template: templateName,
-        filename: config.deployTo.replace(/^.*\//, ""),
+        filename: config.deployTo.replace(/[\/.]/g, "-").replace(/\-js$/, ".js"),
         code: await this.combineToCode(config.enabledIn, style, script, formattedHTML)
       });
     }
@@ -549,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;
         }
@@ -604,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) {
@@ -628,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.1",
+  "version": "2.5.3",
   "description": "scripts for seayoo web repos",
   "type": "module",
   "source": "index.ts",
@@ -74,6 +74,7 @@
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",
+    "type-check": "tsc --noEmit",
     "prepublish": "pnpm build"
   }
 }

package/types/src/env.d.ts

@@ -19,6 +19,8 @@ interface IBuildEnvs {
     deployUser: string;
     /** 部署的 key */
     deployKey: string;
+    /** 本地开发服务器的端口 */
+    port?: number;
     /** 从 vite 读取到的环境变量 */
     viteEnvs: Record<string, string>;
 }