@appium/support 4.1.9 → 4.1.11

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.
@@ -153,6 +153,7 @@ class CliConsole {
153
153
  this.log(this.decorate(message, 'error'), ...args);
154
154
  }
155
155
  }
156
+ exports.CliConsole = CliConsole;
156
157
  _CliConsole_console = new WeakMap(), _CliConsole_useSymbols = new WeakMap(), _CliConsole_useColor = new WeakMap();
157
158
  /**
158
159
  * @type {Record<keyof typeof symbols,keyof Extract<import('@colors/colors').Color, 'string'>>}
@@ -163,7 +164,6 @@ CliConsole.symbolToColor = {
163
164
  warning: 'yellow',
164
165
  error: 'red',
165
166
  };
166
- exports.CliConsole = CliConsole;
167
167
  /**
168
168
  * Options for {@linkcode CliConsole}.
169
169
  *
@@ -1 +1 @@
1
- {"version":3,"file":"console.js","sourceRoot":"","sources":["../../lib/console.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"console.js","sourceRoot":"","sources":["../../lib/console.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,mDAA6C;AAC7C,qCAA+C;AAC/C,0BAAwB;AACxB,8DAAkC;AAwK1B,kBAxKD,qBAAO,CAwKC;AAvKf,mCAAgC;AAEhC;;GAEG;AACH,MAAM,YAAa,SAAQ,iBAAQ;IACjC,6DAA6D;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC9B,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAa,UAAU;IA6BrB;;;OAGG;IACH,YAAY,EAAC,QAAQ,GAAG,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,EAAC,GAAG,EAAE;QAhChE;;;WAGG;QACH,sCAAS;QAET;;;;WAIG;QACH,yCAAY;QAEZ;;WAEG;QACH,uCAAU;QAiBR,uBAAA,IAAI,uBAAY,IAAI,iBAAW,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAA,CAAC;QAChG,uBAAA,IAAI,0BAAe,OAAO,CAAC,UAAU,CAAC,MAAA,CAAC;QACvC,uBAAA,IAAI,wBAAa,OAAO,CAAC,QAAQ,IAAI,IAAA,8BAAa,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAA,CAAC;IACtE,CAAC;IAED;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM;QAClB,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,MAAM,GAAG,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,uBAAA,IAAI,8BAAY,EAAE;gBAC1C,MAAM,GAAG,GAAG,qBAAO,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;gBACxC,IAAI,uBAAA,IAAI,4BAAU,EAAE;oBAClB,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;iBACnD;aACF;YACD,OAAO,MAAM,CAAC;SACf;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,KAAK;QACR,uBAAA,IAAI,2BAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI;QAClB,uBAAA,IAAI,2BAAS,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACH,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI;QACjB,uBAAA,IAAI,2BAAS,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,IAAI,EAAE,IAAI;QACb,uBAAA,IAAI,2BAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI;QACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI;QACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACrD,CAAC;;AApIH,gCAqIC;;AAlHC;;GAEG;AACI,wBAAa,GAAG;IACrB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,KAAK;CACb,AALmB,CAKlB;AA4GJ;;;;;;;;GAQG;AAEU,QAAA,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC"}
@@ -1 +1 @@
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;cAxJvC,QAAQ"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../lib/env.js"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,yCAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AA/BD;;;GAGG;AACH,kCAFU,MAAM,CAEsD;AAEtE;;;GAGG;AACH,gCAFU,MAAM,CAEmC;AAEnD;;;GAGG;AACH,qCAFU,MAAM,CAOd;AAYF;;;;GAIG;AACH,yEAGe,QAAQ,MAAM,GAAC,SAAS,CAAC,uBAkCtC;AAEF;;GAEG;AACH,sCAGa,MAAM,KACJ,QAAQ,OAAO,UAAU,EAAE,qBAAqB,GAAC,SAAS,CAAC,uBAKxE;AAEF;;;;;;;GAOG;AACH,+DAGe,QAAQ,MAAM,CAAC,uBAa5B;AAEF;;;;;GAKG;AACH,wEAGe,QAAQ,MAAM,CAAC,uBAO5B;oCAGW,OAAO,UAAU,EAAE,qBAAqB;cA9IvC,QAAQ"}
package/build/lib/env.js CHANGED
@@ -9,7 +9,7 @@ const lodash_1 = __importDefault(require("lodash"));
9
9
  const os_1 = require("os");
10
10
  const path_1 = __importDefault(require("path"));
11
11
  const read_pkg_1 = __importDefault(require("read-pkg"));
12
- const npm_1 = require("./npm");
12
+ const semver_1 = __importDefault(require("semver"));
13
13
  /**
14
14
  * Path to the default `APPIUM_HOME` dir (`~/.appium`).
15
15
  * @type {string}
@@ -25,7 +25,6 @@ exports.MANIFEST_BASENAME = 'extensions.yaml';
25
25
  * @type {string}
26
26
  */
