From 9831d3b3e29db842af3d62f2e5df86df52c4ae55 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Sat, 28 Mar 2020 18:33:35 -0600
Subject: [PATCH] is-docker, is-wsl

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

diff --git a/packages/next/package.json b/packages/next/package.json
index f05e3a7ab4..45b064f7c4 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -70,8 +70,6 @@
     "find-up": "4.0.0",
     "fork-ts-checker-webpack-plugin": "3.1.1",
     "ignore-loader": "0.1.2",
-    "is-docker": "2.0.0",
-    "is-wsl": "2.1.1",
     "jest-worker": "24.9.0",
     "json5": "2.1.2",
     "jsonwebtoken": "8.5.1",
@@ -193,6 +191,8 @@
     "fresh": "0.5.2",
     "gzip-size": "5.1.1",
     "http-proxy": "1.18.0",
+    "is-docker": "2.0.0",
+    "is-wsl": "2.1.1",
     "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 5ff186b5e4..046c27c8c8 100644
--- a/packages/next/taskfile.js
+++ b/packages/next/taskfile.js
@@ -349,6 +349,20 @@ export async function ncc_http_proxy(task, opts) {
     .target('dist/compiled/http-proxy')
 }
 // eslint-disable-next-line camelcase
+export async function ncc_is_docker(task, opts) {
+  await task
+    .source(opts.src || relative(__dirname, require.resolve('is-docker')))
+    .ncc({ packageName: 'is-docker' })
+    .target('dist/compiled/is-docker')
+}
+// eslint-disable-next-line camelcase
+export async function ncc_is_wsl(task, opts) {
+  await task
+    .source(opts.src || relative(__dirname, require.resolve('is-wsl')))
+    .ncc({ packageName: 'is-wsl' })
+    .target('dist/compiled/is-wsl')
+}
+// eslint-disable-next-line camelcase
 export async function ncc_nanoid(task, opts) {
   await task
     .source(opts.src || relative(__dirname, require.resolve('nanoid')))
@@ -417,6 +431,8 @@ export async function precompile(task) {
     'ncc_fresh',
     'ncc_gzip_size',
     'ncc_http_proxy',
+    'ncc_is_docker',
+    'ncc_is_wsl',
     'ncc_nanoid',
     'ncc_resolve',
     'ncc_text_table',
diff --git a/packages/next/telemetry/anonymous-meta.ts b/packages/next/telemetry/anonymous-meta.ts
index f9f4790c1b..418ccd0081 100644
--- a/packages/next/telemetry/anonymous-meta.ts
+++ b/packages/next/telemetry/anonymous-meta.ts
@@ -1,5 +1,5 @@
-import isDockerFunction from 'is-docker'
-import isWslBoolean from 'is-wsl'
+import isDockerFunction from 'next/dist/compiled/is-docker'
+import isWslBoolean from 'next/dist/compiled/is-wsl'
 import os from 'os'
 
 import * as ciEnvironment from './ci-info'
diff --git a/packages/next/telemetry/storage.ts b/packages/next/telemetry/storage.ts
index 5ed70be0db..b58dfc8470 100644
--- a/packages/next/telemetry/storage.ts
+++ b/packages/next/telemetry/storage.ts
@@ -1,7 +1,7 @@
 import chalk from 'next/dist/compiled/chalk'
 import Conf from 'conf'
 import { BinaryLike, createHash, randomBytes } from 'crypto'
-import isDockerFunction from 'is-docker'
+import isDockerFunction from 'next/dist/compiled/is-docker'
 import path from 'path'
 
 import { getAnonymousMeta } from './anonymous-meta'
diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
index bab00f274e..60a4806446 100644
--- a/packages/next/types/misc.d.ts
+++ b/packages/next/types/misc.d.ts
@@ -108,6 +108,14 @@ declare module 'next/dist/compiled/http-proxy' {
   import m from 'http-proxy'
   export = m
 }
+declare module 'next/dist/compiled/is-docker' {
+  import m from 'is-docker'
+  export = m
+}
+declare module 'next/dist/compiled/is-wsl' {
+  import m from 'is-wsl'
+  export = m
+}
 declare module 'next/dist/compiled/nanoid/index.js' {
   function nanoid(size?: number): string
   export = nanoid
-- 
GitLab