From baf04edffd0bae16e6083713ccde1cabbae002d5 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Tue, 10 Oct 2023 11:56:04 -0400 Subject: [PATCH] implement reversing of the resolvedWithinPackage --- packages/core/src/module-resolver.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts index eb7cf2bf2..94ba0b292 100644 --- a/packages/core/src/module-resolver.ts +++ b/packages/core/src/module-resolver.ts @@ -833,7 +833,9 @@ export class Resolver { return request.rehome(resolve(pkg.root, 'package.json')); } else { // otherwise we need to just assume that internal naming is simple - return request.rehome(resolve(pkg.root, '..', 'superFakeTarget.js')); + return request.rehome(resolve(pkg.root, '..', 'superFakeTarget.js')).withMeta({ + resolvedWithinPackage: pkg.root, + }); } } @@ -1000,6 +1002,13 @@ export class Resolver { return request; } + if (fromFile.endsWith('superFakeTarget.js')) { + if (!request.meta?.resolvedWithinPackage) { + throw new Error(`bug: embroider resolver's meta is not propagating`); + } + fromFile = resolve(request.meta?.resolvedWithinPackage as string, 'package.json'); + } + let pkg = this.packageCache.ownerOfFile(fromFile); if (!pkg) { return logTransition('no identifiable owningPackage', request);