Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve npmPackageName from project root not local paths #2588

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Resolve npmPackageName from project root not local paths #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fba391
Resolve npmPackageName from project root not local paths
acoates-ms Aug 7, 2023
181952c
docs(changeset): Resolve npmPackageName from project root not local p…
acoates-ms Aug 7, 2023
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
6 changes: 6 additions & 0 deletions .changeset/bright-otters-type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rnx-kit/metro-service": patch
"@rnx-kit/metro-config": patch
---

Resolve npmPackageName from project root not local paths
16 changes: 12 additions & 4 deletions packages/metro-config/src/defaultConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,25 @@ const path = require("path");

/**
* @param {PlatformImplementations} availablePlatforms
* @param {string} projectRoot
*/
function getPreludeModules(availablePlatforms) {
function getPreludeModules(availablePlatforms, projectRoot) {
// Include all instances of `InitializeCore` here and let Metro exclude
// the unused ones.
const requireOptions = { paths: [projectRoot] };
const mainModules = new Set([
require.resolve("react-native/Libraries/Core/InitializeCore"),
require.resolve(
"react-native/Libraries/Core/InitializeCore",
requireOptions
),
]);
for (const moduleName of Object.values(availablePlatforms)) {
if (moduleName) {
mainModules.add(
require.resolve(`${moduleName}/Libraries/Core/InitializeCore`)
require.resolve(
`${moduleName}/Libraries/Core/InitializeCore`,
requireOptions
)
);
}
}
Expand Down Expand Up @@ -106,7 +114,7 @@ function getDefaultConfig(projectRoot) {
defaultConfig.resolver.resolveRequest =
outOfTreePlatformResolver(availablePlatforms);

const preludeModules = getPreludeModules(availablePlatforms);
const preludeModules = getPreludeModules(availablePlatforms, projectRoot);
defaultConfig.serializer.getModulesRunBeforeMainModule = () => {
return preludeModules;
};
Expand Down
3 changes: 2 additions & 1 deletion packages/metro-service/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ function getDefaultConfigInternal(cliConfig: CLIConfig): InputConfigT {
require.resolve(
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
`${cliConfig.platforms[platform]
.npmPackageName!}/Libraries/Core/InitializeCore`
.npmPackageName!}/Libraries/Core/InitializeCore`,
{ paths: [cliConfig.root] }
)
),
],
Expand Down