Fix merge conflicts

package.json

@@ -32,6 +32,7 @@
   "version": "1.0.0",
   "devDependencies": {
     "@spotify/eslint-config-oss": "^1.0.1",
+    "file-loader": "^6.0.0",
     "husky": "^4.2.3",
     "identity-obj-proxy": "^3.0.0",
     "lerna": "^3.20.2",

packages/app/package.json

@@ -64,5 +64,12 @@
       "last 1 safari version"
     ]
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "proxy": {
+      "/circleci/api": {
+        "target": "https://circleci.com/api/v1.1",
+        "changeOrigin": true,
+        "pathRewrite": {"^/circleci/api/": "/"}
+      }
+    }
 }

packages/cli/src/commands/app/serve.ts

@@ -14,13 +14,19 @@
  * limitations under the License.
  */
 
-import { serveBundle } from '../../lib/bundler';
+import fs from 'fs-extra';
 import { Command } from 'commander';
+import { serveBundle } from '../../lib/bundler';
+import { paths } from '../../lib/paths';
 
 export default async (cmd: Command) => {
+  const pkgPath = paths.resolveTarget('package.json');
+  const pkg = await fs.readJson(pkgPath);
+
   const waitForExit = await serveBundle({
     entry: 'src/index',
     checksEnabled: cmd.check,
+    proxy: pkg.proxy,
   });
 
   await waitForExit();

packages/cli/src/lib/bundler/server.ts

@@ -48,6 +48,7 @@ export async function serveBundle(options: ServeOptions) {
     https: protocol === 'https',
     host,
     port,
+    proxy: options.proxy,
   });
 
   await new Promise((resolve, reject) => {

packages/cli/src/lib/bundler/types.ts

@@ -15,6 +15,7 @@
  */
 
 import { BundlingPathsOptions } from './paths';
+import { ProxyConfigMap } from 'webpack-dev-server';
 
 export type BundlingOptions = {
   checksEnabled: boolean;
@@ -23,6 +24,7 @@ export type BundlingOptions = {
 
 export type ServeOptions = BundlingPathsOptions & {
   checksEnabled: boolean;
+  proxy?: ProxyConfigMap;
 };
 
 export type BuildOptions = BundlingPathsOptions & {

plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx

@@ -22,8 +22,9 @@ import { makeStyles } from '@material-ui/core/styles';
 import { PluginHeader } from '../../components/PluginHeader';
 import { ActionOutput } from './lib/ActionOutput/ActionOutput';
 import { Layout } from '../../components/Layout';
-import { useBuildWithSteps, useSettings } from '../../state';
 import LaunchIcon from '@material-ui/icons/Launch';
+import { useSettings } from '../../state/useSettings';
+import { useBuildWithSteps } from '../../state/useBuildWithSteps';
 
 const IconLink = IconButton as typeof Link;
 const BuildName: FC<{ build: BuildWithSteps | null }> = ({ build }) => (

plugins/circleci/src/pages/BuildsPage/lib/Builds/Builds.tsx

@@ -16,7 +16,8 @@
 import React, { FC, useEffect } from 'react';
 import { CITableBuildInfo, CITable } from '../CITable';
 import { BuildSummary } from '../../../../api';
-import { useSettings, useBuilds } from '../../../../state';
+import { useBuilds } from '../../../../state/useBuilds';
+import { useSettings } from '../../../../state/useSettings';
 
 const makeReadableStatus = (status: string | undefined) => {
   if (!status) return '';

plugins/circleci/src/pages/SettingsPage/SettingsPage.tsx

@@ -27,7 +27,7 @@ import { Alert } from '@material-ui/lab';
 import { InfoCard, Content } from '@backstage/core';
 import { Layout } from '../../components/Layout';
 import { PluginHeader } from '../../components/PluginHeader';
-import { useSettings } from '../../state';
+import { useSettings } from '../../state/useSettings';
 
 const SettingsPage = () => {
   const [

plugins/circleci/src/state/AppState.tsx

@@ -15,8 +15,8 @@
  */
 import React, { FC, useReducer, Dispatch, Reducer } from 'react';
 import { circleCIApiRef } from '../api';
-import { State, Action, SettingsState } from './types';
-export { SettingsState };
+import type { SettingsState, State, Action } from './types';
+export type { SettingsState };
 import equal from 'fast-deep-equal';
 
 export const AppContext = React.createContext<[State, Dispatch<Action>]>(

plugins/circleci/src/state/index.ts

@@ -14,6 +14,3 @@
  * limitations under the License.
  */
 export * from './AppState';
-export * from './useBuildWithSteps';
-export * from './useBuilds';
-export * from './useSettings';

plugins/circleci/src/state/useSettings.ts

@@ -20,7 +20,6 @@ import { useApi, errorApiRef } from '@backstage/core';
 export function useSettings() {
   const [{ settings }, dispatch] = useContext(AppContext);
 
-
   const errorApi = useApi(errorApiRef);
 
   const rehydrate = () => {

yarn.lock

@@ -9277,6 +9277,14 @@ file-loader@^4.2.0:
     loader-utils "^1.2.3"
     schema-utils "^2.5.0"
 
+file-loader@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f"
+  integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^2.6.5"
+
 file-system-cache@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"