From aef288b6cbd27c3c70287dce2ea6bbc032017f4b Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Mon, 18 May 2020 18:19:56 +0200
Subject: [PATCH] refactor: move to serveBundle

---
 packages/cli/src/commands/app/serve.ts    | 8 +-------
 packages/cli/src/commands/plugin/serve.ts | 6 ------
 packages/cli/src/lib/bundler/server.ts    | 4 ++++
 packages/cli/src/lib/bundler/types.ts     | 2 --
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index 58e9e5fc16..182e338287 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/packages/cli/src/commands/app/serve.ts
@@ -14,19 +14,13 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
-import { Command } from 'commander';
 import { serveBundle } from '../../lib/bundler';
-import { paths } from '../../lib/paths';
+import { Command } from 'commander';
 
 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();
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index f9768ec497..5700992644 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/packages/cli/src/commands/plugin/serve.ts
@@ -14,19 +14,13 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
 import { serveBundle } from '../../lib/bundler';
 import { Command } from 'commander';
-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: 'dev/index',
     checksEnabled: cmd.check,
-    proxy: pkg.proxy,
   });
 
   await waitForExit();
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 3aaf5968f5..ca224fdd1c 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import fs from 'fs-extra';
 import yn from 'yn';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
@@ -36,6 +37,8 @@ export async function serveBundle(options: ServeOptions) {
   const urls = prepareUrls(protocol, host, port);
 
   const paths = resolveBundlingPaths(options);
+  const pkgPath = paths.targetPackageJson;
+  const pkg = await fs.readJson(pkgPath);
   const config = createConfig(paths, { ...options, isDev: true });
   const compiler = webpack(config);
 
@@ -48,6 +51,7 @@ export async function serveBundle(options: ServeOptions) {
     https: protocol === 'https',
     host,
     port,
+    proxy: pkg.proxy,
   });
 
   await new Promise((resolve, reject) => {
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 5e14760574..4182226d69 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -15,7 +15,6 @@
  */
 
 import { BundlingPathsOptions } from './paths';
-import { ProxyConfigMap } from 'webpack-dev-server';
 
 export type BundlingOptions = {
   checksEnabled: boolean;
@@ -24,7 +23,6 @@ export type BundlingOptions = {
 
 export type ServeOptions = BundlingPathsOptions & {
   checksEnabled: boolean;
-  proxy?: ProxyConfigMap;
 };
 
 export type BuildOptions = BundlingPathsOptions & {