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 looping for unchanged files #1670

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Fix looping for unchanged files #1670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c618df
make sure that we don't return a new request when unmoved
mansona Nov 16, 2023
f53a466
add a guard to let us know if a packager loop is likely
mansona Nov 16, 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
24 changes: 20 additions & 4 deletions packages/core/src/module-resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,13 @@ export class Resolver {
// no additional fallback is available.
return resolution;
}

if (nextRequest.fromFile === request.fromFile && nextRequest.specifier === request.specifier) {
throw new Error(
'Bug Discovered! New request is not === original request but has the same fromFile and specifier. This will likely create a loop.'
);
}

if (nextRequest.isVirtual) {
// virtual requests are terminal, there is no more beforeResolve or
// fallbackResolve around them. The defaultResolve is expected to know how
Expand Down Expand Up @@ -834,7 +841,13 @@ export class Resolver {
if (pkg.name.startsWith('@')) {
levels.push('..');
}
return request.rehome(resolve(pkg.root, ...levels, 'moved-package-target.js')).withMeta({
let newRequest = request.rehome(resolve(pkg.root, ...levels, 'moved-package-target.js'));

if (newRequest === request) {
return request;
}

return newRequest.withMeta({
resolvedWithinPackage: pkg.root,
});
}
Expand Down Expand Up @@ -1065,11 +1078,14 @@ export class Resolver {

// auto-upgraded packages can fall back to the set of known active addons
if (pkg.meta['auto-upgraded'] && this.options.activeAddons[packageName]) {
return logTransition(
`activeAddons`,
const rehomed = this.resolveWithinMovedPackage(
request,
this.resolveWithinMovedPackage(request, this.packageCache.get(this.options.activeAddons[packageName]))
this.packageCache.get(this.options.activeAddons[packageName])
);

if (rehomed !== request) {
return logTransition(`activeAddons`, request, rehomed);
}
}

let logicalLocation = this.reverseSearchAppTree(pkg, fromFile);
Expand Down