netlify-cli 20.0.1 → 20.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/dist/commands/deploy/deploy.js +1 -1
  2. package/dist/commands/deploy/deploy.js.map +1 -1
  3. package/dist/commands/functions/functions-list.d.ts +1 -1
  4. package/dist/commands/functions/functions-list.d.ts.map +1 -1
  5. package/dist/commands/functions/functions-list.js +5 -7
  6. package/dist/commands/functions/functions-list.js.map +1 -1
  7. package/dist/commands/status/status.d.ts +2 -2
  8. package/dist/commands/status/status.d.ts.map +1 -1
  9. package/dist/commands/status/status.js +10 -10
  10. package/dist/commands/status/status.js.map +1 -1
  11. package/dist/lib/functions/server.d.ts.map +1 -1
  12. package/dist/lib/functions/server.js +0 -1
  13. package/dist/lib/functions/server.js.map +1 -1
  14. package/dist/recipes/blobs-migrate/index.d.ts.map +1 -1
  15. package/dist/recipes/blobs-migrate/index.js +1 -2
  16. package/dist/recipes/blobs-migrate/index.js.map +1 -1
  17. package/dist/tsconfig.build.tsbuildinfo +1 -1
  18. package/dist/utils/copy-template-dir/copy-template-dir.d.ts +1 -1
  19. package/dist/utils/copy-template-dir/copy-template-dir.d.ts.map +1 -1
  20. package/dist/utils/copy-template-dir/copy-template-dir.js +0 -5
  21. package/dist/utils/copy-template-dir/copy-template-dir.js.map +1 -1
  22. package/dist/utils/deploy/deploy-site.d.ts +2 -5
  23. package/dist/utils/deploy/deploy-site.d.ts.map +1 -1
  24. package/dist/utils/deploy/deploy-site.js +0 -1
  25. package/dist/utils/deploy/deploy-site.js.map +1 -1
  26. package/dist/utils/deploy/hash-files.js +1 -1
  27. package/dist/utils/deploy/hash-files.js.map +1 -1
  28. package/dist/utils/deploy/hash-fns.d.ts +0 -2
  29. package/dist/utils/deploy/hash-fns.d.ts.map +1 -1
  30. package/dist/utils/deploy/hash-fns.js +4 -5
  31. package/dist/utils/deploy/hash-fns.js.map +1 -1
  32. package/dist/utils/deploy/hasher-segments.d.ts +11 -10
  33. package/dist/utils/deploy/hasher-segments.d.ts.map +1 -1
  34. package/dist/utils/deploy/hasher-segments.js +40 -35
  35. package/dist/utils/deploy/hasher-segments.js.map +1 -1
  36. package/dist/utils/deploy/status-cb.d.ts +7 -0
  37. package/dist/utils/deploy/status-cb.d.ts.map +1 -0
  38. package/dist/utils/deploy/status-cb.js +2 -0
  39. package/dist/utils/deploy/status-cb.js.map +1 -0
  40. package/dist/utils/shell.d.ts.map +1 -1
  41. package/dist/utils/shell.js +25 -29
  42. package/dist/utils/shell.js.map +1 -1
  43. package/dist/utils/types.d.ts +1 -1
  44. package/dist/utils/types.d.ts.map +1 -1
  45. package/npm-shrinkwrap.json +2 -105
  46. package/package.json +1 -8
@@ -1,2 +1,2 @@
1
- export declare function copyTemplateDir(srcDir: string, outDir: string, vars: any): Promise<string[]>;
1
+ export declare function copyTemplateDir(srcDir: string, outDir: string, vars: Record<string, string>): Promise<string[]>;
2
2
  //# sourceMappingURL=copy-template-dir.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy-template-dir.d.ts","sourceRoot":"","sources":["../../../src/utils/copy-template-dir/copy-template-dir.ts"],"names":[],"mappings":"AA0DA,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiClG"}
1
+ {"version":3,"file":"copy-template-dir.d.ts","sourceRoot":"","sources":["../../../src/utils/copy-template-dir/copy-template-dir.ts"],"names":[],"mappings":"AAsDA,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+BrH"}
@@ -17,12 +17,9 @@ import fs from 'fs';
17
17
  import path from 'path';
18
18
  import { pipeline } from 'stream';
19
19
  import { promisify } from 'util';
20
- // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'maxstache... Remove this comment to see the full error message
21
20
  import maxstache from 'maxstache';
22
- // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'maxstache-stream... Remove this comment to see the full error message
23
21
  import maxstacheStream from 'maxstache-stream';
24
22
  import { readdirp } from 'readdirp';
25
- const noop = () => undefined;
26
23
  // Remove a leading underscore
