Skip to content

Commit d39e446

Browse files
fix: fix compatibility with @expo/config-plugins v8 (#2083)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tommy Nguyen <[email protected]>
1 parent c6671ce commit d39e446

File tree

4 files changed

+24
-49
lines changed

4 files changed

+24
-49
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"@babel/preset-env": "^7.1.6",
126126
"@eslint/eslintrc": "^2.1.4",
127127
"@eslint/js": "^8.56.0",
128-
"@expo/config-plugins": "^7.0.0",
128+
"@expo/config-plugins": "^8.0.0",
129129
"@microsoft/eslint-plugin-sdl": "^0.2.0",
130130
"@react-native-community/cli": "^12.3.0",
131131
"@rnx-kit/eslint-plugin": "^0.7.0",

scripts/config-plugins/plugins/withIosBaseMods.mjs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ const defaultProviders = {
3131
),
3232
infoPlist: modifyFilePath(expoProviders.infoPlist, "Info.plist"),
3333
entitlements: nullProvider,
34-
podfileProperties: nullProvider,
34+
podfile: makeNullProvider({
35+
path: "",
36+
language: /** @type {const} */ ("rb"),
37+
contents: "",
38+
}),
39+
podfileProperties: makeNullProvider(),
3540
};
3641

3742
// `react-native-test-app` files

scripts/config-plugins/provider.mjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ import * as path from "node:path";
33
import { findFile } from "../helpers.js";
44
import { BaseMods } from "./ExpoConfigPlugins.mjs";
55

