appium-espresso-driver 2.40.3 → 2.40.5

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 (11) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +1 -1
  3. package/build/lib/doctor/required-checks.d.ts +2 -2
  4. package/build/lib/driver.d.ts +2 -2
  5. package/build/lib/driver.d.ts.map +1 -1
  6. package/build/lib/driver.js +1 -3
  7. package/build/lib/driver.js.map +1 -1
  8. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  9. package/lib/driver.ts +5 -6
  10. package/npm-shrinkwrap.json +306 -208
  11. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## [2.40.5](https://github.com/appium/appium-espresso-driver/compare/v2.40.4...v2.40.5) (2024-06-13)
2
+
3
+ ### Bug Fixes
4
+
5
+ * type error in the build ([#1011](https://github.com/appium/appium-espresso-driver/issues/1011)) ([38d7854](https://github.com/appium/appium-espresso-driver/commit/38d7854ab21128a9d5b6792846413d420c75534e))
6
+
7
+ ## [2.40.4](https://github.com/appium/appium-espresso-driver/compare/v2.40.3...v2.40.4) (2024-06-10)
8
+
9
+ ### Miscellaneous Chores
10
+
11
+ * use latest io.appium.settings ([#1010](https://github.com/appium/appium-espresso-driver/issues/1010)) ([ff816cf](https://github.com/appium/appium-espresso-driver/commit/ff816cf26645a1b8bc74001bc99d7577fc8c6fe3))
12
+
1
13
  ## [2.40.3](https://github.com/appium/appium-espresso-driver/compare/v2.40.2...v2.40.3) (2024-06-04)
2
14
 
3
15
  ### Miscellaneous Chores
package/README.md CHANGED
@@ -119,7 +119,7 @@ appium:clearDeviceLogsOnStart | If set to `true` then Espresso deletes all the e
119
119
  appium:buildToolsVersion | The version of Android build tools to use. By default Espresso driver uses the most recent version of build tools installed on the machine, but sometimes it might be necessary to give it a hint (let say if there is a known bug in the most recent tools version). Example: `28.0.3`
120
120
  appium:skipLogcatCapture | Being set to `true` disables automatic logcat output collection during the test run. `false` by default
121
121
  appium:suppressKillServer | Being set to `true` prevents the driver from ever killing the ADB server explicitly. Could be useful if ADB is connected wirelessly. `false` by default
122
- appium:ignoreHiddenApiPolicyError | Being set to `true` ignores a failure while changing hidden API access policies. Could be useful on some devices, where access to these policies has been locked by its vendor. `false` by default.
122
+ appium:ignoreHiddenApiPolicyError | Being set to `true` ignores a failure while changing hidden API access policies to [enable access to non-SDK interfaces](https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces#how_can_i_enable_access_to_non-sdk_interfaces). Could be useful on some devices, where access to these policies has been locked by its vendor. `false` by default.
123
123
  pium:hideKeyboard | Being set to `true` hides the on-screen keyboard while the session is running. Use it instead of the legacy `appium:unicodeKeyboard` one (which will be dropped in the future). This effect is achieved by assigning a custom "artificial" [input method](https://developer.android.com/develop/ui/views/touch-and-input/creating-input-method). Only use this feature for special/exploratory cases as it violates the way your application under test is normally interacted with by a human. Setting this capability explicitly to `false` enforces `adb shell ime reset` call on session startup, which resets the currently selected/enabled IMEs to the default ones as if the device is initially booted with the current locale. `undefined` by default.
124
124
  appium:mockLocationApp | Sets the package identifier of the app, which is used as a system mock location provider since Appium 1.18.0+. This capability has no effect on emulators. If the value is set to `null` or an empty string, then Appium will skip the mocked location provider setup procedure. Defaults to Appium Setting package identifier (`io.appium.settings`).
125
125
  appium:logcatFormat | The log print format, where `format` is one of: `brief` `process` `tag` `thread` `raw` `time` `threadtime` `long`. `threadtime` is the default value.
package/build/lib/doctor/required-checks.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export const androidHomeCheck: {
2
2
  varName: string;
3
3
  opts: doctorCommon.EnvVarCheckOptions;
4
- diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
4
+ diagnose(): Promise<any>;
5
5
  fix(): Promise<string>;
6
6
  hasAutofix(): boolean;
7
7
  isOptional(): boolean;
@@ -9,7 +9,7 @@ export const androidHomeCheck: {
9
9
  export const javaHomeCheck: {
10
10
  varName: string;
11
11
  opts: doctorCommon.EnvVarCheckOptions;
12
- diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
12
+ diagnose(): Promise<any>;
13
13
  fix(): Promise<string>;
14
14
  hasAutofix(): boolean;
15
15
  isOptional(): boolean;
package/build/lib/driver.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { DriverData, ExternalDriver, InitialOpts, StringRecord, SingularSessionData } from '@appium/types';
1
+ import type { DriverData, ExternalDriver, InitialOpts, StringRecord, SingularSessionData, RouteMatcher } from '@appium/types';
2
2
  import type { EspressoConstraints } from './constraints';
3
3
  import { EspressoRunner } from './espresso-runner';
4
4
  import * as appManagementCmds from './commands/app-management';
@@ -363,7 +363,7 @@ export declare class EspressoDriver extends AndroidDriver implements ExternalDri
363
363
  onSettingsUpdate(): Promise<void>;
364
364
  proxyActive(sessionId: any): boolean;
365
365
  canProxy(sessionId: any): boolean;
366
- getProxyAvoidList(sessionId: any): import("@appium/types").RouteMatcher[];
366
+ getProxyAvoidList(sessionId: any): RouteMatcher[];
367
367
  get appOnDevice(): boolean;
368
368
  performActions: typeof actionsCmds.performActions;
369
369
  mobileCommandsMapping: typeof executeCmds.mobileCommandsMapping;
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/driver.js CHANGED
@@ -60,7 +60,6 @@ const DEVICE_PORT = 6791;
60
60
  // TODO: Add the list of paths that we never want to proxy to espresso server.
61
61
  // TODO: Need to segregate the paths better way using regular expressions wherever applicable.
62
62
  // (Not segregating right away because more paths to be added in the NO_PROXY list)
63
- /** @type {import('@appium/types').RouteMatcher[]} */
64
63
  const NO_PROXY = [
65
64
  ['GET', new RegExp('^/session/(?!.*/)')],
66
65
  ['GET', new RegExp('^/session/[^/]+/appium/device/current_activity')],
@@ -123,7 +122,6 @@ const NO_PROXY = [
123
122
  ['POST', new RegExp('^/session/[^/]+/se/log')],
124
123
  ];
125
124
  // This is a set of methods and paths that we never want to proxy to Chromedriver.
126
- /** @type {import('@appium/types').RouteMatcher[]} */
127
125
  const CHROME_NO_PROXY = [
128
126
  ['GET', new RegExp('^/session/[^/]+/appium')],
129
127
  ['GET', new RegExp('^/session/[^/]+/context')],
@@ -652,7 +650,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
652
650
  // and one for Espresso(NO_PROXY), based on current context will return related NO_PROXY list
653
651
  this.jwpProxyAvoid = lodash_1.default.isNil(this.chromedriver) ? NO_PROXY : CHROME_NO_PROXY;
654
652
  if (this.opts.nativeWebScreenshot) {
655
- this.jwpProxyAvoid = /**@type {import('@appium/types').RouteMatcher[]} */ ([
653
+ this.jwpProxyAvoid = ([
656
654
  ...this.jwpProxyAvoid,
657
655
  ['GET', new RegExp('^/session/[^/]+/screenshot')]
658
656
  ]);
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/lib/driver.ts CHANGED
@@ -6,6 +6,7 @@ import type {
6
6
  InitialOpts,
7
7
  StringRecord,
8
8
  SingularSessionData,
9
+ RouteMatcher
9
10
  } from '@appium/types';
10
11
  import type { EspressoConstraints } from './constraints';
11
12
  import _ from 'lodash';
@@ -45,8 +46,7 @@ const DEVICE_PORT = 6791;
45
46
  // TODO: Add the list of paths that we never want to proxy to espresso server.
46
47
  // TODO: Need to segregate the paths better way using regular expressions wherever applicable.
47
48
  // (Not segregating right away because more paths to be added in the NO_PROXY list)
48
- /** @type {import('@appium/types').RouteMatcher[]} */
49
- const NO_PROXY: import('@appium/types').RouteMatcher[] = [
49
+ const NO_PROXY: RouteMatcher[] = [
50
50
  ['GET', new RegExp('^/session/(?!.*/)')],
51
51
  ['GET', new RegExp('^/session/[^/]+/appium/device/current_activity')],
52
52
  ['GET', new RegExp('^/session/[^/]+/appium/device/current_package')],
@@ -111,8 +111,7 @@ const NO_PROXY: import('@appium/types').RouteMatcher[] = [
111
111
  ];
112
112
 
113
113
  // This is a set of methods and paths that we never want to proxy to Chromedriver.
114
- /** @type {import('@appium/types').RouteMatcher[]} */
115
- const CHROME_NO_PROXY: import('@appium/types').RouteMatcher[] = [
114
+ const CHROME_NO_PROXY: RouteMatcher[] = [
116
115
  ['GET', new RegExp('^/session/[^/]+/appium')],
117
116
  ['GET', new RegExp('^/session/[^/]+/context')],
118
117
  ['GET', new RegExp('^/session/[^/]+/element/[^/]+/rect')],
@@ -686,12 +685,12 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
686
685
  }
687
686
 
688
687
  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
689
- getProxyAvoidList (sessionId) {
688
+ getProxyAvoidList (sessionId): RouteMatcher[] {
690
689
  // we are maintaining two sets of NO_PROXY lists, one for chromedriver(CHROME_NO_PROXY)
691
690
  // and one for Espresso(NO_PROXY), based on current context will return related NO_PROXY list
692
691
  this.jwpProxyAvoid = _.isNil(this.chromedriver) ? NO_PROXY : CHROME_NO_PROXY;
693
692
  if (this.opts.nativeWebScreenshot) {
694
- this.jwpProxyAvoid = /**@type {import('@appium/types').RouteMatcher[]} */([
693
+ this.jwpProxyAvoid = ([
695
694
  ...this.jwpProxyAvoid,
696
695
  ['GET', new RegExp('^/session/[^/]+/screenshot')]
697
696
  ]);
package/npm-shrinkwrap.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "2.40.3",
3
+ "version": "2.40.5",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "2.40.3",
9
+ "version": "2.40.5",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "appium-adb": "^12.4.0",
13
13
  "appium-android-driver": "^9.6.0",
14
14
  "asyncbox": "^3.0.0",
15
15
  "bluebird": "^3.5.0",
16
- "io.appium.settings": "^5.10.0",
16
+ "io.appium.settings": "^5.12.0",
17
17
  "lodash": "^4.17.11",
18
18
  "portscanner": "^2.1.1",
19
19
  "source-map-support": "^0.x",
@@ -60,17 +60,17 @@
60
60
  }
61
61
  },
62
62
  "node_modules/@appium/base-driver": {
63
- "version": "9.7.0",
64
- "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.7.0.tgz",
65
- "integrity": "sha512-WOikrt0wcwGjVhjyfWtLZ9TkPdov4FIrrhcYa9H4xfLDUirvEIesFHvXf2syV+Y+dn7eofrSWqEokV6SuX5cyA==",
63
+ "version": "9.10.3",
64
+ "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.10.3.tgz",
65
+ "integrity": "sha512-xPv2StYa8hHzgXF70bvQtc/5dOdqCR1DcwwSjSTOt49FTPGg6bYCSSobAfdHr80iR/alwNXe66qVkiOn1rO1iw==",
66
66
  "dependencies": {
67
- "@appium/support": "^4.2.6",
68
- "@appium/types": "^0.18.0",
67
+ "@appium/support": "^5.0.3",
68
+ "@appium/types": "^0.20.3",
69
69
  "@colors/colors": "1.6.0",
70
70
  "@types/async-lock": "1.4.2",
71
71
  "@types/bluebird": "3.5.42",
72
72
  "@types/express": "4.17.21",
73
- "@types/lodash": "4.17.4",
73
+ "@types/lodash": "4.17.5",
74
74
  "@types/method-override": "0.0.35",
75
75
  "@types/serve-favicon": "2.5.7",
76
76
  "async-lock": "1.4.1",
@@ -87,7 +87,7 @@
87
87
  "path-to-regexp": "6.2.2",
88
88
  "serve-favicon": "2.5.0",
89
89
  "source-map-support": "0.5.21",
90
- "type-fest": "4.18.3",
90
+ "type-fest": "4.20.0",
91
91
  "validate.js": "0.13.1"
92
92
  },
93
93
  "engines": {
@@ -98,10 +98,24 @@
98
98
  "spdy": "4.0.2"
99
99
  }
100
100
  },
101
+ "node_modules/@appium/logger": {
102
+ "version": "1.4.2",
103
+ "resolved": "https://registry.npmjs.org/@appium/logger/-/logger-1.4.2.tgz",
104
+ "integrity": "sha512-ifHuA4wuBa8xLx77lYhYmNi9qNPuGb1QgUQreME58Ugh5K2M6C+4xq6dD9KiQpHf0sy64m8fflxy24jrRPJ8ZA==",
105
+ "dependencies": {
106
+ "console-control-strings": "1.1.0",
107
+ "lodash": "4.17.21",
108
+ "set-blocking": "2.0.0"
109
+ },
110
+ "engines": {
111
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
112
+ "npm": ">=8"
113
+ }
114
+ },
101
115
  "node_modules/@appium/schema": {
102
- "version": "0.5.0",
103
- "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.5.0.tgz",
104
- "integrity": "sha512-HFed9HtFU6+kLdVyp/xpS/Wfcge8PuMS37LJVShviT6OuzHOYvNFx1/y8+KMa/l0Npvll5eafdfHmUsWlRnUAA==",
116
+ "version": "0.6.1",
117
+ "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.6.1.tgz",
118
+ "integrity": "sha512-tk4ytYaQQ94h5pqz97V2yKqZAmGnBd4ld50ZEw4Tt8QL2VBXOuTuizKDH+AMpyyL6hn/+dMFtcSVjy19iKrsUg==",
105
119
  "dependencies": {
106
120
  "@types/json-schema": "7.0.15",
107
121
  "json-schema": "0.4.0",
@@ -113,12 +127,13 @@
113
127
  }
114
128
  },
115
129
  "node_modules/@appium/support": {
116
- "version": "4.2.6",
117
- "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.2.6.tgz",
118
- "integrity": "sha512-uX4OMlatb3zsTOmh2YPZb3owtxdCMfMk9IbcFilIzCMLRAhYEYw29Z8vNe19QN+td2tS0i0NOFae5tz7lB72Uw==",
130
+ "version": "5.0.3",
131
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.0.3.tgz",
132
+ "integrity": "sha512-MCfaP3lg6WyRlBqk2yKr2q51tYhHBbOpJKX9rcHaFenlvf6lCKTrdazY4U/GP8MzW7/RxQE4l8jCJUXomLRfbQ==",
119
133
  "dependencies": {
134
+ "@appium/logger": "^1.4.2",
120
135
  "@appium/tsconfig": "^0.3.3",
121
- "@appium/types": "^0.18.0",
136
+ "@appium/types": "^0.20.3",
122
137
  "@colors/colors": "1.6.0",
123
138
  "@types/archiver": "6.0.2",
124
139
  "@types/base64-stream": "1.0.5",
@@ -128,14 +143,13 @@
128
143
  "@types/lockfile": "1.0.4",
129
144
  "@types/mv": "2.1.4",
130
145
  "@types/ncp": "2.0.8",
131
- "@types/npmlog": "7.0.0",
132
146
  "@types/pluralize": "0.0.33",
133
147
  "@types/semver": "7.5.8",
134
148
  "@types/shell-quote": "1.7.5",
135
149
  "@types/supports-color": "8.1.3",
136
150
  "@types/teen_process": "2.0.4",
137
151
  "@types/uuid": "9.0.8",
138
- "@types/which": "3.0.3",
152
+ "@types/which": "3.0.4",
139
153
  "archiver": "7.0.1",
140
154
  "axios": "1.7.2",
141
155
  "base64-stream": "1.0.0",
@@ -153,7 +167,6 @@
153
167
  "moment": "2.30.1",
154
168
  "mv": "2.1.1",
155
169
  "ncp": "2.0.0",
156
- "npmlog": "7.0.1",
157
170
  "opencv-bindings": "4.5.5",
158
171
  "pkg-dir": "5.0.0",
159
172
  "plist": "3.1.0",
@@ -165,8 +178,8 @@
165
178
  "shell-quote": "1.8.1",
166
179
  "source-map-support": "0.5.21",
167
180
  "supports-color": "8.1.1",
168
- "teen_process": "2.1.3",
169
- "type-fest": "4.18.3",
181
+ "teen_process": "2.1.4",
182
+ "type-fest": "4.20.0",
170
183
  "uuid": "9.0.1",
171
184
  "which": "4.0.0",
172
185
  "yauzl": "3.1.3"
@@ -179,21 +192,6 @@
179
192
  "sharp": "0.33.4"
180
193
  }
181
194
  },
182
- "node_modules/@appium/support/node_modules/teen_process": {
183
- "version": "2.1.3",
184
- "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.3.tgz",
185
- "integrity": "sha512-OBxmDvVOGavBQscCaKn365B5KuQ04uGRekAcKbwCu/2M1YvICpeNgVpqR+z9AhWSYOdB4zKLLwk4M1fyfAwPjw==",
186
- "dependencies": {
187
- "bluebird": "^3.7.2",
188
- "lodash": "^4.17.21",
189
- "shell-quote": "^1.8.1",
190
- "source-map-support": "^0.x"
191
- },
192
- "engines": {
193
- "node": "^16.13.0 || >=18.0.0",
194
- "npm": ">=8"
195
- }
196
- },
197
195
  "node_modules/@appium/tsconfig": {
198
196
  "version": "0.3.3",
199
197
  "resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-0.3.3.tgz",
@@ -207,16 +205,16 @@
207
205
  }
208
206
  },
209
207
  "node_modules/@appium/types": {
210
- "version": "0.18.0",
211
- "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.18.0.tgz",
212
- "integrity": "sha512-gvR75CbtbHP1dqUr1arWlLzI9ABAtosn/qDTqwjG5OX59ael6OwsWlfrR7wIDiGy7CjmHMRZJ38g+O4QwB9GCQ==",
208
+ "version": "0.20.3",
209
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.20.3.tgz",
210
+ "integrity": "sha512-5PTxTAyMvJbSY1ByBiXbnaLOejjPh2B0X+jadoOu6dciuPYMt+12yaH9yk/FfpFI4E7v/tbe1Vov5K/aIKm/jA==",
213
211
  "dependencies": {
214
- "@appium/schema": "^0.5.0",
212
+ "@appium/logger": "^1.4.2",
213
+ "@appium/schema": "^0.6.1",
215
214
  "@appium/tsconfig": "^0.3.3",
216
215
  "@types/express": "4.17.21",
217
- "@types/npmlog": "7.0.0",
218
216
  "@types/ws": "8.5.10",
219
- "type-fest": "4.18.3"
217
+ "type-fest": "4.20.0"
220
218
  },
221
219
  "engines": {
222
220
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -224,11 +222,11 @@
224
222
  }
225
223
  },
226
224
  "node_modules/@babel/code-frame": {
227
- "version": "7.24.6",
228
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
229
- "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
225
+ "version": "7.24.7",
226
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
227
+ "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
230
228
  "dependencies": {
231
- "@babel/highlight": "^7.24.6",
229
+ "@babel/highlight": "^7.24.7",
232
230
  "picocolors": "^1.0.0"
233
231
  },
234
232
  "engines": {
@@ -236,19 +234,19 @@
236
234
  }
237
235
  },
238
236
  "node_modules/@babel/helper-validator-identifier": {
239
- "version": "7.24.6",
240
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
241
- "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
237
+ "version": "7.24.7",
238
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
239
+ "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
242
240
  "engines": {
243
241
  "node": ">=6.9.0"
244
242
  }
245
243
  },
246
244
  "node_modules/@babel/highlight": {
247
- "version": "7.24.6",
248
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
249
- "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
245
+ "version": "7.24.7",
246
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
247
+ "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
250
248
  "dependencies": {
251
- "@babel/helper-validator-identifier": "^7.24.6",
249
+ "@babel/helper-validator-identifier": "^7.24.7",
252
250
  "chalk": "^2.4.2",
253
251
  "js-tokens": "^4.0.0",
254
252
  "picocolors": "^1.0.0"
@@ -589,9 +587,9 @@
589
587
  "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ=="
590
588
  },
591
589
  "node_modules/@types/lodash": {
592
- "version": "4.17.4",
593
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
594
- "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ=="
590
+ "version": "4.17.5",
591
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
592
+ "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw=="
595
593
  },
596
594
  "node_modules/@types/method-override": {
597
595
  "version": "0.0.35",
@@ -620,9 +618,9 @@
620
618
  }
621
619
  },
622
620
  "node_modules/@types/node": {
623
- "version": "20.14.1",
624
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz",
625
- "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==",
621
+ "version": "20.14.2",
622
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
623
+ "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
626
624
  "dependencies": {
627
625
  "undici-types": "~5.26.4"
628
626
  }
@@ -632,14 +630,6 @@
632
630
  "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
633
631
  "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="
634
632
  },
635
- "node_modules/@types/npmlog": {
636
- "version": "7.0.0",
637
- "resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-7.0.0.tgz",
638
- "integrity": "sha512-hJWbrKFvxKyWwSUXjZMYTINsSOY6IclhvGOZ97M8ac2tmR9hMwmTnYaMdpGhvju9ctWLTPhCS+eLfQNluiEjQQ==",
639
- "dependencies": {
640
- "@types/node": "*"
641
- }
642
- },
643
633
  "node_modules/@types/pluralize": {
644
634
  "version": "0.0.33",
645
635
  "resolved": "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.33.tgz",
@@ -719,9 +709,9 @@
719
709
  "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA=="
720
710
  },
721
711
  "node_modules/@types/which": {
722
- "version": "3.0.3",
723
- "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.3.tgz",
724
- "integrity": "sha512-2C1+XoY0huExTbs8MQv1DuS5FS86+SEjdM9F/+GS61gg5Hqbtj8ZiDSx8MfWcyei907fIPbfPGCOrNUTnVHY1g=="
712
+ "version": "3.0.4",
713
+ "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.4.tgz",
714
+ "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w=="
725
715
  },
726
716
  "node_modules/@types/ws": {
727
717
  "version": "8.5.10",
@@ -785,11 +775,11 @@
785
775
  }
786
776
  },
787
777
  "node_modules/appium-adb": {
788
- "version": "12.4.2",
789
- "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.4.2.tgz",
790
- "integrity": "sha512-iBU61R59NblxZWM4b0JiHiSCEm4TzSR1ZVQ1tnQiFdYKucosrqpyMGL10MY5cfOztsn67yi0bxanGJC2WiV5XQ==",
778
+ "version": "12.4.3",
779
+ "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.4.3.tgz",
780
+ "integrity": "sha512-pN8W6mB4PEUa2615XhmP77gHPx21lGrAzIrTlNweIS+ibNW+gMtfOvEFimtLZ1RXMpWW5GMO7AHSr50ceb92ug==",
791
781
  "dependencies": {
792
- "@appium/support": "^4.0.0",
782
+ "@appium/support": "^5.0.3",
793
783
  "@devicefarmer/adbkit-apkreader": "^3.2.4",
794
784
  "async-lock": "^1.0.0",
795
785
  "asyncbox": "^3.0.0",
@@ -807,9 +797,9 @@
807
797
  }
808
798
  },
809
799
  "node_modules/appium-android-driver": {
810
- "version": "9.6.2",
811
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.6.2.tgz",
812
- "integrity": "sha512-TDdQlnWZ2QK01lSxBtAh4alFRalY23JD+SfZti/CMeIpyq9HJov27Ys08jEKfDl3mTdo+Gi/3bKkSlYgp8ynyA==",
800
+ "version": "9.6.5",
801
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.6.5.tgz",
802
+ "integrity": "sha512-7MHHuZwGK+ku1DIHp4pIZdKt/P/MTDnlZqTDhMsxx5D0BQ9OwEd+OGGbUIyktAQOGNPRU2KyH3aeGiYg2XlfSw==",
813
803
  "dependencies": {
814
804
  "@appium/support": "^4.2.0",
815
805
  "@colors/colors": "^1.6.0",
@@ -818,7 +808,7 @@
818
808
  "asyncbox": "^3.0.0",
819
809
  "axios": "^1.x",
820
810
  "bluebird": "^3.4.7",
821
- "io.appium.settings": "^5.9.1",
811
+ "io.appium.settings": "^5.12.0",
822
812
  "lodash": "^4.17.4",
823
813
  "lru-cache": "^10.0.1",
824
814
  "moment": "^2.24.0",
@@ -838,10 +828,118 @@
838
828
  "appium": "^2.0.0"
839
829
  }
840
830
  },
831
+ "node_modules/appium-android-driver/node_modules/@appium/schema": {
832
+ "version": "0.5.0",
833
+ "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.5.0.tgz",
834
+ "integrity": "sha512-HFed9HtFU6+kLdVyp/xpS/Wfcge8PuMS37LJVShviT6OuzHOYvNFx1/y8+KMa/l0Npvll5eafdfHmUsWlRnUAA==",
835
+ "dependencies": {
836
+ "@types/json-schema": "7.0.15",
837
+ "json-schema": "0.4.0",
838
+ "source-map-support": "0.5.21"
839
+ },
840
+ "engines": {
841
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
842
+ "npm": ">=8"
843
+ }
844
+ },
845
+ "node_modules/appium-android-driver/node_modules/@appium/support": {
846
+ "version": "4.5.0",
847
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.5.0.tgz",
848
+ "integrity": "sha512-9pr8sjnvQud3gBaF/RGj1FdySPjcOuDuKE5w4rfYht/HHlnC3GkfNtQG1FH4rqAIbkOk72HoFr4eaQrQV/cc3g==",
849
+ "dependencies": {
850
+ "@appium/logger": "^1.3.0",
851
+ "@appium/tsconfig": "^0.3.3",
852
+ "@appium/types": "^0.19.2",
853
+ "@colors/colors": "1.6.0",
854
+ "@types/archiver": "6.0.2",
855
+ "@types/base64-stream": "1.0.5",
856
+ "@types/find-root": "1.1.4",
857
+ "@types/jsftp": "2.1.5",
858
+ "@types/klaw": "3.0.6",
859
+ "@types/lockfile": "1.0.4",
860
+ "@types/mv": "2.1.4",
861
+ "@types/ncp": "2.0.8",
862
+ "@types/pluralize": "0.0.33",
863
+ "@types/semver": "7.5.8",
864
+ "@types/shell-quote": "1.7.5",
865
+ "@types/supports-color": "8.1.3",
866
+ "@types/teen_process": "2.0.4",
867
+ "@types/uuid": "9.0.8",
868
+ "@types/which": "3.0.4",
869
+ "archiver": "7.0.1",
870
+ "axios": "1.7.2",
871
+ "base64-stream": "1.0.0",
872
+ "bluebird": "3.7.2",
873
+ "bplist-creator": "0.1.1",
874
+ "bplist-parser": "0.3.2",
875
+ "form-data": "4.0.0",
876
+ "get-stream": "6.0.1",
877
+ "glob": "10.4.1",
878
+ "jsftp": "2.1.3",
879
+ "klaw": "4.1.0",
880
+ "lockfile": "1.0.4",
881
+ "lodash": "4.17.21",
882
+ "log-symbols": "4.1.0",
883
+ "moment": "2.30.1",
884
+ "mv": "2.1.1",
885
+ "ncp": "2.0.0",
886
+ "opencv-bindings": "4.5.5",
887
+ "pkg-dir": "5.0.0",
888
+ "plist": "3.1.0",
889
+ "pluralize": "8.0.0",
890
+ "read-pkg": "5.2.0",
891
+ "resolve-from": "5.0.0",
892
+ "sanitize-filename": "1.6.3",
893
+ "semver": "7.6.2",
894
+ "shell-quote": "1.8.1",
895
+ "source-map-support": "0.5.21",
896
+ "supports-color": "8.1.1",
897
+ "teen_process": "2.1.4",
898
+ "type-fest": "4.19.0",
899
+ "uuid": "9.0.1",
900
+ "which": "4.0.0",
901
+ "yauzl": "3.1.3"
902
+ },
903
+ "engines": {
904
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
905
+ "npm": ">=8"
906
+ },
907
+ "optionalDependencies": {
908
+ "sharp": "0.33.4"
909
+ }
910
+ },
911
+ "node_modules/appium-android-driver/node_modules/@appium/types": {
912
+ "version": "0.19.2",
913
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.19.2.tgz",
914
+ "integrity": "sha512-u4oHR8TaFK3uyptgOT26/u3zQU5N6vh652OHIpRDJ78EDWgCWXLfIA6YdF8tA8YMrvZHhRpX9om04+9l8wSXyA==",
915
+ "dependencies": {
916
+ "@appium/logger": "^1.3.0",
917
+ "@appium/schema": "^0.5.0",
918
+ "@appium/tsconfig": "^0.3.3",
919
+ "@types/express": "4.17.21",
920
+ "@types/ws": "8.5.10",
921
+ "type-fest": "4.19.0"
922
+ },
923
+ "engines": {
924
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
925
+ "npm": ">=8"
926
+ }
927
+ },
928
+ "node_modules/appium-android-driver/node_modules/type-fest": {
929
+ "version": "4.19.0",
930
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.19.0.tgz",
931
+ "integrity": "sha512-CN2l+hWACRiejlnr68vY0/7734Kzu+9+TOslUXbSCQ1ruY9XIHDBSceVXCcHm/oXrdzhtLMMdJEKfemf1yXiZQ==",
932
+ "engines": {
933
+ "node": ">=16"
934
+ },
935
+ "funding": {
936
+ "url": "https://github.com/sponsors/sindresorhus"
937
+ }
938
+ },
841
939
  "node_modules/appium-chromedriver": {
842
- "version": "5.6.56",
843
- "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-5.6.56.tgz",
844
- "integrity": "sha512-cPsfsSKwxAKXGC5rZ5qW7lGZX7GXShncJJ8rzsPGQm2gRZl3l5YpTOPT79Bkyr0uN7NaYcEP/x1FSr89+w6JRA==",
940
+ "version": "5.6.57",
941
+ "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-5.6.57.tgz",
942
+ "integrity": "sha512-ho+oUzObPoPxvIJFcqSoAfp7aKcZbb0r7Jb8bOa6aV6u+Tg9TYf9dz7dQF6tkL6ILnTSY2JIcnTJpzgnHf6FFw==",
845
943
  "hasInstallScript": true,
846
944
  "dependencies": {
847
945
  "@appium/base-driver": "^9.1.0",
@@ -864,10 +962,113 @@
864
962
  "npm": ">=8"
865
963
  }
866
964
  },
867
- "node_modules/aproba": {
868
- "version": "2.0.0",
869
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
870
- "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
965
+ "node_modules/appium-chromedriver/node_modules/@appium/schema": {
966
+ "version": "0.5.0",
967
+ "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.5.0.tgz",
968
+ "integrity": "sha512-HFed9HtFU6+kLdVyp/xpS/Wfcge8PuMS37LJVShviT6OuzHOYvNFx1/y8+KMa/l0Npvll5eafdfHmUsWlRnUAA==",
969
+ "dependencies": {
970
+ "@types/json-schema": "7.0.15",
971
+ "json-schema": "0.4.0",
972
+ "source-map-support": "0.5.21"
973
+ },
974
+ "engines": {
975
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
976
+ "npm": ">=8"
977
+ }
978
+ },
979
+ "node_modules/appium-chromedriver/node_modules/@appium/support": {
980
+ "version": "4.5.0",
981
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.5.0.tgz",
982
+ "integrity": "sha512-9pr8sjnvQud3gBaF/RGj1FdySPjcOuDuKE5w4rfYht/HHlnC3GkfNtQG1FH4rqAIbkOk72HoFr4eaQrQV/cc3g==",
983
+ "dependencies": {
984
+ "@appium/logger": "^1.3.0",
985
+ "@appium/tsconfig": "^0.3.3",
986
+ "@appium/types": "^0.19.2",
987
+ "@colors/colors": "1.6.0",
988
+ "@types/archiver": "6.0.2",
989
+ "@types/base64-stream": "1.0.5",
990
+ "@types/find-root": "1.1.4",
991
+ "@types/jsftp": "2.1.5",
992
+ "@types/klaw": "3.0.6",
993
+ "@types/lockfile": "1.0.4",
994
+ "@types/mv": "2.1.4",
995
+ "@types/ncp": "2.0.8",
996
+ "@types/pluralize": "0.0.33",
997
+ "@types/semver": "7.5.8",
998
+ "@types/shell-quote": "1.7.5",
999
+ "@types/supports-color": "8.1.3",
1000
+ "@types/teen_process": "2.0.4",
1001
+ "@types/uuid": "9.0.8",
1002
+ "@types/which": "3.0.4",
1003
+ "archiver": "7.0.1",
1004
+ "axios": "1.7.2",
1005
+ "base64-stream": "1.0.0",
1006
+ "bluebird": "3.7.2",
1007
+ "bplist-creator": "0.1.1",
1008
+ "bplist-parser": "0.3.2",
1009
+ "form-data": "4.0.0",
1010
+ "get-stream": "6.0.1",
1011
+ "glob": "10.4.1",
1012
+ "jsftp": "2.1.3",
1013
+ "klaw": "4.1.0",
1014
+ "lockfile": "1.0.4",
1015
+ "lodash": "4.17.21",
1016
+ "log-symbols": "4.1.0",
1017
+ "moment": "2.30.1",
1018
+ "mv": "2.1.1",
1019
+ "ncp": "2.0.0",
1020
+ "opencv-bindings": "4.5.5",
1021
+ "pkg-dir": "5.0.0",
1022
+ "plist": "3.1.0",
1023
+ "pluralize": "8.0.0",
1024
+ "read-pkg": "5.2.0",
1025
+ "resolve-from": "5.0.0",
1026
+ "sanitize-filename": "1.6.3",
1027
+ "semver": "7.6.2",
1028
+ "shell-quote": "1.8.1",
1029
+ "source-map-support": "0.5.21",
1030
+ "supports-color": "8.1.1",
1031
+ "teen_process": "2.1.4",
1032
+ "type-fest": "4.19.0",
1033
+ "uuid": "9.0.1",
1034
+ "which": "4.0.0",
1035
+ "yauzl": "3.1.3"
1036
+ },
1037
+ "engines": {
1038
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
1039
+ "npm": ">=8"
1040
+ },
1041
+ "optionalDependencies": {
1042
+ "sharp": "0.33.4"
1043
+ }
1044
+ },
1045
+ "node_modules/appium-chromedriver/node_modules/@appium/types": {
1046
+ "version": "0.19.2",
1047
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.19.2.tgz",
1048
+ "integrity": "sha512-u4oHR8TaFK3uyptgOT26/u3zQU5N6vh652OHIpRDJ78EDWgCWXLfIA6YdF8tA8YMrvZHhRpX9om04+9l8wSXyA==",
1049
+ "dependencies": {
1050
+ "@appium/logger": "^1.3.0",
1051
+ "@appium/schema": "^0.5.0",
1052
+ "@appium/tsconfig": "^0.3.3",
1053
+ "@types/express": "4.17.21",
1054
+ "@types/ws": "8.5.10",
1055
+ "type-fest": "4.19.0"
1056
+ },
1057
+ "engines": {
1058
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
1059
+ "npm": ">=8"
1060
+ }
1061
+ },
1062
+ "node_modules/appium-chromedriver/node_modules/type-fest": {
1063
+ "version": "4.19.0",
1064
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.19.0.tgz",
1065
+ "integrity": "sha512-CN2l+hWACRiejlnr68vY0/7734Kzu+9+TOslUXbSCQ1ruY9XIHDBSceVXCcHm/oXrdzhtLMMdJEKfemf1yXiZQ==",
1066
+ "engines": {
1067
+ "node": ">=16"
1068
+ },
1069
+ "funding": {
1070
+ "url": "https://github.com/sponsors/sindresorhus"
1071
+ }
871
1072
  },
872
1073
  "node_modules/archiver": {
873
1074
  "version": "7.0.1",
@@ -903,15 +1104,6 @@
903
1104
  "node": ">= 14"
904
1105
  }
905
1106
  },
906
- "node_modules/are-we-there-yet": {
907
- "version": "4.0.2",
908
- "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz",
909
- "integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==",
910
- "deprecated": "This package is no longer supported.",
911
- "engines": {
912
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
913
- }
914
- },
915
1107
  "node_modules/arg": {
916
1108
  "version": "4.1.3",
917
1109
  "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
@@ -978,9 +1170,9 @@
978
1170
  "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
979
1171
  },
980
1172
  "node_modules/bare-events": {
981
- "version": "2.3.1",
982
- "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.3.1.tgz",
983
- "integrity": "sha512-sJnSOTVESURZ61XgEleqmP255T6zTYwHPwE4r6SssIh0U9/uDvfpdoJYpVUerJJZH2fueO+CdT8ZT+OC/7aZDA==",
1173
+ "version": "2.4.2",
1174
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
1175
+ "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
984
1176
  "optional": true
985
1177
  },
986
1178
  "node_modules/base64-js": {
@@ -1729,9 +1921,9 @@
1729
1921
  }
1730
1922
  },
1731
1923
  "node_modules/foreground-child": {
1732
- "version": "3.1.1",
1733
- "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
1734
- "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
1924
+ "version": "3.2.0",
1925
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz",
1926
+ "integrity": "sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==",
1735
1927
  "dependencies": {
1736
1928
  "cross-spawn": "^7.0.0",
1737
1929
  "signal-exit": "^4.0.1"
@@ -1823,54 +2015,6 @@
1823
2015
  "url": "https://github.com/sponsors/ljharb"
1824
2016
  }
1825
2017
  },
1826
- "node_modules/gauge": {
1827
- "version": "5.0.2",
1828
- "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
1829
- "integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==",
1830
- "deprecated": "This package is no longer supported.",
1831
- "dependencies": {
1832
- "aproba": "^1.0.3 || ^2.0.0",
1833
- "color-support": "^1.1.3",
1834
- "console-control-strings": "^1.1.0",
1835
- "has-unicode": "^2.0.1",
1836
- "signal-exit": "^4.0.1",
1837
- "string-width": "^4.2.3",
1838
- "strip-ansi": "^6.0.1",
1839
- "wide-align": "^1.1.5"
1840
- },
1841
- "engines": {
1842
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
1843
- }
1844
- },
1845
- "node_modules/gauge/node_modules/emoji-regex": {
1846
- "version": "8.0.0",
1847
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
1848
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
1849
- },
1850
- "node_modules/gauge/node_modules/signal-exit": {
1851
- "version": "4.1.0",
1852
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
1853
- "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
1854
- "engines": {
1855
- "node": ">=14"
1856
- },
1857
- "funding": {
1858
- "url": "https://github.com/sponsors/isaacs"
1859
- }
1860
- },
1861
- "node_modules/gauge/node_modules/string-width": {
1862
- "version": "4.2.3",
1863
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
1864
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
1865
- "dependencies": {
1866
- "emoji-regex": "^8.0.0",
1867
- "is-fullwidth-code-point": "^3.0.0",
1868
- "strip-ansi": "^6.0.1"
1869
- },
1870
- "engines": {
1871
- "node": ">=8"
1872
- }
1873
- },
1874
2018
  "node_modules/get-caller-file": {
1875
2019
  "version": "2.0.5",
1876
2020
  "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -1993,11 +2137,6 @@
1993
2137
  "url": "https://github.com/sponsors/ljharb"
1994
2138
  }
1995
2139
  },
1996
- "node_modules/has-unicode": {
1997
- "version": "2.0.1",
1998
- "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
1999
- "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
2000
- },
2001
2140
  "node_modules/hasown": {
2002
2141
  "version": "2.0.2",
2003
2142
  "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -2142,14 +2281,14 @@
2142
2281
  }
2143
2282
  },
2144
2283
  "node_modules/io.appium.settings": {
2145
- "version": "5.10.2",
2146
- "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.10.2.tgz",
2147
- "integrity": "sha512-iQE3mFK+juTKNMUawHQkg+AdWlqclt0VLa7iaMIWq4RYWuw8UlzpOP+usdAe2GayNJxkpBO81Nk7DY++iLKjZw==",
2284
+ "version": "5.12.1",
2285
+ "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.12.1.tgz",
2286
+ "integrity": "sha512-Qtoto6peFUHMPGg9BShWreaXbBgJ1w5Mg5C8RIKvtylicXWRlf9qHbDnEbAq/yTOrTIxPbnz9FIZ2L4+vW/OSA==",
2148
2287
  "dependencies": {
2288
+ "@appium/logger": "^1.3.0",
2149
2289
  "asyncbox": "^3.0.0",
2150
2290
  "bluebird": "^3.5.1",
2151
2291
  "lodash": "^4.2.1",
2152
- "npmlog": "^7.0.1",
2153
2292
  "semver": "^7.5.4",
2154
2293
  "source-map-support": "^0.x",
2155
2294
  "teen_process": "^2.0.0"
@@ -2230,9 +2369,9 @@
2230
2369
  }
2231
2370
  },
2232
2371
  "node_modules/jackspeak": {
2233
- "version": "3.2.3",
2234
- "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.2.3.tgz",
2235
- "integrity": "sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==",
2372
+ "version": "3.4.0",
2373
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
2374
+ "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
2236
2375
  "dependencies": {
2237
2376
  "@isaacs/cliui": "^8.0.2"
2238
2377
  },
@@ -2698,21 +2837,6 @@
2698
2837
  "node": ">=0.10.0"
2699
2838
  }
2700
2839
  },
2701
- "node_modules/npmlog": {
2702
- "version": "7.0.1",
2703
- "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz",
2704
- "integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==",
2705
- "deprecated": "This package is no longer supported.",
2706
- "dependencies": {
2707
- "are-we-there-yet": "^4.0.0",
2708
- "console-control-strings": "^1.1.0",
2709
- "gauge": "^5.0.0",
2710
- "set-blocking": "^2.0.0"
2711
- },
2712
- "engines": {
2713
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
2714
- }
2715
- },
2716
2840
  "node_modules/object-inspect": {
2717
2841
  "version": "1.13.1",
2718
2842
  "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
@@ -3696,15 +3820,15 @@
3696
3820
  }
3697
3821
  },
3698
3822
  "node_modules/tslib": {
3699
- "version": "2.6.2",
3700
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
3701
- "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
3823
+ "version": "2.6.3",
3824
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
3825
+ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
3702
3826
  "extraneous": true
3703
3827
  },
3704
3828
  "node_modules/type-fest": {
3705
- "version": "4.18.3",
3706
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.3.tgz",
3707
- "integrity": "sha512-Q08/0IrpvM+NMY9PA2rti9Jb+JejTddwmwmVQGskAlhtcrw1wsRzoR6ode6mR+OAabNa75w/dxedSUY2mlphaQ==",
3829
+ "version": "4.20.0",
3830
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz",
3831
+ "integrity": "sha512-MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw==",
3708
3832
  "engines": {
3709
3833
  "node": ">=16"
3710
3834
  },
@@ -3832,32 +3956,6 @@
3832
3956
  "node": "^16.13.0 || >=18.0.0"
3833
3957
  }
3834
3958
  },
3835
- "node_modules/wide-align": {
3836
- "version": "1.1.5",
3837
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
3838
- "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
3839
- "dependencies": {
3840
- "string-width": "^1.0.2 || 2 || 3 || 4"
3841
- }
3842
- },
3843
- "node_modules/wide-align/node_modules/emoji-regex": {
3844
- "version": "8.0.0",
3845
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
3846
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
3847
- },
3848
- "node_modules/wide-align/node_modules/string-width": {
3849
- "version": "4.2.3",
3850
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
3851
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
3852
- "dependencies": {
3853
- "emoji-regex": "^8.0.0",
3854
- "is-fullwidth-code-point": "^3.0.0",
3855
- "strip-ansi": "^6.0.1"
3856
- },
3857
- "engines": {
3858
- "node": ">=8"
3859
- }
3860
- },
3861
3959
  "node_modules/wrap-ansi": {
3862
3960
  "version": "7.0.0",
3863
3961
  "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "automated testing",
8
8
  "android"
9
9
  ],
10
- "version": "2.40.3",
10
+ "version": "2.40.5",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {
@@ -76,7 +76,7 @@
76
76
  "appium-android-driver": "^9.6.0",
77
77
  "asyncbox": "^3.0.0",
78
78
  "bluebird": "^3.5.0",
79
- "io.appium.settings": "^5.10.0",
79
+ "io.appium.settings": "^5.12.0",
80
80
  "lodash": "^4.17.11",
81
81
  "portscanner": "^2.1.1",
82
82
  "source-map-support": "^0.x",