@appium/support 3.1.5 → 3.1.7

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.
package/LICENSE CHANGED
@@ -186,7 +186,7 @@
186
186
  same "printed page" as the copyright notice for easier
187
187
  identification within third-party archives.
188
188
 
189
- Copyright JS Foundation and other contributors, https://js.foundation
189
+ Copyright OpenJS Foundation and other contributors, https://openjsf.org/
190
190
 
191
191
  Licensed under the Apache License, Version 2.0 (the "License");
192
192
  you may not use this file except in compliance with the License.
@@ -1 +1 @@
1
- {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../lib/env.js"],"names":[],"mappings":"AAiCA;;;;;GAKG;AACH,yCAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AAjCD;;;GAGG;AACH,kCAFU,MAAM,CAEsD;AAEtE;;;GAGG;AACH,gCAFU,MAAM,CAEmC;AAEnD;;;GAGG;AACH,qCAFU,MAAM,CAOd;AAcF;;;;GAIG;AACH,yEAGe,QAAQ,MAAM,GAAC,SAAS,CAAC,uBA+CtC;AAEF;;GAEG;AACH,sCAGa,MAAM,KACJ,QAAQ,OAAO,UAAU,EAAE,qBAAqB,GAAC,SAAS,CAAC,uBAKxE;AAEF;;;;;;;GAOG;AACH,+DAGe,QAAQ,MAAM,CAAC,uBAmB5B;AAEF;;;;;GAKG;AACH,wEAGe,QAAQ,MAAM,CAAC,uBAO5B;oCAGW,OAAO,UAAU,EAAE,qBAAqB"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../lib/env.js"],"names":[],"mappings":"AAgCA;;;;;GAKG;AACH,yCAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AAjCD;;;GAGG;AACH,kCAFU,MAAM,CAEsD;AAEtE;;;GAGG;AACH,gCAFU,MAAM,CAEmC;AAEnD;;;GAGG;AACH,qCAFU,MAAM,CAOd;AAcF;;;;GAIG;AACH,yEAGe,QAAQ,MAAM,GAAC,SAAS,CAAC,uBAsCtC;AAEF;;GAEG;AACH,sCAGa,MAAM,KACJ,QAAQ,OAAO,UAAU,EAAE,qBAAqB,GAAC,SAAS,CAAC,uBAKxE;AAEF;;;;;;;GAOG;AACH,+DAGe,QAAQ,MAAM,CAAC,uBAiB5B;AAEF;;;;;GAKG;AACH,wEAGe,QAAQ,MAAM,CAAC,uBAO5B;oCAGW,OAAO,UAAU,EAAE,qBAAqB"}
package/build/lib/env.js CHANGED
@@ -10,7 +10,6 @@ const os_1 = require("os");
10
10
  const path_1 = __importDefault(require("path"));
11
11
  const read_pkg_1 = __importDefault(require("read-pkg"));
12
12
  const npm_1 = require("./npm");
