diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts index ce8a34a6ed..52946ce7fd 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts +++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts @@ -15,16 +15,16 @@ */ import { ContainerRunner } from '@backstage/backend-common'; -import { UrlReaderService } from '@backstage/backend-plugin-api'; -import { createMockDirectory } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; +import { JsonObject } from '@backstage/types'; import { ScmIntegrations } from '@backstage/integration'; +import { createMockDirectory } from '@backstage/backend-test-utils'; +import { createFetchCookiecutterAction } from './cookiecutter'; +import { join } from 'path'; import type { ActionContext } from '@backstage/plugin-scaffolder-node'; import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils'; -import { JsonObject } from '@backstage/types'; -import { join } from 'path'; import { Writable } from 'stream'; -import { createFetchCookiecutterAction } from './cookiecutter'; +import { UrlReaderService } from '@backstage/backend-plugin-api'; const executeShellCommand = jest.fn(); const commandExists = jest.fn(); diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts index 269630817c..6e540d7fca 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts +++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts @@ -19,18 +19,18 @@ import { UrlReaderService, resolveSafeChildPath, } from '@backstage/backend-plugin-api'; +import { JsonObject, JsonValue } from '@backstage/types'; import { InputError } from '@backstage/errors'; import { ScmIntegrations } from '@backstage/integration'; -import { - createTemplateAction, - executeShellCommand, - fetchContents, -} from '@backstage/plugin-scaffolder-node'; -import { JsonObject, JsonValue } from '@backstage/types'; import commandExists from 'command-exists'; import fs from 'fs-extra'; import path, { resolve as resolvePath } from 'path'; import { PassThrough, Writable } from 'stream'; +import { + createTemplateAction, + fetchContents, + executeShellCommand, +} from '@backstage/plugin-scaffolder-node'; import { examples } from './cookiecutter.examples'; export class CookiecutterRunner { diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json index 188892b2e2..fe0046f17f 100644 --- a/plugins/scaffolder-backend-module-rails/package.json +++ b/plugins/scaffolder-backend-module-rails/package.json @@ -1,11 +1,11 @@ { "name": "@backstage/plugin-scaffolder-backend-module-rails", - "version": "0.5.1", + "version": "0.5.4-next.2", "description": "A module for the scaffolder backend that lets you template projects using Rails", "backstage": { + "role": "backend-plugin-module", "pluginId": "scaffolder", - "pluginPackage": "@backstage/plugin-scaffolder-backend", - "role": "backend-plugin-module" + "pluginPackage": "@backstage/plugin-scaffolder-backend" }, "publishConfig": { "access": "public" @@ -60,7 +60,7 @@ "@backstage/plugin-scaffolder-node-test-utils": "workspace:^", "@types/command-exists": "^1.2.0", "@types/fs-extra": "^11.0.0", - "@types/node": "^18.17.8", + "@types/node": "^20.16.0", "jest-when": "^3.1.0" } } diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts index c2d3ead6bb..616c90e0de 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts @@ -28,15 +28,15 @@ jest.mock('./railsNewRunner', () => { }); import { ContainerRunner } from '@backstage/backend-common'; -import { UrlReaderService } from '@backstage/backend-plugin-api'; -import { createMockDirectory } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { ScmIntegrations } from '@backstage/integration'; -import { fetchContents } from '@backstage/plugin-scaffolder-node'; -import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils'; import { resolve as resolvePath } from 'path'; -import { Writable } from 'stream'; import { createFetchRailsAction } from './index'; +import { fetchContents } from '@backstage/plugin-scaffolder-node'; +import { createMockDirectory } from '@backstage/backend-test-utils'; +import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils'; +import { Writable } from 'stream'; +import { UrlReaderService } from '@backstage/backend-plugin-api'; describe('fetch:rails', () => { const mockDir = createMockDirectory(); diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts index a063ce0a5b..4d5db0f3ef 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts @@ -15,20 +15,20 @@ */ import { ContainerRunner } from '@backstage/backend-common'; +import { JsonObject } from '@backstage/types'; import { InputError } from '@backstage/errors'; import { ScmIntegrations } from '@backstage/integration'; +import fs from 'fs-extra'; import { createTemplateAction, fetchContents, } from '@backstage/plugin-scaffolder-node'; -import { JsonObject } from '@backstage/types'; -import fs from 'fs-extra'; -import { UrlReaderService } from '@backstage/backend-plugin-api'; import { resolve as resolvePath } from 'path'; +import { RailsNewRunner } from './railsNewRunner'; import { PassThrough } from 'stream'; import { examples } from './index.examples'; -import { RailsNewRunner } from './railsNewRunner'; +import { UrlReaderService } from '@backstage/backend-plugin-api'; /** * Creates the `fetch:rails` Scaffolder action. diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts index c53f368516..47104c66e1 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts @@ -28,10 +28,10 @@ jest.mock( ); import { ContainerRunner } from '@backstage/backend-common'; -import { createMockDirectory } from '@backstage/backend-test-utils'; import path from 'path'; import { PassThrough } from 'stream'; import { RailsNewRunner } from './railsNewRunner'; +import { createMockDirectory } from '@backstage/backend-test-utils'; describe('Rails Templater', () => { const containerRunner: jest.Mocked = { diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts index fe2470eef8..31cfea4a76 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts @@ -15,16 +15,16 @@ */ import { ContainerRunner } from '@backstage/backend-common'; -import { executeShellCommand } from '@backstage/plugin-scaffolder-node'; -import { JsonObject } from '@backstage/types'; -import commandExists from 'command-exists'; import fs from 'fs-extra'; import path from 'path'; -import { Writable } from 'stream'; +import { executeShellCommand } from '@backstage/plugin-scaffolder-node'; +import commandExists from 'command-exists'; import { railsArgumentResolver, RailsRunOptions, } from './railsArgumentResolver'; +import { JsonObject } from '@backstage/types'; +import { Writable } from 'stream'; export class RailsNewRunner { private readonly containerRunner?: ContainerRunner;