Fix typescript and errors

saleor · Jan 3, 2024 · 54b6d4b · 54b6d4b
1 parent cdbc8d3
commit 54b6d4b
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 150 deletions.
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
     "fetch-repo-dir": "^1.0.6",
     "fs-extra": "^11.2.0",
     "git-url-parse": "^14.0.0",
-    "got": "^14.0.0",
+    "got": "^12.0.0",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "graphql-tag": "^2.12.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/cli/configure.ts b/src/cli/configure.ts
@@ -29,7 +29,7 @@ export const builder: CommandBuilder = (_) =>
     desc: 'skip additional prompts',
   });
 
-export const handler = async (argv: Arguments<Options>) => {
+export const handler = async (argv: Arguments<any>) => {
   debug('command arguments: %O', obfuscateArgv(argv));
 
   const { token, force } = argv;

diff --git a/src/cli/dev/prepare.ts b/src/cli/dev/prepare.ts
@@ -9,16 +9,12 @@ import { Config } from '../../lib/config.js';
 import { GitError, obfuscateArgv, printlnSuccess } from '../../lib/util.js';
 import { useGithub } from '../../middleware/index.js';
 
-interface Options {
-  branch?: string;
-}
-
 const debug = Debug('saleor-cli:dev:prepare');
 
 export const command = 'prepare [branch|prURL]';
 export const desc = 'Build cli from branch or pull request URL';
 
-export const handler = async (argv: Arguments<Options>) => {
+export const handler = async (argv: Arguments<any>) => {
   debug('command arguments: %O', obfuscateArgv(argv));
 
   const git = simpleGit();

diff --git a/src/cli/env/cors.ts b/src/cli/env/cors.ts
@@ -95,42 +95,39 @@ export const handler = async (argv: Arguments<Options>) => {
   }
 
   // First form to check current
-  const { kind } = await Enquirer.prompt<{
-    kind: string;
-  }>([
-    {
-      type: 'select',
-      name: 'kind',
-      message: 'Choose allowed API origins ',
-      choices: [
-        {
-          message: 'Allow all origins',
-          name: 'all',
-        },
-        {
-          message: 'Selected Origins',
-          name: 'selected',
-        },
-        {
-          message: 'Dashboard only',
-          name: 'dashboard',
-        },
-      ],
-      initial: () => {
-        if (allowedCorsOrigins === '*') {
-          return 1;
-        }
-        if (allowedCorsOrigins == null) {
-          return 2;
-        }
-        if (Array.isArray(allowedCorsOrigins)) {
-          return 3;
-        }
-
-        return 1;
+  const kindPrompt = new (Enquirer as any).Select({
+    name: 'kind',
+    message: 'Choose allowed API origins ',
+    choices: [
+      {
+        message: 'Allow all origins',
+        name: 'all',
       },
+      {
+        message: 'Selected Origins',
+        name: 'selected',
+      },
+      {
+        message: 'Dashboard only',
+        name: 'dashboard',
+      },
+    ],
+    initial: () => {
+      if (allowedCorsOrigins === '*') {
+        return 1;
+      }
+      if (allowedCorsOrigins == null) {
+        return 2;
+      }
+      if (Array.isArray(allowedCorsOrigins)) {
+        return 3;
+      }
+
+      return 1;
     },
-  ]);
+  });
+
+  const kind = (await kindPrompt.run()) as string;
 
   // Trigger an update for all and dashboard
   if (['all', 'dashboard'].includes(kind)) {
@@ -153,18 +150,15 @@ export const handler = async (argv: Arguments<Options>) => {
 
   const addNewMsg = 'Add a new CORS origin';
 
-  const { origins } = await Enquirer.prompt<{
-    origins: string;
-  }>([
-    {
-      type: 'multiselect',
-      name: 'origins',
-      message:
-        'Define Selected Origins\n (use the arrows to navigate and the space bar to select)',
-      choices: [...selected, addNewMsg],
-      initial: selected,
-    },
-  ]);
+  const originsPrompt = new (Enquirer as any).MultiSelect({
+    name: 'origins',
+    message:
+      'Define Trusted Origins\n (use the arrows to navigate and the space bar to select)',
+    choices: [...selected, addNewMsg],
+    initial: selected,
+  });
+
+  const origins = (await originsPrompt.run()) as string;
 
   do {
     if (origins.length === 0) {

diff --git a/src/cli/env/create.ts b/src/cli/env/create.ts
@@ -29,7 +29,7 @@ interface CommandOptions extends Options {
   pass?: string;
   restore: boolean;
   restoreFrom: string;
-  skipWebhooksUpdate: boolean;
+  skipWebhooksUpdate?: boolean;
   skipRestrict: boolean;
 }
 

diff --git a/src/cli/env/origins.ts b/src/cli/env/origins.ts
@@ -53,18 +53,15 @@ export const handler = async (argv: Arguments<Options>) => {
   const selected: string[] = (allowedClientOrigins as string[]) || [];
   let addMore = true;
 
-  const { origins } = await Enquirer.prompt<{
-    origins: string;
-  }>([
-    {
-      type: 'multiselect',
-      name: 'origins',
-      message:
-        'Define Trusted Origins\n (use the arrows to navigate and the space bar to select)',
-      choices: [...selected, 'Add a new trusted origin'],
-      initial: selected,
-    },
-  ]);
+  const originsPrompt = new (Enquirer as any).MultiSelect({
+    name: 'origins',
+    message:
+      'Define Trusted Origins\n (use the arrows to navigate and the space bar to select)',
+    choices: [...selected, 'Add a new trusted origin'],
+    initial: selected,
+  });
+
+  const origins = (await originsPrompt.run()) as string;
 
   do {
     if (origins.length === 0) {

diff --git a/src/cli/info.ts b/src/cli/info.ts
@@ -8,7 +8,7 @@ import type { CommandBuilder } from 'yargs';
 import { Config } from '../lib/config.js';
 import { header } from '../lib/images.js';
 import { API, GET, getEnvironment } from '../lib/index.js';
-import { User } from '../types.js';
+import { Options, User } from '../types.js';
 
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');

diff --git a/src/cli/login.ts b/src/cli/login.ts
@@ -24,7 +24,7 @@ import {
   println,
   successPage,
 } from '../lib/util.js';
-import { BaseOptions } from '../types.js';
+import { Options } from '../types.js';
 
 const environment = await getEnvironment();
 const RedirectURI = `http://127.0.0.1:${SaleorCLIPort}/`;
@@ -49,7 +49,7 @@ export const builder: CommandBuilder = (_) =>
     .example('saleor login --headless', '')
     .example('saleor login --headless --token=TOKEN', '');
 
-export const handler = async (argv: Arguments<BaseOptions>) => {
+export const handler = async (argv: Arguments<any>) => {
   if (argv.headless) {
     const { ux: cli } = CliUx;
     let { token } = argv;
@@ -155,7 +155,7 @@ export const doLogin = async () => {
 
         const { token }: any = await POST(API.Token, {
           token: `Bearer ${idToken}`,
-        });
+        } as Options);
 
         await createConfig(token, secrets);
       } catch (error) {