From 28652626a003488be2367f4afc2ad3fd7366b7a4 Mon Sep 17 00:00:00 2001 From: Daniel Estoll Date: Tue, 17 Jun 2025 12:15:26 -0600 Subject: [PATCH 1/3] Dirty deployables are now added to git after being updated --- package.json | 2 +- src/commands/prepare.ts | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 537f65d..3dc7bad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polyapi", - "version": "0.23.26", + "version": "0.23.27", "description": "Poly is a CLI tool to help create and manage your Poly definitions.", "license": "MIT", "repository": { diff --git a/src/commands/prepare.ts b/src/commands/prepare.ts index 5226e3b..528201f 100644 --- a/src/commands/prepare.ts +++ b/src/commands/prepare.ts @@ -160,6 +160,21 @@ export const prepareDeployables = async ( writeUpdatedDeployable(deployable, disableDocs), ), ); + const staged = shell.exec('git diff --name-only --cached') + .toString().split('\n').filter(Boolean); + for (const deployable of dirtyDeployables) { + try{ + const rootPath: string = shell.exec('git rev-parse --show-toplevel', {silent:true}).toString('utf8'); + const deployableName = deployable.file.slice(rootPath.length); + if (staged.includes(deployableName)) { + shell.echo(`Staging ${deployableName}`) + shell.exec(`git add ${deployableName}`); + } + } + catch (error) { + console.log(error); + } + } } console.log('Poly deployments are prepared.'); await saveDeployableRecords(parsedDeployables); From 4b541e111fe62cc3da1febfeaa86e1b473beffa6 Mon Sep 17 00:00:00 2001 From: Daniel Estoll Date: Tue, 17 Jun 2025 13:16:21 -0600 Subject: [PATCH 2/3] changed slice to replace --- package-lock.json | 4 ++-- src/commands/prepare.ts | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e48cb08..f8322df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "polyapi", - "version": "0.23.26", + "version": "0.23.27", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "polyapi", - "version": "0.23.26", + "version": "0.23.27", "license": "MIT", "dependencies": { "@guanghechen/helper-string": "4.7.1", diff --git a/src/commands/prepare.ts b/src/commands/prepare.ts index 528201f..5498772 100644 --- a/src/commands/prepare.ts +++ b/src/commands/prepare.ts @@ -162,12 +162,13 @@ export const prepareDeployables = async ( ); const staged = shell.exec('git diff --name-only --cached') .toString().split('\n').filter(Boolean); + const rootPath: string = shell.exec('git rev-parse --show-toplevel', {silent:true}) + .toString('utf8').replace('\n', ''); for (const deployable of dirtyDeployables) { try{ - const rootPath: string = shell.exec('git rev-parse --show-toplevel', {silent:true}).toString('utf8'); - const deployableName = deployable.file.slice(rootPath.length); + const deployableName = deployable.file.replace(rootPath, ''); if (staged.includes(deployableName)) { - shell.echo(`Staging ${deployableName}`) + shell.echo(`Staging ${deployableName}`); shell.exec(`git add ${deployableName}`); } } From 911aa92bb27645b0967c310b798400e449a723a7 Mon Sep 17 00:00:00 2001 From: Daniel Estoll Date: Tue, 17 Jun 2025 14:23:24 -0600 Subject: [PATCH 3/3] Changed log to warn --- src/commands/prepare.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/prepare.ts b/src/commands/prepare.ts index 5498772..9fa1e60 100644 --- a/src/commands/prepare.ts +++ b/src/commands/prepare.ts @@ -173,7 +173,7 @@ export const prepareDeployables = async ( } } catch (error) { - console.log(error); + console.warn(error); } } }