Skip to content

Commit

Permalink
feat(plugin-webpack): customizable HtmlWebpackPlugin options
Browse files Browse the repository at this point in the history
This changeset adds options to entrypoints to support customized
operation of the `HtmlWebpackPlugin`. See below for full changeset.

Changes enclosed:
- Add properties for `output`, `htmlPlugins`, and `htmlOptions` to
  `WebpackPluginEntryPoint`
- Use new options from `Config.ts`, by merging them into their
  expected places
- Add tests to cover new options

Fixes and closes #2968.
  • Loading branch information
sgammon committed Oct 16, 2022
1 parent 362099a commit 07f8368
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
17 changes: 16 additions & 1 deletion packages/plugin/webpack/src/Config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Configuration as RawWebpackConfiguration } from 'webpack';
import { Configuration as RawWebpackConfiguration, WebpackPluginInstance } from 'webpack';
import WebpackDevServer from 'webpack-dev-server';
import { ConfigurationFactory as WebpackConfigurationFactory } from './WebpackConfig';
import HtmlWebpackPlugin from 'html-webpack-plugin';

export interface WebpackPluginEntryPoint {
/**
Expand Down Expand Up @@ -48,6 +49,20 @@ export interface WebpackPluginEntryPoint {
* for all entries.
*/
nodeIntegration?: boolean;
/**
* Custom options to merge into the configuration passed to `HtmlWebpackPlugin`.
*/
htmlOptions?: Partial<HtmlWebpackPlugin.Options>;
/**
* Plugins to include before `HtmlWebpackPlugin`; typically, HTML plugin add-ons will
* need to be placed here.
*/
htmlPlugins?: WebpackPluginInstance[];
/**
* Additional options to merge into the Webpack `output` configuration for this entry-
* point.
*/
output?: object;
}

export interface WebpackPreloadEntryPoint {
Expand Down
3 changes: 3 additions & 0 deletions packages/plugin/webpack/src/WebpackConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ export default class WebpackConfigGenerator {
devtool: this.rendererSourceMapOption,
mode: this.mode,
output: {
...(entryPoint.output || {}),
path: path.resolve(this.webpackDir, 'renderer'),
filename: '[name]/index.js',
globalObject: 'self',
Expand All @@ -205,9 +206,11 @@ export default class WebpackConfigGenerator {
__filename: false,
},
plugins: [
...(entryPoint.htmlPlugins || []),
...(entryPoint.html
? [
new HtmlWebpackPlugin({
...(entryPoint.htmlOptions || {}),
title: entryPoint.name,
template: entryPoint.html,
filename: `${entryPoint.name}/index.html`,
Expand Down
31 changes: 31 additions & 0 deletions packages/plugin/webpack/test/WebpackConfig_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,37 @@ describe('WebpackConfigGenerator', () => {
await generator.getRendererConfig(config.renderer.entryPoints);
expect(getInvokedCounter()).to.equal(2);
});

it('honors custom entrypoint output options', async () => {
const { MyWebpackConfigGenerator } = makeSubclass();

const config = {
mainConfig: () => ({
entry: 'main.js',
...sampleWebpackConfig,
}),
renderer: {
config: { ...sampleWebpackConfig },
entryPoints: [
{
name: 'main',
js: 'rendererScript.js',
output: {
crossorigin: 'anonymous',
},
},
],
},
} as WebpackPluginConfig;

const generator = new MyWebpackConfigGenerator(config, mockProjectDir, false, 3000);

const rendererConfig = await generator.getRendererConfig(config.renderer.entryPoints);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const outputSettings = rendererConfig[0].output as any;
expect(outputSettings).not.to.be.undefined;
expect(outputSettings['crossorigin']).to.equal('anonymous');
});
});
});
});

0 comments on commit 07f8368

Please sign in to comment.