diff --git a/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch b/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch deleted file mode 100644 index 14a7e3407..000000000 --- a/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/dist/lint.js b/dist/lint.js -index a85201a13852e7912fb65b643861d988ccbc7515..4db0e61d7f64079906a86b06ce630373b2e4bf36 100644 ---- a/dist/lint.js -+++ b/dist/lint.js -@@ -15264,7 +15264,8 @@ function setRegisteredRules(rules) { - const neverRunBeforeHook = () => !1; - async function loadPlugin(url, pluginName, pluginNameIsAlias, workspaceUri) { - try { -- let plugin = (await import(url)).default; -+ let p = await import(url); -+ let plugin = p.default ?? p; - return JSONStringify({ Success: registerPlugin(plugin, pluginName, pluginNameIsAlias, workspaceUri) }); - } catch (err) { - return JSONStringify({ Failure: getErrorMessage(err) }); diff --git a/.yarnrc.yml b/.yarnrc.yml index 060002d40..08630e9b9 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -19,11 +19,6 @@ packageExtensions: appium@3: dependencies: "@colors/colors": ^1.6.0 - react-native-macos@0.79: - dependencies: - "@react-native-community/cli": ^18.0.0 - "@react-native-community/cli-platform-apple": ^18.0.0 - "@react-native-community/cli-platform-ios": ^18.0.0 plugins: - path: .yarn/plugins/@yarnpkg/plugin-compat.cjs spec: "@yarnpkg/plugin-compat" diff --git a/package.json b/package.json index 632204fa6..2059baff2 100644 --- a/package.json +++ b/package.json @@ -32,12 +32,13 @@ "@rnx-kit/oxlint-config": "^1.0.3", "@types/js-yaml": "^4.0.5", "@types/node": "^24.0.0", - "eslint-plugin-wdio": "^9.0.0", + "eslint-plugin-wdio": "^9.26.0", + "globals": "^16.5.0", "js-yaml": "^4.1.0", "minimatch": "^10.0.0", "nx": "^21.0.0", "oxfmt": "^0.35.0", - "oxlint": "patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch", + "oxlint": "^1.51.0", "typescript": "^5.0.0" }, "resolutions": { diff --git a/packages/app/package.json b/packages/app/package.json index eac244df6..0f0622f76 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -117,7 +117,7 @@ "memfs": "^4.0.0", "minimatch": "^10.0.0", "oxfmt": "^0.35.0", - "oxlint": "patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch", + "oxlint": "^1.51.0", "react": "19.1.0", "react-native": "^0.81.0", "react-native-macos": "^0.81.1", diff --git a/yarn.lock b/yarn.lock index bed7f26c6..6cc9da007 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2353,12 +2353,13 @@ __metadata: "@rnx-kit/oxlint-config": "npm:^1.0.3" "@types/js-yaml": "npm:^4.0.5" "@types/node": "npm:^24.0.0" - eslint-plugin-wdio: "npm:^9.0.0" + eslint-plugin-wdio: "npm:^9.26.0" + globals: "npm:^16.5.0" js-yaml: "npm:^4.1.0" minimatch: "npm:^10.0.0" nx: "npm:^21.0.0" oxfmt: "npm:^0.35.0" - oxlint: "patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch" + oxlint: "npm:^1.51.0" typescript: "npm:^5.0.0" languageName: unknown linkType: soft @@ -2914,135 +2915,135 @@ __metadata: languageName: node linkType: hard -"@oxlint/binding-android-arm-eabi@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-android-arm-eabi@npm:1.51.0" +"@oxlint/binding-android-arm-eabi@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-android-arm-eabi@npm:1.56.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@oxlint/binding-android-arm64@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-android-arm64@npm:1.51.0" +"@oxlint/binding-android-arm64@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-android-arm64@npm:1.56.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@oxlint/binding-darwin-arm64@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-darwin-arm64@npm:1.51.0" +"@oxlint/binding-darwin-arm64@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-darwin-arm64@npm:1.56.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxlint/binding-darwin-x64@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-darwin-x64@npm:1.51.0" +"@oxlint/binding-darwin-x64@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-darwin-x64@npm:1.56.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxlint/binding-freebsd-x64@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-freebsd-x64@npm:1.51.0" +"@oxlint/binding-freebsd-x64@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-freebsd-x64@npm:1.56.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@oxlint/binding-linux-arm-gnueabihf@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-arm-gnueabihf@npm:1.51.0" +"@oxlint/binding-linux-arm-gnueabihf@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-arm-gnueabihf@npm:1.56.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxlint/binding-linux-arm-musleabihf@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-arm-musleabihf@npm:1.51.0" +"@oxlint/binding-linux-arm-musleabihf@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-arm-musleabihf@npm:1.56.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxlint/binding-linux-arm64-gnu@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-arm64-gnu@npm:1.51.0" +"@oxlint/binding-linux-arm64-gnu@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-arm64-gnu@npm:1.56.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@oxlint/binding-linux-arm64-musl@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-arm64-musl@npm:1.51.0" +"@oxlint/binding-linux-arm64-musl@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-arm64-musl@npm:1.56.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@oxlint/binding-linux-ppc64-gnu@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-ppc64-gnu@npm:1.51.0" +"@oxlint/binding-linux-ppc64-gnu@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-ppc64-gnu@npm:1.56.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@oxlint/binding-linux-riscv64-gnu@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-riscv64-gnu@npm:1.51.0" +"@oxlint/binding-linux-riscv64-gnu@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-riscv64-gnu@npm:1.56.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@oxlint/binding-linux-riscv64-musl@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-riscv64-musl@npm:1.51.0" +"@oxlint/binding-linux-riscv64-musl@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-riscv64-musl@npm:1.56.0" conditions: os=linux & cpu=riscv64 & libc=musl languageName: node linkType: hard -"@oxlint/binding-linux-s390x-gnu@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-s390x-gnu@npm:1.51.0" +"@oxlint/binding-linux-s390x-gnu@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-s390x-gnu@npm:1.56.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@oxlint/binding-linux-x64-gnu@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-x64-gnu@npm:1.51.0" +"@oxlint/binding-linux-x64-gnu@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-x64-gnu@npm:1.56.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@oxlint/binding-linux-x64-musl@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-linux-x64-musl@npm:1.51.0" +"@oxlint/binding-linux-x64-musl@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-linux-x64-musl@npm:1.56.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@oxlint/binding-openharmony-arm64@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-openharmony-arm64@npm:1.51.0" +"@oxlint/binding-openharmony-arm64@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-openharmony-arm64@npm:1.56.0" conditions: os=openharmony & cpu=arm64 languageName: node linkType: hard -"@oxlint/binding-win32-arm64-msvc@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-win32-arm64-msvc@npm:1.51.0" +"@oxlint/binding-win32-arm64-msvc@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-win32-arm64-msvc@npm:1.56.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxlint/binding-win32-ia32-msvc@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-win32-ia32-msvc@npm:1.51.0" +"@oxlint/binding-win32-ia32-msvc@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-win32-ia32-msvc@npm:1.56.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@oxlint/binding-win32-x64-msvc@npm:1.51.0": - version: 1.51.0 - resolution: "@oxlint/binding-win32-x64-msvc@npm:1.51.0" +"@oxlint/binding-win32-x64-msvc@npm:1.56.0": + version: 1.56.0 + resolution: "@oxlint/binding-win32-x64-msvc@npm:1.56.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -7614,10 +7615,17 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-wdio@npm:^9.0.0": - version: 9.23.0 - resolution: "eslint-plugin-wdio@npm:9.23.0" - checksum: 10c0/732238b0f868bcec355057ab7425cf6e517bc73fd6ee2c57670dd579541067d8de6b8471f2ddb1de09d9cedae282f0e6c345ce6d6d273082cacae8323b4a288e +"eslint-plugin-wdio@npm:^9.26.0": + version: 9.26.1 + resolution: "eslint-plugin-wdio@npm:9.26.1" + peerDependencies: + eslint: ^9.39.2 + globals: ^16.5.0 + typescript-eslint: ^8.54.0 + peerDependenciesMeta: + typescript-eslint: + optional: true + checksum: 10c0/85bd9ce483e46840583b6d3c97f46c1eebb20a9e335f12b68f7d08ef996801f6113d90210b49449075bc8fbe998cda4ef53fd2acb9d11e0794568c85bdb1d688 languageName: node linkType: hard @@ -8458,6 +8466,13 @@ __metadata: languageName: node linkType: hard +"globals@npm:^16.5.0": + version: 16.5.0 + resolution: "globals@npm:16.5.0" + checksum: 10c0/615241dae7851c8012f5aa0223005b1ed6607713d6813de0741768bd4ddc39353117648f1a7086b4b0fa45eae733f1c0a0fe369aa4e543bb63f8de8990178ea9 + languageName: node + linkType: hard + "globalthis@npm:^1.0.4": version: 1.0.4 resolution: "globalthis@npm:1.0.4" @@ -11408,102 +11423,29 @@ __metadata: languageName: node linkType: hard -"oxlint@npm:1.51.0": - version: 1.51.0 - resolution: "oxlint@npm:1.51.0" - dependencies: - "@oxlint/binding-android-arm-eabi": "npm:1.51.0" - "@oxlint/binding-android-arm64": "npm:1.51.0" - "@oxlint/binding-darwin-arm64": "npm:1.51.0" - "@oxlint/binding-darwin-x64": "npm:1.51.0" - "@oxlint/binding-freebsd-x64": "npm:1.51.0" - "@oxlint/binding-linux-arm-gnueabihf": "npm:1.51.0" - "@oxlint/binding-linux-arm-musleabihf": "npm:1.51.0" - "@oxlint/binding-linux-arm64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-arm64-musl": "npm:1.51.0" - "@oxlint/binding-linux-ppc64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-riscv64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-riscv64-musl": "npm:1.51.0" - "@oxlint/binding-linux-s390x-gnu": "npm:1.51.0" - "@oxlint/binding-linux-x64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-x64-musl": "npm:1.51.0" - "@oxlint/binding-openharmony-arm64": "npm:1.51.0" - "@oxlint/binding-win32-arm64-msvc": "npm:1.51.0" - "@oxlint/binding-win32-ia32-msvc": "npm:1.51.0" - "@oxlint/binding-win32-x64-msvc": "npm:1.51.0" - peerDependencies: - oxlint-tsgolint: ">=0.15.0" - dependenciesMeta: - "@oxlint/binding-android-arm-eabi": - optional: true - "@oxlint/binding-android-arm64": - optional: true - "@oxlint/binding-darwin-arm64": - optional: true - "@oxlint/binding-darwin-x64": - optional: true - "@oxlint/binding-freebsd-x64": - optional: true - "@oxlint/binding-linux-arm-gnueabihf": - optional: true - "@oxlint/binding-linux-arm-musleabihf": - optional: true - "@oxlint/binding-linux-arm64-gnu": - optional: true - "@oxlint/binding-linux-arm64-musl": - optional: true - "@oxlint/binding-linux-ppc64-gnu": - optional: true - "@oxlint/binding-linux-riscv64-gnu": - optional: true - "@oxlint/binding-linux-riscv64-musl": - optional: true - "@oxlint/binding-linux-s390x-gnu": - optional: true - "@oxlint/binding-linux-x64-gnu": - optional: true - "@oxlint/binding-linux-x64-musl": - optional: true - "@oxlint/binding-openharmony-arm64": - optional: true - "@oxlint/binding-win32-arm64-msvc": - optional: true - "@oxlint/binding-win32-ia32-msvc": - optional: true - "@oxlint/binding-win32-x64-msvc": - optional: true - peerDependenciesMeta: - oxlint-tsgolint: - optional: true - bin: - oxlint: bin/oxlint - checksum: 10c0/5fea641819ec4b74f316e3985f81d5ead094559c56c2c399be4de629614d5b46af1fce1d1dbf9dea085c4943d76cfb126e34b30033ec03b960a494864922b948 - languageName: node - linkType: hard - -"oxlint@patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch": - version: 1.51.0 - resolution: "oxlint@patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch::version=1.51.0&hash=535d74" - dependencies: - "@oxlint/binding-android-arm-eabi": "npm:1.51.0" - "@oxlint/binding-android-arm64": "npm:1.51.0" - "@oxlint/binding-darwin-arm64": "npm:1.51.0" - "@oxlint/binding-darwin-x64": "npm:1.51.0" - "@oxlint/binding-freebsd-x64": "npm:1.51.0" - "@oxlint/binding-linux-arm-gnueabihf": "npm:1.51.0" - "@oxlint/binding-linux-arm-musleabihf": "npm:1.51.0" - "@oxlint/binding-linux-arm64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-arm64-musl": "npm:1.51.0" - "@oxlint/binding-linux-ppc64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-riscv64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-riscv64-musl": "npm:1.51.0" - "@oxlint/binding-linux-s390x-gnu": "npm:1.51.0" - "@oxlint/binding-linux-x64-gnu": "npm:1.51.0" - "@oxlint/binding-linux-x64-musl": "npm:1.51.0" - "@oxlint/binding-openharmony-arm64": "npm:1.51.0" - "@oxlint/binding-win32-arm64-msvc": "npm:1.51.0" - "@oxlint/binding-win32-ia32-msvc": "npm:1.51.0" - "@oxlint/binding-win32-x64-msvc": "npm:1.51.0" +"oxlint@npm:^1.51.0": + version: 1.56.0 + resolution: "oxlint@npm:1.56.0" + dependencies: + "@oxlint/binding-android-arm-eabi": "npm:1.56.0" + "@oxlint/binding-android-arm64": "npm:1.56.0" + "@oxlint/binding-darwin-arm64": "npm:1.56.0" + "@oxlint/binding-darwin-x64": "npm:1.56.0" + "@oxlint/binding-freebsd-x64": "npm:1.56.0" + "@oxlint/binding-linux-arm-gnueabihf": "npm:1.56.0" + "@oxlint/binding-linux-arm-musleabihf": "npm:1.56.0" + "@oxlint/binding-linux-arm64-gnu": "npm:1.56.0" + "@oxlint/binding-linux-arm64-musl": "npm:1.56.0" + "@oxlint/binding-linux-ppc64-gnu": "npm:1.56.0" + "@oxlint/binding-linux-riscv64-gnu": "npm:1.56.0" + "@oxlint/binding-linux-riscv64-musl": "npm:1.56.0" + "@oxlint/binding-linux-s390x-gnu": "npm:1.56.0" + "@oxlint/binding-linux-x64-gnu": "npm:1.56.0" + "@oxlint/binding-linux-x64-musl": "npm:1.56.0" + "@oxlint/binding-openharmony-arm64": "npm:1.56.0" + "@oxlint/binding-win32-arm64-msvc": "npm:1.56.0" + "@oxlint/binding-win32-ia32-msvc": "npm:1.56.0" + "@oxlint/binding-win32-x64-msvc": "npm:1.56.0" peerDependencies: oxlint-tsgolint: ">=0.15.0" dependenciesMeta: @@ -11550,7 +11492,7 @@ __metadata: optional: true bin: oxlint: bin/oxlint - checksum: 10c0/8d147d20bf96e6bce867c4f4321f044d3128b065aa17d781eef5d08d64011f921eefdf9ee22ee49ad286685aaf62c7dd84346ae7cf842c3beb142f328da6db30 + checksum: 10c0/0b95b03106619574244e0837b94730a988c3188a2d0137c07bcc85ee79cb11a3c64e46910b3bca8befce49459af58a503c7e2c26c6022cc11705cf6db787581c languageName: node linkType: hard @@ -12284,7 +12226,7 @@ __metadata: memfs: "npm:^4.0.0" minimatch: "npm:^10.0.0" oxfmt: "npm:^0.35.0" - oxlint: "patch:oxlint@npm%3A1.51.0#~/.yarn/patches/oxlint-npm-1.51.0-b8c8e3b5d8.patch" + oxlint: "npm:^1.51.0" prompts: "npm:^2.4.0" react: "npm:19.1.0" react-native: "npm:^0.81.0"