Skip to content

perf(config): avoid quadratic dependency descriptor copying #2836

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

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −27
Open

perf(config): avoid quadratic dependency descriptor copying #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/cli-config/src/assign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function assign(target: Object, ...sources: Object[]) {
Object.getOwnPropertySymbols(source).forEach((sym) => {
let descriptor = Object.getOwnPropertyDescriptor(source, sym);
if (descriptor && descriptor.enumerable) {
descriptors[sym.toString()] = descriptor;
descriptors[sym] = descriptor;
}
});
Object.defineProperties(target, descriptors);
Expand Down
54 changes: 28 additions & 26 deletions packages/cli-config/src/loadConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default function loadConfig({
get reactNativeVersion() {
return getReactNativeVersion(initialConfig.reactNativePath);
},
dependencies: userConfig.dependencies,
dependencies: {...userConfig.dependencies},
commands: userConfig.commands,
healthChecks: userConfig.healthChecks || [],
platforms: userConfig.platforms,
Expand Down Expand Up @@ -147,18 +147,7 @@ export default function loadConfig({
resolveNodeModuleDir(projectRoot, dependencyName);
let config = readDependencyConfigFromDisk(root, dependencyName);

return assign({}, acc, {
dependencies: assign({}, acc.dependencies, {
get [dependencyName](): DependencyConfig {
return getDependencyConfig(
root,
dependencyName,
finalConfig,
config,
userConfig,
);
},
}),
const nextConfig = assign({}, acc, {
commands: removeDuplicateCommands([
...config.commands,
...acc.commands,
Expand All @@ -173,6 +162,18 @@ export default function loadConfig({
},
healthChecks: [...acc.healthChecks, ...config.healthChecks],
}) as Config;
assign(nextConfig.dependencies, {
get [dependencyName](): DependencyConfig {
return getDependencyConfig(
root,
dependencyName,
finalConfig,
config,
userConfig,
);
},
});
return nextConfig;
} catch {
return acc;
}
Expand Down Expand Up @@ -205,7 +206,7 @@ export async function loadConfigAsync({
get reactNativeVersion() {
return getReactNativeVersion(initialConfig.reactNativePath);
},
dependencies: userConfig.dependencies,
dependencies: {...userConfig.dependencies},
commands: userConfig.commands,
healthChecks: userConfig.healthChecks || [],
platforms: userConfig.platforms,
Expand Down Expand Up @@ -249,18 +250,7 @@ export async function loadConfigAsync({
dependencyName,
);

return assign({}, acc, {
dependencies: assign({}, acc.dependencies, {
get [dependencyName](): DependencyConfig {
return getDependencyConfig(
root,
dependencyName,
finalConfig,
config,
userConfig,
);
},
}),
const nextConfig = assign({}, acc, {
commands: removeDuplicateCommands([
...config.commands,
...acc.commands,
Expand All @@ -275,6 +265,18 @@ export async function loadConfigAsync({
},
healthChecks: [...acc.healthChecks, ...config.healthChecks],
}) as Config;
assign(nextConfig.dependencies, {
get [dependencyName](): DependencyConfig {
return getDependencyConfig(
root,
dependencyName,
finalConfig,
config,
userConfig,
);
},
});
return nextConfig;
} catch {
return acc;
}
Expand Down
1 change: 1 addition & 0 deletions packages/cli-config/src/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const healthCheck = t.object({
healthchecks: t.array().items(
t.object({
label: t.string().required(),
visible: t.bool(),
isRequired: t.bool(),
description: t.string(),
getDiagnostics: t.func(),
Expand Down
Loading