From e8e0f8e276ff7b92e37225008657c7cd411cfdf1 Mon Sep 17 00:00:00 2001 From: solimant Date: Mon, 6 Jan 2025 04:53:17 +0000 Subject: [PATCH] Relocate client Signed-off-by: solimant --- plugins/scaffolder-common/.eslintrc.js | 2 +- plugins/scaffolder-common/package.json | 6 +++--- plugins/scaffolder-common/src/ScaffolderClient.ts | 6 +----- plugins/scaffolder-common/src/api.ts | 2 +- .../src/schema/openapi/generated/apis/Api.client.ts | 0 .../{client => }/src/schema/openapi/generated/apis/index.ts | 0 .../{client => }/src/schema/openapi/generated/index.ts | 0 .../src/schema/openapi/generated/models/Action.model.ts | 0 .../schema/openapi/generated/models/ActionExample.model.ts | 0 .../schema/openapi/generated/models/ActionSchema.model.ts | 0 .../generated/models/Autocomplete200Response.model.ts | 0 .../models/Autocomplete200ResponseResultsInner.model.ts | 0 .../generated/models/Autocomplete400Response.model.ts | 0 .../openapi/generated/models/AutocompleteRequest.model.ts | 0 .../openapi/generated/models/CancelTask200Response.model.ts | 0 .../openapi/generated/models/DryRun200Response.model.ts | 0 .../generated/models/DryRun200ResponseAllOf.model.ts | 0 .../DryRun200ResponseAllOfDirectoryContentsInner.model.ts | 0 .../models/DryRun200ResponseAllOfStepsInner.model.ts | 0 .../schema/openapi/generated/models/DryRunRequest.model.ts | 0 .../models/DryRunRequestDirectoryContentsInner.model.ts | 0 .../schema/openapi/generated/models/DryRunResult.model.ts | 0 .../openapi/generated/models/DryRunResultLogInner.model.ts | 0 .../generated/models/DryRunResultLogInnerBody.model.ts | 0 .../generated/models/DryRunResultLogInnerBodyAllOf.model.ts | 0 .../src/schema/openapi/generated/models/ErrorError.model.ts | 0 .../schema/openapi/generated/models/ErrorRequest.model.ts | 0 .../schema/openapi/generated/models/ErrorResponse.model.ts | 0 .../schema/openapi/generated/models/JsonPrimitive.model.ts | 0 .../src/schema/openapi/generated/models/JsonValue.model.ts | 0 .../openapi/generated/models/ListTasksResponse.model.ts | 0 .../src/schema/openapi/generated/models/ModelError.model.ts | 0 .../schema/openapi/generated/models/RetryRequest.model.ts | 0 .../openapi/generated/models/Scaffold201Response.model.ts | 0 .../openapi/generated/models/Scaffold400Response.model.ts | 0 .../generated/models/ScaffolderScaffoldOptions.model.ts | 0 .../schema/openapi/generated/models/SerializedFile.model.ts | 0 .../schema/openapi/generated/models/SerializedTask.model.ts | 0 .../openapi/generated/models/SerializedTaskEvent.model.ts | 0 .../schema/openapi/generated/models/TaskEventType.model.ts | 0 .../schema/openapi/generated/models/TaskSecrets.model.ts | 0 .../openapi/generated/models/TaskSecretsAllOf.model.ts | 0 .../src/schema/openapi/generated/models/TaskStatus.model.ts | 0 .../generated/models/TemplateParameterSchema.model.ts | 0 .../models/TemplateParameterSchemaStepsInner.model.ts | 0 .../openapi/generated/models/ValidationError.model.ts | 0 .../generated/models/ValidationErrorArgument.model.ts | 0 .../generated/models/ValidationErrorPathInner.model.ts | 0 .../src/schema/openapi/generated/models/index.ts | 0 .../{client => }/src/schema/openapi/generated/pluginId.ts | 0 .../src/schema/openapi/generated/types/discovery.ts | 0 .../src/schema/openapi/generated/types/fetch.ts | 0 .../{client => }/src/schema/openapi/index.ts | 0 53 files changed, 6 insertions(+), 10 deletions(-) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/apis/Api.client.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/apis/index.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/index.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Action.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ActionExample.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ActionSchema.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Autocomplete200Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Autocomplete200ResponseResultsInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Autocomplete400Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/AutocompleteRequest.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/CancelTask200Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRun200Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRun200ResponseAllOf.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRun200ResponseAllOfDirectoryContentsInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRun200ResponseAllOfStepsInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunRequest.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunRequestDirectoryContentsInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunResult.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunResultLogInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunResultLogInnerBody.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/DryRunResultLogInnerBodyAllOf.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ErrorError.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ErrorRequest.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ErrorResponse.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/JsonPrimitive.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/JsonValue.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ListTasksResponse.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ModelError.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/RetryRequest.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Scaffold201Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/Scaffold400Response.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ScaffolderScaffoldOptions.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/SerializedFile.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/SerializedTask.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/SerializedTaskEvent.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TaskEventType.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TaskSecrets.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TaskSecretsAllOf.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TaskStatus.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TemplateParameterSchema.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/TemplateParameterSchemaStepsInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ValidationError.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ValidationErrorArgument.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/ValidationErrorPathInner.model.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/models/index.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/pluginId.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/types/discovery.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/generated/types/fetch.ts (100%) rename plugins/scaffolder-common/{client => }/src/schema/openapi/index.ts (100%) diff --git a/plugins/scaffolder-common/.eslintrc.js b/plugins/scaffolder-common/.eslintrc.js index a9d85200c7..c8ec42e57a 100644 --- a/plugins/scaffolder-common/.eslintrc.js +++ b/plugins/scaffolder-common/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, { overrides: [ { - files: ['client/src/schema/openapi/generated/models/*.model.ts'], + files: ['src/schema/openapi/generated/models/*.model.ts'], rules: { '@typescript-eslint/no-redeclare': 'off', }, diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json index 9383ca12e4..c580f1d502 100644 --- a/plugins/scaffolder-common/package.json +++ b/plugins/scaffolder-common/package.json @@ -67,15 +67,15 @@ "@backstage/types": "workspace:^", "@microsoft/fetch-event-source": "^2.0.1", "@types/json-schema": "^7.0.9", + "cross-fetch": "^4.0.0", "json-schema": "^0.4.0", "qs": "^6.9.4", + "uri-template": "^2.0.0", "zen-observable": "^0.10.0" }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/test-utils": "workspace:^", - "cross-fetch": "^4.0.0", - "msw": "^1.0.0", - "uri-template": "^2.0.0" + "msw": "^1.0.0" } } diff --git a/plugins/scaffolder-common/src/ScaffolderClient.ts b/plugins/scaffolder-common/src/ScaffolderClient.ts index 0e03480283..aececc0e4b 100644 --- a/plugins/scaffolder-common/src/ScaffolderClient.ts +++ b/plugins/scaffolder-common/src/ScaffolderClient.ts @@ -40,11 +40,7 @@ import { ScaffolderStreamLogsOptions, ScaffolderTask, } from './api'; -import { - DefaultApiClient, - TaskStatus, - TypedResponse, -} from '../client/src/schema/openapi'; +import { DefaultApiClient, TaskStatus, TypedResponse } from './schema/openapi'; /** * An API to interact with the scaffolder backend. diff --git a/plugins/scaffolder-common/src/api.ts b/plugins/scaffolder-common/src/api.ts index a62729cad5..52ae010870 100644 --- a/plugins/scaffolder-common/src/api.ts +++ b/plugins/scaffolder-common/src/api.ts @@ -23,7 +23,7 @@ import type { import type { TaskEventType, TaskStatus as ScaffolderTaskStatus, -} from '../client/src/schema/openapi'; +} from './schema/openapi'; export type { ScaffolderTaskStatus, TaskEventType }; diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts b/plugins/scaffolder-common/src/schema/openapi/generated/apis/Api.client.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/apis/Api.client.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/index.ts b/plugins/scaffolder-common/src/schema/openapi/generated/apis/index.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/apis/index.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/apis/index.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/index.ts b/plugins/scaffolder-common/src/schema/openapi/generated/index.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/index.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/index.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Action.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Action.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Action.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Action.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ActionExample.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ActionExample.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ActionExample.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ActionExample.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ActionSchema.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ActionSchema.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ActionSchema.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ActionSchema.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete200Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete200Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete200Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete200Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete200ResponseResultsInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete200ResponseResultsInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete200ResponseResultsInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete200ResponseResultsInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete400Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete400Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Autocomplete400Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Autocomplete400Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/AutocompleteRequest.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/AutocompleteRequest.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/AutocompleteRequest.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/AutocompleteRequest.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/CancelTask200Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/CancelTask200Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/CancelTask200Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/CancelTask200Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOf.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOf.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOf.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOf.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOfDirectoryContentsInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOfDirectoryContentsInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOfDirectoryContentsInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOfDirectoryContentsInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOfStepsInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOfStepsInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRun200ResponseAllOfStepsInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRun200ResponseAllOfStepsInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunRequest.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunRequest.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunRequest.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunRequest.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunRequestDirectoryContentsInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunRequestDirectoryContentsInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunRequestDirectoryContentsInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunRequestDirectoryContentsInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResult.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResult.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResult.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResult.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInnerBody.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInnerBody.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInnerBody.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInnerBody.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInnerBodyAllOf.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInnerBodyAllOf.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/DryRunResultLogInnerBodyAllOf.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/DryRunResultLogInnerBodyAllOf.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorError.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorError.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorError.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorRequest.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorRequest.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorRequest.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorResponse.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ErrorResponse.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ErrorResponse.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/JsonPrimitive.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/JsonPrimitive.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/JsonPrimitive.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/JsonPrimitive.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/JsonValue.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/JsonValue.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/JsonValue.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/JsonValue.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ListTasksResponse.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ListTasksResponse.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ModelError.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ModelError.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ModelError.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/RetryRequest.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/RetryRequest.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/RetryRequest.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/RetryRequest.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Scaffold201Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Scaffold201Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Scaffold201Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Scaffold201Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/Scaffold400Response.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/Scaffold400Response.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/Scaffold400Response.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/Scaffold400Response.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ScaffolderScaffoldOptions.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ScaffolderScaffoldOptions.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ScaffolderScaffoldOptions.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ScaffolderScaffoldOptions.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedFile.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedFile.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedFile.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedFile.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedTask.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedTask.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedTask.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedTask.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedTaskEvent.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedTaskEvent.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/SerializedTaskEvent.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/SerializedTaskEvent.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskEventType.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TaskEventType.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskEventType.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TaskEventType.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSecrets.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TaskSecrets.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSecrets.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TaskSecrets.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSecretsAllOf.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TaskSecretsAllOf.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSecretsAllOf.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TaskSecretsAllOf.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskStatus.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TaskStatus.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskStatus.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TaskStatus.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateParameterSchema.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TemplateParameterSchema.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateParameterSchema.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TemplateParameterSchema.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateParameterSchemaStepsInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/TemplateParameterSchemaStepsInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateParameterSchemaStepsInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/TemplateParameterSchemaStepsInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationError.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationError.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationError.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationError.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationErrorArgument.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationErrorArgument.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationErrorArgument.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationErrorArgument.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationErrorPathInner.model.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationErrorPathInner.model.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/ValidationErrorPathInner.model.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/ValidationErrorPathInner.model.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/index.ts b/plugins/scaffolder-common/src/schema/openapi/generated/models/index.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/models/index.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/models/index.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/pluginId.ts b/plugins/scaffolder-common/src/schema/openapi/generated/pluginId.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/pluginId.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/pluginId.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/types/discovery.ts b/plugins/scaffolder-common/src/schema/openapi/generated/types/discovery.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/types/discovery.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/types/discovery.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/types/fetch.ts b/plugins/scaffolder-common/src/schema/openapi/generated/types/fetch.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/generated/types/fetch.ts rename to plugins/scaffolder-common/src/schema/openapi/generated/types/fetch.ts diff --git a/plugins/scaffolder-common/client/src/schema/openapi/index.ts b/plugins/scaffolder-common/src/schema/openapi/index.ts similarity index 100% rename from plugins/scaffolder-common/client/src/schema/openapi/index.ts rename to plugins/scaffolder-common/src/schema/openapi/index.ts