@todesktop/cli 1.12.2 → 1.12.5

package/README.md

@@ -1201,6 +1201,14 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+### v1.12.5
+
+- Fix: Removed invalid React Hook call in `BuildCommand` that caused errors.
+
+### v1.12.3
+
+- Allow `catalog:` protocol (used by PNPM) for electron dependency version in `package.json`.
+
 ### v1.12.2
 
 - Fix: Update `appFiles` to not error when no `*.js` files are found (but `*.ts` files are present)

package/dist/cli.js

@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/index.ts
 var import_commander = require("commander");
 var import_ink39 = require("ink");
-var import_react25 = require("react");
+var import_react24 = require("react");
 var import_register = require("source-map-support/register");
 
 // src/commands/build/components/Build.tsx
@@ -1155,11 +1155,19 @@ var packageJSON_default = (context) => {
         required: ["electron"],
         properties: {
           electron: {
-            type: "string",
-            semanticVersion: {
-              packageName: "electron",
-              mustBeExact: true
-            }
+            oneOf: [
+              {
+                type: "string",
+                semanticVersion: {
+                  packageName: "electron",
+                  mustBeExact: true
+                }
+              },
+              {
+                type: "string",
+                pattern: "^catalog:"
+              }
+            ]
           }
         }
       },
@@ -2896,35 +2904,24 @@ function Build({
   }
 }
 
-// src/utilities/checkIfReactIsUsable.ts
-var import_react7 = require("react");
-var checkIfReactIsUsable_default = ({ cons = console, proc = process } = {}) => {
-  try {
-    (0, import_react7.useState)(null);
-  } catch (e) {
-    cons.error(e);
-    proc.exit(1);
-  }
-};
-
 // src/components/LoginHOC.tsx
 var import_ink16 = require("ink");
-var import_react10 = require("react");
+var import_react9 = require("react");
 var import_prop_types9 = __toESM(require("prop-types"));
 var import_is_ci4 = __toESM(require("is-ci"));
 
 // src/components/Login.tsx
 var import_ink14 = require("ink");
 var import_prop_types8 = __toESM(require("prop-types"));
-var import_react9 = require("react");
+var import_react8 = require("react");
 var import_react_final_form = require("react-final-form");
 
 // src/components/TextInput.tsx
 var import_ink_text_input = __toESM(require("ink-text-input"));
