Fix merge conflicts

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