27
24
  function removeUnderscore(filepath) {
28
25
  const parts = filepath.split(path.sep);
@@ -43,8 +40,6 @@ async function writeFile(outDir, vars, file) {
43
40
  }
44
41
  // High throughput template dir writes
45
42
  export async function copyTemplateDir(srcDir, outDir, vars) {
46
- if (!vars)
47
- vars = noop;
48
43
  assert.strictEqual(typeof srcDir, 'string');
49
44
  assert.strictEqual(typeof outDir, 'string');
50
45
  assert.strictEqual(typeof vars, 'object');
@@ -1 +1 @@
1
- {"version":3,"file":"copy-template-dir.js","sourceRoot":"","sources":["../../../src/utils/copy-template-dir/copy-template-dir.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"copy-template-dir.js","sourceRoot":"","sources":["../../../src/utils/copy-template-dir/copy-template-dir.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,7 @@
1
1
  import BaseCommand from '../../commands/base-command.js';
2
2
  import { type $TSFixMe } from '../../commands/types.js';
3
- export interface DeployEvent {
4
- type: string;
5
- msg: string;
6
- phase: 'start' | 'progress' | 'error' | 'stop';
7
- }
3
+ import type { DeployEvent } from './status-cb.js';
4
+ export type { DeployEvent };
8
5
  export declare const deploySite: (command: BaseCommand, api: $TSFixMe, siteId: any, dir: any, { assetType, branch, concurrentHash, concurrentUpload, config, deployId, deployTimeout, draft, filter, fnDir, functionsConfig, hashAlgorithm, manifestPath, maxRetry, siteRoot, skipFunctionsCache, statusCb, syncFileLimit, tmpDir, workingDir, }: {
9
6
  concurrentHash?: number;
10
7
  concurrentUpload?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAyBvD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;CAC/C;AAED,eAAO,MAAM,UAAU,GACrB,SAAS,WAAW,EACpB,KAAK,QAAQ,EAEb,WAAM,EAEN,QAAG,EACH,oPAiCG;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EAwIF,CAAA"}
1
+ {"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAgBvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,YAAY,EAAE,WAAW,EAAE,CAAA;AAS3B,eAAO,MAAM,UAAU,GACrB,SAAS,WAAW,EACpB,KAAK,QAAQ,EAEb,WAAM,EAEN,QAAG,EACH,oPAiCG;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EAuIF,CAAA"}
@@ -63,7 +63,6 @@ skipFunctionsCache, statusCb = () => {
63
63
  concurrentHash,
64
64
  hashAlgorithm,
65
65
  statusCb,
66
- assetType,
67
66
  manifestPath,
68
67
  skipFunctionsCache,
69
68
  rootDir: siteRoot,
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
@@ -23,7 +23,7 @@ statusCb, }) => {
23
23
  const files = {};
24
24
  // hash: [fileObj, fileObj, fileObj]
25
25
  const filesShaMap = {};
26
- const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb, assetType });
26
+ const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb });
27
27
  await pipeline([fileStream, fileFilter, hasher, fileNormalizer, manifestCollector]);
28
28
  return { files, filesShaMap };
29
29
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hash-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAE5G,MAAM,SAAS,GAAG,KAAK,EAAE,EACvB,SAAS,GAAG,MAAM;AAClB,2IAA2I;AAC3I,cAAc;AACd,2IAA2I;AAC3I,WAAW;AACX,2IAA2I;AAC3I,MAAM,EACN,aAAa,GAAG,MAAM;AACtB,2IAA2I;AAC3I,UAAU;AACV,2IAA2I;AAC3I,QAAQ,GACT,EAAE,EAAE;IACH,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAE9D,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAA;IAC5D,MAAM,cAAc,GAAG,kBAAkB,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAA;IAEpE,kCAAkC;IAClC,8CAA8C;IAC9C,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,oCAAoC;IACpC,MAAM,WAAW,GAAG,EAAE,CAAA;IACtB,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;IAE5F,MAAM,QAAQ,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAEnF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AAC/B,CAAC,CAAA;AAED,eAAe,SAAS,CAAA"}
1
+ {"version":3,"file":"hash-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAE5G,MAAM,SAAS,GAAG,KAAK,EAAE,EACvB,SAAS,GAAG,MAAM;AAClB,2IAA2I;AAC3I,cAAc;AACd,2IAA2I;AAC3I,WAAW;AACX,2IAA2I;AAC3I,MAAM,EACN,aAAa,GAAG,MAAM;AACtB,2IAA2I;AAC3I,UAAU;AACV,2IAA2I;AAC3I,QAAQ,GACT,EAAE,EAAE;IACH,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAE9D,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAA;IAC5D,MAAM,cAAc,GAAG,kBAAkB,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAA;IAEpE,kCAAkC;IAClC,8CAA8C;IAC9C,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,oCAAoC;IACpC,MAAM,WAAW,GAAG,EAAE,CAAA;IACtB,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEjF,MAAM,QAAQ,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAEnF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AAC/B,CAAC,CAAA;AAED,eAAe,SAAS,CAAA"}
@@ -1,8 +1,6 @@
1
1
  import BaseCommand from '../../commands/base-command.js';
2
2
  import { $TSFixMe } from '../../commands/types.js';
3
3
  declare const hashFns: (command: BaseCommand, directories: string[], config: {
4
- /** @default 'function' */
5
- assetType?: string;
6
4
  concurrentHash?: number;
7
5
  functionsConfig: $TSFixMe;
8
6
  /** @default 'sha256' */
@@ -1 +1 @@
1
- {"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAQA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,GACX,SAAS,WAAW,EACpB,aAAa,MAAM,EAAE,EACrB,QAAQ;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC,QAAQ,CAuGlB,CAAA;AAED,eAAe,OAAO,CAAA"}
1
+ {"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,GACX,SAAS,WAAW,EACpB,aAAa,MAAM,EAAE,EACrB,QAAQ;IACN,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC,QAAQ,CAsGlB,CAAA;AAED,eAAe,OAAO,CAAA"}
@@ -1,9 +1,8 @@
1
1
  import { readFile } from 'fs/promises';
2
2
  import path from 'path';
3
3
  import { pipeline } from 'stream/promises';
4
+ import { Readable } from 'stream';
4
5
  import { zipFunctions } from '@netlify/zip-it-and-ship-it';
5
- // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'from... Remove this comment to see the full error message
6
- import fromArray from 'from2-array';
7
6
  import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.js';
8
7
  import { hasherCtor, manifestCollectorCtor } from './hasher-segments.js';
9
8
  // Maximum age of functions manifest (2 minutes).
@@ -74,7 +73,7 @@ const trafficRulesConfig = (trafficRules) => {
74
73
  };
75
74
  };
76
75
  const hashFns = async (command, directories, config) => {
77
- const { assetType = 'function', concurrentHash, functionsConfig, hashAlgorithm = 'sha256', manifestPath, rootDir, skipFunctionsCache, statusCb, tmpDir, } = config || {};
76
+ const { concurrentHash, functionsConfig, hashAlgorithm = 'sha256', manifestPath, rootDir, skipFunctionsCache, statusCb, tmpDir, } = config || {};
78
77
  // Early out if no functions directories are configured.
79
78
  if (directories.length === 0) {
80
79
  return { functions: {}, functionsWithNativeModules: [], shaMap: {} };
@@ -128,14 +127,14 @@ const hashFns = async (command, directories, config) => {
128
127
  .map(({ name, schedule }) => schedule && { name, cron: schedule })
129
128
  .filter(Boolean);
130
129
  const functionsWithNativeModules = functionZips.filter(({ nativeNodeModules }) => nativeNodeModules !== undefined && Object.keys(nativeNodeModules).length !== 0);
131
- const functionStream = fromArray.obj(fileObjs);
130
+ const functionStream = Readable.from(fileObjs);
132
131
  const hasher = hasherCtor({ concurrentHash, hashAlgorithm });
133
132
  // Written to by manifestCollector
134
133
  // normalizedPath: hash (wanted by deploy API)
135
134
  const functions = {};
136
135
  // hash: [fileObj, fileObj, fileObj]
137
136
  const fnShaMap = {};
138
- const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType });
137
+ const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb });
139
138
  await pipeline([functionStream, hasher, manifestCollector]);
140
139
  return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig };
141
140
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEjC,OAAO,EAAE,YAAY,EAA0C,MAAM,6BAA6B,CAAA;AAIlG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AAErE,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAExE,iDAAiD;AACjD,MAAM,iBAAiB,GAAG,IAAI,CAAA;AAE9B,MAAM,eAAe,GAAG,KAAK,EAAE,EAC7B,OAAO,EACP,WAAW,EACX,eAAe,EACf,YAAY,EACZ,OAAO,EACP,kBAAkB,EAClB,QAAQ,EACR,MAAM,GAUP,EAAyD,EAAE;IAC1D,QAAQ,CAAC;QACP,IAAI,EAAE,oBAAoB;QAC1B,GAAG,EAAE,kCAAkC;QACvC,KAAK,EAAE,OAAO;KACf,CAAC,CAAA;IAEF,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,0BAA0B;YAC1B,2IAA2I;YAC3I,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;YACzE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;YAE1C,IAAI,WAAW,GAAG,iBAAiB,EAAE,CAAC;gBACpC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;YACrC,CAAC;YAED,QAAQ,CAAC;gBACP,IAAI,EAAE,oBAAoB;gBAC1B,GAAG,EAAE,yEAAyE;gBAC9E,KAAK,EAAE,MAAM;aACd,CAAC,CAAA;YAEF,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,QAAQ,CAAC;gBACP,IAAI,EAAE,oBAAoB;gBAC1B,GAAG,EAAE,4CAA4C;gBACjD,KAAK,EAAE,MAAM;aACd,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,kBAAkB;YAC5B,CAAC,CAAC,yEAAyE;YAC3E,CAAC,CAAC,gCAAgC,CAAA;QAEpC,QAAQ,CAAC;YACP,IAAI,EAAE,oBAAoB;YAC1B,GAAG;YACH,KAAK,EAAE,MAAM;SACd,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE;QAC7C,QAAQ,EAAE,OAAO;QACjB,qBAAqB,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;QAC5E,MAAM,EAAE,eAAe;KACxB,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,YAA2B,EAAE,EAAE;IACzD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAM;IACR,CAAC;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI;YAChC,MAAM,EAAE;gBACN,iBAAiB,EAAE;oBACjB,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS;oBACnE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU;oBACtE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW;iBACzE;gBACD,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS;gBAClD,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;aACrC;SACF;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,KAAK,EACnB,OAAoB,EACpB,WAAqB,EACrB,MAUC,EACkB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,aAAa,GAAG,QAAQ,EACxB,YAAY,EACZ,OAAO,EACP,kBAAkB,EAClB,QAAQ,EACR,MAAM,GACP,GAAG,MAAM,IAAI,EAAE,CAAA;IAChB,wDAAwD;IACxD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,0BAA0B,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;IACtE,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;QACzC,OAAO;QACP,WAAW;QACX,eAAe;QACf,YAAY;QACZ,OAAO;QACP,kBAAkB;QAClB,QAAQ;QACR,MAAM;KACP,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAC/B,CAAC,EACC,SAAS,EACT,WAAW,EACX,SAAS,EACT,cAAc,EACd,IAAI,EAAE,YAAY,EAClB,QAAQ,EACR,OAAO,EACP,cAAc,EACd,OAAO,EACP,YAAY,GACb,EAAE,EAAE,CAAC,CAAC;QACL,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;QAC5C,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACrC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;QACnC,IAAI,EAAE,MAAM;QACZ,SAAS,EAAE,UAAU;QACrB,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvE,OAAO,EAAE,cAAc,IAAI,OAAO;QAClC,WAAW;QACX,SAAS;QACT,cAAc;QACd,OAAO;QACP,SAAS;QACT,QAAQ;QACR,YAAY;KACb,CAAC,CACH,CAAA;IACD,MAAM,QAAQ,GAAG,YAAY;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACf,OAAO,CACL,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,CAC1G,CACF;SACA,MAAM,CACL,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,KAAK;QACR,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,eAAe,EAAE,IAAI,CAAC,cAAc;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC;SACrD;KACF,CAAC,EACF,EAAE,CACH,CAAA;IACH,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACjE,MAAM,CAAC,OAAO,CAAC,CAAA;IAClB,MAAM,0BAA0B,GAAG,YAAY,CAAC,MAAM,CACpD,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,iBAAiB,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC,CAC1G,CAAA;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAE9C,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAA;IAE5D,kCAAkC;IAClC,8CAA8C;IAC9C,MAAM,SAAS,GAAG,EAAE,CAAA;IACpB,oCAAoC;IACpC,MAAM,QAAQ,GAAG,EAAE,CAAA;IACnB,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IAElF,MAAM,QAAQ,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAC3D,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,0BAA0B,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;AACzF,CAAC,CAAA;AAED,eAAe,OAAO,CAAA"}
@@ -1,14 +1,15 @@
1
+ import { Transform, Writable } from 'node:stream';
2
+ import type { StatusCallback } from './status-cb.js';
1
3
  export declare const hasherCtor: ({ concurrentHash, hashAlgorithm }: {
2
4
  concurrentHash: any;
3
5
  hashAlgorithm: any;
4
- }) => import("stream").Transform;
5
- export declare const fileNormalizerCtor: ({ assetType, normalizer: normalizeFunction }: {
6
- assetType: any;
7
- normalizer: any;
8
- }) => import("through2").Through2Constructor;
9
- export declare const manifestCollectorCtor: (filesObj: any, shaMap: any, { assetType, statusCb }: {
10
- assetType: any;
11
- statusCb: any;
12
- }) => import("stream").Writable;
13
- export declare const fileFilterCtor: any;
6
+ }) => Transform;
7
+ export declare const fileNormalizerCtor: ({ assetType, normalizer: normalizeFunction, }: {
8
+ assetType: string;
9
+ normalizer?: (file: unknown) => unknown;
10
+ }) => Transform;
11
+ export declare const manifestCollectorCtor: (filesObj: Record<string, unknown>, shaMap: Record<string, unknown[]>, { statusCb }: {
12
+ statusCb: StatusCallback;
13
+ }) => Writable;
14
+ export declare const fileFilterCtor: () => Transform;
14
15
  //# sourceMappingURL=hasher-segments.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hasher-segments.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,UAAU,GAAI;;;CAAiC,+BAa3D,CAAA;AAID,eAAO,MAAM,kBAAkB,GAAI;;;CAA4C,2CAS3E,CAAA;AAIJ,eAAO,MAAM,qBAAqB,GAAI,aAAQ,EAAE,WAAM,EAAE;;;CAAuB,8BAoB9E,CAAA;AAID,eAAO,MAAM,cAAc,KAAsD,CAAA"}
