From 44836eb87cb98dafe40efa20d728defec1d55c2a Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:30:59 -0400 Subject: [PATCH 1/2] fix: run output plugins last --- src/utils/PluginDriver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/PluginDriver.ts b/src/utils/PluginDriver.ts index 1f795f22642..53062e3bb74 100644 --- a/src/utils/PluginDriver.ts +++ b/src/utils/PluginDriver.ts @@ -105,7 +105,7 @@ export class PluginDriver { this.finaliseAssets = this.fileEmitter.finaliseAssets.bind(this.fileEmitter); this.setChunkInformation = this.fileEmitter.setChunkInformation.bind(this.fileEmitter); this.setOutputBundle = this.fileEmitter.setOutputBundle.bind(this.fileEmitter); - this.plugins = userPlugins.concat(basePluginDriver ? basePluginDriver.plugins : []); + this.plugins = (basePluginDriver ? basePluginDriver.plugins : []).concat(userPlugins); const existingPluginNames = new Set(); this.pluginContexts = new Map( From 1e1de2d22fccca79826ca4c83d2787db81e32885 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 6 Jul 2022 06:46:42 +0200 Subject: [PATCH 2/2] Add test --- .../runs-output-plugins-last/_config.js | 23 +++++++++++++++++++ .../runs-output-plugins-last/_expected.js | 7 ++++++ .../samples/runs-output-plugins-last/main.js | 1 + .../samples/options-in-renderstart/_config.js | 4 ++-- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 test/form/samples/runs-output-plugins-last/_config.js create mode 100644 test/form/samples/runs-output-plugins-last/_expected.js create mode 100644 test/form/samples/runs-output-plugins-last/main.js diff --git a/test/form/samples/runs-output-plugins-last/_config.js b/test/form/samples/runs-output-plugins-last/_config.js new file mode 100644 index 00000000000..69c2baad70a --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/_config.js @@ -0,0 +1,23 @@ +module.exports = { + description: 'runs output plugins last', + options: { + plugins: [ + { + name: 'input', + renderChunk(code) { + return `/* input */\n${code}\n/* input */`; + } + } + ], + output: { + plugins: [ + { + name: 'output', + renderChunk(code) { + return `/* output */\n${code}\n/* output */`; + } + } + ] + } + } +}; diff --git a/test/form/samples/runs-output-plugins-last/_expected.js b/test/form/samples/runs-output-plugins-last/_expected.js new file mode 100644 index 00000000000..62059de4228 --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/_expected.js @@ -0,0 +1,7 @@ +/* output */ +/* input */ +let foo = 'base'; + +export { foo }; +/* input */ +/* output */ diff --git a/test/form/samples/runs-output-plugins-last/main.js b/test/form/samples/runs-output-plugins-last/main.js new file mode 100644 index 00000000000..0f906e40da6 --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/main.js @@ -0,0 +1 @@ +export let foo = 'base'; diff --git a/test/function/samples/options-in-renderstart/_config.js b/test/function/samples/options-in-renderstart/_config.js index 3129a8b36ea..156faa21f3d 100644 --- a/test/function/samples/options-in-renderstart/_config.js +++ b/test/function/samples/options-in-renderstart/_config.js @@ -22,10 +22,10 @@ module.exports = { }, exports: () => { assert.deepStrictEqual(checkedOptions, [ - 'output-plugin', + 'input-plugin', 'cjs', 'global', - 'input-plugin', + 'output-plugin', 'cjs', 'global' ]);