@todesktop/cli 1.12.0 → 1.12.2

package/README.md

@@ -951,6 +951,12 @@ Default: Default to the common name from your code signing certificate.
 
 The publisher name, exactly as in your code signing certificate. Several names can be provided. Defaults to common name from your code signing certificate. You should typically not include this property in your configuration unless you wish to transition to a new certificate in the future.
 
+### `appBuilderLibVersion` - (optional) string
+
+Example: `22.14.13`.
+
+The version of app-builder-lib that ToDesktop should use for building your app. This can be useful if you need to use a specific version that includes certain features or fixes.
+
 ## Build lifecycle hooks (package.json scripts)
 
 Sometimes you want to do something before or during the build process. For example, you might want to run a script before the build starts, or you might want to run a script after the files have been packaged. Our lifecycle hooks provide a way to do this.
@@ -1195,6 +1201,14 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+### v1.12.2
+
+- Fix: Update `appFiles` to not error when no `*.js` files are found (but `*.ts` files are present)
+
+### v1.12.1
+
+- Remove sensitive data when logging to `main.log`
+
 ### v1.12.0
 
 - Add support for custom `updateUrlBase` in config to specify a custom auto-update URL

package/dist/cli.js

@@ -50,6 +50,40 @@ var os = __toESM(require("os"));
 var path = __toESM(require("path"));
 var Sentry = __toESM(require("@sentry/node"));
 var logger;
+var SENSITIVE_FIELD_KEY_SUBSTRINGS = [
+  "token",
+  "password",
+  "secret",
+  "credentials",
+  "environmentVariable"
+];
+function isJWT(str) {
+  const jwtPattern = /^[A-Za-z0-9_-]{2,}(?:\.[A-Za-z0-9_-]{2,}){2}$/;
+  return typeof str === "string" && str.length > 20 && jwtPattern.test(str);
+}
+function sanitizeFields(obj) {
+  if (!obj || typeof obj !== "object") {
+    if (typeof obj === "string" && isJWT(obj)) {
+      return "[REDACTED JWT]";
+    }
+    return obj;
+  }
+  const copy = Array.isArray(obj) ? [...obj] : { ...obj };
+  for (const key of Object.keys(copy)) {
+    const lowerKey = key.toLowerCase();
+    const value = copy[key];
+    if (SENSITIVE_FIELD_KEY_SUBSTRINGS.some(
+      (substring) => lowerKey.includes(substring) && !lowerKey.startsWith("$")
+    )) {
+      copy[key] = "[REDACTED]";
+    } else if (typeof value === "string" && isJWT(value)) {
+      copy[key] = "[REDACTED JWT]";
+    } else if (typeof value === "object") {
+      copy[key] = sanitizeFields(value);
+    }
+  }
+  return copy;
+}
 try {
   const name = "todesktop-cli";
   let parentDirectory;
@@ -72,7 +106,9 @@ try {
   fs.mkdirSync(parentDirectory, { recursive: true });
   logger = import_bunyan.default.createLogger({
     name,
-    src: true,
+    serializers: {
+      scrub: (data) => sanitizeFields(data)
+    },
     streams: [
       {
         level: "debug",
@@ -462,7 +498,6 @@ var isPlatformBuildRunning = (platformBuild) => {
 var import_jsx_runtime3 = require("react/jsx-runtime");
 var logForCIThrottled = (0, import_lodash.default)(logForCI_default, 60 * 1e3, { trailing: true });
 var BuildProgress = ({ build, onBuildFailure }) => {
-  logger_default.debug("BuildProgress component: render");
   const exit = useExit_default();
   const [{ hasKickedOff }, setState] = (0, import_react2.useState)({
     hasKickedOff: false
@@ -814,7 +849,6 @@ var MainLayout = ({
   commandUsed,
   hasBuildEverFailed
 }) => {
-  logger_default.debug("MainLayout component: render");
   const onInput = useInput_default();
   const { isRawModeSupported } = (0, import_ink10.useStdin)();
   const [
@@ -953,7 +987,10 @@ var import_pretty_bytes = __toESM(require("pretty-bytes"));
 var import_axios = __toESM(require("axios"));
 var { TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE } = getEnvironmentVariables_default();
 async function postToFirebaseFunction_default(functionName, body = {}, config2 = {}) {
-  logger_default.debug({ functionName, body, config: config2 }, "postToFirebaseFunction");
+  logger_default.debug(
+    { scrub: { functionName, body, config: config2 } },
+    "postToFirebaseFunction"
+  );
   try {
     const response = await import_axios.default.post(
       `${TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE}${functionName}`,
@@ -961,7 +998,7 @@ async function postToFirebaseFunction_default(functionName, body = {}, config2 =
       config2
     );
     logger_default.debug(
-      { responseData: response.data },
+      { scrub: { responseData: response.data } },
       "postToFirebaseFunction: success"
     );
     return response.data;
@@ -2448,9 +2485,11 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   }
   if (!absolutePaths || !absolutePaths.length) {
     throw new Error("No files found to upload");
-  } else if (!absolutePaths.filter((absolutePath) => absolutePath.endsWith(".js")).length) {
+  } else if (!absolutePaths.filter(
+    (absolutePath) => absolutePath.endsWith(".js") || absolutePath.endsWith(".ts")
+  ).length) {
     throw new Error(
-      `No .js files found to upload (${absolutePaths[0]}). There's likely an issue with the appFiles option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
+      `No .js/.ts files found to upload (${absolutePaths[0]}). There's likely an issue with the appFiles option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
     );
   } else {
     let mainFilePath = appPath;
@@ -2483,11 +2522,13 @@ async function uploadApplicationSource({
   var _a;
   logger_default.debug(
     {
-      appId,
-      appPkgJson,
-      buildId,
-      config: config2,
-      onProgress
+      scrub: {
+        appId,
+        appPkgJson,
+        buildId,
+        config: config2,
+        onProgress
+      }
     },
     "uploadApplicationSource"
   );
@@ -5466,7 +5507,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.12.0-1",
+  version: "1.12.1",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",