1
+ {"version":3,"file":"hasher-segments.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAMjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAYpD,eAAO,MAAM,UAAU,GAAI;;;CAAiC,cAa3D,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAAI,+CAGhC;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;CACxC,cAaA,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EACjC,cAAc;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,aAuB3C,CAAA;AAED,eAAO,MAAM,cAAc,iBASvB,CAAA"}
@@ -1,11 +1,8 @@
1
1
  import { createHash } from 'node:crypto';
2
2
  import { createReadStream } from 'node:fs';
3
+ import { Transform, Writable } from 'node:stream';
3
4
  import { pipeline } from 'node:stream/promises';
4
- import flushWriteStream from 'flush-write-stream';
5
5
  import transform from 'parallel-transform';
6
- // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
7
- import { objCtor as objFilterCtor } from 'through2-filter';
8
- import { obj as map } from 'through2-map';
9
6
  import { normalizePath } from './util.js';
10
7
  const hashFile = async (filePath, algorithm) => {
11
8
  const hasher = createHash(algorithm);
@@ -32,38 +29,46 @@ export const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
32
29
  });
33
30
  };
34
31
  // Inject normalized file names into normalizedPath and assetType
35
- // @ts-expect-error TS(7031) FIXME: Binding element 'assetType' implicitly has an 'any... Remove this comment to see the full error message
36
- export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) => map((fileObj) => {
37
- const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) };
38
- if (normalizeFunction !== undefined) {
39
- return normalizeFunction(normalizedFile);
40
- }
41
- return normalizedFile;
42
- });
32
+ export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction, }) => {
33
+ return new Transform({
34
+ objectMode: true,
35
+ transform(fileObj, _, callback) {
36
+ const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) };
37
+ const result = normalizeFunction !== undefined ? normalizeFunction(normalizedFile) : normalizedFile;
38
+ this.push(result);
39
+ callback();
40
+ },
41
+ });
42
+ };
43
43
  // A writable stream segment ctor that normalizes file paths, and writes shaMap's
