edgeone 1.0.11 → 1.0.13

package/edgeone-dist/cli.js

@@ -85016,96 +85016,6 @@ var require_async2 = __commonJS({
   }
 });
 
-// node_modules/mkdirp/index.js
-var require_mkdirp = __commonJS({
-  "node_modules/mkdirp/index.js"(exports2, module2) {
-    var path9 = require("path");
-    var fs9 = require("fs");
-    var _0777 = parseInt("0777", 8);
-    module2.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
-    function mkdirP(p, opts, f3, made) {
-      if (typeof opts === "function") {
-        f3 = opts;
-        opts = {};
-      } else if (!opts || typeof opts !== "object") {
-        opts = { mode: opts };
-      }
-      var mode = opts.mode;
-      var xfs = opts.fs || fs9;
-      if (mode === void 0) {
-        mode = _0777;
-      }
-      if (!made)
-        made = null;
-      var cb2 = f3 || /* istanbul ignore next */
-      function() {
-      };
-      p = path9.resolve(p);
-      xfs.mkdir(p, mode, function(er) {
-        if (!er) {
-          made = made || p;
-          return cb2(null, made);
-        }
-        switch (er.code) {
-          case "ENOENT":
-            if (path9.dirname(p) === p)
-              return cb2(er);
-            mkdirP(path9.dirname(p), opts, function(er2, made2) {
-              if (er2)
-                cb2(er2, made2);
-              else
-                mkdirP(p, opts, cb2, made2);
-            });
-            break;
-          default:
-            xfs.stat(p, function(er2, stat2) {
-              if (er2 || !stat2.isDirectory())
-                cb2(er, made);
-              else
-                cb2(null, made);
-            });
-            break;
-        }
-      });
-    }
-    mkdirP.sync = function sync(p, opts, made) {
-      if (!opts || typeof opts !== "object") {
-        opts = { mode: opts };
-      }
-      var mode = opts.mode;
-      var xfs = opts.fs || fs9;
-      if (mode === void 0) {
-        mode = _0777;
-      }
-      if (!made)
-        made = null;
-      p = path9.resolve(p);
-      try {
-        xfs.mkdirSync(p, mode);
-        made = made || p;
-      } catch (err0) {
-        switch (err0.code) {
-          case "ENOENT":
-            made = sync(path9.dirname(p), opts, made);
-            sync(p, opts, made);
-            break;
-          default:
-            var stat2;
-            try {
-              stat2 = xfs.statSync(p);
-            } catch (err1) {
-              throw err0;
-            }
-            if (!stat2.isDirectory())
-              throw err0;
-            break;
-        }
-      }
-      return made;
-    };
-  }
-});
-
 // node_modules/portfinder/lib/portfinder.js
 var require_portfinder = __commonJS({
   "node_modules/portfinder/lib/portfinder.js"(exports2) {
@@ -85116,7 +85026,6 @@ var require_portfinder = __commonJS({
     var path9 = require("path");
     var _async = require_async2();
     var debug = require_src();
-    var mkdirp = require_mkdirp().mkdirp;
     var debugTestPort = debug("portfinder:testPort");
     var debugGetPort = debug("portfinder:getPort");
     var debugDefaultHosts = debug("portfinder:defaultHosts");
@@ -85173,11 +85082,7 @@ var require_portfinder = __commonJS({
     exports2.setBasePath = function(path10) {
       exports2.basePath = path10;
     };
-    exports2.getPort = function(options, callback) {
-      if (!callback) {
-        callback = options;
-        options = {};
-      }
+    internals.getPort = function(options, callback) {
       options.port = Number(options.port) || Number(exports2.basePort);
       options.host = options.host || null;
       options.stopPort = Number(options.stopPort) || Number(exports2.highestPort);
@@ -85187,7 +85092,7 @@ var require_portfinder = __commonJS({
           throw Error("Provided options.startPort(" + options.startPort + ") is less than 0, which are cannot be bound.");
         }
         if (options.stopPort < options.startPort) {
-          throw Error("Provided options.stopPort(" + options.stopPort + "is less than options.startPort (" + options.startPort + ")");
+          throw Error("Provided options.stopPort(" + options.stopPort + ") is less than options.startPort (" + options.startPort + ")");
         }
       }
       if (options.host && exports2._defaultHosts.indexOf(options.host) === -1) {
@@ -85222,7 +85127,7 @@ var require_portfinder = __commonJS({
             } else {
               const idx = exports2._defaultHosts.indexOf(currentHost);
               exports2._defaultHosts.splice(idx, 1);
-              return exports2.getPort(options, callback);
+              return internals.getPort(options, callback);
             }
           } else {
             return callback(err2);
@@ -85240,34 +85145,37 @@ var require_portfinder = __commonJS({
             return callback(Error(msg));
           }
         } else {
-          return exports2.getPort({ port: openPorts.pop(), host: options.host, startPort: options.startPort, stopPort: options.stopPort }, callback);
+          return internals.getPort({ port: openPorts.pop(), host: options.host, startPort: options.startPort, stopPort: options.stopPort }, callback);
         }
       });
     };
-    exports2.getPortPromise = function(options) {
-      if (!options) {
+    exports2.getPort = function(options, callback) {
+      if (typeof options === "function") {
+        callback = options;
         options = {};
       }
-      return new Promise(function(resolve5, reject) {
-        exports2.getPort(options, function(err2, port) {
-          if (err2) {
-            return reject(err2);
-          }
-          resolve5(port);
-        });
-      });
-    };
-    exports2.getPorts = function(count, options, callback) {
+      options = options || {};
       if (!callback) {
-        callback = options;
-        options = {};
+        return new Promise(function(resolve5, reject) {
+          internals.getPort(options, function(err2, port) {
+            if (err2) {
+              return reject(err2);
+            }
+            resolve5(port);
+          });
+        });
+      } else {
+        return internals.getPort(options, callback);
       }
+    };
+    exports2.getPortPromise = exports2.getPort;
+    internals.getPorts = function(count, options, callback) {
       let lastPort = null;
       _async.timesSeries(count, function(index, asyncCallback) {
         if (lastPort) {
           options.port = exports2.nextPort(lastPort);
         }
-        exports2.getPort(options, function(err2, port) {
+        internals.getPort(options, function(err2, port) {
           if (err2) {
             asyncCallback(err2);
           } else {
@@ -85277,19 +85185,26 @@ var require_portfinder = __commonJS({
         });
       }, callback);
     };
-    exports2.getPortsPromise = function(count, options) {
-      if (!options) {
+    exports2.getPorts = function(count, options, callback) {
+      if (typeof options === "function") {
+        callback = options;
         options = {};
       }
-      return new Promise(function(resolve5, reject) {
-        exports2.getPorts(count, options, function(err2, ports) {
-          if (err2) {
-            return reject(err2);
-          }
-          resolve5(ports);
+      options = options || {};
+      if (!callback) {
+        return new Promise(function(resolve5, reject) {
+          internals.getPorts(count, options, function(err2, ports) {
+            if (err2) {
+              return reject(err2);
+            }
+            resolve5(ports);
+          });
         });
-      });
+      } else {
+        return internals.getPorts(count, options, callback);
+      }
     };
+    exports2.getPortsPromise = exports2.getPorts;
     exports2.getSocket = function(options, callback) {
       if (!callback) {
         callback = options;
@@ -85312,7 +85227,7 @@ var require_portfinder = __commonJS({
         });
       }
       function createAndTestSocket(dir) {
-        mkdirp(dir, options.mod, function(err2) {
+        fs9.mkdir(dir, { mode: options.mod, recursive: true }, function(err2) {
           if (err2) {
             return callback(err2);
           }
@@ -102624,7 +102539,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.11",
+  version: "1.0.13",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -104142,7 +104057,7 @@ function combineURLs(baseURL, relativeURL) {
 // node_modules/axios/lib/core/buildFullPath.js
 function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
   let isRelativeUrl = !isAbsoluteURL(requestedURL);
-  if (baseURL && isRelativeUrl || allowAbsoluteUrls == false) {
+  if (baseURL && (isRelativeUrl || allowAbsoluteUrls == false)) {
     return combineURLs(baseURL, requestedURL);
   }
   return requestedURL;
@@ -104157,7 +104072,7 @@ var import_follow_redirects = __toESM(require_follow_redirects(), 1);
 var import_zlib = __toESM(require("zlib"), 1);
 
 // node_modules/axios/lib/env/data.js
-var VERSION = "1.8.3";
+var VERSION = "1.8.4";
 
 // node_modules/axios/lib/helpers/parseProtocol.js
 function parseProtocol(url2) {
@@ -106240,7 +106155,6 @@ async function capi(action, params, options, callback) {
         }
       }
     );
-    console.log("res1", JSON.stringify(res1.data, null, 2));
     if ((_b2 = (_a6 = res1.data) == null ? void 0 : _a6.data) == null ? void 0 : _b2.Response) {
       if ((_e = (_d2 = (_c2 = res1.data) == null ? void 0 : _c2.data) == null ? void 0 : _d2.Response) == null ? void 0 : _e.Error) {
         throw res1.data.data.Response.Error;
@@ -113578,6 +113492,22 @@ async function PagesCI(_) {
 // src/pages/common/env.tsx
 var pullEnvVars = async (projectId) => {
   const envDestination = getCwdFullPath("./.env");
+  let localEnv = {};
+  try {
+    localEnv = readEnvFileSync(envDestination);
+  } catch (error3) {
+    writeFileSync(envDestination, "");
+    normalLog("Created new .env file");
+  }
+  const localEnvVars = [];
+  Object.keys(localEnv).forEach((key2) => {
+    if (key2.endsWith("DEV")) {
+      localEnvVars.push({
+        Key: key2,
+        Value: localEnv[key2]
+      });
+    }
+  });
   normalLog("Pulling environment variables...");
   const res = await pagesCapi("DescribePagesProjectEnvs", {
     ProjectId: projectId
@@ -113586,8 +113516,9 @@ var pullEnvVars = async (projectId) => {
   });
   const envvars = JSON.parse(res.Result || []);
   const { EnvVars } = envvars;
+  const vars = EnvVars.concat(localEnvVars);
   let envFileContent = "";
-  EnvVars.forEach((item) => {
+  vars.forEach((item) => {
     envFileContent += `${item.Key}=${item.Value}
 `;
   });
@@ -113870,10 +113801,10 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return 1;
   }
   if ("CI" in env2) {
-    if ("GITHUB_ACTIONS" in env2 || "GITEA_ACTIONS" in env2) {
+    if (["GITHUB_ACTIONS", "GITEA_ACTIONS", "CIRCLECI"].some((key2) => key2 in env2)) {
       return 3;
     }
-    if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env2) || env2.CI_NAME === "codeship") {
+    if (["TRAVIS", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env2) || env2.CI_NAME === "codeship") {
       return 1;
     }
     return min;
@@ -114252,8 +114183,7 @@ async function handleLog(url2) {
     okLog("Function log connected.");
   });
   ws.on("close", function close() {
-    normalLog("Function log server disconnected, exiting...Please restart the dev server.");
-    process.exit(0);
+    normalLog("Function log server disconnected");
   });
   ws.on("message", function message(data) {
     const { logs, event_info, exceptions } = JSON.parse(data.toString());
@@ -114326,6 +114256,7 @@ async function PagesDevServer(devConfig) {
       return res.end();
     }
     if (localStaticPath) {
+      console.log("this is localStaticPath");
       const localPath = path6.join(localStaticPath, req.url);
       if (localStaticPath && sirver && fs6.existsSync(localPath)) {
         if (req.url !== "/") {
@@ -114334,6 +114265,7 @@ async function PagesDevServer(devConfig) {
         }
       }
     }
+    console.log("proxy");
     proxy.web(req, res, {
       target: `${DebugUrl}`,
       changeOrigin: true

package/package.json

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