From 6571a6ba216015e3f4b601c99731afb1edf932ef Mon Sep 17 00:00:00 2001 From: Benjamin Kinga Date: Fri, 23 Oct 2020 21:51:11 -0500 Subject: [PATCH 1/2] added test for preloadmodules --- .../test/__snapshots__/plugin.test.js.snap | 36 ++++++++++++++++++- plugins/plugin-optimize/test/plugin.test.js | 18 ++++++++++ .../test/stubs/minimal/esm_example.js | 4 +++ .../test/stubs/minimal/index.js | 2 ++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 plugins/plugin-optimize/test/stubs/minimal/esm_example.js diff --git a/plugins/plugin-optimize/test/__snapshots__/plugin.test.js.snap b/plugins/plugin-optimize/test/__snapshots__/plugin.test.js.snap index d650204080..4d1142a7d2 100644 --- a/plugins/plugin-optimize/test/__snapshots__/plugin.test.js.snap +++ b/plugins/plugin-optimize/test/__snapshots__/plugin.test.js.snap @@ -7,13 +7,47 @@ exports[`@snowpack/plugin-optimize minimal - no minification: fs.writeFileSync 1 exports[`@snowpack/plugin-optimize minimal - no options: console.log 1`] = ``; exports[`@snowpack/plugin-optimize minimal - no options: fs.writeFileSync 1`] = ` +FILE: stubs/minimal/esm_example.js +export default function e(){return console.log("example"),1} + + +-------------------------------------------------------------------------------- + FILE: stubs/minimal/index.html Minimal test -------------------------------------------------------------------------------- FILE: stubs/minimal/index.js -(()=>{function n(o){console.log(o)}n("test")})(); +import"./esm_example.js";(()=>{function e(m){console.log(m)}e("test")})(); + + +-------------------------------------------------------------------------------- + +FILE: stubs/minimal/style.css +body{border:1px solid red} +`; + +exports[`@snowpack/plugin-optimize no HTML minification, with preloadModules: console.log 1`] = ``; + +exports[`@snowpack/plugin-optimize no HTML minification, with preloadModules: fs.writeFileSync 1`] = ` +FILE: stubs/minimal/esm_example.js +export default function e(){return console.log("example"),1} + + +-------------------------------------------------------------------------------- + +FILE: stubs/minimal/index.html +Minimal test + + + + + +-------------------------------------------------------------------------------- + +FILE: stubs/minimal/index.js +import"./esm_example.js";(()=>{function e(m){console.log(m)}e("test")})(); -------------------------------------------------------------------------------- diff --git a/plugins/plugin-optimize/test/plugin.test.js b/plugins/plugin-optimize/test/plugin.test.js index 93943e1299..5e11c9c465 100644 --- a/plugins/plugin-optimize/test/plugin.test.js +++ b/plugins/plugin-optimize/test/plugin.test.js @@ -54,4 +54,22 @@ describe('@snowpack/plugin-optimize', () => { expect(fs.writeFileSync).toMatchSnapshot('fs.writeFileSync'); expect(console.log).toMatchSnapshot('console.log'); }); + + it('no HTML minification, with preloadModules', async () => { + const pluginInstance = plugin( + { + buildOptions: {}, + }, + { + minifyHTML: false, + preloadModules: true + }) + + await pluginInstance.optimize({ + buildDirectory: path.resolve(__dirname, 'stubs/minimal/'), + }); + + expect(fs.writeFileSync).toMatchSnapshot('fs.writeFileSync'); + expect(console.log).toMatchSnapshot('console.log'); + }); }); diff --git a/plugins/plugin-optimize/test/stubs/minimal/esm_example.js b/plugins/plugin-optimize/test/stubs/minimal/esm_example.js new file mode 100644 index 0000000000..ffe45e46ca --- /dev/null +++ b/plugins/plugin-optimize/test/stubs/minimal/esm_example.js @@ -0,0 +1,4 @@ +export default function example() { + console.log('example') + return 1 +} diff --git a/plugins/plugin-optimize/test/stubs/minimal/index.js b/plugins/plugin-optimize/test/stubs/minimal/index.js index a422c44fb7..eb7c4664f7 100644 --- a/plugins/plugin-optimize/test/stubs/minimal/index.js +++ b/plugins/plugin-optimize/test/stubs/minimal/index.js @@ -1,3 +1,5 @@ +import esm_example from './esm_example.js' + (() => { function n(o) { console.log(o); From fff6634c50485f8b6349364efad3bad8e4c45f5a Mon Sep 17 00:00:00 2001 From: Benjamin Kinga Date: Fri, 23 Oct 2020 22:01:13 -0500 Subject: [PATCH 2/2] corrected function name --- plugins/plugin-optimize/test/stubs/minimal/esm_example.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugin-optimize/test/stubs/minimal/esm_example.js b/plugins/plugin-optimize/test/stubs/minimal/esm_example.js index ffe45e46ca..6dac8eded9 100644 --- a/plugins/plugin-optimize/test/stubs/minimal/esm_example.js +++ b/plugins/plugin-optimize/test/stubs/minimal/esm_example.js @@ -1,4 +1,4 @@ -export default function example() { +export default function esm_example() { console.log('example') return 1 }