44
- // @ts-expect-error TS(7006) FIXME: Parameter 'filesObj' implicitly has an 'any' type.
45
- export const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
46
- if (!statusCb || !assetType)
47
- throw new Error('Missing required options');
48
- return flushWriteStream.obj((fileObj, _, cb) => {
49
- filesObj[fileObj.normalizedPath] = fileObj.hash;
50
- // We map a hash to multiple fileObj's because the same file
51
- // might live in two different locations
52
- if (Array.isArray(shaMap[fileObj.hash])) {
53
- shaMap[fileObj.hash].push(fileObj);
54
- }
55
- else {
56
- shaMap[fileObj.hash] = [fileObj];
57
- }
58
- statusCb({
59
- type: 'hashing',
60
- msg: `Hashing ${fileObj.relname}`,
61
- phase: 'progress',
62
- });
63
- cb();
44
+ export const manifestCollectorCtor = (filesObj, shaMap, { statusCb }) => {
45
+ return new Writable({
46
+ objectMode: true,
47
+ write(fileObj, _encoding, callback) {
48
+ filesObj[fileObj.normalizedPath] = fileObj.hash;
49
+ // Maintain hash to fileObj mapping
50
+ if (Array.isArray(shaMap[fileObj.hash])) {
51
+ shaMap[fileObj.hash].push(fileObj);
52
+ }
53
+ else {
54
+ shaMap[fileObj.hash] = [fileObj];
55
+ }
56
+ statusCb({
57
+ type: 'hashing',
58
+ msg: `Hashing ${fileObj.relname}`,
59
+ phase: 'progress',
60
+ });
61
+ callback();
62
+ },
64
63
  });
65
64
  };
66
- // transform stream ctor that filters folder-walker results for only files
67
- // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
68
- export const fileFilterCtor = objFilterCtor((fileObj) => fileObj.type === 'file');
65
+ export const fileFilterCtor = () => new Transform({
66
+ objectMode: true,
67
+ transform(fileObj, _, callback) {
68
+ if (fileObj.type === 'file') {
69
+ this.push(fileObj);
70
+ }
71
+ callback();
72
+ },
73
+ });
69
74
  //# sourceMappingURL=hasher-segments.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hasher-segments.js","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hasher-segments.js","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ export interface DeployEvent {
2
+ type: string;
3
+ msg: string;
4
+ phase: 'start' | 'progress' | 'error' | 'stop';
5
+ }
6
+ export type StatusCallback = (status: DeployEvent) => void;
7
+ //# sourceMappingURL=status-cb.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"status-cb.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/status-cb.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;CAC/C;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=status-cb.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"status-cb.js","sourceRoot":"","sources":["../../../src/utils/deploy/status-cb.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- {"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAe,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAA;AA6B7D,eAAO,MAAM,UAAU,GACrB,SAAS,MAAM,EACf,SAAS;IACP,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,GAAG,EAAE,MAAM,CAAA;CACZ,oCAmEF,CAAA"}
1
+ {"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAe,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAgC7D,eAAO,MAAM,UAAU,GACrB,SAAS,MAAM,EACf,SAAS;IACP,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,GAAG,EAAE,MAAM,CAAA;CACZ,oCAwEF,CAAA"}
@@ -1,29 +1,27 @@
1
1
  import process from 'process';
2
+ import { Transform } from 'stream';
3
+ import { stripVTControlCharacters } from 'util';
2
4
  import execa from 'execa';
3
- // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'stri... Remove this comment to see the full error message
4
- import stripAnsiCc from 'strip-ansi-control-characters';
5
5
  import { stopSpinner } from '../lib/spinner.js';
6
6
  import { chalk, log, NETLIFYDEVERR, NETLIFYDEVWARN } from './command-helpers.js';
7
7
  import { processOnExit } from './dev.js';
8
- /**
9
- * @type {(() => Promise<void>)[]} - array of functions to run before the process exits
10
- */
11
- // @ts-expect-error TS(7034) FIXME: Variable 'cleanupWork' implicitly has type 'any[]'... Remove this comment to see the full error message
8
+ const isErrnoException = (value) => value instanceof Error && Object.hasOwn(value, 'code');
9
+ const createStripAnsiControlCharsStream = () => new Transform({
10
+ transform(chunk, _encoding, callback) {
11
+ callback(null, stripVTControlCharacters(typeof chunk === 'string' ? chunk : chunk?.toString() ?? ''));
12
+ },
13
+ });
12
14
  const cleanupWork = [];
13
15
  let cleanupStarted = false;
14
- /**
15
- * @param {object} input
16
- * @param {number=} input.exitCode The exit code to return when exiting the process after cleanup
17
- */
18
16
  const cleanupBeforeExit = async ({ exitCode } = {}) => {
19
17
  // If cleanup has started, then wherever started it will be responsible for exiting
20
18
  if (!cleanupStarted) {
21
19
  cleanupStarted = true;
22
20
  try {
23
- // @ts-expect-error TS(7005) FIXME: Variable 'cleanupWork' implicitly has an 'any[]' t... Remove this comment to see the full error message
24
21
  await Promise.all(cleanupWork.map((cleanup) => cleanup()));
25
22
  }
26
23
  finally {
24
+ // eslint-disable-next-line n/no-process-exit
27
25
  process.exit(exitCode);
28
26
  }
29
27
  }
@@ -58,14 +56,18 @@ export const runCommand = (command, options) => {
58
56
  spinner?.spin();
59
57
  });
60
58
  };
