rename to just types

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

.changeset/rotten-melons-carry.md

@@ -5,4 +5,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Start using the new `@backstage/core-types` package. Initially, this means using the `Observable` and `Json*` types from there. The types also remain in their old places but deprecated, and will be removed in a future release.
+Start using the new `@backstage/types` package. Initially, this means using the `Observable` and `Json*` types from there. The types also remain in their old places but deprecated, and will be removed in a future release.

packages/config/api-report.md

@@ -3,10 +3,10 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import type { JsonArray as JsonArray_2 } from '@backstage/core-types';
-import { JsonObject as JsonObject_2 } from '@backstage/core-types';
-import type { JsonPrimitive as JsonPrimitive_2 } from '@backstage/core-types';
-import { JsonValue as JsonValue_2 } from '@backstage/core-types';
+import type { JsonArray as JsonArray_2 } from '@backstage/types';
+import { JsonObject as JsonObject_2 } from '@backstage/types';
+import type { JsonPrimitive as JsonPrimitive_2 } from '@backstage/types';
+import { JsonValue as JsonValue_2 } from '@backstage/types';
 
 // @public
 export type AppConfig = {

packages/config/package.json

@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-types": "^0.1.0",
+    "@backstage/types": "^0.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

packages/config/src/deprecatedTypes.ts

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-// Temporarily re-export the JSON types from @backstage/core-types
+// Temporarily re-export the JSON types from @backstage/types
 import type {
   JsonArray as CoreJsonArray,
   JsonObject as CoreJsonObject,
   JsonPrimitive as CoreJsonPrimitive,
   JsonValue as CoreJsonValue,
-} from '@backstage/core-types';
+} from '@backstage/types';
 
 /**
  * A type representing all allowed JSON primitive values.
  *
  * @public
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type JsonPrimitive = CoreJsonPrimitive;
 
@@ -34,7 +34,7 @@ export type JsonPrimitive = CoreJsonPrimitive;
  * A type representing all allowed JSON object values.
  *
  * @public
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type JsonObject = CoreJsonObject;
 
@@ -42,7 +42,7 @@ export type JsonObject = CoreJsonObject;
  * A type representing all allowed JSON array values.
  *
  * @public
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type JsonArray = CoreJsonArray;
 
@@ -50,6 +50,6 @@ export type JsonArray = CoreJsonArray;
  * A type representing all allowed JSON values.
  *
  * @public
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type JsonValue = CoreJsonValue;

packages/config/src/reader.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue, JsonObject } from '@backstage/core-types';
+import { JsonValue, JsonObject } from '@backstage/types';
 import { AppConfig, Config } from './types';
 import cloneDeep from 'lodash/cloneDeep';
 import mergeWith from 'lodash/mergeWith';

packages/config/src/types.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonObject, JsonValue } from '@backstage/core-types';
+import { JsonObject, JsonValue } from '@backstage/types';
 
 /**
  * A serialized form of configuration data that carries additional context.

packages/core-app-api/api-report.md

@@ -40,7 +40,7 @@ import { microsoftAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { OAuthRequestApi } from '@backstage/core-plugin-api';
 import { Observable } from '@backstage/core-plugin-api';
-import { Observable as Observable_2 } from '@backstage/core-types';
+import { Observable as Observable_2 } from '@backstage/types';
 import { oktaAuthApiRef } from '@backstage/core-plugin-api';
 import { oneloginAuthApiRef } from '@backstage/core-plugin-api';
 import { OpenIdConnectApi } from '@backstage/core-plugin-api';

packages/core-plugin-api/api-report.md

@@ -8,12 +8,12 @@
 import { BackstageTheme } from '@backstage/theme';
 import { ComponentType } from 'react';
 import { Config } from '@backstage/config';
-import { Observable as Observable_2 } from '@backstage/core-types';
-import { Observer as Observer_2 } from '@backstage/core-types';
+import { Observable as Observable_2 } from '@backstage/types';
+import { Observer as Observer_2 } from '@backstage/types';
 import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import { ReactNode } from 'react';
-import { Subscription as Subscription_2 } from '@backstage/core-types';
+import { Subscription as Subscription_2 } from '@backstage/types';
 import { SvgIconProps } from '@material-ui/core';
 
 // Warning: (ae-missing-release-tag) "AlertApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

packages/core-plugin-api/package.json

@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.9",
-    "@backstage/core-types": "^0.1.0",
     "@backstage/theme": "^0.2.9",
+    "@backstage/types": "^0.1.0",
     "@backstage/version-bridge": "^0.1.0",
     "@material-ui/core": "^4.12.2",
     "@types/react": "*",

packages/core-plugin-api/src/apis/definitions/AlertApi.ts

@@ -15,7 +15,7 @@
  */
 
 import { createApiRef, ApiRef } from '../system';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 
 export type AlertMessage = {
   message: string;

packages/core-plugin-api/src/apis/definitions/AppThemeApi.ts

@@ -16,7 +16,7 @@
 
 import { ApiRef, createApiRef } from '../system';
 import { BackstageTheme } from '@backstage/theme';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 
 /**
  * Describes a theme provided by the app.

packages/core-plugin-api/src/apis/definitions/ErrorApi.ts

@@ -15,7 +15,7 @@
  */
 
 import { ApiRef, createApiRef } from '../system';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 
 /**
  * Mirrors the JavaScript Error class, for the purpose of

packages/core-plugin-api/src/apis/definitions/OAuthRequestApi.ts

@@ -15,7 +15,7 @@
  */
 
 import { IconComponent } from '../../icons/types';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 import { ApiRef, createApiRef } from '../system';
 
 /**

packages/core-plugin-api/src/apis/definitions/StorageApi.ts

@@ -15,7 +15,7 @@
  */
 
 import { ApiRef, createApiRef } from '../system';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 
 export type StorageValueChange<T = any> = {
   key: string;

packages/core-plugin-api/src/apis/definitions/auth.ts

@@ -15,7 +15,7 @@
  */
 
 import { ApiRef, createApiRef } from '../system';
-import { Observable } from '@backstage/core-types';
+import { Observable } from '@backstage/types';
 
 /**
  * This file contains declarations for common interfaces of auth-related APIs.

packages/core-plugin-api/src/deprecatedTypes.ts

@@ -18,19 +18,19 @@ import {
   Observer as CoreObserver,
   Subscription as CoreSubscription,
   Observable as CoreObservable,
-} from '@backstage/core-types';
+} from '@backstage/types';
 
 /**
  * Observer interface for consuming an Observer, see TC39.
  *
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type Observer<T> = CoreObserver<T>;
 
 /**
  * Subscription returned when subscribing to an Observable, see TC39.
  *
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type Subscription = CoreSubscription;
 
@@ -42,6 +42,6 @@ export type Subscription = CoreSubscription;
  * This is used as a common return type for observable values and can be created
  * using many different observable implementations, such as zen-observable or RxJS 5.
  *
- * @deprecated Please use the same type from `@backstage/core-types` instead
+ * @deprecated Please use the same type from `@backstage/types` instead
  */
 export type Observable<T> = CoreObservable<T>;

packages/types/README.md

@@ -1,4 +1,4 @@
-# Common core types used within Backstage
+# Common TypeScript types used within Backstage
 
 Contains some common types that are used widely within the rest of the Backstage project and in plugins.
 

packages/types/api-report.md

@@ -1,4 +1,4 @@
-## API Report File for "@backstage/core-types"
+## API Report File for "@backstage/types"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 

packages/types/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@backstage/core-types",
-  "description": "Common core types used within Backstage",
+  "name": "@backstage/types",
+  "description": "Common TypeScript types used within Backstage",
   "version": "0.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -16,7 +16,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/backstage/backstage",
-    "directory": "packages/core-types"
+    "directory": "packages/types"
   },
   "keywords": [
     "backstage"

packages/types/src/index.ts

@@ -15,7 +15,7 @@
  */
 
 /**
- * Common core types used within Backstage
+ * Common TypeScript types used within Backstage
  *
  * @packageDocumentation
  */

plugins/scaffolder-backend/api-report.md

@@ -15,9 +15,9 @@ 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/core-types';
+import { JsonObject as JsonObject_2 } from '@backstage/types';
 import { JsonValue } from '@backstage/config';
-import { JsonValue as JsonValue_2 } from '@backstage/core-types';
+import { JsonValue as JsonValue_2 } from '@backstage/types';
 import { LocationSpec } from '@backstage/catalog-model';
 import { Logger as Logger_2 } from 'winston';
 import { Octokit } from '@octokit/rest';