appium-xcuitest-driver 7.28.3 → 7.29.1

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 (7) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/build/lib/app-utils.d.ts.map +1 -1
  3. package/build/lib/app-utils.js +35 -7
  4. package/build/lib/app-utils.js.map +1 -1
  5. package/lib/app-utils.js +45 -10
  6. package/npm-shrinkwrap.json +115 -177
  7. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## [7.29.1](https://github.com/appium/appium-xcuitest-driver/compare/v7.29.0...v7.29.1) (2024-11-11)
2
+
3
+ ### Bug Fixes
4
+
5
+ * Tune simulator app architecture validation ([#2492](https://github.com/appium/appium-xcuitest-driver/issues/2492)) ([0738ae9](https://github.com/appium/appium-xcuitest-driver/commit/0738ae9a6db8da8a47fe08c6d9e2d463c1c17591))
6
+
7
+ ## [7.29.0](https://github.com/appium/appium-xcuitest-driver/compare/v7.28.3...v7.29.0) (2024-11-11)
8
+
9
+ ### Features
10
+
11
+ * add useClearTextShortcut to setting api ([#2490](https://github.com/appium/appium-xcuitest-driver/issues/2490)) ([f54a157](https://github.com/appium/appium-xcuitest-driver/commit/f54a1570da5ca791ccb1f3f7402dafd1b9860c1b))
12
+
1
13
  ## [7.28.3](https://github.com/appium/appium-xcuitest-driver/compare/v7.28.2...v7.28.3) (2024-10-23)
2
14
 
3
15
  ### Bug Fixes
package/build/lib/app-utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-utils.d.ts","sourceRoot":"","sources":["../../lib/app-utils.js"],"names":[],"mappings":"AA8BA;;;;;;;GAOG;AACH,oFAHa,OAAO,CAAC,IAAI,CAAC,CA4CzB;AAgBD;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,wFAHW,yBAAyB,GACvB,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CA6FzD;AA0BD;;;;GAIG;AAEH;;;;;GAKG;AACH,uCAHW,MAAM,GACJ,OAAO,CAAC,SAAS,CAAC,CAiB9B;AAED;;;;;;;;GAQG;AACH,uCAHW,OAAO,aAAa,EAAE,QAAQ,GAC5B,OAAO,CAAC,SAAS,CAAC,CAoD9B;AAoJD;;;;;GAKG;AACH,6CAHW,OAAO,UAAU,EAAE,kBAAkB,GACpC,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAexD;AAyGD;;;;;;;;;;GAUG;AACH,4FAHW,OAAO,eAAe,EAAE,kBAAkB,GACxC,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;;GAIG;AACH,+GAHW,OAAO,eAAe,EAAE,kBAAkB,GACxC,OAAO,CAAC,OAAO,eAAe,EAAE,iBAAiB,GAAC,KAAK,CAAC,CA0DpE;AA7oBD,wDAAyD;AACzD,6BAA8B;AAC9B,6BAA8B;AAW9B,4CAAuD;;;;;;;;;aA4MzC,MAAM;iBACN,MAAM;;6BAsbP,OAAO,UAAU,EAAE,cAAc"}
1
+ {"version":3,"file":"app-utils.d.ts","sourceRoot":"","sources":["../../lib/app-utils.js"],"names":[],"mappings":"AA+BA;;;;;;;GAOG;AACH,oFAHa,OAAO,CAAC,IAAI,CAAC,CAgEzB;AAgBD;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,wFAHW,yBAAyB,GACvB,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CA6FzD;AA0BD;;;;GAIG;AAEH;;;;;GAKG;AACH,uCAHW,MAAM,GACJ,OAAO,CAAC,SAAS,CAAC,CAiB9B;AAED;;;;;;;;GAQG;AACH,uCAHW,OAAO,aAAa,EAAE,QAAQ,GAC5B,OAAO,CAAC,SAAS,CAAC,CAoD9B;AAoJD;;;;;GAKG;AACH,6CAHW,OAAO,UAAU,EAAE,kBAAkB,GACpC,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAexD;AAyGD;;;;;;;;;;GAUG;AACH,4FAHW,OAAO,eAAe,EAAE,kBAAkB,GACxC,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;;GAIG;AACH,+GAHW,OAAO,eAAe,EAAE,kBAAkB,GACxC,OAAO,CAAC,OAAO,eAAe,EAAE,iBAAiB,GAAC,KAAK,CAAC,CA0DpE;AAlqBD,wDAAyD;AACzD,6BAA8B;AAC9B,6BAA8B;AAW9B,4CAAuD;;;;;;;;;aAiOzC,MAAM;iBACN,MAAM;;6BAocP,OAAO,UAAU,EAAE,cAAc"}
package/build/lib/app-utils.js CHANGED
@@ -39,6 +39,7 @@ const MAX_ARCHIVE_SCAN_DEPTH = 1;
39
39
  exports.SUPPORTED_EXTENSIONS = [exports.IPA_EXT, exports.APP_EXT];
40
40
  const MACOS_RESOURCE_FOLDER = '__MACOSX';
41
41
  const SANITIZE_REPLACEMENT = '-';
42
+ const INTEL_ARCH = 'x86_64';
42
43
  /**
43
44
  * Verify whether the given application is compatible to the
44
45
  * platform where it is going to be installed and tested.
@@ -68,16 +69,31 @@ async function verifyApplicationPlatform() {
68
69
  ]);
69
70
  const bundleExecutableInfo = lodash_1.default.trim(resFile.stdout);
70
71
  this.log.debug(bundleExecutableInfo);
71
- const arch = lodash_1.default.trim(resUname.stdout);
72
- const isAppleSilicon = node_os_1.default.cpus()[0].model.includes('Apple');
72
+ const processArch = lodash_1.default.trim(resUname.stdout);
73
+ this.log.debug(`Current process architecture: ${processArch}`);
74
+ const isAppleSiliconCpu = isAppleSilicon();
75
+ this.log.debug(`Is Apple Silicon CPU: ${isAppleSiliconCpu}`);
76
+ if (isAppleSiliconCpu && processArch === INTEL_ARCH) {
77
+ this.log.warn(`It looks like the Appium server process is running under Rosetta emulation. ` +
78
+ `This might lead to various performance/compatibility issues while running tests on Simulator. ` +
79
+ `Consider using binaries compiled natively for the ARM64 architecture to run Appium server ` +
80
+ `with this driver.`);
81
+ }
82
+ if (lodash_1.default.includes(bundleExecutableInfo, processArch)) {
83
+ return;
84
+ }
85
+ const hasRosetta = isAppleSiliconCpu && await isRosettaInstalled();
86
+ const isIntelApp = lodash_1.default.includes(bundleExecutableInfo, INTEL_ARCH);
73
87
  // We cannot run Simulator builds compiled for arm64 on Intel machines
74
88
  // Rosetta allows only to run Intel ones on arm64
75
- if (!lodash_1.default.includes(bundleExecutableInfo, arch) &&
76
- !(isAppleSilicon && lodash_1.default.includes(bundleExecutableInfo, 'x86_64'))) {
77
- throw new Error(`The ${this.opts.bundleId} application does not support the ${arch} Simulator ` +
78
- `architecture:\n${bundleExecutableInfo}\n\n` +
79
- `Please rebuild your application to support the ${arch} platform.`);
89
+ if ((isIntelApp && (!isAppleSiliconCpu || hasRosetta)) || (!isIntelApp && isAppleSiliconCpu)) {
90
+ return;
80
91
  }
92
+ const advice = isIntelApp && isAppleSiliconCpu && !hasRosetta
93
+ ? `Please install Rosetta and try again.`
94
+ : `Please rebuild your application to support the ${processArch} platform.`;
95
+ throw new Error(`The ${this.opts.bundleId} application does not support the ${processArch} Simulator ` +
96
+ `architecture:\n${bundleExecutableInfo}\n\n${advice}`);
81
97
  }
82
98
  /**
83
99
  *
@@ -619,6 +635,18 @@ async function onPostConfigureApp({ cachedAppInfo, isUrl, appPath }) {
619
635
  : await unzipApp.bind(this)(/** @type {string} */ (appPath))
620
636
  };
621
637
  }
638
+ /**
639
+ * @returns {Promise<boolean>}
640
+ */
641
+ async function isRosettaInstalled() {
642
+ return await support_1.fs.exists('/Library/Apple/usr/share/rosetta/rosetta');
643
+ }
644
+ /**
645
+ * @returns {boolean}
646
+ */
647
+ function isAppleSilicon() {
648
+ return node_os_1.default.cpus()[0].model.includes('Apple');
649
+ }
622
650
  /**
623
651
  * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
624
652
  */
package/build/lib/app-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../../lib/app-utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../../lib/app-utils.js"],"names":[],"mappings":"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"}
package/lib/app-utils.js CHANGED
@@ -27,6 +27,7 @@ const MAX_ARCHIVE_SCAN_DEPTH = 1;
27
27
  export const SUPPORTED_EXTENSIONS = [IPA_EXT, APP_EXT];
28
28
  const MACOS_RESOURCE_FOLDER = '__MACOSX';
29
29
  const SANITIZE_REPLACEMENT = '-';
30
+ const INTEL_ARCH = 'x86_64';
30
31
 
31
32
  /**
32
33
  * Verify whether the given application is compatible to the
@@ -56,27 +57,47 @@ export async function verifyApplicationPlatform() {
56
57
  return;
57
58
  }
58
59
 
59
- const executablePath = path.resolve(this.opts.app, await this.appInfosCache.extractExecutableName(this.opts.app));
60
+ const executablePath = path.resolve(
61
+ this.opts.app,
62
+ await this.appInfosCache.extractExecutableName(this.opts.app)
63
+ );
60
64
  const [resFile, resUname] = await B.all([
61
65
  exec('lipo', ['-info', executablePath]),
62
66
  exec('uname', ['-m']),
63
67
  ]);
64
68
  const bundleExecutableInfo = _.trim(resFile.stdout);
65
69
  this.log.debug(bundleExecutableInfo);
66
- const arch = _.trim(resUname.stdout);
67
- const isAppleSilicon = os.cpus()[0].model.includes('Apple');
70
+ const processArch = _.trim(resUname.stdout);
71
+ this.log.debug(`Current process architecture: ${processArch}`);
72
+ const isAppleSiliconCpu = isAppleSilicon();
73
+ this.log.debug(`Is Apple Silicon CPU: ${isAppleSiliconCpu}`);
74
+ if (isAppleSiliconCpu && processArch === INTEL_ARCH) {
75
+ this.log.warn(
76
+ `It looks like the Appium server process is running under Rosetta emulation. ` +
77
+ `This might lead to various performance/compatibility issues while running tests on Simulator. ` +
78
+ `Consider using binaries compiled natively for the ARM64 architecture to run Appium server ` +
79
+ `with this driver.`
80
+ );
81
+ }
82
+ if (_.includes(bundleExecutableInfo, processArch)) {
83
+ return;
84
+ }
85
+ const hasRosetta = isAppleSiliconCpu && await isRosettaInstalled();
86
+ const isIntelApp = _.includes(bundleExecutableInfo, INTEL_ARCH);
68
87
  // We cannot run Simulator builds compiled for arm64 on Intel machines
69
88
  // Rosetta allows only to run Intel ones on arm64
70
89
  if (
71
- !_.includes(bundleExecutableInfo, arch) &&
72
- !(isAppleSilicon && _.includes(bundleExecutableInfo, 'x86_64'))
90
+ (isIntelApp && (!isAppleSiliconCpu || hasRosetta)) || (!isIntelApp && isAppleSiliconCpu)
73
91
  ) {
74
- throw new Error(
75
- `The ${this.opts.bundleId} application does not support the ${arch} Simulator ` +
76
- `architecture:\n${bundleExecutableInfo}\n\n` +
77
- `Please rebuild your application to support the ${arch} platform.`,
78
- );
92
+ return;
79
93
  }
94
+ const advice = isIntelApp && isAppleSiliconCpu && !hasRosetta
95
+ ? `Please install Rosetta and try again.`
96
+ : `Please rebuild your application to support the ${processArch} platform.`;
97
+ throw new Error(
98
+ `The ${this.opts.bundleId} application does not support the ${processArch} Simulator ` +
99
+ `architecture:\n${bundleExecutableInfo}\n\n${advice}`
100
+ );
80
101
  }
81
102
 
82
103
  /**
@@ -666,6 +687,20 @@ export async function onPostConfigureApp({cachedAppInfo, isUrl, appPath}) {
666
687
  };
667
688
  }
668
689
 
690
+ /**
691
+ * @returns {Promise<boolean>}
692
+ */
693
+ async function isRosettaInstalled() {
694
+ return await fs.exists('/Library/Apple/usr/share/rosetta/rosetta');
695
+ }
696
+
697
+ /**
698
+ * @returns {boolean}
699
+ */
700
+ function isAppleSilicon() {
701
+ return os.cpus()[0].model.includes('Apple');
702
+ }
703
+
669
704
  /**
670
705
  * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
671
706
  */
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-xcuitest-driver",
3
- "version": "7.28.3",
3
+ "version": "7.29.1",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-xcuitest-driver",
9
- "version": "7.28.3",
9
+ "version": "7.29.1",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "@colors/colors": "^1.6.0",
@@ -14,7 +14,7 @@
14
14
  "appium-ios-device": "^2.7.23",
15
15
  "appium-ios-simulator": "^6.1.7",
16
16
  "appium-remote-debugger": "^12.1.1",
17
- "appium-webdriveragent": "^8.9.4",
17
+ "appium-webdriveragent": "^8.10.0",
18
18
  "appium-xcode": "^5.1.4",
19
19
  "async-lock": "^1.4.0",
20
20
  "asyncbox": "^3.0.0",
@@ -73,18 +73,18 @@
73
73
  }
