Skip to content

Commit ab0fbab

Browse files
committed
Update metro config
1 parent 2759d8d commit ab0fbab

3 files changed

Lines changed: 40 additions & 34 deletions

File tree

apps/expo-example/metro.config.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const { getDefaultConfig } = require('expo/metro-config');
22
const path = require('path');
33

4-
const exclusionList = require('metro-config/private/defaults/exclusionList').default;
4+
const exclusionList =
5+
require('metro-config/private/defaults/exclusionList').default;
56
const escape = require('escape-string-regexp');
67
const pack = require('./package.json');
78

@@ -10,6 +11,7 @@ modulesBlacklist.push(...Object.keys(pack.devDependencies));
1011

1112
const projectRoot = __dirname;
1213
const monorepoRoot = path.resolve(projectRoot, '../..');
14+
const commonAppRoot = path.resolve(monorepoRoot, 'apps/common-app');
1315

1416
const config = getDefaultConfig(projectRoot);
1517

@@ -21,9 +23,10 @@ config.resolver.nodeModulesPaths = [
2123
];
2224

2325
config.resolver.blacklistRE = exclusionList(
24-
modulesBlacklist.map(
25-
(m) =>
26-
new RegExp(`^${escape(path.join(monorepoRoot, 'node_modules', m))}\\/.*$`)
26+
[monorepoRoot, commonAppRoot].flatMap((root) =>
27+
modulesBlacklist.map(
28+
(m) => new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
29+
)
2730
)
2831
);
2932

apps/macos-example/metro.config.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ modulesBlacklist.push(...Object.keys(appPackage.devDependencies));
1515

1616
const projectRoot = __dirname;
1717
const monorepoRoot = path.resolve(projectRoot, '../..');
18+
const commonAppRoot = path.resolve(monorepoRoot, 'apps/common-app');
1819

1920
const config = getDefaultConfig(__dirname);
2021

@@ -26,9 +27,11 @@ config.resolver.nodeModulesPaths = [
2627
];
2728

2829
config.resolver.blacklistRE = exclusionList(
29-
modulesBlacklist.map(
30-
(m) =>
31-
new RegExp(`^${escape(path.join(monorepoRoot, 'node_modules', m))}\\/.*$`)
30+
[monorepoRoot, commonAppRoot].flatMap((root) =>
31+
modulesBlacklist.map(
32+
(m) =>
33+
new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
34+
)
3235
)
3336
);
3437

yarn.lock

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4496,9 +4496,9 @@ __metadata:
44964496
languageName: node
44974497
linkType: hard
44984498

4499-
"@react-navigation/core@npm:^7.17.1":
4500-
version: 7.17.1
4501-
resolution: "@react-navigation/core@npm:7.17.1"
4499+
"@react-navigation/core@npm:^7.17.2":
4500+
version: 7.17.2
4501+
resolution: "@react-navigation/core@npm:7.17.2"
45024502
dependencies:
45034503
"@react-navigation/routers": "npm:^7.5.3"
45044504
escape-string-regexp: "npm:^4.0.0"
@@ -4510,43 +4510,43 @@ __metadata:
45104510
use-sync-external-store: "npm:^1.5.0"
45114511
peerDependencies:
45124512
react: ">= 18.2.0"
4513-
checksum: 10c0/6825ff148f1d43961fea2ef2d0ad38462dcf73cb191f2d51d59dd3f5b59f134b3139866bcec21af83490e2993897f4ca41e5bbd4eb3f50a3ef704a55801a91f5
4513+
checksum: 10c0/df1889769e90f85b71605070818b22bd9967f5fd0572187d31e6a17386339336c8890b9c7ba505854382426cb3b5be8d03ea4684da4ad5be2cdae828302b98a0
45144514
languageName: node
45154515
linkType: hard
45164516

4517-
"@react-navigation/elements@npm:^2.3.8, @react-navigation/elements@npm:^2.9.13":
4518-
version: 2.9.13
4519-
resolution: "@react-navigation/elements@npm:2.9.13"
4517+
"@react-navigation/elements@npm:^2.3.8, @react-navigation/elements@npm:^2.9.14":
4518+
version: 2.9.14
4519+
resolution: "@react-navigation/elements@npm:2.9.14"
45204520
dependencies:
45214521
color: "npm:^4.2.3"
45224522
use-latest-callback: "npm:^0.2.4"
45234523
use-sync-external-store: "npm:^1.5.0"
45244524
peerDependencies:
45254525
"@react-native-masked-view/masked-view": ">= 0.2.0"
4526-
"@react-navigation/native": ^7.2.1
4526+
"@react-navigation/native": ^7.2.2
45274527
react: ">= 18.2.0"
45284528
react-native: "*"
45294529
react-native-safe-area-context: ">= 4.0.0"
45304530
peerDependenciesMeta:
45314531
"@react-native-masked-view/masked-view":
45324532
optional: true
4533-
checksum: 10c0/5a10ccadb9f71fb91aa50d706fa0adb1c28cb1b40fac4c106598f935ba51a762bd5bcd6bdcd1839d1e01f2f3afe129b5a191db3463ea88521cb65cf4aeb3f147
4533+
checksum: 10c0/c2602f5be41caaad8ea81a9bdfde654d4a89d83c627a910f5d166bd8cac2700399fce805f6bf15faaf06c2bbc776325269bc0ec1fbbe917b615e17a0a5d371e1
45344534
languageName: node
45354535
linkType: hard
45364536

45374537
"@react-navigation/native@npm:^7.1.6":
4538-
version: 7.2.1
4539-
resolution: "@react-navigation/native@npm:7.2.1"
4538+
version: 7.2.2
4539+
resolution: "@react-navigation/native@npm:7.2.2"
45404540
dependencies:
4541-
"@react-navigation/core": "npm:^7.17.1"
4541+
"@react-navigation/core": "npm:^7.17.2"
45424542
escape-string-regexp: "npm:^4.0.0"
45434543
fast-deep-equal: "npm:^3.1.3"
45444544
nanoid: "npm:^3.3.11"
45454545
use-latest-callback: "npm:^0.2.4"
45464546
peerDependencies:
45474547
react: ">= 18.2.0"
45484548
react-native: "*"
4549-
checksum: 10c0/2d99e0ddac69b16460e931224aa8143d26ecbd4eae55c7f8a52e5707d911f0ee0eb62415de8242b0a99d93a5bded48e4280e1daebc3d1ca989df164b055d4115
4549+
checksum: 10c0/3ca6e742da2ed4110b81fc008536ca62f07cdf49b368e9b7f73cbc25ad86603f87f14d08492bf1de2647ca6f4cf7141bec4fa3cd76961fa2fa22f83d0f805e83
45504550
languageName: node
45514551
linkType: hard
45524552

@@ -4560,20 +4560,20 @@ __metadata:
45604560
linkType: hard
45614561

45624562
"@react-navigation/stack@npm:^7.2.10":
4563-
version: 7.8.8
4564-
resolution: "@react-navigation/stack@npm:7.8.8"
4563+
version: 7.8.9
4564+
resolution: "@react-navigation/stack@npm:7.8.9"
45654565
dependencies:
4566-
"@react-navigation/elements": "npm:^2.9.13"
4566+
"@react-navigation/elements": "npm:^2.9.14"
45674567
color: "npm:^4.2.3"
45684568
use-latest-callback: "npm:^0.2.4"
45694569
peerDependencies:
4570-
"@react-navigation/native": ^7.2.1
4570+
"@react-navigation/native": ^7.2.2
45714571
react: ">= 18.2.0"
45724572
react-native: "*"
45734573
react-native-gesture-handler: ">= 2.0.0"
45744574
react-native-safe-area-context: ">= 4.0.0"
45754575
react-native-screens: ">= 4.0.0"
4576-
checksum: 10c0/c8809a6412fa3559278ce408196460882043bf23c8f09dca5a93ee6c995fab002e284fe35ca36baf1146f6612356d08092e501e94afe7e6817507fb50eb96873
4576+
checksum: 10c0/29ecb6198f16709aec49b757832408c133f452c69a7b7490b1e6b53f8f681aa4de41efaff01e8371e34200a056b10de2a3efcde75da17625b8ff67bc6342eb86
45774577
languageName: node
45784578
linkType: hard
45794579

@@ -5404,9 +5404,9 @@ __metadata:
54045404
linkType: hard
54055405

54065406
"@xmldom/xmldom@npm:^0.8.8":
5407-
version: 0.8.11
5408-
resolution: "@xmldom/xmldom@npm:0.8.11"
5409-
checksum: 10c0/e768623de72c95d3dae6b5da8e33dda0d81665047811b5498d23a328d45b13feb5536fe921d0308b96a4a8dd8addf80b1f6ef466508051c0b581e63e0dc74ed5
5407+
version: 0.8.12
5408+
resolution: "@xmldom/xmldom@npm:0.8.12"
5409+
checksum: 10c0/b733c84292d1bee32ef21a05aba8f9063456b51a54068d0b4a1abf5545156ee0b9894b7ae23775b5881b11c35a8a03871d1b514fb7e1b11654cdbee57e1c2707
54105410
languageName: node
54115411
linkType: hard
54125412

@@ -6128,11 +6128,11 @@ __metadata:
61286128
linkType: hard
61296129

61306130
"baseline-browser-mapping@npm:^2.9.0":
6131-
version: 2.10.11
6132-
resolution: "baseline-browser-mapping@npm:2.10.11"
6131+
version: 2.10.12
6132+
resolution: "baseline-browser-mapping@npm:2.10.12"
61336133
bin:
61346134
baseline-browser-mapping: dist/cli.cjs
6135-
checksum: 10c0/6ae44b653c26de8ea7b75a109c0771c95c9676c32a11aff25f7c10b2ddeb864d2c387243a0ec083dffe3b76a7aacf2d777fa7e5a6df16e3a2624c1573e116285
6135+
checksum: 10c0/391d354240160546c8248317698b61f21f287cc6444766414c2d299a8880045e605ed97e8d8cd198a0b9dfaa4e73c2fa765bbef089474533a904733b1dc9a363
61366136
languageName: node
61376137
linkType: hard
61386138

@@ -6443,9 +6443,9 @@ __metadata:
64436443
linkType: hard
64446444

64456445
"caniuse-lite@npm:^1.0.30001759":
6446-
version: 1.0.30001781
6447-
resolution: "caniuse-lite@npm:1.0.30001781"
6448-
checksum: 10c0/79e77d8759a55e90f0f5db96ab9e7925c7b2e3021f77852e647e45f64f7dc701954174188438e84b810824afc16d706c64a38f20f9c1ed9ac174b6362d33325f
6446+
version: 1.0.30001782
6447+
resolution: "caniuse-lite@npm:1.0.30001782"
6448+
checksum: 10c0/f11685de4ce1f0bc16d385fc0a07b0877da0b14af8bf510cee6a3cdfe9da1602360e1f11320e92d4f5d63cd6bec8b43539de25ee78ff94bdb7ec0fa3cce5200c
64496449
languageName: node
64506450
linkType: hard
64516451

0 commit comments

Comments
 (0)