From dd93bc9ced36525599b12247a56ead66d51701b8 Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Mon, 18 May 2020 17:56:36 +0200
Subject: [PATCH] feat: proxy

Allowing to put a proxy field into a package.json for both app and
plugin to use it with a wds build-in proxy
---
 packages/cli/src/commands/app/serve.ts    | 8 +++++++-
 packages/cli/src/commands/plugin/serve.ts | 6 ++++++
 packages/cli/src/lib/bundler/types.ts     | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index 182e338287..58e9e5fc16 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/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();
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index 5700992644..f9768ec497 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/packages/cli/src/commands/plugin/serve.ts
@@ -14,13 +14,19 @@
  * 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/types.ts b/packages/cli/src/lib/bundler/types.ts
index 4182226d69..5e14760574 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/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 & {