74
74
  },
75
75
  "node_modules/@appium/base-driver": {
76
- "version": "9.12.0",
77
- "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.12.0.tgz",
78
- "integrity": "sha512-nnRRVRjC6dtcTZUxnuq80PnfWrObR1x9XsHDPR3eC7kbi6meexgQdezoisDw2rOka744zvYMZxDt9E7Q3mkNUA==",
76
+ "version": "9.12.1",
77
+ "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.12.1.tgz",
78
+ "integrity": "sha512-lUOI/r0jrT1EVR16D31OH2m2FgEQAfYzJTsuDCohqI9caA8vHd4ChkWELnhMG/PdfhigxUoIpyvTlImG4XtbVQ==",
79
79
  "license": "Apache-2.0",
80
80
  "dependencies": {
81
- "@appium/support": "^5.1.5",
81
+ "@appium/support": "^5.1.6",
82
82
  "@appium/types": "^0.22.0",
83
83
  "@colors/colors": "1.6.0",
84
84
  "@types/async-lock": "1.4.2",
85
85
  "@types/bluebird": "3.5.42",
86
86
  "@types/express": "5.0.0",
87
- "@types/lodash": "4.17.10",
87
+ "@types/lodash": "4.17.12",
88
88
  "@types/method-override": "0.0.35",
89
89
  "@types/serve-favicon": "2.5.7",
90
90
  "async-lock": "1.4.1",
@@ -113,18 +113,18 @@
113
113
  }
114
114
  },