27
27
  exports.MANIFEST_RELATIVE_PATH = path_1.default.join('node_modules', '.cache', 'appium', exports.MANIFEST_BASENAME);
28
- const OLD_VERSION_REGEX = /^[01]/;
29
28
  /**
30
29
  * Resolves `true` if an `appium` dependency can be found somewhere in the given `cwd`.
31
30
  *
@@ -48,38 +47,33 @@ exports.findAppiumDependencyPackage = lodash_1.default.memoize(
48
47
  */
49
48
  async (cwd = process.cwd()) => {
50
49
  /**
51
- * Tries to read `package.json` in `cwd` and resolves the identity if it depends on `appium`;
50
+ * Tries to read `package.json` in `root` and resolves the identity if it depends on `appium`;
52
51
  * otherwise resolves `undefined`.
53
- * @param {string} cwd
52
+ * @param {string} root
54
53
  * @returns {Promise<string|undefined>}
55
54
  */
56
- const readPkg = async (cwd) => {
57
- /** @type {string|undefined} */
58
- let pkgPath;
55
+ const readPkg = async (root) => {
59
56
  try {
60
- const pkg = await (0, exports.readPackageInDir)(cwd);
61
- const version = pkg?.dependencies?.appium ??
57
+ const pkg = await (0, exports.readPackageInDir)(root);
58
+ const version = semver_1.default.clean(String(pkg?.dependencies?.appium ??
62
59
  pkg?.devDependencies?.appium ??
63
- pkg?.peerDependencies?.appium;
64
- pkgPath = version && !OLD_VERSION_REGEX.test(String(version)) ? cwd : undefined;
60
+ pkg?.peerDependencies?.appium));
61
+ return version && semver_1.default.satisfies(version, '>=2.0.0-beta', { includePrerelease: true })
62
+ ? root
63
+ : undefined;
65
64
  }
66
65
  catch { }
67
- return pkgPath;
68
66
  };
69
- cwd = path_1.default.resolve(cwd);
70
- /** @type {string} */
71
- let pkgDir;
72
- try {
73
- const { json: list } = await npm_1.npm.exec('list', ['--long', '--json'], { cwd });
74
- ({ path: pkgDir } = list);
75
- if (pkgDir !== cwd) {
76
- pkgDir = pkgDir ?? cwd;
67
+ let currentDir = path_1.default.resolve(cwd);
68
+ let isAtFsRoot = false;
69
+ while (!isAtFsRoot) {
70
+ const result = await readPkg(currentDir);
71
+ if (result) {
72
+ return result;
77
73
  }
74
+ currentDir = path_1.default.dirname(currentDir);
75
+ isAtFsRoot = currentDir.length <= path_1.default.dirname(currentDir).length;
78
76
  }
79
- catch {
80
- pkgDir = cwd;
81
- }
82
- return await readPkg(pkgDir);
83
77
  });
84
78
  /**
85
79
  * Read a `package.json` in dir `cwd`. If none found, return `undefined`.
@@ -113,11 +107,7 @@ async function _resolveAppiumHome(cwd = process.cwd()) {
113
107
  if (process.env.APPIUM_HOME) {
114
108
  return path_1.default.resolve(cwd, process.env.APPIUM_HOME);
115
109
  }
116
- const pkgPath = await (0, exports.findAppiumDependencyPackage)(cwd);
117
- if (pkgPath) {
118
- return pkgPath;
119
- }
120
- return exports.DEFAULT_APPIUM_HOME;
110
+ return await (0, exports.findAppiumDependencyPackage)(cwd) ?? exports.DEFAULT_APPIUM_HOME;
121
111
  });
122
112
  /**
123
113
  * Figure out manifest path based on `appiumHome`.
@@ -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":"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"}
package/build/lib/fs.d.ts CHANGED
@@ -127,34 +127,34 @@ export namespace fs {
127
127
  * @returns {string} The closeset parent dir containing `package.json`
128
128
  */
129
129
  export function findRoot(dir: string): string;
130
- export const access: typeof fsPromises.access;
131
- export const appendFile: typeof fsPromises.appendFile;
132
- export const chmod: typeof fsPromises.chmod;
133
- export const close: (arg1: number) => B<any>;
130
+ export let access: typeof fsPromises.access;
131
+ export let appendFile: typeof fsPromises.appendFile;
132
+ export let chmod: typeof fsPromises.chmod;
133
+ export let close: (arg1: number) => B<any>;
134
134
  export { constants };
135
135
  export { createWriteStream };
136
136
  export { createReadStream };
137
- export const lstat: typeof fsPromises.lstat;
138
- export const open: (path: import("fs").PathLike, flags: import("fs").OpenMode, mode?: import("fs").Mode | undefined) => Promise<number>;
139
- export const openFile: typeof fsPromises.open;
140
- export const readdir: typeof fsPromises.readdir;
137
+ export let lstat: typeof fsPromises.lstat;
138
+ export let open: (path: import("fs").PathLike, flags: import("fs").OpenMode, mode?: import("fs").Mode | undefined) => Promise<number>;
139
+ export let openFile: typeof fsPromises.open;
140
+ export let readdir: typeof fsPromises.readdir;
141
141
  export function read(fd: number, buffer: NodeJS.ArrayBufferView | import("fs").ReadAsyncOptions<NodeJS.ArrayBufferView>, offset: number | undefined, length: number | undefined, position: number | null | undefined): B<{
142
142
  bytesRead: number;
143
143
  buffer: NodeJS.ArrayBufferView;
144
144
  }>;
145
- export const readFile: typeof fsPromises.readFile;
146
- export const readlink: typeof fsPromises.readlink;
147
- export const realpath: typeof fsPromises.realpath;
148
- export const rename: typeof fsPromises.rename;
149
- export const stat: typeof fsPromises.stat;
150
- export const symlink: typeof fsPromises.symlink;
151
- export const unlink: typeof fsPromises.unlink;
152
- export const write: (arg1: number, arg2: string) => B<number>;
153
- export const writeFile: typeof fsPromises.writeFile;
154
- export const F_OK: number;
155
- export const R_OK: number;
156
- export const W_OK: number;
157
- export const X_OK: number;
145
+ export let readFile: typeof fsPromises.readFile;
146
+ export let readlink: typeof fsPromises.readlink;
147
+ export let realpath: typeof fsPromises.realpath;
148
+ export let rename: typeof fsPromises.rename;
149
+ export let stat: typeof fsPromises.stat;
150
+ export let symlink: typeof fsPromises.symlink;
151
+ export let unlink: typeof fsPromises.unlink;
152
+ export let write: (arg1: number, arg2: string) => B<number>;
153
+ export let writeFile: typeof fsPromises.writeFile;
154
+ export let F_OK: number;
155
+ export let R_OK: number;
156
+ export let W_OK: number;
157
+ export let X_OK: number;
158
158
  }
159
159
  import mv from 'mv';
160
160
  import B from 'bluebird';
package/build/lib/npm.js CHANGED
@@ -218,7 +218,7 @@ class NPM {
218
218
  throw err;
219
219
  }
220
220
  }
