totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-19 05:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix legacy builds

Browse Source
This commit is contained in:
Rich Harris
2018-10-02 11:13:09 -04:00
parent 9403799393
commit bb04af41bd
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/create_compilers/extract_css.ts
View File

@@ -170,9 +170,8 @@ export default function extract_css(client_result: CompileResult, components: Pa
return null; return null;
} }
let main = client_result.assets.main; let asset_dir = `${dirs.dest}/client`;
if (process.env.SAPPER_LEGACY_BUILD) main = `legacy/${main}`; if (process.env.SAPPER_LEGACY_BUILD) asset_dir += '/legacy';
const entry = fs.readFileSync(`${dirs.dest}/client/${main}`, 'utf-8');
const replacements = new Map(); const replacements = new Map();
@@ -186,10 +185,10 @@ export default function extract_css(client_result: CompileResult, components: Pa
const output_file_name = chunk.file.replace(/\.js$/, '.css'); const output_file_name = chunk.file.replace(/\.js$/, '.css');
map.file = output_file_name; map.file = output_file_name;
map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source)); map.sources = map.sources.map(source => path.relative(`${asset_dir}`, source));
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`); fs.writeFileSync(`${asset_dir}/${output_file_name}`, `${code}\n/* sourceMappingURL=./${output_file_name}.map */`);
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, ' ')); fs.writeFileSync(`${asset_dir}/${output_file_name}.map`, JSON.stringify(map, null, ' '));
return true; return true;
} }
@@ -205,14 +204,16 @@ export default function extract_css(client_result: CompileResult, components: Pa
result.chunks[component.file] = files; result.chunks[component.file] = files;
}); });
fs.readdirSync(`${dirs.dest}/client`).forEach(file => { fs.readdirSync(asset_dir).forEach(file => {
const source = fs.readFileSync(`${dirs.dest}/client/${file}`, 'utf-8'); if (fs.statSync(`${asset_dir}/${file}`).isDirectory()) return;
const source = fs.readFileSync(`${asset_dir}/${file}`, 'utf-8');
const replaced = source.replace(/["']__SAPPER_CSS_PLACEHOLDER:(.+?)__["']/g, (m, route) => { const replaced = source.replace(/["']__SAPPER_CSS_PLACEHOLDER:(.+?)__["']/g, (m, route) => {
return JSON.stringify(replacements.get(route)); return JSON.stringify(replacements.get(route));
}); });
fs.writeFileSync(`${dirs.dest}/client/${file}`, replaced); fs.writeFileSync(`${asset_dir}/${file}`, replaced);
}); });
const leftover = get_css_from_modules(Array.from(unaccounted_for)); const leftover = get_css_from_modules(Array.from(unaccounted_for));
@@ -224,10 +225,10 @@ export default function extract_css(client_result: CompileResult, components: Pa
const output_file_name = `main.${main_hash}.css`; const output_file_name = `main.${main_hash}.css`;
map.file = output_file_name; map.file = output_file_name;
map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source)); map.sources = map.sources.map(source => path.relative(asset_dir, source));
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`); fs.writeFileSync(`${asset_dir}/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`);
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, ' ')); fs.writeFileSync(`${asset_dir}/${output_file_name}.map`, JSON.stringify(map, null, ' '));
result.main = output_file_name; result.main = output_file_name;
} }