115
115
  "node_modules/@appium/base-driver/node_modules/@types/lodash": {
116
- "version": "4.17.10",
117
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
118
- "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
116
+ "version": "4.17.12",
117
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
118
+ "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
119
119
  "license": "MIT"
120
120
  },
121
121
  "node_modules/@appium/docutils": {
122
- "version": "1.0.22",
123
- "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-1.0.22.tgz",
124
- "integrity": "sha512-JQessORO8gM5GRrXJzoGlx8yPRJlQglok2FsQthF/3NqB+owoVwbJyJxB9L9cWfrLSikfHMRQ1YKK1gXaj6kRA==",
122
+ "version": "1.0.23",
123
+ "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-1.0.23.tgz",
124
+ "integrity": "sha512-NXqviNCm/NCLFVzQ60gqCkFITMTpX8IY/ASI+gVSTJAEF4cvndE94FM1tq8ocuMmkTOYiFk4ZJa8CcPV3afbVw==",
125
125
  "license": "Apache-2.0",
126
126
  "dependencies": {
127
- "@appium/support": "^5.1.5",
127
+ "@appium/support": "^5.1.6",
128
128
  "@appium/tsconfig": "^0.3.3",
129
129
  "@sliphua/lilconfig-ts-loader": "3.2.2",
130
130
  "@types/which": "3.0.4",
@@ -199,16 +199,16 @@
199
199
  }
200
200
  },
