From d2eb093bec74f0f4e63608651c7344e76ff25ced Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sat, 12 Sep 2020 15:39:11 -0700 Subject: [PATCH 1/2] Make filename relative --- index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index c9c5b91..cff1c58 100644 --- a/index.js +++ b/index.js @@ -227,6 +227,8 @@ module.exports = function svelte(options = {}) { if (!~extensions.indexOf(extension)) return null; + + const filename = path.relative(process.cwd(), id); const dependencies = []; let preprocessPromise; if (options.preprocess) { @@ -246,11 +248,11 @@ module.exports = function svelte(options = {}) { } preprocessPromise = preprocess( code, - Object.assign(preprocessOptions, { filename: id }) + Object.assign(preprocessOptions, { filename }) ).then(code => code.toString()); } else { preprocessPromise = preprocess(code, options.preprocess, { - filename: id + filename }).then(processed => { if (processed.dependencies) { dependencies.push(...processed.dependencies); @@ -274,7 +276,7 @@ module.exports = function svelte(options = {}) { const compiled = compile( code, Object.assign(base_options, fixed_options, { - filename: id + filename }, major_version >= 3 ? null : { name: capitalize(sanitize(id)) }) From 53612e72278b30b5c82085217dd615f3b0c2a1bc Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Mon, 19 Oct 2020 15:38:38 -0700 Subject: [PATCH 2/2] chore: spacing / code style --- index.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/index.js b/index.js index cff1c58..4fb87ab 100644 --- a/index.js +++ b/index.js @@ -224,11 +224,10 @@ module.exports = function svelte(options = {}) { if (!filter(id)) return null; const extension = path.extname(id); - if (!~extensions.indexOf(extension)) return null; - - + const filename = path.relative(process.cwd(), id); + const dependencies = []; let preprocessPromise; if (options.preprocess) { @@ -251,9 +250,7 @@ module.exports = function svelte(options = {}) { Object.assign(preprocessOptions, { filename }) ).then(code => code.toString()); } else { - preprocessPromise = preprocess(code, options.preprocess, { - filename - }).then(processed => { + preprocessPromise = preprocess(code, options.preprocess, { filename }).then(processed => { if (processed.dependencies) { dependencies.push(...processed.dependencies); } @@ -275,9 +272,7 @@ module.exports = function svelte(options = {}) { const compiled = compile( code, - Object.assign(base_options, fixed_options, { - filename - }, major_version >= 3 ? null : { + Object.assign(base_options, fixed_options, { filename }, major_version >= 3 ? null : { name: capitalize(sanitize(id)) }) ); @@ -316,6 +311,7 @@ module.exports = function svelte(options = {}) { return compiled.js; }); }, + /** * If css: true then outputs a single file with all CSS bundled together */