13
- const logger_1 = __importDefault(require("./logger"));
14
13
  /**
15
14
  * Path to the default `APPIUM_HOME` dir (`~/.appium`).
16
15
  * @type {string}
@@ -65,12 +64,6 @@ async (cwd = process.cwd()) => {
65
64
  pkgPath = version && !OLD_VERSION_REGEX.test(String(version)) ? cwd : undefined;
66
65
  }
67
66
  catch { }
68
- if (pkgPath) {
69
- logger_1.default.debug(`Found package.json having current Appium dep in ${pkgPath}`);
70
- }
71
- else {
72
- logger_1.default.debug(`No package.json having current Appium dep in ${cwd}`);
73
- }
74
67
  return pkgPath;
75
68
  };
76
69
  cwd = path_1.default.resolve(cwd);
@@ -80,12 +73,7 @@ async (cwd = process.cwd()) => {
80
73
  const { json: list } = await npm_1.npm.exec('list', ['--long', '--json'], { cwd });
81
74
  ({ path: pkgDir } = list);
82
75
  if (pkgDir !== cwd) {
83
- if (pkgDir) {
84
- logger_1.default.debug(`Determined package/workspace root from ${cwd} => ${pkgDir}`);
85
- }
86
- else {
87
- pkgDir = cwd;
88
- }
76
+ pkgDir = pkgDir ?? cwd;
89
77
  }
90
78
  }
91
79
  catch {
@@ -123,14 +111,12 @@ async function _resolveAppiumHome(cwd = process.cwd()) {
123
111
  throw new TypeError('`cwd` parameter must be an absolute path');
124
112
  }
125
113
  if (process.env.APPIUM_HOME) {
126
- logger_1.default.debug(`Using APPIUM_HOME from env: ${process.env.APPIUM_HOME}`);
127
114
  return path_1.default.resolve(cwd, process.env.APPIUM_HOME);
128
115
  }
129
116
  const pkgPath = await (0, exports.findAppiumDependencyPackage)(cwd);
130
117
  if (pkgPath) {
131
118
  return pkgPath;
132
119
  }
133
- logger_1.default.debug(`Using default APPIUM_HOME: ${exports.DEFAULT_APPIUM_HOME}`);
134
120
  return exports.DEFAULT_APPIUM_HOME;
135
121
  });
136
122
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../../lib/env.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../../lib/env.js"],"names":[],"mappings":";;;;;;AAAA,YAAY;AACZ,oDAAuB;AACvB,2BAA2B;AAC3B,gDAAwB;AACxB,wDAA+B;AAC/B,+BAA0B;AAE1B;;;GAGG;AACU,QAAA,mBAAmB,GAAG,cAAI,CAAC,OAAO,CAAC,IAAA,YAAO,GAAE,EAAE,SAAS,CAAC,CAAC;AAEtE;;;GAGG;AACU,QAAA,iBAAiB,GAAG,iBAAiB,CAAC;AAEnD;;;GAGG;AACU,QAAA,sBAAsB,GAAG,cAAI,CAAC,IAAI,CAC7C,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,yBAAiB,CAClB,CAAC;AAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAElC;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CAAC,GAAG;IAC3C,OAAO,OAAO,CAAC,MAAM,IAAA,mCAA2B,EAAC,GAAG,CAAC,CAAC,CAAC;AACzD,CAAC;AAFD,kDAEC;AAED;;;;GAIG;AACU,QAAA,2BAA2B,GAAG,gBAAC,CAAC,OAAO;AAClD;;;GAGG;AACH,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;IAC5B;;;;;OAKG;IACH,MAAM,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE;QAC5B,+BAA+B;QAC/B,IAAI,OAAO,CAAC;QACZ,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAgB,EAAC,GAAG,CAAC,CAAC;YACxC,MAAM,OAAO,GACX,GAAG,EAAE,YAAY,EAAE,MAAM;gBACzB,GAAG,EAAE,eAAe,EAAE,MAAM;gBAC5B,GAAG,EAAE,gBAAgB,EAAE,MAAM,CAAC;YAChC,OAAO,GAAG,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;SACjF;QAAC,MAAM,GAAE;QACV,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAExB,qBAAqB;IACrB,IAAI,MAAM,CAAC;IACX,IAAI;QACF,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,MAAM,SAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAC,GAAG,EAAC,CAAC,CAAC;QACzE,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,CAAC;QACxB,IAAI,MAAM,KAAK,GAAG,EAAE;YAClB,MAAM,GAAG,MAAM,IAAI,GAAG,CAAC;SACxB;KACF;IAAC,MAAM;QACN,MAAM,GAAG,GAAG,CAAC;KACd;IACD,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CACF,CAAC;AAEF;;GAEG;AACU,QAAA,gBAAgB,GAAG,gBAAC,CAAC,OAAO;AACvC;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAAC,GAAG;IAClC,OAAO,MAAM,IAAA,kBAAO,EAAC,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;AAC/C,CAAC,CACF,CAAC;AAEF;;;;;;;GAOG;AACU,QAAA,iBAAiB,GAAG,gBAAC,CAAC,OAAO;AACxC;;;GAGG;AACH,KAAK,UAAU,kBAAkB,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IACnD,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAC;KACjE;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE;QAC3B,OAAO,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACnD;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,mCAA2B,EAAC,GAAG,CAAC,CAAC;IACvD,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,2BAAmB,CAAC;AAC7B,CAAC,CACF,CAAC;AAEF;;;;;GAKG;AACU,QAAA,mBAAmB,GAAG,gBAAC,CAAC,OAAO;AAC1C;;;GAGG;AACH,KAAK,UAAU,oBAAoB,CAAC,UAAU;IAC5C,+DAA+D;IAC/D,UAAU,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,yBAAiB,GAAE,CAAC,CAAC;IACvD,OAAO,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,8BAAsB,CAAC,CAAC;AACvD,CAAC,CACF,CAAC;AAEF;;GAEG"}
package/build/lib/fs.d.ts CHANGED
@@ -22,26 +22,6 @@ export namespace fs {
22
22
  * @returns {Promise<boolean>}
23
23
  */
24
24
  export function hasAccess(path: import("fs").PathLike): Promise<boolean>;
25
- /**
26
- * Resolves `true` if `path` is _readable_, which differs from Node.js' default behavior of "can we see it?"
27
- *
28
- * On Windows, ACLs are not supported, so this becomes a simple check for existence.
29
- *
30
- * This function will never reject.
31
- * @param {PathLike} path
32
- * @returns {Promise<boolean>}
33
- */
34
- export function hasAccess(path: import("fs").PathLike): Promise<boolean>;
35
- /**
36
- * Resolves `true` if `path` is executable; `false` otherwise.
37
- *
38
- * On Windows, this function delegates to {@linkcode fs.hasAccess}.
39
- *
40
- * This function will never reject.
41
- * @param {PathLike} path
42
- * @returns {Promise<boolean>}
43
- */
44
- export function isExecutable(path: import("fs").PathLike): Promise<boolean>;
45
25
  /**
46
26
  * Resolves `true` if `path` is executable; `false` otherwise.
47
27
  *
@@ -57,11 +37,6 @@ export namespace fs {
57
37
  * @param {PathLike} path
58
38
  */
59
39
  export function exists(path: import("fs").PathLike): Promise<boolean>;
60
- /**
61
- * Alias for {@linkcode fs.hasAccess}
62
- * @param {PathLike} path
63
- */
64
- export function exists(path: import("fs").PathLike): Promise<boolean>;
65
40
  export function rimraf(dirpath: string, opts?: rimrafIdx.Options | undefined): Promise<void>;
66
41
  export const rimrafSync: typeof rimrafIdx.sync;
67
42
  /**
@@ -73,15 +48,6 @@ export namespace fs {
73
48
  * @see https://nodejs.org/api/fs.html#fspromisesmkdirpath-options
74
49
  */
75
50
  export function mkdir(filepath: string | Buffer | URL, opts?: import("fs").MakeDirectoryOptions | undefined): Promise<string | undefined>;
76
- /**
77
- * Like Node.js' `fsPromises.mkdir()`, but will _not_ reject if the directory already exists.
78
- *
79
- * @param {string|Buffer|URL} filepath
80
- * @param {import('fs').MakeDirectoryOptions} [opts]
81
- * @returns {Promise<string|undefined>}
82
- * @see https://nodejs.org/api/fs.html#fspromisesmkdirpath-options
83
- */
84
- export function mkdir(filepath: string | Buffer | URL, opts?: import("fs").MakeDirectoryOptions | undefined): Promise<string | undefined>;
85
51
  /**
86
52
  * Copies files _and entire directories_
87
53
  * @param {string} source - Source to copy
@@ -91,21 +57,6 @@ export namespace fs {
91
57
  * @returns {Promise<void>}
92
58
  */