6+
/**
7+
* @template {import("@expo/json-file").JSONObject} T
8+
* @param {T} [defaultRead={}]
9+
*/
10+
// @ts-expect-error Type '{}' is not assignable to type 'T'
611
export function makeNullProvider(defaultRead = {}) {
712
return BaseMods.provider({
813
getFilePath: () => "",

yarn.lock

Lines changed: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,52 +1994,33 @@ __metadata:
19941994
languageName: node
19951995
linkType: hard
19961996

1997-
"@expo/config-plugins@npm:^7.0.0":
1998-
version: 7.9.2
1999-
resolution: "@expo/config-plugins@npm:7.9.2"
1997+
"@expo/config-plugins@npm:^8.0.0":
1998+
version: 8.0.5
1999+
resolution: "@expo/config-plugins@npm:8.0.5"
20002000
dependencies:
2001-
"@expo/config-types": "npm:^50.0.0-alpha.1"
2002-
"@expo/fingerprint": "npm:^0.6.0"
2001+
"@expo/config-types": "npm:^51.0.0-unreleased"
20032002
"@expo/json-file": "npm:~8.3.0"
20042003
"@expo/plist": "npm:^0.1.0"
20052004
"@expo/sdk-runtime-versions": "npm:^1.0.0"
2006-
"@react-native/normalize-color": "npm:^2.0.0"
20072005
chalk: "npm:^4.1.2"
20082006
debug: "npm:^4.3.1"
20092007
find-up: "npm:~5.0.0"
20102008
getenv: "npm:^1.0.0"
20112009
glob: "npm:7.1.6"
20122010
resolve-from: "npm:^5.0.0"
2013-
semver: "npm:^7.5.3"
2011+
semver: "npm:^7.5.4"
20142012
slash: "npm:^3.0.0"
20152013
slugify: "npm:^1.6.6"
20162014
xcode: "npm:^3.0.1"
20172015
xml2js: "npm:0.6.0"
2018-
checksum: 10c0/bec1ab967d3bb3c0a9f84dcedb4def9efda27c271d3eaa9d33b98d9923d6e118163cc97fc12417ec227d6d24c6e86cc7611f7e19af06af191be5989ba613ec8a
2019-
languageName: node
2020-
linkType: hard
2021-
2022-
"@expo/config-types@npm:^50.0.0-alpha.1":
2023-
version: 50.0.0-alpha.1
2024-
resolution: "@expo/config-types@npm:50.0.0-alpha.1"
2025-
checksum: 10c0/ab9f1e93287350997b53bf1fe18c730b30fb2268c57d089ef512743e3b8a980efad94a7593af93c611a28758c56196a1d7d17870bf1a17602352e7298ab017f3
2016+
checksum: 10c0/9025bb8932368c71dc6a33a376c07c59f821b44cd1e188e48ac647b28a48c54b42e7f1ad186ac5b76faa4879c019c6888ae122aa49401d5f7214f90b5eeb631a
20262017
languageName: node
20272018
linkType: hard
20282019

2029-
"@expo/fingerprint@npm:^0.6.0":
2030-
version: 0.6.0
2031-
resolution: "@expo/fingerprint@npm:0.6.0"
2032-
dependencies:
2033-
"@expo/spawn-async": "npm:^1.5.0"
2034-
chalk: "npm:^4.1.2"
2035-
debug: "npm:^4.3.4"
2036-
find-up: "npm:^5.0.0"
2037-
minimatch: "npm:^3.0.4"
2038-
p-limit: "npm:^3.1.0"
2039-
resolve-from: "npm:^5.0.0"
2040-
bin:
2041-
fingerprint: bin/cli.js
2042-
checksum: 10c0/799da8071153662885bf327c50b001d4087839f86e5871382a1f1c0c4bea2b36f3e8b8254e5ece855df7249cad6b175e4d67a183874cf57a303582478af3a9c3
2020+
"@expo/config-types@npm:^51.0.0-unreleased":
2021+
version: 51.0.1
2022+
resolution: "@expo/config-types@npm:51.0.1"
2023+
checksum: 10c0/4146532eb37896e57062abf6e9bba83c8052761ed13f21ac52747e253e50871f6e88902309cd720d8cc6cd057a7fbc37c441219b2f2829bfb8639868076b3431
20432024
languageName: node
20442025
linkType: hard
20452026

@@ -2072,15 +2053,6 @@ __metadata:
20722053
languageName: node
20732054
linkType: hard
20742055

2075-
"@expo/spawn-async@npm:^1.5.0":
2076-
version: 1.7.2
2077-
resolution: "@expo/spawn-async@npm:1.7.2"
2078-
dependencies:
2079-
cross-spawn: "npm:^7.0.3"
2080-
checksum: 10c0/0548c4e95ee39393c2f3919bc605f21eba4f0a8ba66fa82fbbc4b1b624e0054526918489227b924f03af5bc156a011f39a2472c223c0d2237fb7afd8dedd5357
2081-
languageName: node
2082-
linkType: hard
2083-
20842056
"@gar/promisify@npm:^1.1.3":
20852057
version: 1.1.3
20862058
resolution: "@gar/promisify@npm:1.1.3"
@@ -3326,13 +3298,6 @@ __metadata:
33263298
languageName: node
33273299
linkType: hard
33283300

3329-
"@react-native/normalize-color@npm:^2.0.0":
3330-
version: 2.1.0
3331-
resolution: "@react-native/normalize-color@npm:2.1.0"
3332-
checksum: 10c0/95814a1e2aac9c00dfc2c65f9e2caec07f70d3dba903b5640f5cf24605bf39863e572f2a5138a85d1c514fb3c33f6931595e0a9f738a58b5c220ee74f2bec13b
3333-
languageName: node
3334-
linkType: hard
3335-
33363301
"@react-native/normalize-colors@npm:0.73.2, @react-native/normalize-colors@npm:^0.73.0":
33373302
version: 0.73.2
33383303
resolution: "@react-native/normalize-colors@npm:0.73.2"
@@ -11490,7 +11455,7 @@ __metadata:
1149011455
languageName: node
1149111456
linkType: hard
1149211457

11493-
"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
11458+
"p-limit@npm:^3.0.2":
1149411459
version: 3.1.0
1149511460
resolution: "p-limit@npm:3.1.0"
1149611461
dependencies:
@@ -12271,7 +12236,7 @@ __metadata:
1227112236
"@babel/preset-env": "npm:^7.1.6"
1227212237
"@eslint/eslintrc": "npm:^2.1.4"
1227312238
"@eslint/js": "npm:^8.56.0"
12274-
"@expo/config-plugins": "npm:^7.0.0"
12239+
"@expo/config-plugins": "npm:^8.0.0"
1227512240
"@microsoft/eslint-plugin-sdl": "npm:^0.2.0"
1227612241
"@react-native-community/cli": "npm:^12.3.0"
1227712242
"@rnx-kit/eslint-plugin": "npm:^0.7.0"

0 commit comments

Comments
 (0)