201
201
  "node_modules/@appium/support": {
202
- "version": "5.1.5",
203
- "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.1.5.tgz",
204
- "integrity": "sha512-/K0ut+ys4dv49hirH4taMK5FJ3cLkTgUGYdoxTh24pfJyd9CE1TCxCoDdCTrO7fmGBfKIsInceZdFJw2/JBAvw==",
202
+ "version": "5.1.6",
203
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.1.6.tgz",
204
+ "integrity": "sha512-BtWnVkIGUOHLDWkuBKSm15C5t2g5qv2+NOguAJ6ujPwDn2VLL86usk82DZF3IJ3Yujn0IrLGUrDLvtlG/uqXUg==",
205
205
  "license": "Apache-2.0",
206
206
  "dependencies": {
207
207
  "@appium/logger": "^1.6.1",
208
208
  "@appium/tsconfig": "^0.3.3",
209
209
  "@appium/types": "^0.22.0",
210
210
  "@colors/colors": "1.6.0",
211
- "@types/archiver": "6.0.2",
211
+ "@types/archiver": "6.0.3",
212
212
  "@types/base64-stream": "1.0.5",
213
213
  "@types/find-root": "1.1.4",
214
214
  "@types/jsftp": "2.1.5",
@@ -297,12 +297,13 @@
297
297
  }
298
298
  },
