From 56f182dde2767d8e700d5ed0c16c052891f54626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 22 Oct 2021 15:52:51 +0200
Subject: [PATCH] Remove all internal usage of the Json types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 packages/backend-common/api-report.md                     | 2 +-
 packages/backend-common/package.json                      | 1 +
 packages/backend-common/src/cache/CacheClient.ts          | 2 +-
 packages/backend-common/src/config.ts                     | 3 ++-
 packages/backend-common/src/database/DatabaseManager.ts   | 3 ++-
 packages/backend-common/src/database/connection.ts        | 3 ++-
 .../backend-common/src/reading/AwsS3UrlReader.test.ts     | 4 +++-
 .../backend-common/src/reading/GoogleGcsUrlReader.test.ts | 3 ++-
 packages/catalog-model/api-report.md                      | 4 ++--
 packages/catalog-model/package.json                       | 1 +
 packages/catalog-model/src/entity/Entity.ts               | 2 +-
 packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts | 2 +-
 packages/catalog-model/src/types.ts                       | 2 +-
 packages/cli/package.json                                 | 1 +
 packages/cli/src/commands/config/docs.ts                  | 2 +-
 packages/cli/src/commands/config/schema.ts                | 2 +-
 packages/cli/src/commands/install/types.ts                | 2 +-
 packages/config-loader/api-report.md                      | 2 +-
 packages/config-loader/package.json                       | 1 +
 packages/config-loader/src/lib/env.ts                     | 3 ++-
 packages/config-loader/src/lib/schema/collect.ts          | 2 +-
 packages/config-loader/src/lib/schema/filtering.test.ts   | 2 +-
 packages/config-loader/src/lib/schema/filtering.ts        | 2 +-
 packages/config-loader/src/lib/schema/load.ts             | 3 ++-
 packages/config-loader/src/lib/schema/types.ts            | 3 ++-
 packages/config-loader/src/lib/transform/apply.ts         | 2 +-
 packages/config-loader/src/lib/transform/include.ts       | 2 +-
 packages/config-loader/src/lib/transform/substitution.ts  | 2 +-
 packages/config-loader/src/lib/transform/types.ts         | 2 +-
 packages/config-loader/src/lib/transform/utils.ts         | 2 +-
 packages/core-app-api/package.json                        | 1 +
 packages/core-app-api/src/app/createApp.tsx               | 3 ++-
 packages/errors/api-report.md                             | 2 +-
 packages/errors/package.json                              | 2 +-
 packages/errors/src/serialization/error.ts                | 2 +-
 packages/search-common/api-report.md                      | 2 +-
 packages/search-common/package.json                       | 2 +-
 packages/search-common/src/types.ts                       | 2 +-
 plugins/app-backend/package.json                          | 2 ++
 plugins/app-backend/src/lib/config.ts                     | 3 ++-
 plugins/catalog-backend-module-ldap/api-report.md         | 2 +-
 plugins/catalog-backend-module-ldap/package.json          | 1 +
 plugins/catalog-backend-module-ldap/src/ldap/config.ts    | 3 ++-
 plugins/catalog-backend/api-report.md                     | 4 ++--
 plugins/catalog-backend/package.json                      | 1 +
 plugins/catalog-backend/src/database/types.ts             | 2 +-
 .../src/ingestion/processors/PlaceholderProcessor.ts      | 2 +-
 plugins/catalog-backend/src/ingestion/processors/types.ts | 2 +-
 .../processing/DefaultCatalogProcessingOrchestrator.ts    | 2 +-
 .../src/processing/ProcessorCacheManager.ts               | 2 +-
 plugins/catalog-backend/src/processing/types.ts           | 2 +-
 plugins/catalog-backend/src/processing/util.ts            | 2 +-
 plugins/catalog-graphql/package.json                      | 1 +
 plugins/catalog-graphql/src/service/client.ts             | 2 +-
 plugins/config-schema/package.json                        | 1 +
 .../config-schema/src/components/SchemaView/ChildView.tsx | 2 +-
 .../src/components/SchemaView/MetadataView.tsx            | 2 +-
 .../scaffolder-backend-module-cookiecutter/package.json   | 1 +
 .../src/actions/fetch/cookiecutter.test.ts                | 3 ++-
 .../src/actions/fetch/cookiecutter.ts                     | 2 +-
 plugins/scaffolder-backend-module-rails/package.json      | 1 +
 .../src/actions/fetch/rails/index.ts                      | 2 +-
 .../src/actions/fetch/rails/railsNewRunner.ts             | 2 +-
 plugins/scaffolder-backend-module-yeoman/package.json     | 1 +
 .../src/actions/run/yeoman.test.ts                        | 2 +-
 .../src/actions/run/yeoman.ts                             | 2 +-
 .../src/actions/run/yeomanRun.ts                          | 2 +-
 plugins/scaffolder-backend/api-report.md                  | 8 +++-----
 plugins/scaffolder-backend/package.json                   | 1 +
 .../src/scaffolder/actions/builtin/fetch/helpers.ts       | 2 +-
 .../src/scaffolder/actions/builtin/filesystem/rename.ts   | 2 +-
 .../scaffolder-backend/src/scaffolder/actions/types.ts    | 2 +-
 .../src/scaffolder/tasks/DatabaseTaskStore.ts             | 2 +-
 .../src/scaffolder/tasks/DefaultWorkflowRunner.ts         | 2 +-
 .../src/scaffolder/tasks/LegacyWorkflowRunner.ts          | 2 +-
 .../src/scaffolder/tasks/StorageTaskBroker.ts             | 2 +-
 plugins/scaffolder-backend/src/scaffolder/tasks/types.ts  | 2 +-
 plugins/scaffolder-common/api-report.md                   | 2 +-
 plugins/scaffolder-common/package.json                    | 2 +-
 plugins/scaffolder-common/src/TemplateEntityV1beta3.ts    | 2 +-
 plugins/scaffolder/api-report.md                          | 4 ++--
 plugins/scaffolder/package.json                           | 1 +
 plugins/scaffolder/src/api.ts                             | 2 +-
 .../components/MultistepJsonForm/MultistepJsonForm.tsx    | 2 +-
 .../scaffolder/src/components/MultistepJsonForm/schema.ts | 2 +-
 .../src/components/TemplatePage/TemplatePage.tsx          | 2 +-
 plugins/scaffolder/src/types.ts                           | 2 +-
 plugins/search/api-report.md                              | 2 +-
 plugins/search/package.json                               | 1 +
 .../search/src/components/SearchContext/SearchContext.tsx | 2 +-
 plugins/search/src/components/SearchPage/SearchPage.tsx   | 2 +-
 91 files changed, 110 insertions(+), 82 deletions(-)

diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index e2d68055bf..2336a57ec3 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -18,7 +18,7 @@ import { GithubCredentialsProvider } from '@backstage/integration';
 import { GitHubIntegration } from '@backstage/integration';
 import { GitLabIntegration } from '@backstage/integration';
 import { isChildPath } from '@backstage/cli-common';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { Logger as Logger_2 } from 'winston';
 import { MergeResult } from 'isomorphic-git';
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 8da4184f71..60824f0c40 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -34,6 +34,7 @@
     "@backstage/config-loader": "^0.7.0",
     "@backstage/errors": "^0.1.3",
     "@backstage/integration": "^0.6.7",
+    "@backstage/types": "^0.1.1",
     "@google-cloud/storage": "^5.8.0",
     "@octokit/rest": "^18.5.3",
     "@types/cors": "^2.8.6",
diff --git a/packages/backend-common/src/cache/CacheClient.ts b/packages/backend-common/src/cache/CacheClient.ts
index 79f48a2757..8e046f7f19 100644
--- a/packages/backend-common/src/cache/CacheClient.ts
+++ b/packages/backend-common/src/cache/CacheClient.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { createHash } from 'crypto';
 import Keyv from 'keyv';
 
diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 04cf1ac2bb..fa49d5f015 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -18,7 +18,8 @@ import { resolve as resolvePath } from 'path';
 import parseArgs from 'minimist';
 import { Logger } from 'winston';
 import { findPaths } from '@backstage/cli-common';
