Skip to content

Commit 85c9391

Browse files
committed
fix: add isConfig check
1 parent f4953a0 commit 85c9391

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

packages/core/src/config/config-resolvers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export async function resolveConfigFileAndRefs({
6868
rootDocument: document,
6969
rootType: NormalizedConfigTypes.ConfigRoot,
7070
externalRefResolver,
71+
isConfig: true,
7172
});
7273

7374
return { document, resolvedRefMap };

packages/core/src/resolve.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ export async function resolveDocument(opts: {
230230
rootDocument: Document;
231231
externalRefResolver: BaseResolver;
232232
rootType: NormalizedNodeType;
233+
isConfig?: boolean;
233234
}): Promise<ResolvedRefMap> {
234-
const { rootDocument, externalRefResolver, rootType } = opts;
235+
const { rootDocument, externalRefResolver, rootType, isConfig = false } = opts;
235236
const resolvedRefMap: ResolvedRefMap = new Map();
236237
const seenNodes = new Set<string>(); // format "${type}::${absoluteRef}${pointer}"
237238

@@ -366,11 +367,10 @@ export async function resolveDocument(opts: {
366367
resolvePromises.push(promise);
367368
}
368369

369-
if ('extends' in node) {
370-
// TODO: check if config root
370+
if ('extends' in node && isConfig) {
371371
const promise = Promise.all(
372372
node.extends
373-
.filter((e: string) => e.startsWith('./')) // TODO: add proper check to exclude internal presets
373+
.filter((e: string) => isAbsoluteUrl(e) || path.extname(e))
374374
.map((extendPath: string) => {
375375
return followRef(
376376
rootNodeDocument,

0 commit comments

Comments
 (0)