299
299
  "node_modules/@babel/code-frame": {
300
- "version": "7.25.9",
301
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz",
302
- "integrity": "sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==",
300
+ "version": "7.26.2",
301
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
302
+ "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
303
303
  "license": "MIT",
304
304
  "dependencies": {
305
- "@babel/highlight": "^7.25.9",
305
+ "@babel/helper-validator-identifier": "^7.25.9",
306
+ "js-tokens": "^4.0.0",
306
307
  "picocolors": "^1.0.0"
307
308
  },
308
309
  "engines": {
@@ -318,92 +319,6 @@
318
319
  "node": ">=6.9.0"
319
320
  }
320
321
  },
321
- "node_modules/@babel/highlight": {
322
- "version": "7.25.9",
323
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz",
324
- "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==",
325
- "license": "MIT",
326
- "dependencies": {
327
- "@babel/helper-validator-identifier": "^7.25.9",
328
- "chalk": "^2.4.2",
329
- "js-tokens": "^4.0.0",
330
- "picocolors": "^1.0.0"
331
- },
332
- "engines": {
333
- "node": ">=6.9.0"
334
- }
335
- },
336
- "node_modules/@babel/highlight/node_modules/ansi-styles": {
337
- "version": "3.2.1",
338
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
339
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
340
- "license": "MIT",
341
- "dependencies": {
342
- "color-convert": "^1.9.0"
343
- },
344
- "engines": {
345
- "node": ">=4"
346
- }
347
- },
348
- "node_modules/@babel/highlight/node_modules/chalk": {
349
- "version": "2.4.2",
350
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
351
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
352
- "license": "MIT",
353
- "dependencies": {
354
- "ansi-styles": "^3.2.1",
355
- "escape-string-regexp": "^1.0.5",
356
- "supports-color": "^5.3.0"
357
- },
358
- "engines": {
359
- "node": ">=4"
360
- }
361
- },
362
- "node_modules/@babel/highlight/node_modules/color-convert": {
363
- "version": "1.9.3",
364
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
365
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
366
- "license": "MIT",
367
- "dependencies": {
368
- "color-name": "1.1.3"
369
- }
370
- },
371
- "node_modules/@babel/highlight/node_modules/color-name": {
372
- "version": "1.1.3",
373
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
374
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
375
- "license": "MIT"
376
- },
377
- "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
378
- "version": "1.0.5",
379
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
380
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
381
- "license": "MIT",
382
- "engines": {
383
- "node": ">=0.8.0"
384
- }
385
- },
386
- "node_modules/@babel/highlight/node_modules/has-flag": {
387
- "version": "3.0.0",
388
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
389
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
390
- "license": "MIT",
391
- "engines": {
392
- "node": ">=4"
393
- }
394
- },
395
- "node_modules/@babel/highlight/node_modules/supports-color": {
396
- "version": "5.5.0",
397
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
398
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
399
- "license": "MIT",
400
- "dependencies": {
401
- "has-flag": "^3.0.0"
402
- },
403
- "engines": {
404
- "node": ">=4"
405
- }
406
- },
407
322
  "node_modules/@colors/colors": {
408
323
  "version": "1.6.0",
409
324
  "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
@@ -430,18 +345,6 @@
430
345
  "node": ">=12"
431
346
  }
432
347
  },
433
- "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
434
- "version": "6.1.0",
435
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
436
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
437
- "license": "MIT",
438
- "engines": {
439
- "node": ">=12"
440
- },
441
- "funding": {
442
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
443
- }
444
- },
445
348
  "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
446
349
  "version": "6.2.1",
447
350
  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
@@ -556,9 +459,9 @@
556
459
  "license": "MIT"
557
460
  },
558
461
  "node_modules/@types/archiver": {
559
- "version": "6.0.2",
560
- "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-6.0.2.tgz",
561
- "integrity": "sha512-KmROQqbQzKGuaAbmK+ZcytkJ51+YqDa7NmbXjmtC5YBLSyQYo21YaUnQ3HbaPFKL1ooo6RQ6OPYPIDyxfpDDXw==",
462
+ "version": "6.0.3",
463
+ "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-6.0.3.tgz",
464
+ "integrity": "sha512-a6wUll6k3zX6qs5KlxIggs1P1JcYJaTCx2gnlr+f0S1yd2DoaEwoIK10HmBaLnZwWneBz+JBm0dwcZu0zECBcQ==",
562
465
  "license": "MIT",
563
466
  "dependencies": {
564
467
  "@types/readdir-glob": "*"
@@ -617,9 +520,9 @@
617
520
  }
618
521
  },
619
522
  "node_modules/@types/express-serve-static-core": {
620
- "version": "5.0.0",
621
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz",
622
- "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==",
523
+ "version": "5.0.1",
524
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
525
+ "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
623
526
  "license": "MIT",
624
527
  "dependencies": {
625
528
  "@types/node": "*",
@@ -671,9 +574,9 @@
671
574
  "license": "MIT"
672
575
  },
673
576
  "node_modules/@types/lodash": {
674
- "version": "4.17.12",
675
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
676
- "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
577
+ "version": "4.17.13",
578
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
579
+ "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
677
580
  "license": "MIT"
678
581
  },
679
582
  "node_modules/@types/method-override": {
@@ -707,12 +610,12 @@
707
610
  }
708
611
  },
709
612
  "node_modules/@types/node": {
710
- "version": "22.7.9",
711
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
712
- "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg==",
613
+ "version": "22.9.0",
614
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
615
+ "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
713
616
  "license": "MIT",
714
617
  "dependencies": {
715
- "undici-types": "~6.19.2"
618
+ "undici-types": "~6.19.8"
716
619
  }
717
620
  },
718
621
  "node_modules/@types/normalize-package-data": {
@@ -728,9 +631,9 @@
728
631
  "license": "MIT"
729
632
  },
730
633
  "node_modules/@types/qs": {
731
- "version": "6.9.16",
732
- "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
733
- "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==",
634
+ "version": "6.9.17",
635
+ "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
636
+ "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
734
637
  "license": "MIT"
735
638
  },
736
639
  "node_modules/@types/range-parser": {
@@ -827,9 +730,9 @@
827
730
  }
828
731
  },
829
732
  "node_modules/@xmldom/xmldom": {
830
- "version": "0.9.4",
831
- "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.4.tgz",
832
- "integrity": "sha512-zglELfWx7g1cEpVMRBZ0srIQO5nEvKvraJ6CVUC/c5Ky1GgX8OIjtUj5qOweTYULYZo5VnXs/LpUUUNiGpX/rA==",
733
+ "version": "0.9.5",
734
+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.5.tgz",
735
+ "integrity": "sha512-6g1EwSs8cr8JhP1iBxzyVAWM6BIDvx9Y3FZRIQiMDzgG43Pxi8YkWOZ0nQj2NHgNzgXDZbJewFx/n+YAvMZrfg==",
833
736
  "license": "MIT",
834
737
  "engines": {
835
738
  "node": ">=14.6"
@@ -861,12 +764,15 @@
861
764
  }
862
765
  },
863
766
  "node_modules/ansi-regex": {
864
- "version": "5.0.1",
865
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
866
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
767
+ "version": "6.1.0",
768
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
769
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
867
770
  "license": "MIT",
868
771
  "engines": {
869
- "node": ">=8"
772
+ "node": ">=12"
773
+ },
774
+ "funding": {
775
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
870
776
  }
871
777
  },
872
778
  "node_modules/ansi-styles": {
@@ -903,9 +809,9 @@
903
809
  }
904
810
  },