93
59
  export function copyFile(source: string, destination: string, opts?: ncp.Options | undefined): Promise<void>;
94
- /**
95
- * Copies files _and entire directories_
96
- * @param {string} source - Source to copy
97
- * @param {string} destination - Destination to copy to
98
- * @param {ncp.Options} [opts] - Additional arguments to pass to `ncp`
99
- * @see https://npm.im/ncp
100
- * @returns {Promise<void>}
101
- */
102
- export function copyFile(source: string, destination: string, opts?: ncp.Options | undefined): Promise<void>;
103
- /**
104
- * Create an MD5 hash of a file.
105
- * @param {PathLike} filePath
106
- * @returns {Promise<string>}
107
- */
108
- export function md5(filePath: import("fs").PathLike): Promise<string>;
109
60
  /**
110
61
  * Create an MD5 hash of a file.
111
62
  * @param {PathLike} filePath
@@ -125,22 +76,6 @@ export namespace fs {
125
76
  * @returns {Promise<string>}
126
77
  */
127
78
  export function hash(filePath: import("fs").PathLike, algorithm?: string | undefined): Promise<string>;
128
- /**
129
- * Create a hex digest of some file at `filePath`
130
- * @param {PathLike} filePath
131
- * @param {string} [algorithm]
132
- * @returns {Promise<string>}
133
- */
134
- export function hash(filePath: import("fs").PathLike, algorithm?: string | undefined): Promise<string>;
135
- /**
136
- * Returns an `Walker` instance, which is a readable stream (and thusly an async iterator).
137
- *
138
- * @param {string} dir - Dir to start walking at
139
- * @param {import('klaw').Options} [opts]
140
- * @returns {import('klaw').Walker}
141
- * @see https://www.npmjs.com/package/klaw
142
- */
143
- export function walk(dir: string, opts?: klaw.Options | undefined): klaw.Walker;
144
79
  /**
145
80
  * Returns an `Walker` instance, which is a readable stream (and thusly an async iterator).
146
81
  *
@@ -156,21 +91,6 @@ export namespace fs {
156
91
  * @returns {Promise<string|undefined>}
157
92
  */
158
93
  export function mkdirp(dir: import("fs").PathLike): Promise<string | undefined>;
159
- /**
160
- * Recursively create a directory.
161
- * @param {PathLike} dir
162
- * @returns {Promise<string|undefined>}
163
- */
164
- export function mkdirp(dir: import("fs").PathLike): Promise<string | undefined>;
165
- /**
166
- * Walks a directory given according to the parameters given. The callback will be invoked with a path joined with the dir parameter
167
- * @param {string} dir Directory path where we will start walking
168
- * @param {boolean} recursive Set it to true if you want to continue walking sub directories
169
- * @param {WalkDirCallback} callback The callback to be called when a new path is found
170
- * @throws {Error} If the `dir` parameter contains a path to an invalid folder
171
- * @returns {Promise<string?>} returns the found path or null if the item was not found
172
- */
173
- export function walkDir(dir: string, recursive: boolean, callback: WalkDirCallback): Promise<string | null>;
174
94
  /**
175
95
  * Walks a directory given according to the parameters given. The callback will be invoked with a path joined with the dir parameter
176
96
  * @param {string} dir Directory path where we will start walking
@@ -185,25 +105,9 @@ export namespace fs {
185
105
  * @param {string} dir - Directory to search from
186
106
  * @param {import('read-pkg').Options} [opts] - Additional options for `read-pkg`
187
107
  * @throws {Error} If there were problems finding or reading a `package.json` file
188
- * @returns {object} A parsed `package.json`
108
+ * @returns {import('read-pkg').NormalizedPackageJson} A parsed `package.json`
189
109
  */
