Skip to content

Commit e39e4ce

Browse files
committed
all assets go in subdirectories I guess
1 parent 45a82c8 commit e39e4ce

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
990990

991991
// assets are never internal for multipage builds
992992
// @ts-expect-error
993-
const multipageLocationOnDisk = path.join(this.assets.directory, 'multipage.js');
993+
const multipageLocationOnDisk = path.join(this.assets.directory, 'js', 'multipage.js');
994994

995995
this.generatedFiles.set(multipageLocationOnDisk, multipageJsContents);
996996

@@ -1142,7 +1142,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
11421142
const urlRef =
11431143
this.assets.type === 'inline'
11441144
? `data:font/${fontType};base64,${FONT_FILE_CONTENTS.get(fontFile)!.toString('base64')}`
1145-
: `../${fontFile}`;
1145+
: `../fonts/${fontFile}`;
11461146
return `${indent}src: local(${displayName}), local(${postScriptName}), url(${urlRef}) format('${fontType}');`;
11471147
},
11481148
)
@@ -1154,7 +1154,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
11541154
const urlRef =
11551155
this.assets.type === 'inline'
11561156
? `data:image/${imageType};base64,${IMG_FILE_CONTENTS.get(url)!.toString('base64')}`
1157-
: `./${url}`;
1157+
: `../img/${url}`;
11581158
return `${indent}content: url(${urlRef});`;
11591159
}),
11601160
);
@@ -1166,7 +1166,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
11661166
: path.dirname(this.opts.outfile)
11671167
: process.cwd();
11681168

1169-
const scriptLocationOnDisk = path.join(this.assets.directory, 'ecmarkup.js');
1169+
const scriptLocationOnDisk = path.join(this.assets.directory, 'js', 'ecmarkup.js');
11701170
const styleLocationOnDisk = path.join(this.assets.directory, 'css', 'ecmarkup.css');
11711171
const printStyleLocationOnDisk = path.join(this.assets.directory, 'css', 'print.css');
11721172

@@ -1175,7 +1175,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
11751175
this.generatedFiles.set(printStyleLocationOnDisk, printCssContents);
11761176
for (const [, fontFile] of FONT_FILES) {
11771177
this.generatedFiles.set(
1178-
path.join(this.assets.directory, fontFile),
1178+
path.join(this.assets.directory, 'fonts', fontFile),
11791179
FONT_FILE_CONTENTS.get(fontFile)!,
11801180
);
11811181
}

0 commit comments

Comments
 (0)