905
811
  "node_modules/appium-ios-device": {
906
- "version": "2.7.23",
907
- "resolved": "https://registry.npmjs.org/appium-ios-device/-/appium-ios-device-2.7.23.tgz",
908
- "integrity": "sha512-S0n9i8wKBKRICdRSVpgQ+3A22bEjGKuAR4ScSCGS62ni5wYFJ95eFi6iC6SFKGkDElAl9Eszmc1MzX65z0hKXg==",
812
+ "version": "2.7.25",
813
+ "resolved": "https://registry.npmjs.org/appium-ios-device/-/appium-ios-device-2.7.25.tgz",
814
+ "integrity": "sha512-d29nKRWkOi9E32Tl4Ddz63zGAj7ZfGoCc+qJ/gCYwPGbFHfIQnJ2L7V41MNpb8VjrUQNtyKOA3tatRyBWS8zqw==",
909
815
  "license": "Apache-2.0",
910
816
  "dependencies": {
911
817
  "@appium/support": "^5.0.3",
@@ -917,13 +823,26 @@
917
823
  "lodash": "^4.17.15",
918
824
  "semver": "^7.0.0",
919
825
  "source-map-support": "^0.x",
920
- "uuid": "^10.0.0"
826
+ "uuid": "^11.0.1"
921
827
  },
922
828
  "engines": {
923
829
  "node": ">=14",
924
830
  "npm": ">=8"
925
831
  }
926
832
  },
833
+ "node_modules/appium-ios-device/node_modules/uuid": {
834
+ "version": "11.0.3",
835
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
836
+ "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
837
+ "funding": [
838
+ "https://github.com/sponsors/broofa",
839
+ "https://github.com/sponsors/ctavan"
840
+ ],
841
+ "license": "MIT",
842
+ "bin": {
843
+ "uuid": "dist/esm/bin/uuid"
844
+ }
845
+ },
927
846
  "node_modules/appium-ios-simulator": {
928
847
  "version": "6.1.13",
929
848
  "resolved": "https://registry.npmjs.org/appium-ios-simulator/-/appium-ios-simulator-6.1.13.tgz",
@@ -969,15 +888,15 @@
969
888
  }
970
889
  },
971
890
  "node_modules/appium-webdriveragent": {
972
- "version": "8.9.4",
973
- "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.9.4.tgz",
974
- "integrity": "sha512-04+YmkvLEky9v3JPfsaOgtqwGRRLti77bKWWlcUJYFIJA/I0R1nQre4uNN1qXl7o/e+YO6ng2+Qn1vkftrPpQA==",
891
+ "version": "8.11.1",
892
+ "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.11.1.tgz",
893
+ "integrity": "sha512-Hiy3ipDjPyy37sQb24Vlaz15bCpLNjSBqSu+c6gx30RtAE/Vu//UGFvbtf3NWcpmPLYUph/dqJ94WBlGIBrRAQ==",
975
894
  "license": "Apache-2.0",
976
895
  "dependencies": {
977
896
  "@appium/base-driver": "^9.0.0",
978
897
  "@appium/strongbox": "^0.x",
979
898
  "@appium/support": "^5.0.3",
980
- "appium-ios-device": "^2.5.0",
899
+ "appium-ios-device": "^2.7.25",
981
900
  "appium-ios-simulator": "^6.0.0",
982
901
  "async-lock": "^1.0.0",
983
902
  "asyncbox": "^3.0.0",
@@ -1554,9 +1473,9 @@
1554
1473
  "license": "MIT"
1555
1474
  },
1556
1475
  "node_modules/cross-spawn": {
1557
- "version": "7.0.3",
1558
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
1559
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
1476
+ "version": "7.0.5",
1477
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
1478
+ "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
1560
1479
  "license": "MIT",
1561
1480
  "dependencies": {
1562
1481
  "path-key": "^3.1.0",
@@ -2926,9 +2845,9 @@
2926
2845
  }
2927
2846
  },
2928
2847
  "node_modules/node-simctl": {
2929
- "version": "7.6.1",
2930
- "resolved": "https://registry.npmjs.org/node-simctl/-/node-simctl-7.6.1.tgz",
2931
- "integrity": "sha512-5vJvlPNqgu2iMHiBBkJ2vYtol18638ATpDcKjnSwcOkqXcjADBZh3IW7lLt5idiswFG9KsK1qXVHBhELXfWeyg==",
2848
+ "version": "7.6.2",
2849
+ "resolved": "https://registry.npmjs.org/node-simctl/-/node-simctl-7.6.2.tgz",
2850
+ "integrity": "sha512-cchHIVLY5Rh2muCBobbwVquqtOBysxD4t7EThTcOIcBw13OsTWTfkCpHlxdjFRl4HnB9Mv8Z5MpkFyWmuH0iDA==",
2932
2851
  "license": "Apache-2.0",
2933
2852
  "dependencies": {
2934
2853
  "@appium/logger": "^1.3.0",
@@ -2939,7 +2858,7 @@
2939
2858
  "semver": "^7.0.0",
2940
2859
  "source-map-support": "^0.x",
2941
2860
  "teen_process": "^2.2.0",
2942
- "uuid": "^10.0.0",
2861
+ "uuid": "^11.0.1",
2943
2862
  "which": "^4.0.0"
2944
2863
  },
2945
2864
  "engines": {
@@ -2947,6 +2866,19 @@
2947
2866
  "npm": ">=8"
2948
2867
  }
2949
2868
  },
2869
+ "node_modules/node-simctl/node_modules/uuid": {
2870
+ "version": "11.0.3",
2871
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
2872
+ "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
2873
+ "funding": [
2874
+ "https://github.com/sponsors/broofa",
2875
+ "https://github.com/sponsors/ctavan"
2876
+ ],
2877
+ "license": "MIT",
2878
+ "bin": {
2879
+ "uuid": "dist/esm/bin/uuid"
2880
+ }
2881
+ },
2950
2882
  "node_modules/normalize-package-data": {
2951
2883
  "version": "2.5.0",
2952
2884
  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -2978,9 +2910,9 @@
2978
2910
  }
2979
2911
  },