190
- export function readPackageJsonFrom(dir: string, opts?: readPkg.Options | undefined): any;
191
- /**
192
- * Reads the closest `package.json` file from absolute path `dir`.
193
- * @param {string} dir - Directory to search from
194
- * @param {import('read-pkg').Options} [opts] - Additional options for `read-pkg`
195
- * @throws {Error} If there were problems finding or reading a `package.json` file
196
- * @returns {object} A parsed `package.json`
197
- */
198
- export function readPackageJsonFrom(dir: string, opts?: readPkg.Options | undefined): any;
199
- /**
200
- * Finds the project root directory from `dir`.
201
- * @param {string} dir - Directory to search from
202
- * @throws {TypeError} If `dir` is not a nonempty string or relative path
203
- * @throws {Error} If there were problems finding the project root
204
- * @returns {string} The closeset parent dir containing `package.json`
205
- */
206
- export function findRoot(dir: string): string;
110
+ export function readPackageJsonFrom(dir: string, opts?: readPkg.Options | undefined): readPkg.NormalizedPackageJson;
207
111
  /**
208
112
  * Finds the project root directory from `dir`.
209
113
  * @param {string} dir - Directory to search from
@@ -1 +1 @@
1
- {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.js"],"names":[],"mappings":";;;;;yCAiYW,MAAM,eACN,OAAO,KACN,OAAO;;;uBAMN,OAAO,IAAI,EAAE,QAAQ;kEAMvB,MAAM,UACN,OAAO,GAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,qGAIjD,EAAE;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,CAAC;;IA/WlD;;;;;;;;OAQG;IACH,yEAOC;IAhBD;;;;;;;;OAQG;IACH,yEAOC;IAED;;;;;;;;OAQG;IACH,4EAUC;IAnBD;;;;;;;;OAQG;IACH,4EAUC;IAED;;;OAGG;IACH,sEAEC;IAND;;;OAGG;IACH,sEAEC;IAMkB,6FAAmE;;IAUtF;;;;;;;OAOG;IACH,0IAQC;IAhBD;;;;;;;OAOG;IACH,0IAQC;IACD;;;;;;;OAOG;IACH,6GAKC;IAbD;;;;;;;OAOG;IACH,6GAKC;IAED;;;;OAIG;IACH,sEAEC;IAPD;;;;OAIG;IACH,sEAEC;IAKc,uFAAwD;;;IAYtD,uFAAsD;;;IAQvE;;;;;OAKG;IACH,uGAcC;IApBD;;;;;OAKG;IACH,uGAcC;IAED;;;;;;;OAOG;IACH,gFAEC;IAVD;;;;;;;OAOG;IACH,gFAEC;IAED;;;;OAIG;IACH,gFAEC;IAPD;;;;OAIG;IACH,gFAEC;IAED;;;;;;;OAOG;IACH,4GAyEC;IAjFD;;;;;;;OAOG;IACH,4GAyEC;IACD;;;;;;OAMG;IACH,0FAQC;IAfD;;;;;;OAMG;IACH,0FAQC;IACD;;;;;;OAMG;IACH,8CASC;IAhBD;;;;;;OAMG;IACH,8CASC;;;;;;;;;;;;IA+EA;;;OAOF"}
1
+ {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.js"],"names":[],"mappings":";;;;;yCAmYW,MAAM,eACN,OAAO,KACN,OAAO;;;uBAMN,OAAO,IAAI,EAAE,QAAQ;kEAMvB,MAAM,UACN,OAAO,GAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,qGAIjD,EAAE;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,CAAC;;IAjXlD;;;;;;;;OAQG;IACH,yEAOC;IAED;;;;;;;;OAQG;IACH,4EAUC;IAED;;;OAGG;IACH,sEAEC;IAMkB,6FAAmE;;IAUtF;;;;;;;OAOG;IACH,0IAQC;IACD;;;;;;;OAOG;IACH,6GAKC;IAED;;;;OAIG;IACH,sEAEC;IAKc,uFAAwD;;;IAYtD,uFAAsD;;;IAQvE;;;;;OAKG;IACH,uGAcC;IAED;;;;;;;OAOG;IACH,gFAEC;IAED;;;;OAIG;IACH,gFAEC;IAED;;;;;;;OAOG;IACH,4GAyEC;IACD;;;;;;OAMG;IACH,oHAUC;IACD;;;;;;OAMG;IACH,8CASC;;;;;;;;;;;;IA+EA;;;OAOF"}
package/build/lib/fs.js CHANGED
@@ -259,12 +259,13 @@ const fs = {
259
259
  * @param {string} dir - Directory to search from
260
260
  * @param {import('read-pkg').Options} [opts] - Additional options for `read-pkg`
261
261
  * @throws {Error} If there were problems finding or reading a `package.json` file
262
- * @returns {object} A parsed `package.json`
262
+ * @returns {import('read-pkg').NormalizedPackageJson} A parsed `package.json`
263
263
  */
264
264
  readPackageJsonFrom(dir, opts = {}) {
265
265
  const cwd = fs.findRoot(dir);
266
266
  try {
267
- return read_pkg_1.default.sync({ ...opts, cwd });
267
+ return read_pkg_1.default.sync(
268
+ /** @type {import('read-pkg').NormalizeOptions} */ ({ normalize: true, ...opts, cwd }));
268
269
  }
269
270
  catch (err) {
270
271
  err.message = `Failed to read a \`package.json\` from dir \`${dir}\`:\n\n${err.message}`;
@@ -1 +1 @@
1
- {"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.js"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"image-util.d.ts","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":";yBAoKa,KAAK,IAAI,EAAC,WAAW,CAAC,GAAG;IAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;CAAC;;UAK3D,MAAM;SACN,MAAM;WACN,MAAM;YACN,MAAM;;AA1HpB;;;;;;GAMG;AACH,6CAJW,MAAM,QACN,MAAM,GACL,QAAQ,MAAM,CAAC,CAM1B;AAED;;;;;GAKG;AACH,2CAHW,MAAM,GACL,QAAQ,GAAG,CAAC,CAcvB;AAED;;;;;GAKG;AACH,qCAHW,GAAG,GACF,QAAQ,MAAM,CAAC,CAgB1B;AAED;;;;;GAKG;AACH,iCAHW,GAAG,QACH,MAAM,OAiChB;AApID;;;;;;;;GAQG;AACH,mCAJW,MAAM,GAAC,MAAM,GAEX,QAAQ,UAAU,CAAC,CA+B/B"}
1
+ {"version":3,"file":"image-util.d.ts","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":";yBAwKa,KAAK,IAAI,EAAC,WAAW,CAAC,GAAG;IAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;CAAC;;UAK3D,MAAM;SACN,MAAM;WACN,MAAM;YACN,MAAM;;AA1HpB;;;;;;GAMG;AACH,6CAJW,MAAM,QACN,MAAM,GACL,QAAQ,MAAM,CAAC,CAM1B;AAED;;;;;GAKG;AACH,2CAHW,MAAM,GACL,QAAQ,GAAG,CAAC,CAcvB;AAED;;;;;GAKG;AACH,qCAHW,GAAG,GACF,QAAQ,MAAM,CAAC,CAgB1B;AAED;;;;;GAKG;AACH,iCAHW,GAAG,QACH,MAAM,OAiChB;AAxID;;;;;;;;GAQG;AACH,mCAJW,MAAM,GAAC,MAAM,GAEX,QAAQ,UAAU,CAAC,CAmC/B"}
@@ -26,20 +26,21 @@ exports.MIME_BMP = MIME_BMP;
26
26
  */
27
27
  async function getJimpImage(data) {
28
28
  return await new bluebird_1.default((resolve, reject) => {
29
- if (!lodash_1.default.isString(data) && !lodash_1.default.isBuffer(data)) {
29
+ if (!lodash_1.default.isString(data) && !buffer_1.Buffer.isBuffer(data)) {
30
30
  return reject(new Error('Must initialize jimp object with string or buffer'));
31
31
  }
32
+ const truncatedData = lodash_1.default.truncate(buffer_1.Buffer.isBuffer(data) ? data.toString('utf8') : data, { length: 50 });
33
+ new jimp_1.default(
32
34
  // if data is a string, assume it is a base64-encoded image
33
- if (lodash_1.default.isString(data)) {
34
- data = buffer_1.Buffer.from(data, 'base64');
35
- }
36
- new jimp_1.default(data,
35
+ buffer_1.Buffer.isBuffer(data) ? data : buffer_1.Buffer.from(String(data), 'base64'),
37
36
  /**
38
37
  * @param {Error?} err
39
38
  * @param {AppiumJimp} imgObj
40
39
  */
41
40
  (err, imgObj) => {
42
41
  if (err) {
42
+ err.message = `The argument must be a valid base64-encoded image payload. ` +
43
+ `'${truncatedData}' was passed instead. Original error: ${err.message}`;
43
44
  return reject(err);
44
45
  }
45
46
  if (!imgObj) {
@@ -1 +1 @@
1
- {"version":3,"file":"image-util.js","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"image-util.js","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":"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"}
@@ -64,10 +64,10 @@ export class NPM {
64
64
  * Installs a package w/ `npm`
65
65
  * @param {string} cwd
66
66
  * @param {string} pkgName
67
- * @param {InstallPackageOpts} [opts]
67
+ * @param {InstallPackageOpts} opts
68
68
  * @returns {Promise<NpmInstallReceipt>}
69
69
  */
70
- installPackage(cwd: string, pkgName: string, { pkgVer, installType }?: InstallPackageOpts | undefined): Promise<NpmInstallReceipt>;
70
+ installPackage(cwd: string, pkgName: string, { pkgVer, installType }?: InstallPackageOpts): Promise<NpmInstallReceipt>;
71
71
  /**
72
72
  * @param {string} cwd
73
73
  * @param {string} pkg
@@ -1 +1 @@
1
- {"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH,6CAAqF;AAErF;;GAEG;AACH,oDAAkG;AAElG;;GAEG;AACH;IACE;;;;OAIG;IACH,gCAEC;IAED;;;;;;;;;OASG;IACH,UALW,MAAM,QACN,MAAM,EAAE,QACR,QAAQ;eAsByD,GAAG;OAyB9E;IAED;;;;OAIG;IACH,sBAJW,MAAM,OACN,MAAM,GACJ,QAAQ,MAAM,QAAE,CAkB5B;IAED;;;;;OAKG;IACH,iCALW,MAAM,OACN,MAAM,cACN,MAAM,GACJ,QAAQ,MAAM,QAAE,CAiB5B;IAED;;;;OAIG;IACH,UAHW,MAAM,0CAKhB;IAED;;;;;;;;;OASG;IACH,6CALW,MAAM,eACN,MAAM,MAAM,CAAC,GAEZ,MAAM,GAAC,IAAI,CAmCtB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,WACN,MAAM,6DAEJ,QAAQ,iBAAiB,CAAC,CAwDtC;IAED;;;OAGG;IACH,sBAHW,MAAM,OACN,MAAM,iBAOhB;CACF;AAED,sBAA6B;;;;;;;;;;;;;;;;;;;;;SAYf,MAAM;;;;;;;;;;qCAMP,OAAO,cAAc,EAAE,sBAAsB;;;;;iBAK5C,MAAM;;;;SACN,OAAO,WAAW,EAAE,WAAW"}
1
+ {"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH,6CAAqF;AAErF;;GAEG;AACH,oDAAkG;AAElG;;GAEG;AACH;IACE;;;;OAIG;IACH,gCAEC;IAED;;;;;;;;;OASG;IACH,UALW,MAAM,QACN,MAAM,EAAE,QACR,QAAQ;eAsByD,GAAG;OAyB9E;IAED;;;;OAIG;IACH,sBAJW,MAAM,OACN,MAAM,GACJ,QAAQ,MAAM,QAAE,CAkB5B;IAED;;;;;OAKG;IACH,iCALW,MAAM,OACN,MAAM,cACN,MAAM,GACJ,QAAQ,MAAM,QAAE,CAiB5B;IAED;;;;OAIG;IACH,UAHW,MAAM,0CAKhB;IAED;;;;;;;;;OASG;IACH,6CALW,MAAM,eACN,MAAM,MAAM,CAAC,GAEZ,MAAM,GAAC,IAAI,CAmCtB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,WACN,MAAM,4BACN,kBAAkB,GAChB,QAAQ,iBAAiB,CAAC,CAwDtC;IAED;;;OAGG;IACH,sBAHW,MAAM,OACN,MAAM,iBAOhB;CACF;AAED,sBAA6B;;;;;;;;;;;;;;;;;;;;;SAYf,MAAM;;;;;;;;;;qCAMP,OAAO,cAAc,EAAE,sBAAsB;;;;;iBAK5C,MAAM;;;;SACN,OAAO,WAAW,EAAE,WAAW"}
package/build/lib/npm.js CHANGED
@@ -199,10 +199,10 @@ class NPM {
199
199
  * Installs a package w/ `npm`
200
200
  * @param {string} cwd
201
201
  * @param {string} pkgName
202
- * @param {InstallPackageOpts} [opts]
202
+ * @param {InstallPackageOpts} opts
203
203
  * @returns {Promise<NpmInstallReceipt>}
204
204
  */
205
- async installPackage(cwd, pkgName, { pkgVer, installType }) {
205
+ async installPackage(cwd, pkgName, { pkgVer, installType } = {}) {
206
206
  /** @type {any} */
207
207
  let dummyPkgJson;
208
208
  const dummyPkgPath = path_1.default.join(cwd, 'package.json');
@@ -1 +1 @@
1
- {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"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"}
@@ -50,11 +50,20 @@ export function localIp(): any;
50
50
  export function cancellableDelay(ms: any): B<any>;
51
51
  export function multiResolve(roots: any, ...args: any[]): any;
52
52
  export function safeJsonParse(obj: any): any;
53
- export function wrapElement(elementId: any): {
54
- ELEMENT: any;
55
- "element-6066-11e4-a52e-4f735466cecf": any;
56
- };
57
- export function unwrapElement(el: any): any;
53
+ /**
54
+ *
55
+ * @param {string} elementId
56
+ * @returns {import('@appium/types').Element}
57
+ */
58
+ export function wrapElement(elementId: string): import('@appium/types').Element;
59
+ /**
60
+ * Removes the wrapper from element, if it exists.
61
+ * { ELEMENT: 4 } becomes 4
62
+ * { element-6066-11e4-a52e-4f735466cecf: 5 } becomes 5
63
+ * @param {import('@appium/types').Element|string} el
64
+ * @returns {string}
65
+ */
66
+ export function unwrapElement(el: import('@appium/types').Element | string): string;
58
67
  export function filterObject(obj: any, predicate: any): any;
59
68
  /**
60
69
  * Converts number of bytes to a readable size string.
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,+EAEC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAuhBY,CAAC,SAAS,EAAE,GAAG,KAAK,GAAG,CAAC;AArhBrC;;;;;;;GAOG;AACH,2DAMC;AAGD,2CAEC;AAED,oEAsBC;AAED,+BAYC;AAMD,kDAoBC;AAED,8DAEC;AAKD,6CAOC;AAoDD;;;EAKC;AAdD,4CAOC;AAiBD,4DAgBC;AAED;;;;;;;;GAQG;AACH,4CANW,MAAM,GAAC,MAAM,GACX,MAAM,CAkBlB;AAED;;;;;;;;;GASG;AACH,wCANW,MAAM,QACN,MAAM,eACL,OAAO,UACN,OAAO,CAanB;AAlPD,+EAAyE;AAoPzE;;;;;;;;GAQG;AACH,yCALW,MAAM,SACN,MAAM,YACH,MAAM,KACP,QAAQ,OAAO,CAAC,CAoB5B;AAuBD;;;;;;;;;;;;GAYG;AACH,sCAVW,MAAM,YAIN,MAAM,QAFN,MAAM,GAIJ,OAAO,CAenB;AA7CD;;;;;;;;;;GAUG;AACH,kEAPW,MAAM,6EAahB;AA8BD;;;;;;GAMG;AACH,4BAHW,MAAM,GAAC,MAAM,EAAE,GACb,MAAM,CAIlB;AAED;;;;;;;GAOG;AACH,sCAFY,MAAM,CAIjB;AAtND,+EAsBC;AAkMD;;;GAGG;AAEH;;;;;;;;GAQG;AACH,gCANW,MAAM,SACN,MAAM,YACN,gBAAgB,GAAC,OAAO,GAEtB,MAAM,CAYlB;AA5WD,yBAAuB;AADvB,yBAAuB;AADvB,uBAAiB;AAgXjB;;;;;;;GAOG;AAEH;;;;;;;;;;GAUG;AACH,0CANW,MAAM,SACN,eAAe,GACb,QAAQ,MAAM,CAAC,CAmD3B;;;;;;AAED;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,8CALW,MAAM,SACN,eAAe;yBAcH,GAAG,EAAE;;EA0C3B"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,+EAEC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA8hBY,CAAC,SAAS,EAAE,GAAG,KAAK,GAAG,CAAC;AA5hBrC;;;;;;;GAOG;AACH,2DAMC;AAGD,2CAEC;AAED,oEAsBC;AAED,+BAYC;AAMD,kDAoBC;AAED,8DAEC;AAKD,6CAOC;AAsDD;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,CAO3C;AA1BD;;;;;;GAMG;AACH,kCAHW,OAAO,eAAe,EAAE,OAAO,GAAC,MAAM,GACpC,MAAM,CASlB;AAsBD,4DAgBC;AAED;;;;;;;;GAQG;AACH,4CANW,MAAM,GAAC,MAAM,GACX,MAAM,CAkBlB;AAED;;;;;;;;;GASG;AACH,wCANW,MAAM,QACN,MAAM,eACL,OAAO,UACN,OAAO,CAanB;AAzPD,+EAAyE;AA2PzE;;;;;;;;GAQG;AACH,yCALW,MAAM,SACN,MAAM,YACH,MAAM,KACP,QAAQ,OAAO,CAAC,CAoB5B;AAuBD;;;;;;;;;;;;GAYG;AACH,sCAVW,MAAM,YAIN,MAAM,QAFN,MAAM,GAIJ,OAAO,CAenB;AA7CD;;;;;;;;;;GAUG;AACH,kEAPW,MAAM,6EAahB;AA8BD;;;;;;GAMG;AACH,4BAHW,MAAM,GAAC,MAAM,EAAE,GACb,MAAM,CAIlB;AAED;;;;;;;GAOG;AACH,sCAFY,MAAM,CAIjB;AA7ND,+EAsBC;AAyMD;;;GAGG;AAEH;;;;;;;;GAQG;AACH,gCANW,MAAM,SACN,MAAM,YACN,gBAAgB,GAAC,OAAO,GAEtB,MAAM,CAYlB;AAnXD,yBAAuB;AADvB,yBAAuB;AADvB,uBAAiB;AAuXjB;;;;;;;GAOG;AAEH;;;;;;;;;;GAUG;AACH,0CANW,MAAM,SACN,eAAe,GACb,QAAQ,MAAM,CAAC,CAmD3B;;;;;;AAED;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,8CALW,MAAM,SACN,eAAe;yBAcH,GAAG,EAAE;;EA0C3B"}
package/build/lib/util.js CHANGED
@@ -170,10 +170,12 @@ function jsonStringify(obj, replacer, space = 2) {
170
170
  }
171
171
  }
172
172
  exports.jsonStringify = jsonStringify;
173
- /*
173
+ /**
174
174
  * Removes the wrapper from element, if it exists.
175
175
  * { ELEMENT: 4 } becomes 4
176
176
  * { element-6066-11e4-a52e-4f735466cecf: 5 } becomes 5
177
+ * @param {import('@appium/types').Element|string} el
178
+ * @returns {string}
177
179
  */
178
180
  function unwrapElement(el) {
179
181
  for (const propName of [W3C_WEB_ELEMENT_IDENTIFIER, 'ELEMENT']) {
@@ -181,9 +183,14 @@ function unwrapElement(el) {
181
183
  return el[propName];
182
184
  }
183
185
  }
184
- return el;
186
+ return /** @type {string} */ (el);
185
187
  }
186
188
  exports.unwrapElement = unwrapElement;
189
+ /**
190
+ *
191
+ * @param {string} elementId
192
+ * @returns {import('@appium/types').Element}
193
+ */
187
194
  function wrapElement(elementId) {
188
195
  return {
189
196
  ELEMENT: elementId,
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"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"}
package/lib/env.js CHANGED
@@ -4,7 +4,6 @@ import {homedir} from 'os';
4
4
  import path from 'path';
5
5
  import readPkg from 'read-pkg';
6
6
  import {npm} from './npm';
7
- import log from './logger';
8
7
 
9
8
  /**
10
9
  * Path to the default `APPIUM_HOME` dir (`~/.appium`).
@@ -69,11 +68,6 @@ export const findAppiumDependencyPackage = _.memoize(
69
68
  pkg?.peerDependencies?.appium;
70
69
  pkgPath = version && !OLD_VERSION_REGEX.test(String(version)) ? cwd : undefined;
71
70
  } catch {}
72
- if (pkgPath) {
73
- log.debug(`Found package.json having current Appium dep in ${pkgPath}`);
74
- } else {
75
- log.debug(`No package.json having current Appium dep in ${cwd}`);
76
- }
77
71
  return pkgPath;
78
72
  };
79
73
 
@@ -85,11 +79,7 @@ export const findAppiumDependencyPackage = _.memoize(
85
79
  const {json: list} = await npm.exec('list', ['--long', '--json'], {cwd});
86
80
  ({path: pkgDir} = list);
87
81
  if (pkgDir !== cwd) {
88
- if (pkgDir) {
89
- log.debug(`Determined package/workspace root from ${cwd} => ${pkgDir}`);
90
- } else {
91
- pkgDir = cwd;
92
- }
82
+ pkgDir = pkgDir ?? cwd;
93
83
  }
94
84
  } catch {
95
85
  pkgDir = cwd;
@@ -131,7 +121,6 @@ export const resolveAppiumHome = _.memoize(
131
121
  }
132
122
 
133
123
  if (process.env.APPIUM_HOME) {
134
- log.debug(`Using APPIUM_HOME from env: ${process.env.APPIUM_HOME}`);
135
124
  return path.resolve(cwd, process.env.APPIUM_HOME);
136
125
  }
137
126
 
@@ -139,7 +128,6 @@ export const resolveAppiumHome = _.memoize(
139
128
  if (pkgPath) {
140
129
  return pkgPath;
141
130
  }
142
- log.debug(`Using default APPIUM_HOME: ${DEFAULT_APPIUM_HOME}`);
143
131
  return DEFAULT_APPIUM_HOME;
144
132
  }
145
133
  );
package/lib/fs.js CHANGED
@@ -290,12 +290,14 @@ const fs = {
290
290
  * @param {string} dir - Directory to search from
291
291
  * @param {import('read-pkg').Options} [opts] - Additional options for `read-pkg`
292
292
  * @throws {Error} If there were problems finding or reading a `package.json` file
293
- * @returns {object} A parsed `package.json`
293
+ * @returns {import('read-pkg').NormalizedPackageJson} A parsed `package.json`
294
294
  */
295
295
  readPackageJsonFrom(dir, opts = {}) {
296
296
  const cwd = fs.findRoot(dir);
297
297
  try {
298
- return readPkg.sync({...opts, cwd});
298
+ return readPkg.sync(
299
+ /** @type {import('read-pkg').NormalizeOptions} */ ({normalize: true, ...opts, cwd})
300
+ );
299
301
  } catch (err) {
300
302
  err.message = `Failed to read a \`package.json\` from dir \`${dir}\`:\n\n${err.message}`;
301
303
  throw err;
package/lib/image-util.js CHANGED
@@ -19,21 +19,25 @@ const {MIME_JPEG, MIME_PNG, MIME_BMP} = Jimp;
19
19
  */
20
20
  async function getJimpImage(data) {
21
21
  return await new B((resolve, reject) => {
22
- if (!_.isString(data) && !_.isBuffer(data)) {
22
+ if (!_.isString(data) && !Buffer.isBuffer(data)) {
23
23
  return reject(new Error('Must initialize jimp object with string or buffer'));
24
24
  }
25
- // if data is a string, assume it is a base64-encoded image
26
- if (_.isString(data)) {
27
- data = Buffer.from(data, 'base64');
28
- }
25
+
26
+ const truncatedData = _.truncate(
27
+ Buffer.isBuffer(data) ? data.toString('utf8') : data,
28
+ {length: 50}
29
+ );
29
30
  new Jimp(
30
- data,
31
+ // if data is a string, assume it is a base64-encoded image
32
+ Buffer.isBuffer(data) ? data : Buffer.from(String(data), 'base64'),
31
33
  /**
32
34
  * @param {Error?} err
33
35
  * @param {AppiumJimp} imgObj
34
36
  */
35
37
  (err, imgObj) => {
36
38
  if (err) {
39
+ err.message = `The argument must be a valid base64-encoded image payload. ` +
40
+ `'${truncatedData}' was passed instead. Original error: ${err.message}`;
37
41
  return reject(err);
38
42
  }
39
43
  if (!imgObj) {
package/lib/npm.js CHANGED
@@ -193,10 +193,10 @@ export class NPM {
193
193
  * Installs a package w/ `npm`
194
194
  * @param {string} cwd
195
195
  * @param {string} pkgName
196
- * @param {InstallPackageOpts} [opts]
196
+ * @param {InstallPackageOpts} opts
197
197
  * @returns {Promise<NpmInstallReceipt>}
198
198
  */
199
- async installPackage(cwd, pkgName, {pkgVer, installType}) {
199
+ async installPackage(cwd, pkgName, {pkgVer, installType} = {}) {
200
200
  /** @type {any} */
201
201
  let dummyPkgJson;
202
202
  const dummyPkgPath = path.join(cwd, 'package.json');
package/lib/util.js CHANGED
@@ -172,10 +172,12 @@ function jsonStringify(obj, replacer, space = 2) {
172
172
  }
173
173
  }
174
174
 
175
- /*
175
+ /**
176
176
  * Removes the wrapper from element, if it exists.
177
177
  * { ELEMENT: 4 } becomes 4
178
178
  * { element-6066-11e4-a52e-4f735466cecf: 5 } becomes 5
179
+ * @param {import('@appium/types').Element|string} el
180
+ * @returns {string}
179
181
  */
180
182
  function unwrapElement(el) {
181
183
  for (const propName of [W3C_WEB_ELEMENT_IDENTIFIER, 'ELEMENT']) {
@@ -183,9 +185,14 @@ function unwrapElement(el) {
183
185
  return el[propName];
184
186
  }
185
187
  }
186
- return el;
188
+ return /** @type {string} */(el);
187
189
  }
188
190
 
191
+ /**
192
+ *
193
+ * @param {string} elementId
194
+ * @returns {import('@appium/types').Element}
195
+ */
189
196
  function wrapElement(elementId) {
190
197
  return {
191
198
  ELEMENT: elementId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appium/support",
3
- "version": "3.1.5",
3
+ "version": "3.1.7",
4
4
  "description": "Support libs used across appium packages",
5
5
  "keywords": [
6
6
  "automation",
@@ -42,12 +42,12 @@
42
42
  },
43
43
  "dependencies": {
44
44
  "@appium/tsconfig": "^0.2.4",
45
- "@appium/types": "^0.9.1",
45
+ "@appium/types": "^0.10.1",
46
46
  "@colors/colors": "1.5.0",
47
47
  "@types/archiver": "5.3.1",
48
48
  "@types/base64-stream": "1.0.2",
49
49
  "@types/find-root": "1.1.2",
50
- "@types/glob": "8.0.1",
50
+ "@types/glob": "8.1.0",
51
51
  "@types/jsftp": "2.1.2",
52
52
  "@types/klaw": "3.0.3",
53
53
  "@types/lockfile": "1.0.2",
@@ -61,9 +61,9 @@
61
61
  "@types/shell-quote": "1.7.1",
62
62
  "@types/supports-color": "8.1.1",
63
63
  "@types/teen_process": "2.0.0",
64
- "@types/uuid": "9.0.0",
64
+ "@types/uuid": "9.0.1",
65
65
  "archiver": "5.3.1",
66
- "axios": "1.2.3",
66
+ "axios": "1.3.4",
67
67
  "base64-stream": "1.0.0",
68
68
  "bluebird": "3.7.2",
69
69
  "bplist-creator": "0.1.1",
@@ -71,7 +71,7 @@
71
71
  "form-data": "4.0.0",
72
72
  "get-stream": "6.0.1",
73
73
  "glob": "8.1.0",
74
- "jimp": "0.22.4",
74
+ "jimp": "0.22.7",
75
75
  "jsftp": "2.1.3",
76
76
  "klaw": "4.1.0",
77
77
  "lockfile": "1.0.4",
@@ -85,7 +85,7 @@
85
85
  "pkg-dir": "5.0.0",
86
86
  "plist": "3.0.6",
87
87
  "pluralize": "8.0.0",
88
- "pngjs": "6.0.0",
88
+ "pngjs": "7.0.0",
89
89
  "read-pkg": "5.2.0",
90
90
  "resolve-from": "5.0.0",
91
91
  "rimraf": "3.0.2",
@@ -95,7 +95,7 @@
95
95
  "source-map-support": "0.5.21",
96
96
  "supports-color": "8.1.1",
97
97
  "teen_process": "2.0.2",
98
- "type-fest": "3.5.6",
98
+ "type-fest": "3.6.1",
99
99
  "uuid": "9.0.0",
100
100
  "which": "3.0.0",
101
101
  "yauzl": "2.10.0"
@@ -107,11 +107,8 @@
107
107
  "publishConfig": {
108
108
  "access": "public"
109
109
  },
110
- "gitHead": "322363b8876a7ea7b630d538e22965f7bab0ea06",
110
+ "gitHead": "872b924a97c13142bdb8bf4218a4db324f309ce4",
111
111
  "typedoc": {
112
112
  "entryPoint": "./lib/index.js"
113
- },
114
- "overrides": {
115
- "jpeg-js": "0.4.4"
116
113
  }
117
114
  }