fix(deps): remove stream utils (#7120)

* fix(deps): remove `is-stream` micro-utility

* fix(deps): remove from2-array microutility

* fix(deps): remove through2-filter dependency

* fix(deps): remove flush-write-stream

* chore: fmt

* chore(dev-deps): remove `@types/flush-write-stream`

* fix(deps): remove through2-map micro-utility

* chore: update lockfile

I had rebased with the wrong npm version

* refactor: fix eslint errors from rebase

* Update src/utils/deploy/hasher-segments.ts

Co-authored-by: Nathan Houle <[email protected]>

* fix(deps): use built-in `isReadable` (available since v17.4)

* Revert "fix(deps): use built-in `isReadable` (available since v17.4)"

This reverts commit d812303.

* Revert "fix(deps): remove `is-stream` micro-utility"

This reverts commit 5d6dd8f.

---------

Co-authored-by: Philippe Serhal <[email protected]>
Co-authored-by: Nathan Houle <[email protected]>

Author: 3 people

package-lock.json

@@ -100,9 +100,7 @@
     "fastest-levenshtein": "1.0.16",
     "fastify": "4.29.0",
     "find-up": "7.0.0",
-    "flush-write-stream": "2.0.0",
     "folder-walker": "3.2.0",
-    "from2-array": "0.0.4",
     "fuzzy": "0.1.3",
     "get-port": "5.1.1",
     "gh-release-fetch": "4.0.3",
@@ -148,8 +146,6 @@
     "strip-ansi-control-characters": "2.0.0",
     "tempy": "3.1.0",
     "terminal-link": "4.0.0",
-    "through2-filter": "4.0.0",
-    "through2-map": "4.0.0",
     "toml": "3.0.0",
     "tomlify-j0.4": "3.0.0",
     "ulid": "2.3.0",
@@ -173,7 +169,6 @@
     "@types/envinfo": "7.8.4",
     "@types/eslint-config-prettier": "^6.11.3",
     "@types/etag": "1.8.3",
-    "@types/flush-write-stream": "1.0.2",
     "@types/folder-walker": "3.2.4",
     "@types/gitconfiglocal": "2.0.3",
     "@types/inquirer": "9.0.7",
@@ -191,7 +186,6 @@
     "@types/semver": "7.7.0",
     "@types/serialize-javascript": "^5.0.4",
     "@types/source-map-support": "0.5.10",
-    "@types/through2-map": "3.0.4",
     "@types/write-file-atomic": "4.0.3",
     "@types/ws": "8.18.1",
     "@vitest/coverage-v8": "3.1.1",

package.json

@@ -20,6 +20,9 @@ import hashFiles from './hash-files.js'
 import hashFns from './hash-fns.js'
 import uploadFiles from './upload-files.js'
 import { getUploadList, waitForDeploy, waitForDiff } from './util.js'
+import type { DeployEvent } from './status-cb.js'
+
+export type { DeployEvent }
 
 const buildStatsString = (possibleParts: (string | false | undefined)[]) => {
   const parts = possibleParts.filter(Boolean)
@@ -28,13 +31,6 @@ const buildStatsString = (possibleParts: (string | false | undefined)[]) => {
   return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message
 }
 
-// TODO(serhalp): This is alternatingly called "event", "status", and "progress". Standardize.
-export interface DeployEvent {
-  type: string
-  msg: string
-  phase: 'start' | 'progress' | 'error' | 'stop'
-}
-
 export const deploySite = async (
   command: BaseCommand,
   api: $TSFixMe,
@@ -115,7 +111,6 @@ export const deploySite = async (
       concurrentHash,
       hashAlgorithm,
       statusCb,
-      assetType,
       manifestPath,
       skipFunctionsCache,
       rootDir: siteRoot,

src/utils/deploy/deploy-site.ts

@@ -30,7 +30,7 @@ const hashFiles = async ({
   const files = {}
   // hash: [fileObj, fileObj, fileObj]
   const filesShaMap = {}
-  const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb, assetType })
+  const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb })
 
   await pipeline([fileStream, fileFilter, hasher, fileNormalizer, manifestCollector])
 

src/utils/deploy/hash-files.ts

@@ -1,10 +1,9 @@
 import { readFile } from 'fs/promises'
 import path from 'path'
 import { pipeline } from 'stream/promises'
+import { Readable } from 'stream'
 
 import { zipFunctions, type FunctionResult, type TrafficRules } from '@netlify/zip-it-and-ship-it'
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'from... Remove this comment to see the full error message
-import fromArray from 'from2-array'
 
 import BaseCommand from '../../commands/base-command.js'
 import { $TSFixMe } from '../../commands/types.js'
@@ -109,8 +108,6 @@ const hashFns = async (
   command: BaseCommand,
   directories: string[],
   config: {
-    /** @default 'function' */
-    assetType?: string
     concurrentHash?: number
     functionsConfig: $TSFixMe
     /** @default 'sha256' */
@@ -123,7 +120,6 @@ const hashFns = async (
   },
 ): Promise<$TSFixMe> => {
   const {
-    assetType = 'function',
     concurrentHash,
     functionsConfig,
     hashAlgorithm = 'sha256',
@@ -211,7 +207,7 @@ const hashFns = async (
     ({ nativeNodeModules }) => nativeNodeModules !== undefined && Object.keys(nativeNodeModules).length !== 0,
   )
 
-  const functionStream = fromArray.obj(fileObjs)
+  const functionStream = Readable.from(fileObjs)
 
   const hasher = hasherCtor({ concurrentHash, hashAlgorithm })
 
@@ -220,7 +216,7 @@ const hashFns = async (
   const functions = {}
   // hash: [fileObj, fileObj, fileObj]
   const fnShaMap = {}
-  const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType })
+  const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb })
 
   await pipeline([functionStream, hasher, manifestCollector])
   return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig }