Server-side preload check fixes (fixes #575, #594, #598)

This commit is contained in:
Conduitry
2019-03-08 08:34:36 -05:00
committed by Rich Harris
parent 9540383796
commit 74c66b784f
4 changed files with 18 additions and 21 deletions

View File

@@ -17,11 +17,8 @@ export default function create_manifest_data(cwd: string): ManifestData {
if (/preload/.test(source)) {
try {
const { stats } = svelte.compile(source, {
generate: false,
onwarn: () => {}
});
return !!stats.vars.find((variable: any) => variable.module && variable.export_name === 'preload');
const { vars } = svelte.compile(source.replace(/<style\b[^>]*>[^]*?<\/style>/g, ''), { generate: false });
return vars.some((variable: any) => variable.module && variable.export_name === 'preload');
} catch (err) {}
}
@@ -346,4 +343,4 @@ function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
}).join('') +
(add_trailing_slash ? '\\\/?$' : '$')
);
}
}