-var import_react8 = __toESM(require("react"));
+var import_react7 = __toESM(require("react"));
 var import_jsx_runtime13 = require("react/jsx-runtime");
 var TextInput = ({ onBlur, onFocus, ...props }) => {
-  import_react8.default.useEffect(() => {
+  import_react7.default.useEffect(() => {
     onFocus();
     return onBlur;
   }, [onFocus, onBlur]);
@@ -2958,10 +2955,10 @@ var loginFields = [
   }
 ];
 var Login = ({ setIsLoggedIn }) => {
-  const [activeField, setActiveField] = (0, import_react9.useState)(0);
-  const [error, setError] = (0, import_react9.useState)(null);
-  const [failureMessage, setFailureMessage] = (0, import_react9.useState)(null);
-  const [isSubmittingForm, setIsSubmittingForm] = (0, import_react9.useState)(false);
+  const [activeField, setActiveField] = (0, import_react8.useState)(0);
+  const [error, setError] = (0, import_react8.useState)(null);
+  const [failureMessage, setFailureMessage] = (0, import_react8.useState)(null);
+  const [isSubmittingForm, setIsSubmittingForm] = (0, import_react8.useState)(false);
   const onFailure = (message2) => {
     setIsSubmittingForm(false);
     setFailureMessage(message2);
@@ -3060,11 +3057,11 @@ var LoadingText_default = LoadingText;
 // src/components/LoginHOC.tsx
 var import_jsx_runtime16 = require("react/jsx-runtime");
 var LoginHOC = ({ children, isInteractive = true }) => {
-  const [isLoggedIn, setIsLoggedIn] = (0, import_react10.useState)(false);
-  const [isEffectDone, setEffectDone] = (0, import_react10.useState)(false);
-  const [error, setError] = (0, import_react10.useState)(null);
+  const [isLoggedIn, setIsLoggedIn] = (0, import_react9.useState)(false);
+  const [isEffectDone, setEffectDone] = (0, import_react9.useState)(false);
+  const [error, setError] = (0, import_react9.useState)(null);
   const { isRawModeSupported } = (0, import_ink16.useStdin)();
-  (0, import_react10.useEffect)(() => {
+  (0, import_react9.useEffect)(() => {
     async function isAccessTokenValid() {
       const { accessToken, email, jwtToken } = getAuthConfig();
       let userCreds = null;
@@ -3141,9 +3138,9 @@ LoginHOC.propTypes = {
 var LoginHOC_default = LoginHOC;
 
 // src/components/ErrorBoundary.tsx
-var import_react11 = __toESM(require("react"));
+var import_react10 = __toESM(require("react"));
 var Sentry2 = __toESM(require("@sentry/node"));
-var ErrorBoundary = class extends import_react11.default.Component {
+var ErrorBoundary = class extends import_react10.default.Component {
   constructor(props) {
     super(props);
     this.state = { eventId: null, error: null };
@@ -3171,7 +3168,7 @@ var ErrorBoundary_default = ErrorBoundary;
 var import_ink20 = require("ink");
 var import_ink_select_input = __toESM(require("ink-select-input"));
 var import_prop_types11 = __toESM(require("prop-types"));
-var import_react13 = require("react");
+var import_react12 = require("react");
 
 // src/components/CustomSelectInputIndicator.tsx
 var import_ink17 = require("ink");
@@ -3198,7 +3195,7 @@ function CustomSelectInputItem({
 // src/components/ViewBuild.tsx
 var import_ink19 = require("ink");
 var import_prop_types10 = __toESM(require("prop-types"));
-var import_react12 = require("react");
+var import_react11 = require("react");
 
 // src/utilities/getLatestBuildId.ts
 async function getLatestBuildId({
@@ -3293,7 +3290,7 @@ var ViewBuild = ({ commandUsed, id, configPath }) => {
       isLoading
     },
     setState
-  ] = (0, import_react12.useState)({
+  ] = (0, import_react11.useState)({
     appId: null,
     arbitraryMessageComponent: null,
     build: null,
@@ -3309,7 +3306,7 @@ var ViewBuild = ({ commandUsed, id, configPath }) => {
       error: error2
     }));
   };
-  (0, import_react12.useEffect)(() => {
+  (0, import_react11.useEffect)(() => {
     let firebaseUnsubscribe;
     async function viewBuild() {
       let config2;
@@ -3366,12 +3363,12 @@ var ViewBuild = ({ commandUsed, id, configPath }) => {
       }
     };
   }, [id, configPath]);
-  (0, import_react12.useEffect)(() => {
+  (0, import_react11.useEffect)(() => {
     if (hasBuildEverFailed && shouldExitOnBuildFailure_default(build)) {
       setTimeout(() => exit(new Error("Build has failed")), 10);
     }
   }, [build, exit, hasBuildEverFailed]);
-  (0, import_react12.useEffect)(() => {
+  (0, import_react11.useEffect)(() => {
     if (arbitraryMessageComponent) {
       setTimeout(() => exit(new Error("Validation failed")), 10);
     }
@@ -3450,14 +3447,14 @@ var OngoingBuildGuard = ({
   const { isRawModeSupported } = (0, import_ink20.useStdin)();
   const onInput = useInput_default();
   const exit = useExit_default();
-  const [{ appId, builds, error, isLoading, itemChosen }, setState] = (0, import_react13.useState)({
+  const [{ appId, builds, error, isLoading, itemChosen }, setState] = (0, import_react12.useState)({
     appId: null,
     builds: [],
     error: null,
     isLoading: true,
     itemChosen: null
   });
-  (0, import_react13.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     if (!isLoading) {
       return;
     }
@@ -3580,9 +3577,9 @@ OngoingBuildGuard.propTypes = {
 var OngoingBuildGuard_default = OngoingBuildGuard;
 
 // src/utilities/useAnalytics.ts
-var import_react14 = require("react");
+var import_react13 = require("react");
 var useAnalyticsCommand = (command, flags = {}, properties = {}) => {
-  const [hasAttemptedTracking, setTrackingAttempt] = (0, import_react14.useState)(false);
+  const [hasAttemptedTracking, setTrackingAttempt] = (0, import_react13.useState)(false);
   logger_default.info({ command, flags, properties }, "useAnalyticsCommand");
   try {
     if (flags.projectPath) {
@@ -3593,7 +3590,7 @@ var useAnalyticsCommand = (command, flags = {}, properties = {}) => {
     }
   } catch (err) {
   }
-  (0, import_react14.useEffect)(() => {
+  (0, import_react13.useEffect)(() => {
     const authUnsubscribe = onUserAuth(async (user) => {
       if (user.uid) {
         identify(
@@ -3628,7 +3625,6 @@ function BuildCommand({
   configPath,
   flags
 }) {
-  checkIfReactIsUsable_default();
   useAnalyticsCommand("build", {
     async: flags.exitAfterUploading,
     codeSign: flags.shouldCodeSign,
@@ -3649,7 +3645,7 @@ function BuildCommand({
 // src/components/ViewBuilds.tsx
 var import_ink26 = require("ink");
 var import_prop_types17 = __toESM(require("prop-types"));
-var import_react16 = require("react");
+var import_react15 = require("react");
 
 // src/components/Table.tsx
 var import_ink24 = require("ink");
@@ -3673,7 +3669,7 @@ var TableEnd_default = TableEnd;
 // src/components/TableHead.tsx
 var import_ink22 = require("ink");
 var import_prop_types13 = __toESM(require("prop-types"));
-var import_react15 = require("react");
+var import_react14 = require("react");
 var import_jsx_runtime23 = require("react/jsx-runtime");
 var TableHead = ({ keyDetails, ...props }) => {
   let topLine = "\u250C";
@@ -3681,7 +3677,7 @@ var TableHead = ({ keyDetails, ...props }) => {
   topLine += "\u2510";
   const contentLineElements = Object.values(keyDetails).map(
     ({ key, width }, index) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_react15.Fragment, { children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_react14.Fragment, { children: [
         index > 0 ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_ink22.Text, { children: " \u2502 " }) : null,
         /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_ink22.Box, { width, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_ink22.Text, { bold: true, children: key }) })
       ] }, key);
@@ -3915,7 +3911,7 @@ var ViewBuilds = ({
       user
     },
     setState
-  ] = (0, import_react16.useState)({
+  ] = (0, import_react15.useState)({
     builds: [],
     error: null,
     hasMoreToLoad: true,
@@ -3940,7 +3936,7 @@ var ViewBuilds = ({
       }));
     }
   });
-  (0, import_react16.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     async function viewBuilds() {
       if (error || isLoading || isInitialLoadComplete && (!hasMoreToLoad || !startAfter)) {
         return;
@@ -4015,12 +4011,12 @@ var ViewBuilds = ({
     format,
     count
   ]);
-  (0, import_react16.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (!hasMoreToLoad) {
       setTimeout(exit, 10);
     }
   }, [exit, hasMoreToLoad]);
-  (0, import_react16.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (!isLoading && isInitialLoadComplete && shouldExitAfterViewingBuilds) {
       setTimeout(exit, 10);
     }
@@ -4106,7 +4102,6 @@ var BuildsCommand = ({
   format = "table",
   exit
 }) => {
-  checkIfReactIsUsable_default();
   useAnalyticsCommand("builds", {
     id,
     shouldViewLatest,
@@ -4148,15 +4143,14 @@ var BuildsCommand = ({
 var BuildsCommand_default = BuildsCommand;
 
 // src/commands/LogoutCommand.tsx
-var import_react17 = require("react");
+var import_react16 = require("react");
 var import_ink27 = require("ink");
 var import_jsx_runtime30 = require("react/jsx-runtime");
 var Logout = () => {
   const exit = useExit_default();
   const { hasAttemptedTracking } = useAnalyticsCommand("logout");
-  checkIfReactIsUsable_default();
   deleteAuthConfig();
-  (0, import_react17.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (hasAttemptedTracking) {
       exit();
     }
@@ -4170,7 +4164,7 @@ var LogoutCommand_default = LogoutWrapper;
 
 // src/components/BuildPicker.tsx
 var import_ink29 = require("ink");
-var import_react18 = require("react");
+var import_react17 = require("react");
 
 // src/components/SelectTable.tsx
 var import_ink28 = require("ink");
@@ -4288,11 +4282,11 @@ function BuildPicker({
   const exit = useExit_default();
   const onInput = useInput_default();
   const isRealIdPassed = buildId && buildId !== "latest";
-  const [state, setState] = (0, import_react18.useState)({
+  const [state, setState] = (0, import_react17.useState)({
     selectedBuildId: isRealIdPassed ? buildId : void 0,
     state: isRealIdPassed ? "selected" : "loading"
   });
-  (0, import_react18.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     loadData({
       buildFilter,
       buildId,
@@ -4407,7 +4401,7 @@ async function getBuildItems({
 }
 
 // src/commands/release/components/ReleaseBuildLogic.tsx
-var import_react19 = require("react");
+var import_react18 = require("react");
 
 // src/utilities/getBuildAttributes.ts
 async function getBuildAttributes({
@@ -4544,8 +4538,8 @@ function ReleaseBuildLogic({
   configPath
 }) {
   const exit = useExit_default();
-  const [state, setState] = (0, import_react19.useState)({ state: "loading" });
-  (0, import_react19.useEffect)(() => {
+  const [state, setState] = (0, import_react18.useState)({ state: "loading" });
+  (0, import_react18.useEffect)(() => {
     releaseBuildWorkflow({ configPath, buildId, updateState }).catch(
       logger_default.error
     );
@@ -4583,7 +4577,7 @@ async function releaseBuildWorkflow({
 
 // src/commands/release/components/ReleaseConfirmation.tsx
 var import_ink34 = require("ink");
-var import_react21 = require("react");
+var import_react20 = require("react");
 
 // src/commands/smoke-test/utilities/build.ts
 var import_semver = __toESM(require("semver"));
@@ -4742,15 +4736,15 @@ function analyzeRelease({
 // src/commands/release/components/DowngradeConfirmation.tsx
 var import_ink32 = require("ink");
 var import_ink_text_input2 = __toESM(require("ink-text-input"));
-var import_react20 = require("react");
+var import_react19 = require("react");
 var import_jsx_runtime36 = require("react/jsx-runtime");
 function DowngradeConfirmation({
   build,
   latestReleasedBuild,
   confirmDowngrade: confirmDowngrade2
 }) {
-  const [confirmText, setConfirmText] = (0, import_react20.useState)("");
-  const [showError, setShowError] = (0, import_react20.useState)(false);
+  const [confirmText, setConfirmText] = (0, import_react19.useState)("");
+  const [showError, setShowError] = (0, import_react19.useState)(false);
   const buildVersion = build.appVersion;
   const latestVersion2 = latestReleasedBuild.appVersion;
   function onType(text) {
@@ -4835,10 +4829,10 @@ function ReleaseConfirmation({
   loadData = loadBuildsData
 }) {
   var _a;
-  const [state, setState] = (0, import_react21.useState)({
+  const [state, setState] = (0, import_react20.useState)({
     state: disabled ? "bypass" : "loading"
   });
-  (0, import_react21.useEffect)(() => {
+  (0, import_react20.useEffect)(() => {
     confirmationWorkflow({
       buildId,
       configPath,
@@ -5018,7 +5012,6 @@ function ReleaseCommand({
   configPath,
   shouldConfirm
 }) {
-  checkIfReactIsUsable_default();
   useAnalyticsCommand("release", {
     buildId,
     shouldConfirm,
@@ -5061,11 +5054,11 @@ function isBuildReleasable(opts) {
 }
 
 // src/commands/smoke-test/SmokeTestCommand.tsx
-var import_react23 = require("react");
+var import_react22 = require("react");
 
 // src/commands/smoke-test/components/Cancellation.tsx
 var import_ink35 = require("ink");
-var import_react22 = require("react");
+var import_react21 = require("react");
 var import_jsx_runtime40 = require("react/jsx-runtime");
 function Cancellation({
   children,
@@ -5085,8 +5078,8 @@ function Cancellation({
   renderError = (e) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(ErrorDisplay, { error: e }),
   subject
 }) {
-  const [state, setState] = (0, import_react22.useState)("normal");
-  const [error, setError] = (0, import_react22.useState)();
+  const [state, setState] = (0, import_react21.useState)("normal");
+  const [error, setError] = (0, import_react21.useState)();
   const onInput = useInput_default();
   const exit = useExit_default();
   onInput(async (input, key) => {
@@ -5323,7 +5316,6 @@ function SmokeTestCommand({
   buildId,
   configPath
 }) {
-  checkIfReactIsUsable_default();
   useAnalyticsCommand("smoke-test", { buildId, configPath });
   const command = `todesktop release ${buildId === "latest" ? "--latest" : "<id>"}`;
   return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(ErrorBoundary_default, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(LoginHOC_default, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
@@ -5351,13 +5343,13 @@ function SmokeTestContainer({
   configPath
 }) {
   const exit = useExit_default();
-  const [state, setState] = (0, import_react23.useState)({
+  const [state, setState] = (0, import_react22.useState)({
     buildId,
     state: "loading"
   });
-  const [abortController] = (0, import_react23.useState)(new AbortController());
+  const [abortController] = (0, import_react22.useState)(new AbortController());
   const abortSignal = abortController.signal;
-  (0, import_react23.useEffect)(() => {
+  (0, import_react22.useEffect)(() => {
     smokeTestWorkflow({ abortSignal, buildId, configPath, updateState }).catch(
       logger_default.error
     );
@@ -5448,15 +5440,14 @@ function isCancelable(state) {
 }
 
 // src/commands/WhoamiCommand.tsx
-var import_react24 = require("react");
+var import_react23 = require("react");
 var import_ink38 = require("ink");
 var import_jsx_runtime45 = require("react/jsx-runtime");
 var WhoAmI = () => {
   const exit = useExit_default();
-  checkIfReactIsUsable_default();
   const auth = getAuthConfig();
   const { hasAttemptedTracking } = useAnalyticsCommand("whoami", {}, {});
-  (0, import_react24.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     if (hasAttemptedTracking) {
       exit();
     }
@@ -5507,7 +5498,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.12.1",
+  version: "1.12.3",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5808,7 +5799,7 @@ import_commander.program.command("whoami").description("Prints the email of the
 });
 var runCommand = (component, props = null, { exitIfOutOfDate = true } = {}) => {
   onCommand_default({ exitIfOutOfDate });
-  const { waitUntilExit } = (0, import_ink39.render)((0, import_react25.createElement)(component, props));
+  const { waitUntilExit } = (0, import_ink39.render)((0, import_react24.createElement)(component, props));
   waitUntilExit().catch((error) => {
     console.error(error.stack);
   });