From 5da7d9edca8069c008c9dccf1f9ace4f3c779df8 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Sat, 28 Mar 2020 18:30:34 -0600
Subject: [PATCH] http-proxy

---
 packages/next/next-server/server/next-server.ts | 2 +-
 packages/next/package.json                      | 2 +-
 packages/next/taskfile.js                       | 8 ++++++++
 packages/next/types/misc.d.ts                   | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index 7f754b6c69..a90ae425f5 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -1,7 +1,7 @@
 import compression from 'next/dist/compiled/compression'
 import fs from 'fs'
 import { IncomingMessage, ServerResponse } from 'http'
-import Proxy from 'http-proxy'
+import Proxy from 'next/dist/compiled/http-proxy'
 import nanoid from 'next/dist/compiled/nanoid/index.js'
 import { join, relative, resolve, sep } from 'path'
 import { parse as parseQs, ParsedUrlQuery } from 'querystring'
diff --git a/packages/next/package.json b/packages/next/package.json
index a9516567d1..f05e3a7ab4 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -69,7 +69,6 @@
     "finally-polyfill": "0.1.0",
     "find-up": "4.0.0",
     "fork-ts-checker-webpack-plugin": "3.1.1",
-    "http-proxy": "1.18.0",
     "ignore-loader": "0.1.2",
     "is-docker": "2.0.0",
     "is-wsl": "2.1.1",
@@ -193,6 +192,7 @@
     "etag": "1.8.1",
     "fresh": "0.5.2",
     "gzip-size": "5.1.1",
+    "http-proxy": "1.18.0",
     "nanoid": "2.0.3",
     "resolve": "1.11.0",
     "taskr": "1.1.0",
diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
index 9de4cbc852..5ff186b5e4 100644
--- a/packages/next/taskfile.js
+++ b/packages/next/taskfile.js
@@ -342,6 +342,13 @@ export async function ncc_gzip_size(task, opts) {
     .target('dist/compiled/gzip-size')
 }
 // eslint-disable-next-line camelcase
+export async function ncc_http_proxy(task, opts) {
+  await task
+    .source(opts.src || relative(__dirname, require.resolve('http-proxy')))
+    .ncc({ packageName: 'http-proxy' })
+    .target('dist/compiled/http-proxy')
+}
+// eslint-disable-next-line camelcase
 export async function ncc_nanoid(task, opts) {
   await task
     .source(opts.src || relative(__dirname, require.resolve('nanoid')))
@@ -409,6 +416,7 @@ export async function precompile(task) {
     'ncc_etag',
     'ncc_fresh',
     'ncc_gzip_size',
+    'ncc_http_proxy',
     'ncc_nanoid',
     'ncc_resolve',
     'ncc_text_table',
diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
index 5fbbbb0e04..bab00f274e 100644
--- a/packages/next/types/misc.d.ts
+++ b/packages/next/types/misc.d.ts
@@ -104,6 +104,10 @@ declare module 'next/dist/compiled/gzip-size' {
   import m from 'gzip-size'
   export = m
 }
+declare module 'next/dist/compiled/http-proxy' {
+  import m from 'http-proxy'
+  export = m
+}
 declare module 'next/dist/compiled/nanoid/index.js' {
   function nanoid(size?: number): string
   export = nanoid
-- 
GitLab