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

Jump to bottom

Fix non-deterministic builds between project directories #8869

Merged
merged 13 commits into from
Mar 15, 2023
Merged

Fix non-deterministic builds between project directories #8869

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
214cae3
Use BitSet for bundler intersections
mattcompiles Feb 23, 2023
b94daa2
Fix type and lint errors
mattcompiles Feb 26, 2023
59252ef
Clean up implementation
mattcompiles Feb 26, 2023
dac4122
More implementaion cleanup
mattcompiles Feb 26, 2023
8197b3f
Fix typo
mattcompiles Feb 27, 2023
f1efc0e
Add BitSet tests
mattcompiles Feb 27, 2023
fc29b8e
Fix typo
mattcompiles Feb 27, 2023
3546ab0
Add comment to explaining values strategy
mattcompiles Feb 28, 2023
694332c
Fix asset order after shared bundles are deleted
mattcompiles Mar 2, 2023
64f1e2f
Ensure import specifiers hashes are deterministic across projects
mattcompiles Mar 6, 2023
9f35ac4
Fix merge issue
mattcompiles Mar 6, 2023
714ba92
Update packages/bundlers/default/src/DefaultBundler.js
mattcompiles Mar 13, 2023
7139c9a
Merge branch 'v2' into mjones/shared-asset-order
mattcompiles Mar 13, 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
20 changes: 20 additions & 0 deletions packages/bundlers/default/src/DefaultBundler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,8 @@ function createIdealGraph(
}
}

let modifiedSourceBundles = new Set();

// Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
for (let bundleGroupId of bundleGraph.getNodeIdsConnectedFrom(rootNodeId)) {
// Find shared bundles in this bundle group.
Expand Down Expand Up @@ -1081,6 +1083,7 @@ function createIdealGraph(
for (let sourceBundleId of sourceBundles) {
let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
invariant(sourceBundle !== 'root');
modifiedSourceBundles.add(sourceBundle);
bundleToRemove.sourceBundles.delete(sourceBundleId);
for (let asset of bundleToRemove.assets) {
sourceBundle.assets.add(asset);
Expand Down Expand Up @@ -1119,6 +1122,23 @@ function createIdealGraph(
}
}
}

// Fix asset order in source bundles as they are likely now incorrect after shared bundle deletion
if (modifiedSourceBundles.size > 0) {
let assetOrderMap = new Map(assets.map(a => [a, assets.indexOf(a)]));
mattcompiles marked this conversation as resolved.
Show resolved Hide resolved

for (let bundle of modifiedSourceBundles) {
bundle.assets = new Set(
[...bundle.assets].sort((a, b) => {
let aIndex = nullthrows(assetOrderMap.get(a));
let bIndex = nullthrows(assetOrderMap.get(b));

return aIndex - bIndex;
}),
);
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder if you could use BitSet for bundle.assets here? Then when you do bundle.assets.add it would just be setting a bit corresponding to the position within assets. When we take the ideal graph and convert it back to the legacy graph we could iterate in asset order (as BitSet#values() does).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funny you mention this because I considered that approach as well but was worried this iteration cost might not be worth it. You've inspired me to try it though. Will report back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@devongovett Just realised it'd be hard to use the BitSet here as we need to create bundles before we know the full list of assets as we add them during the traverse.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could create the bitset earlier maybe

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could, but I'd have to add a second full asset traverse to collect the list of all assets before starting the main traverse. Unless there's some other cheap way to get the list of all assets?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After migrating all asset sets to BitSets I actually saw a drop in perf. This is due to the values() extraction being too expensive. I think there's potential to use BitSet more widely in the bundler but it would require a larger rethink to optimise around its benefits.

tl;dr let's just sort for now.


function deleteBundle(bundleRoot: BundleRoot) {
bundleGraph.removeNode(nullthrows(bundles.get(bundleRoot.id)));
bundleRoots.delete(bundleRoot);
Expand Down
26 changes: 16 additions & 10 deletions packages/transformers/js/core/src/dependency_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,12 @@ impl<'a> DependencyCollector<'a> {
}
_ => Some(format!(
"{:x}",
hash!(format!("{}:{}:{}", self.config.filename, specifier, kind))
hash!(format!(
"{}:{}:{}",
self.get_project_relative_filename(),
specifier,
kind
))
)),
};

Expand Down Expand Up @@ -1245,21 +1250,22 @@ impl<'a> DependencyCollector<'a> {
}
}

fn get_import_meta_url(&mut self) -> ast::Expr {
use ast::*;

// Get a relative path from the project root.
let filename = if let Some(relative) =
pathdiff::diff_paths(&self.config.filename, &self.config.project_root)
{
fn get_project_relative_filename(&self) -> String {
if let Some(relative) = pathdiff::diff_paths(&self.config.filename, &self.config.project_root) {
relative.to_slash_lossy()
} else if let Some(filename) = Path::new(&self.config.filename).file_name() {
String::from(filename.to_string_lossy())
} else {
String::from("unknown.js")
};
}
}

fn get_import_meta_url(&mut self) -> ast::Expr {
use ast::*;

Expr::Lit(Lit::Str(format!("file:///{}", filename).into()))
Expr::Lit(Lit::Str(
format!("file:///{}", self.get_project_relative_filename()).into(),
))
}

fn get_import_meta(&mut self) -> ast::Expr {
Expand Down