-import { Config, ConfigReader, JsonValue } from '@backstage/config';
+import { Config, ConfigReader } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { loadConfig } from '@backstage/config-loader';
 
 export class ObservableConfigProxy implements Config {
diff --git a/packages/backend-common/src/database/DatabaseManager.ts b/packages/backend-common/src/database/DatabaseManager.ts
index de39279a4f..c0511c6b78 100644
--- a/packages/backend-common/src/database/DatabaseManager.ts
+++ b/packages/backend-common/src/database/DatabaseManager.ts
@@ -15,7 +15,8 @@
  */
 import { Knex } from 'knex';
 import { omit } from 'lodash';
-import { Config, ConfigReader, JsonObject } from '@backstage/config';
+import { Config, ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import {
   createDatabaseClient,
   ensureDatabaseExists,
diff --git a/packages/backend-common/src/database/connection.ts b/packages/backend-common/src/database/connection.ts
index 8ea46070eb..1c5cce3718 100644
--- a/packages/backend-common/src/database/connection.ts
+++ b/packages/backend-common/src/database/connection.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Config, JsonObject } from '@backstage/config';
+import { Config } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import knexFactory, { Knex } from 'knex';
 import { mergeDatabaseConfig } from './config';
diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
index 6959edcc8b..301543e8c9 100644
--- a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ConfigReader, JsonObject } from '@backstage/config';
+
+import { ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { getVoidLogger } from '../logging';
 import { DefaultReadTreeResponseFactory } from './tree';
 import { AwsS3UrlReader } from './AwsS3UrlReader';
diff --git a/packages/backend-common/src/reading/GoogleGcsUrlReader.test.ts b/packages/backend-common/src/reading/GoogleGcsUrlReader.test.ts
index d8aac4886d..31cf2956f8 100644
--- a/packages/backend-common/src/reading/GoogleGcsUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GoogleGcsUrlReader.test.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { ConfigReader, JsonObject } from '@backstage/config';
+import { ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { getVoidLogger } from '../logging';
 import { DefaultReadTreeResponseFactory } from './tree';
 import { GoogleGcsUrlReader } from './GoogleGcsUrlReader';
diff --git a/packages/catalog-model/api-report.md b/packages/catalog-model/api-report.md
index c9429f9bdb..52f36493b5 100644
--- a/packages/catalog-model/api-report.md
+++ b/packages/catalog-model/api-report.md
@@ -3,9 +3,9 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { JSONSchema7 } from 'json-schema';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { SerializedError } from '@backstage/errors';
 import * as yup from 'yup';
 
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 69d1c34ba9..615e80b684 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -32,6 +32,7 @@
   "dependencies": {
     "@backstage/config": "^0.1.10",
     "@backstage/errors": "^0.1.3",
+    "@backstage/types": "^0.1.1",
     "@types/json-schema": "^7.0.5",
     "@types/yup": "^0.29.13",
     "ajv": "^7.0.3",
diff --git a/packages/catalog-model/src/entity/Entity.ts b/packages/catalog-model/src/entity/Entity.ts
index 7a4729c309..9d65d3e8f3 100644
--- a/packages/catalog-model/src/entity/Entity.ts
+++ b/packages/catalog-model/src/entity/Entity.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { EntityName } from '../types';
 import { UNSTABLE_EntityStatus } from './EntityStatus';
 
diff --git a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
index 1b1966d05d..f4c2dfb5bc 100644
--- a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
+++ b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Template.v1beta2.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
diff --git a/packages/catalog-model/src/types.ts b/packages/catalog-model/src/types.ts
index 8ec1303a40..1a0fab267c 100644
--- a/packages/catalog-model/src/types.ts
+++ b/packages/catalog-model/src/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { JSONSchema7 } from 'json-schema';
 
 /**
diff --git a/packages/cli/package.json b/packages/cli/package.json
index da9e161fef..62a008087e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -32,6 +32,7 @@
     "@backstage/config": "^0.1.10",
     "@backstage/config-loader": "^0.7.0",
     "@backstage/errors": "^0.1.3",
+    "@backstage/types": "^0.1.1",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
diff --git a/packages/cli/src/commands/config/docs.ts b/packages/cli/src/commands/config/docs.ts
index 198244b941..7a807f7c78 100644
--- a/packages/cli/src/commands/config/docs.ts
+++ b/packages/cli/src/commands/config/docs.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { mergeConfigSchemas } from '@backstage/config-loader';
 import { Command } from 'commander';
 import { JSONSchema7 as JSONSchema } from 'json-schema';
diff --git a/packages/cli/src/commands/config/schema.ts b/packages/cli/src/commands/config/schema.ts
index a36fc24f06..be228e1e7c 100644
--- a/packages/cli/src/commands/config/schema.ts
+++ b/packages/cli/src/commands/config/schema.ts
@@ -18,7 +18,7 @@ import { Command } from 'commander';
 import { JSONSchema7 as JSONSchema } from 'json-schema';
 import { stringify as stringifyYaml } from 'yaml';
 import { loadCliConfig } from '../../lib/config';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { mergeConfigSchemas } from '@backstage/config-loader';
 
 export default async (cmd: Command) => {
diff --git a/packages/cli/src/commands/install/types.ts b/packages/cli/src/commands/install/types.ts
index 5479032de5..3105f78822 100644
--- a/packages/cli/src/commands/install/types.ts
+++ b/packages/cli/src/commands/install/types.ts
@@ -15,7 +15,7 @@
  */
 
 import { YarnInfoInspectData } from '../../lib/versioning';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 /**
  * TODO: possible types
diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md
index b47119d470..19b5ee9e27 100644
--- a/packages/config-loader/api-report.md
+++ b/packages/config-loader/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 import { AppConfig } from '@backstage/config';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { JSONSchema7 } from 'json-schema';
 
 // @public
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 03ea61abe2..a731225e2b 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -33,6 +33,7 @@
     "@backstage/cli-common": "^0.1.4",
     "@backstage/config": "^0.1.9",
     "@backstage/errors": "^0.1.3",
+    "@backstage/types": "^0.1.1",
     "@types/json-schema": "^7.0.6",
     "ajv": "^7.0.3",
     "chokidar": "^3.5.2",
diff --git a/packages/config-loader/src/lib/env.ts b/packages/config-loader/src/lib/env.ts
index 57cfc077a7..638b49dbc8 100644
--- a/packages/config-loader/src/lib/env.ts
+++ b/packages/config-loader/src/lib/env.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AppConfig, JsonObject } from '@backstage/config';
+import { AppConfig } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { assertError } from '@backstage/errors';
 
 const ENV_PREFIX = 'APP_CONFIG_';
diff --git a/packages/config-loader/src/lib/schema/collect.ts b/packages/config-loader/src/lib/schema/collect.ts
index de6aff376f..8e7f582e44 100644
--- a/packages/config-loader/src/lib/schema/collect.ts
+++ b/packages/config-loader/src/lib/schema/collect.ts
@@ -23,7 +23,7 @@ import {
 } from 'path';
 import { ConfigSchemaPackageEntry } from './types';
 import { getProgramFromFiles, generateSchema } from 'typescript-json-schema';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { assertError } from '@backstage/errors';
 
 type Item = {
diff --git a/packages/config-loader/src/lib/schema/filtering.test.ts b/packages/config-loader/src/lib/schema/filtering.test.ts
index 3b9e548026..0395c7da6a 100644
--- a/packages/config-loader/src/lib/schema/filtering.test.ts
+++ b/packages/config-loader/src/lib/schema/filtering.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { ConfigVisibility } from './types';
 import { filterByVisibility, filterErrorsByVisibility } from './filtering';
 
diff --git a/packages/config-loader/src/lib/schema/filtering.ts b/packages/config-loader/src/lib/schema/filtering.ts
index 2b13f7ac3f..b4226d7dad 100644
--- a/packages/config-loader/src/lib/schema/filtering.ts
+++ b/packages/config-loader/src/lib/schema/filtering.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import {
   ConfigVisibility,
   DEFAULT_CONFIG_VISIBILITY,
diff --git a/packages/config-loader/src/lib/schema/load.ts b/packages/config-loader/src/lib/schema/load.ts
index f3ea0b900e..2d78785304 100644
--- a/packages/config-loader/src/lib/schema/load.ts
+++ b/packages/config-loader/src/lib/schema/load.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AppConfig, JsonObject } from '@backstage/config';
+import { AppConfig } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { compileConfigSchemas } from './compile';
 import { collectConfigSchemas } from './collect';
 import { filterByVisibility, filterErrorsByVisibility } from './filtering';
diff --git a/packages/config-loader/src/lib/schema/types.ts b/packages/config-loader/src/lib/schema/types.ts
index d1c07f4dac..53f4dec88e 100644
--- a/packages/config-loader/src/lib/schema/types.ts
+++ b/packages/config-loader/src/lib/schema/types.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AppConfig, JsonObject } from '@backstage/config';
+import { AppConfig } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 /**
  * An sub-set of configuration schema.
diff --git a/packages/config-loader/src/lib/transform/apply.ts b/packages/config-loader/src/lib/transform/apply.ts
index 091f9c23c5..80ddad90d0 100644
--- a/packages/config-loader/src/lib/transform/apply.ts
+++ b/packages/config-loader/src/lib/transform/apply.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { assertError } from '@backstage/errors';
 import { TransformFunc } from './types';
 import { isObject } from './utils';
diff --git a/packages/config-loader/src/lib/transform/include.ts b/packages/config-loader/src/lib/transform/include.ts
index 5ea7161e5f..569b61c82c 100644
--- a/packages/config-loader/src/lib/transform/include.ts
+++ b/packages/config-loader/src/lib/transform/include.ts
@@ -16,7 +16,7 @@
 
 import yaml from 'yaml';
 import { extname, dirname, resolve as resolvePath } from 'path';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { isObject } from './utils';
 import { TransformFunc, EnvFunc, ReadFileFunc } from './types';
 
diff --git a/packages/config-loader/src/lib/transform/substitution.ts b/packages/config-loader/src/lib/transform/substitution.ts
index 21edfb7e57..3c25784dc2 100644
--- a/packages/config-loader/src/lib/transform/substitution.ts
+++ b/packages/config-loader/src/lib/transform/substitution.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { TransformFunc, EnvFunc } from './types';
 
 /**
diff --git a/packages/config-loader/src/lib/transform/types.ts b/packages/config-loader/src/lib/transform/types.ts
index 20e5f88718..0b743cb0fe 100644
--- a/packages/config-loader/src/lib/transform/types.ts
+++ b/packages/config-loader/src/lib/transform/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 
 export type EnvFunc = (name: string) => Promise<string | undefined>;
 
diff --git a/packages/config-loader/src/lib/transform/utils.ts b/packages/config-loader/src/lib/transform/utils.ts
index a49e9b14bd..b28effa023 100644
--- a/packages/config-loader/src/lib/transform/utils.ts
+++ b/packages/config-loader/src/lib/transform/utils.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue, JsonObject } from '@backstage/config';
+import { JsonValue, JsonObject } from '@backstage/types';
 
 export function isObject(obj: JsonValue | undefined): obj is JsonObject {
   if (typeof obj !== 'object') {
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index d11b7122ce..1eca9249fc 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -33,6 +33,7 @@
     "@backstage/config": "^0.1.10",
     "@backstage/core-plugin-api": "^0.1.11",
     "@backstage/theme": "^0.2.11",
+    "@backstage/types": "^0.1.1",
     "@backstage/version-bridge": "^0.1.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
diff --git a/packages/core-app-api/src/app/createApp.tsx b/packages/core-app-api/src/app/createApp.tsx
index e9c37a1420..901697edba 100644
--- a/packages/core-app-api/src/app/createApp.tsx
+++ b/packages/core-app-api/src/app/createApp.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AppConfig, JsonObject } from '@backstage/config';
+import { AppConfig } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { Button } from '@material-ui/core';
 import { ErrorPage, ErrorPanel, Progress } from '@backstage/core-components';
 import { darkTheme, lightTheme } from '@backstage/theme';
diff --git a/packages/errors/api-report.md b/packages/errors/api-report.md
index ffb111884e..a96132cee7 100644
--- a/packages/errors/api-report.md
+++ b/packages/errors/api-report.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 // @public
 export function assertError(value: unknown): asserts value is ErrorLike;
diff --git a/packages/errors/package.json b/packages/errors/package.json
index e3d49f55c7..b1f214e5af 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.9",
+    "@backstage/types": "^0.1.1",
     "cross-fetch": "^3.0.6",
     "serialize-error": "^8.0.1"
   },
diff --git a/packages/errors/src/serialization/error.ts b/packages/errors/src/serialization/error.ts
index b1f63063cf..8d031949bf 100644
--- a/packages/errors/src/serialization/error.ts
+++ b/packages/errors/src/serialization/error.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import {
   deserializeError as deserializeErrorInternal,
   serializeError as serializeErrorInternal,
diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index d8d9c2922a..c4950e3556 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 // Warning: (ae-missing-release-tag) "DocumentCollator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index 46e3518b51..fee0fe59dd 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -36,7 +36,7 @@
     "url": "https://github.com/backstage/backstage/issues"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.6"
+    "@backstage/types": "^0.1.1"
   },
   "devDependencies": {
     "@backstage/cli": "^0.8.0"
diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 063e0cb96c..f73665de5b 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 export interface SearchQuery {
   term: string;
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index 6047b5aeb1..3483bfa8bd 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -33,6 +33,7 @@
     "@backstage/backend-common": "^0.9.7",
     "@backstage/config-loader": "^0.7.0",
     "@backstage/config": "^0.1.8",
+    "@backstage/types": "^0.1.1",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -42,6 +43,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.8.0",
+    "@backstage/types": "^0.1.1",
     "@types/supertest": "^2.0.8",
     "msw": "^0.29.0",
     "supertest": "^6.1.3"
diff --git a/plugins/app-backend/src/lib/config.ts b/plugins/app-backend/src/lib/config.ts
index 1ebd95a5c0..c37dc34dcc 100644
--- a/plugins/app-backend/src/lib/config.ts
+++ b/plugins/app-backend/src/lib/config.ts
@@ -17,7 +17,8 @@
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
 import { Logger } from 'winston';
-import { AppConfig, Config, JsonObject } from '@backstage/config';
+import { AppConfig, Config } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { loadConfigSchema, readEnvConfig } from '@backstage/config-loader';
 
 type InjectOptions = {
diff --git a/plugins/catalog-backend-module-ldap/api-report.md b/plugins/catalog-backend-module-ldap/api-report.md
index ae4a085649..bbf92944b9 100644
--- a/plugins/catalog-backend-module-ldap/api-report.md
+++ b/plugins/catalog-backend-module-ldap/api-report.md
@@ -10,7 +10,7 @@ import { Config } from '@backstage/config';
 import { EntityProvider } from '@backstage/plugin-catalog-backend';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
 import { GroupEntity } from '@backstage/catalog-model';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { LocationSpec } from '@backstage/catalog-model';
 import { Logger as Logger_2 } from 'winston';
 import { SearchEntry } from 'ldapjs';
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 7236e780c4..51c8780a9d 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -33,6 +33,7 @@
     "@backstage/config": "^0.1.10",
     "@backstage/errors": "^0.1.3",
     "@backstage/plugin-catalog-backend": "^0.17.1",
+    "@backstage/types": "^0.1.1",
     "@types/ldapjs": "^2.2.0",
     "ldapjs": "^2.2.0",
     "lodash": "^4.17.21",
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/config.ts b/plugins/catalog-backend-module-ldap/src/ldap/config.ts
index 6dad7e087f..dc1ec4910d 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/config.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/config.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Config, JsonValue } from '@backstage/config';
+import { Config } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { SearchOptions } from 'ldapjs';
 import mergeWith from 'lodash/mergeWith';
 import { RecursivePartial } from '@backstage/plugin-catalog-backend';
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index d3c73afc91..cbef4c90a1 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -18,8 +18,8 @@ import { EntityRelationSpec } from '@backstage/catalog-model';
 import express from 'express';
 import { GitHubIntegrationConfig } from '@backstage/integration';
 import { IndexableDocument } from '@backstage/search-common';
-import { JsonObject } from '@backstage/config';
-import { JsonValue } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
+import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { Location as Location_2 } from '@backstage/catalog-model';
 import { LocationSpec } from '@backstage/catalog-model';
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 896bbde592..9a44258958 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -37,6 +37,7 @@
     "@backstage/errors": "^0.1.3",
     "@backstage/integration": "^0.6.8",
     "@backstage/search-common": "^0.2.0",
+    "@backstage/types": "^0.1.1",
     "@octokit/graphql": "^4.5.8",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
diff --git a/plugins/catalog-backend/src/database/types.ts b/plugins/catalog-backend/src/database/types.ts
index 9d28387e2c..ac2ff07498 100644
--- a/plugins/catalog-backend/src/database/types.ts
+++ b/plugins/catalog-backend/src/database/types.ts
@@ -15,7 +15,7 @@
  */
 
 import { Entity, EntityRelationSpec } from '@backstage/catalog-model';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { DateTime } from 'luxon';
 import { DeferredEntity } from '../processing/types';
 
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
index 9ddef1ab3b..65f65a0479 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
@@ -16,7 +16,7 @@
 
 import { UrlReader } from '@backstage/backend-common';
 import { Entity, LocationSpec } from '@backstage/catalog-model';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import yaml from 'yaml';
 import { CatalogProcessor } from './types';
diff --git a/plugins/catalog-backend/src/ingestion/processors/types.ts b/plugins/catalog-backend/src/ingestion/processors/types.ts
index dccc60d42c..3e4e24b0fe 100644
--- a/plugins/catalog-backend/src/ingestion/processors/types.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/types.ts
@@ -19,7 +19,7 @@ import {
   EntityRelationSpec,
   LocationSpec,
 } from '@backstage/catalog-model';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 
 export type CatalogProcessor = {
   /**
diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts
index d3ec162216..b42c8839cf 100644
--- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts
+++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts
@@ -29,7 +29,7 @@ import {
   InputError,
   NotAllowedError,
 } from '@backstage/errors';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import path from 'path';
 import { Logger } from 'winston';
diff --git a/plugins/catalog-backend/src/processing/ProcessorCacheManager.ts b/plugins/catalog-backend/src/processing/ProcessorCacheManager.ts
index 378974e33e..472d6453ce 100644
--- a/plugins/catalog-backend/src/processing/ProcessorCacheManager.ts
+++ b/plugins/catalog-backend/src/processing/ProcessorCacheManager.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { CatalogProcessor } from '../ingestion/processors';
 import { CatalogProcessorCache } from '../ingestion/processors/types';
 import { isObject } from './util';
diff --git a/plugins/catalog-backend/src/processing/types.ts b/plugins/catalog-backend/src/processing/types.ts
index 4b16ccef32..7fb1157d3b 100644
--- a/plugins/catalog-backend/src/processing/types.ts
+++ b/plugins/catalog-backend/src/processing/types.ts
@@ -15,7 +15,7 @@
  */
 
 import { Entity, EntityRelationSpec } from '@backstage/catalog-model';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 export type EntityProcessingRequest = {
   entity: Entity;
diff --git a/plugins/catalog-backend/src/processing/util.ts b/plugins/catalog-backend/src/processing/util.ts
index ad8fe8be60..9f5f23ed09 100644
--- a/plugins/catalog-backend/src/processing/util.ts
+++ b/plugins/catalog-backend/src/processing/util.ts
@@ -24,7 +24,7 @@ import {
   ORIGIN_LOCATION_ANNOTATION,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import path from 'path';
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 80ad7f9a16..f5705dcc76 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.9.5",
     "@backstage/config": "^0.1.8",
+    "@backstage/types": "^0.1.1",
     "@graphql-modules/core": "^0.7.17",
     "apollo-server": "^2.16.1",
     "cross-fetch": "^3.0.6",
diff --git a/plugins/catalog-graphql/src/service/client.ts b/plugins/catalog-graphql/src/service/client.ts
index 487762d5d7..4328a5bd5a 100644
--- a/plugins/catalog-graphql/src/service/client.ts
+++ b/plugins/catalog-graphql/src/service/client.ts
@@ -16,7 +16,7 @@
 
 import { Entity, EntityMeta } from '@backstage/catalog-model';
 import fetch from 'cross-fetch';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 export interface ReaderEntityMeta extends EntityMeta {
   uid: string;
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 1b2214de8b..1a6b39f0cb 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -26,6 +26,7 @@
     "@backstage/core-plugin-api": "^0.1.11",
     "@backstage/errors": "^0.1.3",
     "@backstage/theme": "^0.2.11",
+    "@backstage/types": "^0.1.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
diff --git a/plugins/config-schema/src/components/SchemaView/ChildView.tsx b/plugins/config-schema/src/components/SchemaView/ChildView.tsx
index 03cb1201a0..dcb446db5a 100644
--- a/plugins/config-schema/src/components/SchemaView/ChildView.tsx
+++ b/plugins/config-schema/src/components/SchemaView/ChildView.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { Box, Chip, Divider, makeStyles, Typography } from '@material-ui/core';
 import { Schema } from 'jsonschema';
 import React, { useEffect, useRef } from 'react';
diff --git a/plugins/config-schema/src/components/SchemaView/MetadataView.tsx b/plugins/config-schema/src/components/SchemaView/MetadataView.tsx
index c7113950cc..157890ae6a 100644
--- a/plugins/config-schema/src/components/SchemaView/MetadataView.tsx
+++ b/plugins/config-schema/src/components/SchemaView/MetadataView.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import {
   Paper,
   Table,
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 7db57dbe6b..1f004b8804 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -25,6 +25,7 @@
     "@backstage/integration": "^0.6.2",
     "@backstage/plugin-scaffolder-backend": "^0.15.10",
     "@backstage/config": "^0.1.8",
+    "@backstage/types": "^0.1.1",
     "command-exists": "^1.2.9",
     "fs-extra": "10.0.0",
     "winston": "^3.2.1",
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 bc3fe3eca2..bba51e3f01 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
@@ -29,7 +29,8 @@ import {
   UrlReader,
   ContainerRunner,
 } from '@backstage/backend-common';
-import { ConfigReader, JsonObject } from '@backstage/config';
+import { ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { ScmIntegrations } from '@backstage/integration';
 import mockFs from 'mock-fs';
 import os from 'os';
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 1f6fbdb7d8..5120cd3b27 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
@@ -19,7 +19,7 @@ import {
   UrlReader,
   resolveSafeChildPath,
 } from '@backstage/backend-common';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import commandExists from 'command-exists';
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index c88e6d0f9f..5e1c9d0107 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -26,6 +26,7 @@
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.3",
     "@backstage/integration": "^0.6.2",
+    "@backstage/types": "^0.1.1",
     "command-exists": "^1.2.9",
     "fs-extra": "^9.0.0"
   },
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 e2dc8fd95a..5ce7d46689 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,7 +15,7 @@
  */
 
 import { ContainerRunner, UrlReader } from '@backstage/backend-common';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
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 a828800e84..27ce32dde2 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
@@ -23,7 +23,7 @@ import {
   railsArgumentResolver,
   RailsRunOptions,
 } from './railsArgumentResolver';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { Writable } from 'stream';
 
 export class RailsNewRunner {
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index eb339b90d5..a1f1635808 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "@backstage/config": "^0.1.8",
     "@backstage/plugin-scaffolder-backend": "^0.15.2",
+    "@backstage/types": "^0.1.1",
     "winston": "^3.2.1",
     "yeoman-environment": "^3.6.0"
   },
diff --git a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
index 6e61ae77c4..ee5e8449f7 100644
--- a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
+++ b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
@@ -23,7 +23,7 @@ import os from 'os';
 import { PassThrough } from 'stream';
 import { createRunYeomanAction } from './yeoman';
 import type { ActionContext } from '@backstage/plugin-scaffolder-backend';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 describe('run:yeoman', () => {
   const mockTmpDir = os.tmpdir();
diff --git a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
index c8bd49f3d3..f6a29037a3 100644
--- a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
+++ b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-backend';
 import { yeomanRun } from './yeomanRun';
 
diff --git a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeomanRun.ts b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeomanRun.ts
index ff11634f81..a18ea38c46 100644
--- a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeomanRun.ts
+++ b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeomanRun.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 
 /*
  * This module should use '@types/yeoman-environment' eventually as soon as '@types/yeoman-environment' supports
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 07c6c7a57d..1a7aebf2f5 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -14,10 +14,8 @@ import { createFetchCookiecutterAction } from '@backstage/plugin-scaffolder-back
 import { createPullRequest } from 'octokit-plugin-create-pull-request';
 import { Entity } from '@backstage/catalog-model';
 import express from 'express';
-import { JsonObject } from '@backstage/config';
-import { JsonObject as JsonObject_2 } from '@backstage/types';
-import { JsonValue } from '@backstage/config';
-import { JsonValue as JsonValue_2 } from '@backstage/types';
+import { JsonObject } from '@backstage/types';
+import { JsonValue } from '@backstage/types';
 import { LocationSpec } from '@backstage/catalog-model';
 import { Logger as Logger_2 } from 'winston';
 import { Octokit } from '@octokit/rest';
@@ -185,7 +183,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
 // @public (undocumented)
 export const createTemplateAction: <
   Input extends Partial<{
-    [name: string]: JsonValue_2 | Partial<JsonObject_2> | undefined;
+    [name: string]: JsonValue | Partial<JsonObject> | undefined;
   }>,
 >(
   templateAction: TemplateAction<Input>,
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index ea29866485..cfea66284d 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -39,6 +39,7 @@
     "@backstage/plugin-catalog-backend": "^0.17.1",
     "@backstage/plugin-scaffolder-common": "^0.1.0",
     "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.2",
+    "@backstage/types": "^0.1.1",
     "@gitbeaker/core": "^30.2.0",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/helpers.ts
index 5625989417..3946110d42 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/helpers.ts
@@ -15,7 +15,7 @@
  */
 
 import { resolveSafeChildPath, UrlReader } from '@backstage/backend-common';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
index aaadd5df57..4bdba96750 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
@@ -17,7 +17,7 @@ import { createTemplateAction } from '../../createTemplateAction';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 
 import { InputError } from '@backstage/errors';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import fs from 'fs-extra';
 
 interface FilesToRename extends JsonObject {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
index 3783359b95..ca3459d29c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
@@ -16,7 +16,7 @@
 
 import { Logger } from 'winston';
 import { Writable } from 'stream';
-import { JsonValue, JsonObject } from '@backstage/config';
+import { JsonValue, JsonObject } from '@backstage/types';
 import { Schema } from 'jsonschema';
 
 type PartialJsonObject = Partial<JsonObject>;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 09cba596b1..9c72a310c1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { resolvePackagePath } from '@backstage/backend-common';
 import { ConflictError, NotFoundError } from '@backstage/errors';
 import { Knex } from 'knex';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
index 2ac309a1d4..6c68e0c4c5 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
@@ -26,7 +26,7 @@ import * as winston from 'winston';
 import nunjucks from 'nunjucks';
 import fs from 'fs-extra';
 import path from 'path';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { PassThrough } from 'stream';
 import { isTruthy } from './helper';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/LegacyWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/LegacyWorkflowRunner.ts
index 97e3a4dec4..6d43ae978c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/LegacyWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/LegacyWorkflowRunner.ts
@@ -31,7 +31,7 @@ import { Logger } from 'winston';
 import path from 'path';
 import fs from 'fs-extra';
 import { validate as validateJsonSchema } from 'jsonschema';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 
 type Options = {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 4cd1066fc9..2a99c3eb30 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { assertError } from '@backstage/errors';
 import { Logger } from 'winston';
 import {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index cd93404165..b91930c56a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue, JsonObject } from '@backstage/config';
+import { JsonValue, JsonObject } from '@backstage/types';
 
 export type Status =
   | 'open'
diff --git a/plugins/scaffolder-common/api-report.md b/plugins/scaffolder-common/api-report.md
index 722e746967..8485e224b2 100644
--- a/plugins/scaffolder-common/api-report.md
+++ b/plugins/scaffolder-common/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 import { Entity } from '@backstage/catalog-model';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { JSONSchema } from '@backstage/catalog-model';
 
 // @public (undocumented)
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index b0c8de30c7..3c1c444a78 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.5",
-    "@backstage/config": "^0.1.10"
+    "@backstage/types": "^0.1.1"
   },
   "devDependencies": {
     "@backstage/cli": "^0.8.0"
diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
index 6471fe0ca6..2aefa5fd6b 100644
--- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
+++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { Entity } from '@backstage/catalog-model';
 
 /** @public */
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 949f19a058..74abada9a8 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -19,9 +19,9 @@ import { FieldProps } from '@rjsf/core';
 import { FieldValidation } from '@rjsf/core';
 import { IconButton } from '@material-ui/core';
 import { IdentityApi } from '@backstage/core-plugin-api';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { JSONSchema } from '@backstage/catalog-model';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 import { Observable } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 10483f4807..aa4412204a 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -41,6 +41,7 @@
     "@backstage/integration-react": "^0.1.12",
     "@backstage/plugin-catalog-react": "^0.6.1",
     "@backstage/theme": "^0.2.11",
+    "@backstage/types": "^0.1.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 3e0ac3eccb..1511899c65 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -15,7 +15,7 @@
  */
 
 import { EntityName } from '@backstage/catalog-model';
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { ResponseError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { Field, FieldValidation } from '@rjsf/core';
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 62c2881ab0..df5be2de56 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import {
   Box,
   Button,
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
index dd86784275..39592d314d 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { FormProps } from '@rjsf/core';
 
 function isObject(value: unknown): value is JsonObject {
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
index 05533376db..0ea53212c2 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { JsonObject, JsonValue } from '@backstage/config';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { LinearProgress } from '@material-ui/core';
 import { FormValidation, IChangeEvent } from '@rjsf/core';
 import React, { useCallback, useState } from 'react';
diff --git a/plugins/scaffolder/src/types.ts b/plugins/scaffolder/src/types.ts
index dc71d44f71..5597082f22 100644
--- a/plugins/scaffolder/src/types.ts
+++ b/plugins/scaffolder/src/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { JSONSchema } from '@backstage/catalog-model';
-import { JsonValue } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
 
 export type Status = 'open' | 'processing' | 'failed' | 'completed' | 'skipped';
 export type JobStatus = 'PENDING' | 'STARTED' | 'COMPLETED' | 'FAILED';
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index b29149805c..c638fb4af6 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -9,7 +9,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IndexableDocument } from '@backstage/search-common';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 9830d26e5c..ee8a2fb726 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -38,6 +38,7 @@
     "@backstage/plugin-catalog-react": "^0.6.1",
     "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.11",
+    "@backstage/types": "^0.1.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 16d1371964..11d6a2786e 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { useApi } from '@backstage/core-plugin-api';
 import { SearchResultSet } from '@backstage/search-common';
 import React, {
diff --git a/plugins/search/src/components/SearchPage/SearchPage.tsx b/plugins/search/src/components/SearchPage/SearchPage.tsx
index fb18833da6..a0738b3466 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.tsx
@@ -19,7 +19,7 @@ import { usePrevious } from 'react-use';
 import qs from 'qs';
 import { useLocation, useOutlet } from 'react-router';
 import { SearchContextProvider, useSearch } from '../SearchContext';
-import { JsonObject } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
 import { LegacySearchPage } from '../LegacySearchPage';
 
 export const UrlUpdater = () => {