From 4ca32282688a816d7fe6ec518a296d565026ec99 Mon Sep 17 00:00:00 2001 From: Dominik Henneke Date: Mon, 14 Jun 2021 10:38:24 +0200 Subject: [PATCH 1/2] Migrate from the `command-exists-promise` dependency to `command-exists` Signed-off-by: Dominik Henneke --- .changeset/thick-donkeys-carry.md | 5 +++++ plugins/scaffolder-backend/package.json | 2 +- .../src/scaffolder/stages/templater/cookiecutter.test.ts | 2 +- .../src/scaffolder/stages/templater/cookiecutter.ts | 2 +- yarn.lock | 5 ----- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 .changeset/thick-donkeys-carry.md diff --git a/.changeset/thick-donkeys-carry.md b/.changeset/thick-donkeys-carry.md new file mode 100644 index 0000000000..41cd319654 --- /dev/null +++ b/.changeset/thick-donkeys-carry.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +Migrate from the `command-exists-promise` dependency to `command-exists`. diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index 8eb6097fb6..f437eff300 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -41,7 +41,7 @@ "@types/express": "^4.17.6", "@types/git-url-parse": "^9.0.0", "azure-devops-node-api": "^10.1.1", - "command-exists-promise": "^2.0.2", + "command-exists": "^1.2.9", "compression": "^1.7.4", "cors": "^2.8.5", "cross-fetch": "^3.0.6", diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts index 59fb72d515..a9227c742e 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts @@ -18,7 +18,7 @@ const runCommand = jest.fn(); const commandExists = jest.fn(); jest.mock('./helpers', () => ({ runCommand })); -jest.mock('command-exists-promise', () => commandExists); +jest.mock('command-exists', () => commandExists); jest.mock('fs-extra'); import { ContainerRunner } from '@backstage/backend-common'; diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts index 8819a90d63..541c433a6c 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts @@ -21,7 +21,7 @@ import path from 'path'; import { runCommand } from './helpers'; import { TemplaterBase, TemplaterRunOptions } from './types'; -const commandExists = require('command-exists-promise'); +const commandExists = require('command-exists'); export class CookieCutter implements TemplaterBase { private readonly containerRunner: ContainerRunner; diff --git a/yarn.lock b/yarn.lock index af81214be9..b453ea3693 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9802,11 +9802,6 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -command-exists-promise@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/command-exists-promise/-/command-exists-promise-2.0.2.tgz#7beecc4b218299f3c61fa69a4047aa0b36a64a99" - integrity sha512-T6PB6vdFrwnHXg/I0kivM3DqaCGZLjjYSOe0a5WgFKcz1sOnmOeIjnhQPXVXX3QjVbLyTJ85lJkX6lUpukTzaA== - command-exists@^1.2.9: version "1.2.9" resolved "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" From ca70bd37d5adcd3b60b910a3f1abf87dde08da40 Mon Sep 17 00:00:00 2001 From: Dominik Henneke Date: Mon, 14 Jun 2021 12:55:19 +0200 Subject: [PATCH 2/2] Move from require to import Signed-off-by: Dominik Henneke --- plugins/scaffolder-backend/package.json | 1 + .../src/scaffolder/stages/templater/cookiecutter.ts | 3 +-- yarn.lock | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index f437eff300..9c782d7053 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -66,6 +66,7 @@ "devDependencies": { "@backstage/cli": "^0.7.0", "@backstage/test-utils": "^0.1.13", + "@types/command-exists": "^1.2.0", "@types/fs-extra": "^9.0.1", "@types/mock-fs": "^4.13.0", "@types/supertest": "^2.0.8", diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts index 541c433a6c..c0abc44521 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts @@ -16,13 +16,12 @@ import { ContainerRunner } from '@backstage/backend-common'; import { JsonValue } from '@backstage/config'; +import commandExists from 'command-exists'; import fs from 'fs-extra'; import path from 'path'; import { runCommand } from './helpers'; import { TemplaterBase, TemplaterRunOptions } from './types'; -const commandExists = require('command-exists'); - export class CookieCutter implements TemplaterBase { private readonly containerRunner: ContainerRunner; diff --git a/yarn.lock b/yarn.lock index b453ea3693..808c68443e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5508,6 +5508,11 @@ dependencies: "@types/color-convert" "*" +"@types/command-exists@^1.2.0": + version "1.2.0" + resolved "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz#d97e0ed10097090e4ab0367ed425b0312fad86f3" + integrity sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A== + "@types/compression@^1.7.0": version "1.7.0" resolved "https://registry.npmjs.org/@types/compression/-/compression-1.7.0.tgz#8dc2a56604873cf0dd4e746d9ae4d31ae77b2390"