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

Fix rollup input paths on Windows

Browse Source
This commit is contained in:
mrkishi
2018-10-01 17:04:00 -03:00
parent 4071acf7c0
commit 584ddd1c85
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/create_compilers/RollupResult.ts
View File

@@ -38,11 +38,18 @@ export default class RollupResult implements CompileResult {
// webpack, but we can have a route -> [chunk] map or something // webpack, but we can have a route -> [chunk] map or something
this.assets = {}; this.assets = {};
compiler.chunks.forEach(chunk => { if (typeof compiler.input === 'string') {
if (compiler.input in chunk.modules) { compiler.chunks.forEach(chunk => {
this.assets.main = chunk.fileName; if (compiler.input in chunk.modules) {
this.assets.main = chunk.fileName;
}
});
} else {
for (const name in compiler.input) {
const file = compiler.input[name];
this.assets[name] = compiler.chunks.find(chunk => file in chunk.modules).fileName;
} }
}); }
this.summary = compiler.chunks.map(chunk => { this.summary = compiler.chunks.map(chunk => {
const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white; const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white;

19
src/core/create_compilers/index.ts
View File

@@ -15,6 +15,13 @@ export default async function create_compilers(bundler: 'rollup' | 'webpack'): P
const config = await RollupCompiler.load_config(); const config = await RollupCompiler.load_config();
validate_config(config, 'rollup'); validate_config(config, 'rollup');
normalize_rollup_config(config.client);
normalize_rollup_config(config.server);
if (config.serviceworker) {
normalize_rollup_config(config.serviceworker);
}
return { return {
client: new RollupCompiler(config.client), client: new RollupCompiler(config.client),
server: new RollupCompiler(config.server), server: new RollupCompiler(config.server),
@@ -41,4 +48,14 @@ function validate_config(config: any, bundler: 'rollup' | 'webpack') {
if (!config.client || !config.server) { if (!config.client || !config.server) {
throw new Error(`${bundler}.config.js must export a { client, server, serviceworker? } object`); throw new Error(`${bundler}.config.js must export a { client, server, serviceworker? } object`);
} }
} }
function normalize_rollup_config(config: any) {
if (typeof config.input === 'string') {
config.input = path.normalize(config.input);
} else {
for (const name in config.input) {
config.input[name] = path.normalize(config.input[name]);
}
}
}