From e5dc9d91d4ebccc3f09924b71c42a9868f682a7a Mon Sep 17 00:00:00 2001 From: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> Date: Tue, 20 Sep 2022 15:45:39 -0400 Subject: [PATCH 1/4] fix(cli): use exec to run cap command in right cwd --- .../cli/src/lib/integrations/capacitor/index.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts index d6c22d3e82..9d7908fad2 100644 --- a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts +++ b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts @@ -1,3 +1,4 @@ +import { exec, ExecOptions } from 'child_process'; import { parseArgs } from '@ionic/cli-framework'; import { mkdirp, pathExists } from '@ionic/utils-fs'; import { prettyPath } from '@ionic/utils-terminal'; @@ -190,7 +191,18 @@ export class Integration extends BaseIntegration { debug('Getting config with Capacitor CLI: %O', args); - const output = await this.e.shell.cmdinfo('capacitor', args, { cwd: this.root }); + //const output = await this.e.shell.cmdinfo('capacitor', args, { cwd: this.root }); + + const output = await ((cmd: string, opts: ExecOptions): Promise => { + return new Promise((resolve, reject) => { + exec(cmd, opts, (error, stdout, stderr) => { + if (error) { + resolve(undefined); + } + resolve(stdout); + }) + }) + })(`capacitor ${args.join(' ')}`, { cwd: this.root }); if (!output) { debug('Could not get config from Capacitor CLI (probably old version)'); From 83c4dffaa4fe4fa86ef2b52b9b9b838f2da95175 Mon Sep 17 00:00:00 2001 From: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> Date: Wed, 21 Sep 2022 09:59:58 -0400 Subject: [PATCH 2/4] chore: fix deps causing build errors --- packages/@ionic/lab/package.json | 5 +++-- packages/@ionic/v1-toolkit/package.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/@ionic/lab/package.json b/packages/@ionic/lab/package.json index ca4acb5674..5462600f96 100644 --- a/packages/@ionic/lab/package.json +++ b/packages/@ionic/lab/package.json @@ -44,13 +44,14 @@ "@ionic/cli-framework": "5.1.3", "@ionic/utils-fs": "3.1.6", "chalk": "^4.0.0", - "express": "^4.16.2", + "express": "4.16.2", "tslib": "^2.0.1" }, "devDependencies": { "@ionic-internal/ionic-ds": "^2.1.0", "@stencil/core": "~1.8.5", - "@types/express": "^4.11.0", + "@types/express": "4.11.0", + "@types/express-serve-static-core": "4.11.0", "@types/node": "~10.17.13", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", diff --git a/packages/@ionic/v1-toolkit/package.json b/packages/@ionic/v1-toolkit/package.json index 2087899fdf..862f0adfd2 100644 --- a/packages/@ionic/v1-toolkit/package.json +++ b/packages/@ionic/v1-toolkit/package.json @@ -42,7 +42,7 @@ "chalk": "^4.0.0", "chokidar": "^3.0.1", "debug": "^4.0.0", - "express": "^4.16.2", + "express": "4.16.2", "gulp": "^4.0.2", "http-proxy-middleware": "^0.20.0", "tiny-lr": "^1.1.0", @@ -51,7 +51,8 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/express": "^4.11.0", + "@types/express": "4.11.0", + "@types/express-serve-static-core": "4.11.0", "@types/gulp": "^4.0.6", "@types/http-proxy-middleware": "^0.19.0", "@types/jest": "^26.0.10", From 7494f72c0429ec707f316822150bf3eb4b955b72 Mon Sep 17 00:00:00 2001 From: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:28:06 -0400 Subject: [PATCH 3/4] chore: cleanup --- packages/@ionic/cli/src/lib/integrations/capacitor/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts index 9d7908fad2..43fa372356 100644 --- a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts +++ b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts @@ -191,8 +191,6 @@ export class Integration extends BaseIntegration { debug('Getting config with Capacitor CLI: %O', args); - //const output = await this.e.shell.cmdinfo('capacitor', args, { cwd: this.root }); - const output = await ((cmd: string, opts: ExecOptions): Promise => { return new Promise((resolve, reject) => { exec(cmd, opts, (error, stdout, stderr) => { From b5b96fa971ff4826eb4a69b46cc445df7accd12f Mon Sep 17 00:00:00 2001 From: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> Date: Fri, 23 Sep 2022 10:36:01 -0400 Subject: [PATCH 4/4] chore: promise should reject from exec error --- packages/@ionic/cli/src/lib/integrations/capacitor/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts index 43fa372356..92e4043bed 100644 --- a/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts +++ b/packages/@ionic/cli/src/lib/integrations/capacitor/index.ts @@ -195,7 +195,7 @@ export class Integration extends BaseIntegration { return new Promise((resolve, reject) => { exec(cmd, opts, (error, stdout, stderr) => { if (error) { - resolve(undefined); + reject(); } resolve(stdout); })