2980
2912
  "node_modules/object-inspect": {
2981
- "version": "1.13.2",
2982
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
2983
- "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
2913
+ "version": "1.13.3",
2914
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
2915
+ "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
2984
2916
  "license": "MIT",
2985
2917
  "engines": {
2986
2918
  "node": ">= 0.4"
@@ -3961,18 +3893,6 @@
3961
3893
  "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
3962
3894
  "license": "MIT"
3963
3895
  },
3964
- "node_modules/string-width/node_modules/ansi-regex": {
3965
- "version": "6.1.0",
3966
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
3967
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
3968
- "license": "MIT",
3969
- "engines": {
3970
- "node": ">=12"
3971
- },
3972
- "funding": {
3973
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
3974
- }
3975
- },
3976
3896
  "node_modules/string-width/node_modules/strip-ansi": {
3977
3897
  "version": "7.1.0",
3978
3898
  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -4013,6 +3933,24 @@
4013
3933
  "node": ">=8"
4014
3934
  }
4015
3935
  },
3936
+ "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
3937
+ "version": "5.0.1",
3938
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
3939
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
3940
+ "license": "MIT",
3941
+ "engines": {
3942
+ "node": ">=8"
3943
+ }
3944
+ },
3945
+ "node_modules/strip-ansi/node_modules/ansi-regex": {
3946
+ "version": "5.0.1",
3947
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
3948
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
3949
+ "license": "MIT",
3950
+ "engines": {
3951
+ "node": ">=8"
3952
+ }
3953
+ },
4016
3954
  "node_modules/supports-color": {
4017
3955
  "version": "8.1.1",
4018
3956
  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -4098,9 +4036,9 @@
4098
4036
  }
4099
4037
  },
4100
4038
  "node_modules/tslib": {
4101
- "version": "2.8.0",
4102
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
4103
- "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
4039
+ "version": "2.8.1",
4040
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
4041
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
4104
4042
  "license": "0BSD"
4105
4043
  },
4106
4044
  "node_modules/type-fest": {
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "xcuitest",
9
9
  "xctest"
10
10
  ],
11
- "version": "7.28.3",
11
+ "version": "7.29.1",
12
12
  "author": "Appium Contributors",
13
13
  "license": "Apache-2.0",
14
14
  "repository": {
@@ -81,7 +81,7 @@
81
81
  "appium-ios-device": "^2.7.23",
82
82
  "appium-ios-simulator": "^6.1.7",
83
83
  "appium-remote-debugger": "^12.1.1",
84
- "appium-webdriveragent": "^8.9.4",
84
+ "appium-webdriveragent": "^8.10.0",
85
85
  "appium-xcode": "^5.1.4",
86
86
  "async-lock": "^1.4.0",
87
87
  "asyncbox": "^3.0.0",