Skip to content

Commit 95d1cd6

Browse files
committed
fix bug: set __origin on resulting manifest object to resolve relative references
1 parent 4caafb2 commit 95d1cd6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

app/exec/extension/_lib/merger.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,13 @@ export class Merger {
127127
public async merge(): Promise<VsixComponents> {
128128
trace.debug("merger.merge");
129129

130-
const manifestPromises: Promise<any>[] = [];
131130
let overridesProvided = false;
131+
const manifestPromises: Promise<any>[] = [];
132132

133133
if (this.settings.manifestJs) {
134-
manifestPromises.push(Promise.resolve(this.loadManifestJs()));
134+
const result = this.loadManifestJs();
135+
result.__origin = this.settings.manifestJs; // save the origin in order to resolve relative paths later.
136+
manifestPromises.push(Promise.resolve(result));
135137
} else {
136138
let manifestFiles = await this.gatherManifests();
137139
manifestFiles.forEach(file => {

0 commit comments

Comments
 (0)