From 7ea2ce8c0e2b903eab24d6d28da7f1a46b160e33 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Sun, 29 Mar 2020 09:46:33 -0600
Subject: [PATCH] conf

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

diff --git a/packages/next/package.json b/packages/next/package.json
index a341389e70681..38a51c20c93cd 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -62,7 +62,6 @@
     "@next/polyfill-nomodule": "9.3.4-canary.0",
     "autodll-webpack-plugin": "0.4.2",
     "cache-loader": "4.1.0",
-    "conf": "5.0.0",
     "css-loader": "3.3.0",
     "cssnano-simple": "1.0.0",
     "file-loader": "4.2.0",
@@ -167,6 +166,7 @@
     "chalk": "2.4.2",
     "ci-info": "2.0.0",
     "compression": "1.7.4",
+    "conf": "5.0.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "devalue": "2.0.1",
diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
index 4b5dd56eefb50..659993ab33f25 100644
--- a/packages/next/taskfile.js
+++ b/packages/next/taskfile.js
@@ -334,6 +334,13 @@ export async function ncc_compression(task, opts) {
     .target('dist/compiled/compression')
 }
 // eslint-disable-next-line camelcase
+export async function ncc_conf(task, opts) {
+  await task
+    .source(opts.src || relative(__dirname, require.resolve('conf')))
+    .ncc({ packageName: 'conf' })
+    .target('dist/compiled/conf')
+}
+// eslint-disable-next-line camelcase
 export async function ncc_content_type(task, opts) {
   await task
     .source(opts.src || relative(__dirname, require.resolve('content-type')))
@@ -583,6 +590,7 @@ export async function precompile(task) {
     'ncc_chalk',
     'ncc_ci_info',
     'ncc_compression',
+    'ncc_conf',
     'ncc_content_type',
     'ncc_cookie',
     'ncc_devalue',
diff --git a/packages/next/telemetry/storage.ts b/packages/next/telemetry/storage.ts
index b58dfc8470af4..abf2dccb0c019 100644
--- a/packages/next/telemetry/storage.ts
+++ b/packages/next/telemetry/storage.ts
@@ -1,5 +1,5 @@
 import chalk from 'next/dist/compiled/chalk'
-import Conf from 'conf'
+import Conf from 'next/dist/compiled/conf'
 import { BinaryLike, createHash, randomBytes } from 'crypto'
 import isDockerFunction from 'next/dist/compiled/is-docker'
 import path from 'path'
diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
index 88b200f5f2b19..57ef036297f1b 100644
--- a/packages/next/types/misc.d.ts
+++ b/packages/next/types/misc.d.ts
@@ -67,6 +67,10 @@ declare module 'next/dist/compiled/compression' {
   import m from 'compression'
   export = m
 }
+declare module 'next/dist/compiled/conf' {
+  import m from 'conf'
+  export = m
+}
 declare module 'next/dist/compiled/content-type' {
   import m from 'content-type'
   export = m