61
- // @ts-expect-error TS(2531) FIXME: Object is possibly 'null'.
62
- commandProcess.stdout.pipe(stripAnsiCc.stream()).on('data', pipeDataWithSpinner.bind(null, process.stdout));
63
- // @ts-expect-error TS(2531) FIXME: Object is possibly 'null'.
64
- commandProcess.stderr.pipe(stripAnsiCc.stream()).on('data', pipeDataWithSpinner.bind(null, process.stderr));
65
- // @ts-expect-error TS(2345) FIXME: Argument of type 'Writable | null' is not assignab... Remove this comment to see the full error message
66
- process.stdin.pipe(commandProcess.stdin);
59
+ commandProcess.stdout
60
+ ?.pipe(createStripAnsiControlCharsStream())
61
+ .on('data', pipeDataWithSpinner.bind(null, process.stdout));
62
+ commandProcess.stderr
63
+ ?.pipe(createStripAnsiControlCharsStream())
64
+ .on('data', pipeDataWithSpinner.bind(null, process.stderr));
65
+ if (commandProcess.stdin != null) {
66
+ process.stdin.pipe(commandProcess.stdin);
67
+ }
67
68
  // we can't try->await->catch since we don't want to block on the framework server which
68
69
  // is a long running process
70
+ // eslint-disable-next-line @typescript-eslint/no-floating-promises
69
71
  commandProcess.then(async () => {
70
72
  const result = await commandProcess;
71
73
  const [commandWithoutArgs] = command.split(' ');
@@ -74,9 +76,10 @@ export const runCommand = (command, options) => {
74
76
  }
75
77
  else {
76
78
  const errorMessage = result.failed
77
- ? // @ts-expect-error TS(2339) FIXME: Property 'shortMessage' does not exist on type 'Ex... Remove this comment to see the full error message
79
+ ? // @ts-expect-error FIXME(serhalp): We use `reject: false` which means the resolved value is either the resolved value
80
+ // or the rejected value, but the types aren't smart enough to know this.
78
81
  `${NETLIFYDEVERR} ${result.shortMessage}`
79
- : `${NETLIFYDEVWARN} "${command}" exited with code ${result.exitCode}`;
82
+ : `${NETLIFYDEVWARN} "${command}" exited with code ${result.exitCode.toString()}`;
80
83
  log(`${errorMessage}. Shutting down Netlify Dev server`);
81
84
  }
82
85
  await cleanupBeforeExit({ exitCode: 1 });
@@ -86,18 +89,10 @@ export const runCommand = (command, options) => {
86
89
  });
87
90
  return commandProcess;
88
91
  };
