Merge branch 'master' of github.com:spotify/backstage into sebastianq/component-navigation

* 'master' of github.com:spotify/backstage:
  packages/cli: avoid duplicate dependency warning in E2E test
  build(deps): [security] bump websocket-extensions from 0.1.3 to 0.1.4
  fix: import from package
  fix: type checking
  fix: tests
  Ran yarn install
  fix: show list of components in removal dialog
  fix: github actions
  fix: make locations fetching work
  feature: extract getLocationById method, wrap location fetching in useAsync

packages/catalog-model/src/location/annotation.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export const LOCATION_ANNOTATION = 'backstage.io/managed-by-location';

packages/catalog-model/src/location/index.ts

@@ -16,3 +16,4 @@
 
 export type { Location, LocationSpec } from './types';
 export { locationSchema, locationSpecSchema } from './validation';
+export { LOCATION_ANNOTATION } from './annotation';

packages/cli/src/lib/tasks.ts

@@ -143,6 +143,7 @@ export async function installWithLocalDeps(dir: string) {
             // Add to both resolutions and dependencies, or transitive dependencies will still be fetched from the registry.
             pkgJson.dependencies[`@backstage/${name}`] = `file:${pkgPath}`;
             pkgJson.resolutions[`@backstage/${name}`] = `file:${pkgPath}`;
+            delete pkgJson.devDependencies[`@backstage/${name}`];
 
             await fs
               .writeJSON(pkgJsonPath, pkgJson, { encoding: 'utf8', spaces: 2 })