edgeone 1.0.7 → 1.0.8

package/edgeone-bin/edgeone.js

@@ -1827,115 +1827,6 @@ var require_browser = __commonJS({
   }
 });
 
-// ../../node_modules/has-flag/index.js
-var require_has_flag = __commonJS({
-  "../../node_modules/has-flag/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = (flag, argv) => {
-      argv = argv || process.argv;
-      const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-      const pos = argv.indexOf(prefix + flag);
-      const terminatorPos = argv.indexOf("--");
-      return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-    };
-  }
-});
-
-// ../../node_modules/supports-color/index.js
-var require_supports_color = __commonJS({
-  "../../node_modules/supports-color/index.js"(exports2, module2) {
-    "use strict";
-    var os = require("os");
-    var hasFlag = require_has_flag();
-    var env = process.env;
-    var forceColor;
-    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
-      forceColor = false;
-    } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-      forceColor = true;
-    }
-    if ("FORCE_COLOR" in env) {
-      forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
-    }
-    function translateLevel(level) {
-      if (level === 0) {
-        return false;
-      }
-      return {
-        level,
-        hasBasic: true,
-        has256: level >= 2,
-        has16m: level >= 3
-      };
-    }
-    function supportsColor(stream) {
-      if (forceColor === false) {
-        return 0;
-      }
-      if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
-        return 3;
-      }
-      if (hasFlag("color=256")) {
-        return 2;
-      }
-      if (stream && !stream.isTTY && forceColor !== true) {
-        return 0;
-      }
-      const min = forceColor ? 1 : 0;
-      if (process.platform === "win32") {
-        const osRelease = os.release().split(".");
-        if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
-          return Number(osRelease[2]) >= 14931 ? 3 : 2;
-        }
-        return 1;
-      }
-      if ("CI" in env) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
-          return 1;
-        }
-        return min;
-      }
-      if ("TEAMCITY_VERSION" in env) {
-        return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-      }
-      if (env.COLORTERM === "truecolor") {
-        return 3;
-      }
-      if ("TERM_PROGRAM" in env) {
-        const version = parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
-        switch (env.TERM_PROGRAM) {
-          case "iTerm.app":
-            return version >= 3 ? 3 : 2;
-          case "Apple_Terminal":
-            return 2;
-        }
-      }
-      if (/-256(color)?$/i.test(env.TERM)) {
-        return 2;
-      }
-      if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-        return 1;
-      }
-      if ("COLORTERM" in env) {
-        return 1;
-      }
-      if (env.TERM === "dumb") {
-        return min;
-      }
-      return min;
-    }
-    function getSupportLevel(stream) {
-      const level = supportsColor(stream);
-      return translateLevel(level);
-    }
-    module2.exports = {
-      supportsColor: getSupportLevel,
-      stdout: getSupportLevel(process.stdout),
-      stderr: getSupportLevel(process.stderr)
-    };
-  }
-});
-
 // ../../node_modules/debug/src/node.js
 var require_node = __commonJS({
   "../../node_modules/debug/src/node.js"(exports2, module2) {
@@ -1954,7 +1845,7 @@ var require_node = __commonJS({
     );
     exports2.colors = [6, 2, 3, 4, 5, 1];
     try {
-      const supportsColor = require_supports_color();
+      const supportsColor = require("supports-color");
       if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
         exports2.colors = [
           20,

package/edgeone-dist/cli.js

@@ -78179,115 +78179,6 @@ var require_browser = __commonJS({
   }
 });
 
-// ../../node_modules/has-flag/index.js
-var require_has_flag2 = __commonJS({
-  "../../node_modules/has-flag/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = (flag, argv) => {
-      argv = argv || process.argv;
-      const prefix2 = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-      const pos = argv.indexOf(prefix2 + flag);
-      const terminatorPos = argv.indexOf("--");
-      return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-    };
-  }
-});
-
-// ../../node_modules/supports-color/index.js
-var require_supports_color2 = __commonJS({
-  "../../node_modules/supports-color/index.js"(exports2, module2) {
-    "use strict";
-    var os2 = require("os");
-    var hasFlag2 = require_has_flag2();
-    var env3 = process.env;
-    var forceColor;
-    if (hasFlag2("no-color") || hasFlag2("no-colors") || hasFlag2("color=false")) {
-      forceColor = false;
-    } else if (hasFlag2("color") || hasFlag2("colors") || hasFlag2("color=true") || hasFlag2("color=always")) {
-      forceColor = true;
-    }
-    if ("FORCE_COLOR" in env3) {
-      forceColor = env3.FORCE_COLOR.length === 0 || parseInt(env3.FORCE_COLOR, 10) !== 0;
-    }
-    function translateLevel2(level) {
-      if (level === 0) {
-        return false;
-      }
-      return {
-        level,
-        hasBasic: true,
-        has256: level >= 2,
-        has16m: level >= 3
-      };
-    }
-    function supportsColor2(stream4) {
-      if (forceColor === false) {
-        return 0;
-      }
-      if (hasFlag2("color=16m") || hasFlag2("color=full") || hasFlag2("color=truecolor")) {
-        return 3;
-      }
-      if (hasFlag2("color=256")) {
-        return 2;
-      }
-      if (stream4 && !stream4.isTTY && forceColor !== true) {
-        return 0;
-      }
-      const min = forceColor ? 1 : 0;
-      if (process.platform === "win32") {
-        const osRelease = os2.release().split(".");
-        if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
-          return Number(osRelease[2]) >= 14931 ? 3 : 2;
-        }
-        return 1;
-      }
-      if ("CI" in env3) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => sign in env3) || env3.CI_NAME === "codeship") {
-          return 1;
-        }
-        return min;
-      }
-      if ("TEAMCITY_VERSION" in env3) {
-        return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env3.TEAMCITY_VERSION) ? 1 : 0;
-      }
-      if (env3.COLORTERM === "truecolor") {
-        return 3;
-      }
-      if ("TERM_PROGRAM" in env3) {
-        const version = parseInt((env3.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
-        switch (env3.TERM_PROGRAM) {
-          case "iTerm.app":
-            return version >= 3 ? 3 : 2;
-          case "Apple_Terminal":
-            return 2;
-        }
-      }
-      if (/-256(color)?$/i.test(env3.TERM)) {
-        return 2;
-      }
-      if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env3.TERM)) {
-        return 1;
-      }
-      if ("COLORTERM" in env3) {
-        return 1;
-      }
-      if (env3.TERM === "dumb") {
-        return min;
-      }
-      return min;
-    }
-    function getSupportLevel(stream4) {
-      const level = supportsColor2(stream4);
-      return translateLevel2(level);
-    }
-    module2.exports = {
-      supportsColor: getSupportLevel,
-      stdout: getSupportLevel(process.stdout),
-      stderr: getSupportLevel(process.stderr)
-    };
-  }
-});
-
 // ../../node_modules/debug/src/node.js
 var require_node = __commonJS({
   "../../node_modules/debug/src/node.js"(exports2, module2) {
@@ -78306,7 +78197,7 @@ var require_node = __commonJS({
     );
     exports2.colors = [6, 2, 3, 4, 5, 1];
     try {
-      const supportsColor2 = require_supports_color2();
+      const supportsColor2 = require("supports-color");
       if (supportsColor2 && (supportsColor2.stderr || supportsColor2).level >= 2) {
         exports2.colors = [
           20,
@@ -86404,7 +86295,7 @@ var require_node2 = __commonJS({
     exports2.useColors = useColors;
     exports2.colors = [6, 2, 3, 4, 5, 1];
     try {
-      supportsColor2 = require_supports_color2();
+      supportsColor2 = require("supports-color");
       if (supportsColor2 && (supportsColor2.stderr || supportsColor2).level >= 2) {
         exports2.colors = [20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68, 69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134, 135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 214, 215, 220, 221];
       }
@@ -103299,7 +103190,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.7",
+  version: "1.0.8",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -106855,7 +106746,7 @@ var {
 var cookie = __toESM(require_dist2());
 var getHost = async () => {
   const region = await getLoginRegion();
-  if (region === "ap-singapore") {
+  if (region === "global") {
     return "https://edgeone.tencentcloud.com/api/cli/proxy";
   }
   return "https://edgeone.cloud.tencent.com/api/cli/proxy";
@@ -106891,6 +106782,7 @@ async function capi(action, params, options, callback) {
   try {
     const res1 = await axios_default.post(
       // `https://siaas.cloud.tencent.com/cgi/capi?csrfCode=${await getCsrfCode()}`,
+      // `https://siaas.tencentcloud.com/cgi/capi?csrfCode=${await getCsrfCode()}`,
       await getHost(),
       JSON.stringify(data.body),
       {
@@ -113626,6 +113518,7 @@ var path5 = require("path");
 var esbuild = require("esbuild");
 var FUNCTIONPATH = "./functions";
 var OUTPUTPATH = "./.edgeone/functions/index.js";
+var CSSOUTPUTPATH = "./.edgeone/assets/index.css";
 var OUTPUTMETA = "./.edgeone/meta.json";
 var regex1 = /^\/(?:[^/]+\/)*\[(.+?)\]$/;
 var regex2 = /^\/(?:[^/]+\/)*\[\[(.+?)\]\]$/;
@@ -113668,6 +113561,7 @@ var BuildFunctionGenerator = class {
   env;
   logicText;
   bundleText;
+  cssText;
   functionList;
   functionIndex;
   constructor(props) {
@@ -113675,6 +113569,7 @@ var BuildFunctionGenerator = class {
     this.env = props.env;
     this.logicText = "";
     this.bundleText = "";
+    this.cssText = "";
     this.functionList = [];
     this.functionIndex = 0;
     if (!props.env) {
@@ -113692,9 +113587,31 @@ var BuildFunctionGenerator = class {
   }
   async init() {
     await this.readIndexFiles(FUNCTIONPATH);
+    if (this.cssText) {
+      writeFileSync(CSSOUTPUTPATH, this.cssText);
+    }
     if (this.logicText) {
       this.bundleText = `
       let global = globalThis;
+
+      class MessageChannel {
+        constructor() {
+          this.port1 = new MessagePort();
+          this.port2 = new MessagePort();
+        }
+      }
+      class MessagePort {
+        constructor() {
+          this.onmessage = null;
+        }
+        postMessage(data) {
+          if (this.onmessage) {
+            setTimeout(() => this.onmessage({ data }), 0);
+          }
+        }
+      }
+      global.MessageChannel = MessageChannel;
+
       let routeParams = {};
       let pagesFunctionResponse = null;
       async function handleRequest(context){
@@ -113818,7 +113735,7 @@ var BuildFunctionGenerator = class {
     let tempResult = stringMap.text;
     const onRequestRegex = /onRequest(?![a-zA-Z])/;
     if (onRequestRegex.test(tempResult)) {
-      tempResult = stringMap.text.replace(/\}\)\(\)\;\nresponseFoo/, `
+      tempResult = stringMap.text.replace(/\}\)\(\)\;\n(\/\*\!(.|\n)*\*\/\n)*responseFoo/, `
         pagesFunctionResponse = onRequest;
       })();`);
       const routeParams = this.matchPath(`${stringMap.path}`);
@@ -113856,7 +113773,7 @@ var BuildFunctionGenerator = class {
     }
     methodList.forEach((item) => {
       if (tempResult.indexOf(item.funcName) > -1) {
-        tempResult = stringMap.text.replace(/\}\)\(\)\;\nresponseFoo/, `
+        tempResult = stringMap.text.replace(/\}\)\(\)\;\n(\/\*\!(.|\n)*\*\/\n)*responseFoo/, `
           pagesFunctionResponse = ${item.funcName};
         })();`);
         const routeParams = this.matchPath(stringMap.path);
@@ -113922,19 +113839,30 @@ var BuildFunctionGenerator = class {
     const result = esbuild.buildSync({
       entryPoints: [filePath],
       bundle: true,
+      // minify: true,
       // minifyWhitespace: true,
-      write: false
+      // outdir: './.tef_dist/assets',
+      write: false,
       // 禁止写入文件
+      outfile: "./.tef_dist/assets.js"
     });
-    const regex = /\.(js|ts|cjs|tsx|jsx)$/;
-    const bundledCode = result.outputFiles[0].text;
-    filePath = filePath.replace(/\\/g, "/");
-    const extractedPath = filePath.replace(/\/index\.(js|ts|cjs|tsx|jsx)/, ".js").replace(regex, "").replace("functions", "");
-    return {
-      filePath: filePath.replace("functions/", ""),
-      path: extractedPath === "" ? "/" : extractedPath,
-      text: `${bundledCode}responseFoo`
-    };
+    let currentFileInfo;
+    for (let i3 = 0; i3 < result.outputFiles.length; i3++) {
+      if (result.outputFiles[i3].path.indexOf(".css") > -1) {
+        this.cssText += result.outputFiles[i3].text;
+      } else {
+        const regex = /\.(js|ts|cjs|tsx|jsx)$/;
+        const bundledCode = result.outputFiles[i3].text;
+        filePath = filePath.replace(/\\/g, "/");
+        const extractedPath = filePath.replace(/\/index\.(js|ts|cjs|tsx|jsx)/, ".js").replace(regex, "").replace("functions", "");
+        currentFileInfo = {
+          filePath: filePath.replace("functions/", ""),
+          path: extractedPath === "" ? "/" : extractedPath,
+          text: `${bundledCode}responseFoo`
+        };
+      }
+    }
+    return currentFileInfo;
   }
 };
 async function PagesBuild(props) {
@@ -114525,7 +114453,7 @@ var path6 = require("path");
 var chokidar = require("chokidar");
 var listenFileTypes = ["js", "json", "html", "css", "jsx", "ts", "tsx", "vue", "md", "cjs"];
 async function remoteDevServer(jscontent, projectId, metaJSON) {
-  const res = await pagesCapi("DescribeDebugFunction", {
+  const res = await pagesCapi("CreateDebugFunction", {
     JSContent: jscontent,
     ProjectId: projectId,
     MetaData: metaJSON

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edgeone",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Command-line interface for TencentCloud Pages Functions",
   "bin": {
     "edgeone": "./edgeone-bin/edgeone.js"