89
- /**
90
- *
91
- * @param {object} config
92
- * @param {string} config.command
93
- * @param {*} config.error
94
- * @returns
95
- */
96
- // @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
97
92
  const isNonExistingCommandError = ({ command, error: commandError }) => {
98
93
  // `ENOENT` is only returned for non Windows systems
99
94
  // See https://github.com/sindresorhus/execa/pull/447
100
- if (commandError.code === 'ENOENT') {
95
+ if (isErrnoException(commandError) && commandError.code === 'ENOENT') {
101
96
  return true;
102
97
  }
103
98
  // if the command is a package manager we let it report the error
@@ -105,7 +100,8 @@ const isNonExistingCommandError = ({ command, error: commandError }) => {
105
100
  return false;
106
101
  }
107
102
  // this only works on English versions of Windows
108
- return (typeof commandError.message === 'string' &&
103
+ return (commandError instanceof Error &&
104
+ typeof commandError.message === 'string' &&
109
105
  commandError.message.includes('is not recognized as an internal or external command'));
110
106
  };
111
107
  //# sourceMappingURL=shell.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,MAAM,CAAA;AAE/C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,WAAW,EAAgB,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAkC,EAAE,CAC1E,KAAK,YAAY,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AAExD,MAAM,iCAAiC,GAAG,GAAc,EAAE,CACxD,IAAI,SAAS,CAAC;IACZ,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ;QAClC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,KAAiB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACpH,CAAC;CACF,CAAC,CAAA;AAEJ,MAAM,WAAW,GAA4B,EAAE,CAAA;AAE/C,IAAI,cAAc,GAAG,KAAK,CAAA;AAE1B,MAAM,iBAAiB,GAAG,KAAK,EAAE,EAAE,QAAQ,KAAwC,EAAE,EAAE,EAAE;IACvF,mFAAmF;IACnF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;QAC5D,CAAC;gBAAS,CAAC;YACT,6CAA6C;YAC7C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAe,EACf,OAIC,EACD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;IAC1C,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE;QAC5C,WAAW,EAAE,IAAI;QACjB,sFAAsF;QACtF,MAAM,EAAE,KAAK;QACb,GAAG,EAAE;YACH,2CAA2C;YAC3C,WAAW,EAAE,MAAM;YACnB,GAAG,GAAG;SACP;QACD,mFAAmF;QACnF,WAAW,EAAE,KAAK;QAClB,GAAG;KACJ,CAAC,CAAA;IAEF,uEAAuE;IACvE,qEAAqE;IACrE,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;QACxB,2FAA2F;QAC3F,2GAA2G;QAC3G,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;IACxC,CAAC;IACD,MAAM,mBAAmB,GAAG,CAAC,WAA+B,EAAE,KAA0B,EAAE,EAAE;QAC1F,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC;QACD,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE;YAC5B,OAAO,EAAE,IAAI,EAAE,CAAA;QACjB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,cAAc,CAAC,MAAM;QACnB,EAAE,IAAI,CAAC,iCAAiC,EAAE,CAAC;SAC1C,EAAE,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7D,cAAc,CAAC,MAAM;QACnB,EAAE,IAAI,CAAC,iCAAiC,EAAE,CAAC;SAC1C,EAAE,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7D,IAAI,cAAc,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,wFAAwF;IACxF,4BAA4B;IAC5B,mEAAmE;IACnE,cAAc,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;QAC7B,MAAM,MAAM,GAAG,MAAM,cAAc,CAAA;QACnC,MAAM,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/C,IAAI,MAAM,CAAC,MAAM,IAAI,yBAAyB,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC/F,GAAG,CACD,GAAG,aAAa,4BAA4B,OAAO,mBAAmB,KAAK,CAAC,OAAO,CACjF,IAAI,kBAAkB,GAAG,CAC1B,SAAS,CACX,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM;gBAChC,CAAC,CAAC,sHAAsH;oBACtH,yEAAyE;oBACzE,GAAG,aAAa,IAAI,MAAM,CAAC,YAAsB,EAAE;gBACrD,CAAC,CAAC,GAAG,cAAc,KAAK,OAAO,sBAAsB,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAA;YAEnF,GAAG,CAAC,GAAG,YAAY,oCAAoC,CAAC,CAAA;QAC1D,CAAC;QAED,MAAM,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IACF,aAAa,CAAC,KAAK,IAAI,EAAE;QACvB,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAuC,EAAE,EAAE;IAC1G,oDAAoD;IACpD,qDAAqD;IACrD,IAAI,gBAAgB,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,iEAAiE;IACjE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,iDAAiD;IACjD,OAAO,CACL,YAAY,YAAY,KAAK;QAC7B,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ;QACxC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CACtF,CAAA;AACH,CAAC,CAAA"}
@@ -144,7 +144,7 @@ export interface SiteInfo {
144
144
  updated_at: string;
145
145
  url: string;
146
146
  user_id: string;
147
- };
147
+ } | undefined;
148
148
  screenshot_url: string;
149
149
  session_id: string;
150
150
  ssl: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE;QACL,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,GAAG,EAAE;QACH,QAAQ,EAAE,MAAM,EAAE,CAAA;QAClB,IAAI,EAAE,MAAM,CAAA;QACZ,iBAAiB,EAAE,eAAe,EAAE,CAAA;KACrC,CAAA;IACD,IAAI,EAAE,cAAc,CAAA;IACpB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+CAA+C;IAC/C,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;IACnC,6BAA6B;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG;IAChD,uBAAuB;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,iDAAiD;IACjD,WAAW,EAAE,MAAM,CAAA;IACnB,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,WAAW,OAAQ,SAAQ,eAAe;IAC9C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAA;AAK9D,MAAM,WAAW,QAAQ;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IAGjB,cAAc,CAAC,EACX;QACE,gBAAgB,EAAE,MAAM,EAAE,CAAA;QAC1B,GAAG,EAAE,MAAM,CAAA;QACX,aAAa,EAAE,MAAM,CAAA;QACrB,GAAG,EAAE,MAAM,CAAA;QACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,EAAE,EAAE,MAAM,CAAA;QACV,YAAY,EAAE,OAAO,CAAA;QACrB,QAAQ,EAAE,MAAM,CAAA;QAChB,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,QAAQ,EAAE,MAAM,CAAA;KACjB,GACD,SAAS,CAAA;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,mBAAmB,CAAC,EAChB;QACE,GAAG,EAAE,MAAM,CAAA;QACX,WAAW,EAAE,MAAM,CAAA;KACpB,GACD,SAAS,CAAA;IACb,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IAChD,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,EAAE,OAAO,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE;QACnB,GAAG,EAAE;YACH,MAAM,EAAE,OAAO,CAAA;YACf,MAAM,EAAE,OAAO,CAAA;SAChB,CAAA;QACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,EAAE;YACF,MAAM,EAAE,OAAO,CAAA;YACf,MAAM,EAAE,OAAO,CAAA;SAChB,CAAA;QACD,IAAI,EAAE,OAAO,CAAA;KACd,CAAA;IACD,gBAAgB,EAAE;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;QAClB,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,cAAc,EAAE,MAAM,CAAA;QACtB,UAAU,EAAE,MAAM,CAAA;QAClB,KAAK,EAAE,OAAO,CAAA;QACd,aAAa,EAAE,MAAM,CAAA;QACrB,EAAE,EAAE,MAAM,CAAA;QACV,MAAM,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,YAAY,EAAE,MAAM,CAAA;QACpB,QAAQ,EAAE,MAAM,EAAE,CAAA;QAClB,kBAAkB,EAAE,MAAM,EAAE,CAAA;QAC5B,SAAS,EAAE,MAAM,CAAA;QACjB,UAAU,EAAE,MAAM,CAAA;QAClB,cAAc,EAAE,MAAM,CAAA;QACtB,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,MAAM,CAAA;QAClB,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;IACD,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnE,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,YAAY,EAAE,OAAO,CAAA;IACrB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,KAAK,wBAAwB,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,iBAAiB,CAAA;AACtF,KAAK,yBAAyB,GAAG,SAAS,GAAG,QAAQ,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI,CAAA;AAEpG,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,MAAM,EACN;IAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,CAC7F,CAAA;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACpC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}