221
- const installOpts = ['--save-dev'];
221
+ const installOpts = ['--save-dev', '--no-progress', '--no-audit', '--prefer-offline'];
222
222
  if (!(await (0, env_1.hasAppiumDependency)(cwd))) {
223
223
  if (process.env.APPIUM_OMIT_PEER_DEPS) {
224
224
  installOpts.push('--omit=peer');
@@ -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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"}
package/lib/env.js CHANGED
@@ -3,7 +3,7 @@ import _ from 'lodash';
3
3
  import {homedir} from 'os';
4
4
  import path from 'path';
5
5
  import readPkg from 'read-pkg';
6
- import {npm} from './npm';
6
+ import semver from 'semver';
7
7
 
8
8
  /**
9
9
  * Path to the default `APPIUM_HOME` dir (`~/.appium`).
@@ -28,8 +28,6 @@ export const MANIFEST_RELATIVE_PATH = path.join(
28
28
  MANIFEST_BASENAME
29
29
  );
30
30
 
31
- const OLD_VERSION_REGEX = /^[01]/;
32
-
33
31
  /**
34
32
  * Resolves `true` if an `appium` dependency can be found somewhere in the given `cwd`.
35
33
  *
@@ -52,39 +50,35 @@ export const findAppiumDependencyPackage = _.memoize(
52
50
  */
53
51
  async (cwd = process.cwd()) => {
54
52
  /**
55
- * Tries to read `package.json` in `cwd` and resolves the identity if it depends on `appium`;
53
+ * Tries to read `package.json` in `root` and resolves the identity if it depends on `appium`;
56
54
  * otherwise resolves `undefined`.
57
- * @param {string} cwd
55
+ * @param {string} root
58
56
  * @returns {Promise<string|undefined>}
59
57
  */
60
- const readPkg = async (cwd) => {
61
- /** @type {string|undefined} */
62
- let pkgPath;
58
+ const readPkg = async (root) => {
63
59
  try {
64
- const pkg = await readPackageInDir(cwd);
65
- const version =
60
+ const pkg = await readPackageInDir(root);
61
+ const version = semver.clean(String(
66
62
  pkg?.dependencies?.appium ??
67
63
  pkg?.devDependencies?.appium ??
68
- pkg?.peerDependencies?.appium;
69
- pkgPath = version && !OLD_VERSION_REGEX.test(String(version)) ? cwd : undefined;
64
+ pkg?.peerDependencies?.appium
65
+ ));
66
+ return version && semver.satisfies(version, '>=2.0.0-beta', {includePrerelease: true})
67
+ ? root
68
+ : undefined;
70
69
  } catch {}
71
- return pkgPath;
72
70
  };
73
71
 
74
- cwd = path.resolve(cwd);
75
-
76
- /** @type {string} */
77
- let pkgDir;
78
- try {
79
- const {json: list} = await npm.exec('list', ['--long', '--json'], {cwd});
80
- ({path: pkgDir} = list);
81
- if (pkgDir !== cwd) {
82
- pkgDir = pkgDir ?? cwd;
72
+ let currentDir = path.resolve(cwd);
73
+ let isAtFsRoot = false;
74
+ while (!isAtFsRoot) {
75
+ const result = await readPkg(currentDir);
76
+ if (result) {
77
+ return result;
83
78
  }
84
- } catch {
85
- pkgDir = cwd;
79
+ currentDir = path.dirname(currentDir);
80
+ isAtFsRoot = currentDir.length <= path.dirname(currentDir).length;
86
81
  }
87
- return await readPkg(pkgDir);
88
82
  }
89
83
  );
90
84
 
@@ -124,11 +118,7 @@ export const resolveAppiumHome = _.memoize(
124
118
  return path.resolve(cwd, process.env.APPIUM_HOME);
125
119
  }
126
120
 
127
- const pkgPath = await findAppiumDependencyPackage(cwd);
128
- if (pkgPath) {
129
- return pkgPath;
130
- }
131
- return DEFAULT_APPIUM_HOME;
121
+ return await findAppiumDependencyPackage(cwd) ?? DEFAULT_APPIUM_HOME;
132
122
  }
133
123
  );
134
124
 
package/lib/npm.js CHANGED
@@ -211,7 +211,7 @@ export class NPM {
211
211
  }
212
212
  }
213
213
 
214
- const installOpts = ['--save-dev'];
214
+ const installOpts = ['--save-dev', '--no-progress', '--no-audit', '--prefer-offline'];
215
215
  if (!(await hasAppiumDependency(cwd))) {
216
216
  if (process.env.APPIUM_OMIT_PEER_DEPS) {
217
217
  installOpts.push('--omit=peer');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appium/support",
3
- "version": "4.1.9",
3
+ "version": "4.1.11",
4
4
  "description": "Support libs used across appium packages",
5
5
  "keywords": [
6
6
  "automation",
@@ -42,9 +42,9 @@
42
42
  },
43
43
  "dependencies": {
44
44
  "@appium/tsconfig": "^0.x",
45
- "@appium/types": "^0.14.2",
45
+ "@appium/types": "^0.15.0",
46
46
  "@colors/colors": "1.6.0",
47
- "@types/archiver": "6.0.1",
47
+ "@types/archiver": "6.0.2",
48
48
  "@types/base64-stream": "1.0.5",
49
49
  "@types/find-root": "1.1.4",
50
50
  "@types/jsftp": "2.1.5",
@@ -52,16 +52,16 @@
52
52
  "@types/lockfile": "1.0.4",
53
53
  "@types/mv": "2.1.4",
54
54
  "@types/ncp": "2.0.8",
55
- "@types/npmlog": "4.1.6",
55
+ "@types/npmlog": "7.0.0",
56
56
  "@types/pluralize": "0.0.33",
57
- "@types/semver": "7.5.5",
58
- "@types/shell-quote": "1.7.4",
57
+ "@types/semver": "7.5.6",
58
+ "@types/shell-quote": "1.7.5",
59
59
  "@types/supports-color": "8.1.3",
60
- "@types/teen_process": "2.0.3",
60
+ "@types/teen_process": "2.0.4",
61
61
  "@types/uuid": "9.0.7",
62
- "@types/which": "3.0.1",
62
+ "@types/which": "3.0.3",
63
63
  "archiver": "6.0.1",
64
- "axios": "1.6.1",
64
+ "axios": "1.6.2",
65
65
  "base64-stream": "1.0.0",
66
66
  "bluebird": "3.7.2",
67
67
  "bplist-creator": "0.1.1",
@@ -89,8 +89,8 @@
89
89
  "shell-quote": "1.8.1",
90
90
  "source-map-support": "0.5.21",
91
91
  "supports-color": "8.1.1",
92
- "teen_process": "2.0.84",
93
- "type-fest": "3.13.1",
92
+ "teen_process": "2.1.1",
93
+ "type-fest": "4.8.3",
94
94
  "uuid": "9.0.1",
95
95
  "which": "4.0.0",
96
96
  "yauzl": "2.10.0"
@@ -105,8 +105,5 @@
105
105
  "publishConfig": {
106
106
  "access": "public"
107
107
  },
108
- "gitHead": "717ec38d8cb63330ac1901eda8ef4489d256678b",
109
- "typedoc": {
110
- "entryPoint": "./lib/index.js"
111
- }
108
+ "gitHead": "5c1d20517cfc8773cd5ffb0f8bb996668d71116b"
112
109
  }