Remove all internal usage of the Json types

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

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

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",

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_';

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 = {

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';
 

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,

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';

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.

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';

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';
 

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';
 
 /**

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>;
 

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') {