From 07dc9f405d0a3152984cf4165e9ba78eb478b09b Mon Sep 17 00:00:00 2001 From: Pat Cavit Date: Tue, 5 Dec 2017 14:06:54 -0800 Subject: [PATCH 1/3] WIP: pass module id to preprocess hooks --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 7816794..4235a96 100644 --- a/src/index.js +++ b/src/index.js @@ -181,7 +181,7 @@ export default function svelte(options = {}) { if (!filter(id)) return null; if (!~extensions.indexOf(path.extname(id))) return null; - return (options.preprocess ? preprocess(code, options.preprocess) : Promise.resolve(code)).then(code => { + return (options.preprocess ? preprocess(code, Object.assign({}, options.preprocess, { id })) : Promise.resolve(code)).then(code => { const compiled = compile( code.toString(), Object.assign({}, { From 3e69101900cb619badcc3518d640703e1f5365ab Mon Sep 17 00:00:00 2001 From: Pat Cavit Date: Thu, 7 Dec 2017 10:20:48 -0800 Subject: [PATCH 2/3] WIP: change id to filename --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 4235a96..78ec80c 100644 --- a/src/index.js +++ b/src/index.js @@ -181,7 +181,7 @@ export default function svelte(options = {}) { if (!filter(id)) return null; if (!~extensions.indexOf(path.extname(id))) return null; - return (options.preprocess ? preprocess(code, Object.assign({}, options.preprocess, { id })) : Promise.resolve(code)).then(code => { + return (options.preprocess ? preprocess(code, Object.assign({}, options.preprocess, { filename : id })) : Promise.resolve(code)).then(code => { const compiled = compile( code.toString(), Object.assign({}, { From f85bf102fbea854c20ef591169f0492d144190ee Mon Sep 17 00:00:00 2001 From: Pat Cavit Date: Thu, 7 Dec 2017 10:32:09 -0800 Subject: [PATCH 3/3] test: add failing filename test Depends on changes to` svelte.preprocess()` to actually work. --- test/test.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/test.js b/test/test.js index b8eb831..e9cc659 100644 --- a/test/test.js +++ b/test/test.js @@ -137,9 +137,11 @@ describe('rollup-plugin-svelte', () => { it('preprocesses components', () => { const { transform } = plugin({ preprocess: { - markup: ({ content }) => { + markup: ({ content, filename }) => { return { - code: content.replace('__REPLACEME__', 'replaced') + code: content + .replace('__REPLACEME__', 'replaced') + .replace('__FILENAME__', filename) }; } } @@ -147,8 +149,10 @@ describe('rollup-plugin-svelte', () => { return transform(`

Hello __REPLACEME__!

+

file: __FILENAME__

`, 'test.html').then(({ code }) => { - assert.equal(code.indexOf('__REPLACEME__'), -1); + assert.equal(code.indexOf('__REPLACEME__'), -1, 'content not modified'); + assert.notEqual(code.indexOf('file: test.html'), -1, 'filename not replaced'); }); }); });