more updates per review comments

vercel · Aug 4, 2021 · f54b73f · f54b73f
1 parent 50ef69c
commit f54b73f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 2 deletions.
diff --git a/packages/next/compiled/cross-spawn/LICENSE b/packages/next/compiled/cross-spawn/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Made With MOXY Lda <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/next/compiled/cross-spawn/index.js b/packages/next/compiled/cross-spawn/index.js
diff --git a/packages/next/compiled/cross-spawn/package.json b/packages/next/compiled/cross-spawn/package.json
@@ -0,0 +1 @@
+{"name":"cross-spawn","main":"index.js","author":"André Cruz <[email protected]>","license":"MIT"}
diff --git a/packages/next/lib/helpers/install.ts b/packages/next/lib/helpers/install.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import chalk from 'chalk'
-import spawn from 'cross-spawn'
+import spawn from 'next/dist/compiled/cross-spawn'
 
 interface InstallArgs {
   /**

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -78,7 +78,6 @@
     "caniuse-lite": "^1.0.30001228",
     "chalk": "2.4.2",
     "chokidar": "3.5.1",
-    "cli-select": "1.1.2",
     "constants-browserify": "1.0.0",
     "cross-spawn": "6.0.5",
     "crypto-browserify": "3.12.0",
@@ -198,11 +197,13 @@
     "bfj": "7.0.2",
     "cacache": "15.0.5",
     "ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540",
+    "cli-select": "1.1.2",
     "comment-json": "3.0.3",
     "compression": "1.7.4",
     "conf": "5.0.0",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
+    "cross-spawn": "6.0.5",
     "css-loader": "4.3.0",
     "debug": "4.1.1",
     "devalue": "2.0.1",

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -244,6 +244,14 @@ export async function ncc_cookie(task, opts) {
     .target('compiled/cookie')
 }
 // eslint-disable-next-line camelcase
+externals['cross-spawn'] = 'next/dist/compiled/cross-spawn'
+export async function ncc_cross_spawn(task, opts) {
+  await task
+    .source(opts.src || relative(__dirname, require.resolve('cross-spawn')))
+    .ncc({ packageName: 'cross-spawn', externals })
+    .target('compiled/cross-spawn')
+}
+// eslint-disable-next-line camelcase
 externals['css-loader'] = 'next/dist/compiled/css-loader'
 export async function ncc_css_loader(task, opts) {
   await task
@@ -754,6 +762,7 @@ export async function ncc(task, opts) {
         'ncc_conf',
         'ncc_content_type',
         'ncc_cookie',
+        'ncc_cross_spawn',
         'ncc_css_loader',
         'ncc_debug',
         'ncc_devalue',

diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
@@ -95,6 +95,10 @@ declare module 'next/dist/compiled/cookie' {
   import m from 'cookie'
   export = m
 }
+declare module 'next/dist/compiled/cross-spawn' {
+  import m from 'cross-spawn'
+  export = m
+}
 declare module 'next/dist/compiled/debug' {
   import m from 'debug'
   export = m
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"cross-spawn","main":"index.js","author":"André Cruz <[email protected]>","license":"MIT"}