Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/build/lib/extension/manifest.js b/build/lib/extension/manifest.js
index 5b650a6ff4dbe737ffdf8821e255e9e4e3d89da3..6179965231285c3ae1d3cddee0c45c57ab3fba03 100644
index af59df0ff07d6294bbc373cbcc273cc06300482f..6ad054e11bc7ece77e80e08c0d265e538ebe7c53 100644
--- a/build/lib/extension/manifest.js
+++ b/build/lib/extension/manifest.js
@@ -195,12 +195,14 @@ class Manifest {
onMatch(path_1.default.join(__classPrivateFieldGet(this, _Manifest_appiumHome, "f"), 'package.json'), true),
@@ -180,12 +180,14 @@ class Manifest {
onMatch(path_1.default.join(this.#appiumHome, 'package.json'), true),
];
// add dependencies to the queue
- const filepaths = await support_1.fs.glob('node_modules/{*,@*/*}/package.json', {
- cwd: __classPrivateFieldGet(this, _Manifest_appiumHome, "f"),
- cwd: this.#appiumHome,
- absolute: true,
- });
- for (const filepath of filepaths) {
Expand Down
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"@rnx-kit/polyfills": "^0.2.0",
"@rnx-kit/tsconfig": "^2.0.0",
"@types/react": "~19.0.0",
"appium": "patch:appium@npm%3A2.19.0#~/.yarn/patches/appium-npm-2.11.2-f39bb587af.patch",
"appium-uiautomator2-driver": "^4.0.0",
"appium-xcuitest-driver": "^9.0.0",
"appium": "patch:appium@npm%3A3.0.2#~/.yarn/patches/appium-npm-3.0.2-7d0e99d983.patch",
"appium-uiautomator2-driver": "^5.0.0",
"appium-xcuitest-driver": "^10.0.0",
"react-native-test-app": "workspace:*",
"webdriverio": "^9.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/test/specs/wdio.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const findLatestIPhoneSimulator = (() => {
const sims = devices[latestRuntime];
const simulator = sims.find(({ name }) => name.includes("Pro"));
result = [
simulator?.name ?? "iPhone 15 Pro",
simulator?.name ?? "iPhone 16 Pro",
latestRuntime
.substring("com.apple.CoreSimulator.SimRuntime.iOS-".length)
.replaceAll("-", "."),
Expand Down
29 changes: 16 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,16 @@
},
"packageManager": "[email protected]",
"resolutions": {
"@appium/base-driver/axios": "^1.8.3",
"@appium/base-driver/axios": "^1.11.0",
"@appium/base-driver/lru-cache": "^11.2.1",
"@appium/docutils": "link:./example",
"@appium/support/archiver": "^7.0.1",
"@appium/support/axios": "^1.8.3",
"@appium/support/form-data": "^4.0.2",
"@appium/support/semver": "^7.7.1",
"@appium/support/teen_process": "^2.3.1",
"@appium/support/uuid": "^11.1.0",
"@appium/logger/lru-cache": "^11.2.1",
"@appium/support/archiver": "~7.0.1",
"@appium/support/axios": "^1.11.0",
"@appium/support/form-data": "~4.0.4",
"@appium/support/semver": "~7.7.2",
"@appium/support/teen_process": "~3.0.1",
"@appium/support/uuid": "~13.0.0",
"@colors/colors": "^1.6.0",
"@expo/json-file/@babel/code-frame": "^7.10.4",
"@microsoft/eslint-plugin-sdl/eslint-plugin-n": "^17.10.3",
Expand All @@ -184,12 +186,13 @@
"@react-native/js-polyfills": "^0.78.0",
"@react-native/normalize-colors": "^0.78.0",
"@react-native/virtualized-lists": "^0.78.0",
"appium/ajv": "^8.17.1",
"appium/axios": "^1.8.3",
"appium/semver": "^7.7.1",
"appium/teen_process": "^2.3.1",
"appium/ws": "^8.18.1",
"appium/yaml": "^2.6.0",
"appium/ajv": "~8.17.1",
"appium/axios": "^1.11.0",
"appium/lru-cache": "^11.2.1",
"appium/semver": "~7.7.2",
"appium/teen_process": "~3.0.1",
"appium/ws": "~8.18.3",
"appium/yaml": "~2.8.1",
"argparse/sprintf-js": "^1.0.2",
"body-parser": "~1.20.3",
"body-parser/qs": "^6.13.0",
Expand Down
2 changes: 2 additions & 0 deletions scripts/testing/test-apple.mts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ export function installPods({
rm_r(`${platform}/Podfile.lock`);
rm_r(`${platform}/Pods`);
rm_r(`${platform}/build`);

process.env["RCT_USE_PREBUILT_RNCORE"] = "1";
$("pod", "install", `--project-directory=${platform}`);

return Promise.resolve();
Expand Down
9 changes: 6 additions & 3 deletions scripts/testing/test-matrix.mts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ const TAG = "┃";
const TEST_VARIANTS = ["paper", "fabric"] as const;

function isVariantSupported({ version, variant }: Required<BuildConfig>) {
return variant === "fabric" || toVersionNumber(version) < v(0, 82, 0);
return (
variant === "fabric" ||
Boolean(version && toVersionNumber(version) < v(0, 82, 0))
);
}

function isAppleVariantSupported(config: Required<BuildConfig>) {
Expand All @@ -38,7 +41,7 @@ function isAppleVariantSupported(config: Required<BuildConfig>) {
}

const { version, engine } = config;
if (engine === "jsc" && toVersionNumber(version) >= v(0, 80, 0)) {
if (engine === "jsc" && version && toVersionNumber(version) >= v(0, 80, 0)) {
return false;
}

Expand Down Expand Up @@ -390,7 +393,7 @@ if (platforms.length === 0) {
process.exitCode = e;
} else {
process.exitCode = 1;
showBanner(`❌ ${e}`);
showBanner(`❌ ${(e instanceof Error && e.stack) || e}`);
}
});
}
2 changes: 1 addition & 1 deletion scripts/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ export type ApplePlatform = "ios" | "macos" | "visionos";
export type TargetPlatform = ApplePlatform | "android" | "windows";

export type BuildConfig = {
version: string;
version: string | undefined;
platform: TargetPlatform;
variant: "fabric" | "paper";
engine?: "hermes" | "jsc";
Expand Down
Loading
Loading