diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts index f0d31ac1eb01..d20ddd08ad82 100644 --- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts +++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts @@ -179,10 +179,8 @@ export default async (options: Options & Record): Promise ({ - compilation, - files, - options: templateOptions, + template, + templateParameters: { version: packageJson.version, globals: { CONFIG_TYPE: configType, @@ -198,7 +196,7 @@ export default async (options: Options & Record): Promise): Promise): Promise ({ - compilation, - files, - options: templateOptions, + template, + templateParameters: { version: packageJson.version, globals: { CONFIG_TYPE: configType, @@ -196,7 +194,7 @@ export default async (options: Options & Record): Promise): Promise - <%= options.title || 'Storybook'%> + <%= htmlWebpackPlugin.options.title || 'Storybook'%> - <% if (files.favicon) { %> - + <% if (htmlWebpackPlugin.files.favicon) { %> + <% } %> <% if (typeof headHtmlSnippet !== 'undefined') { %> <%= headHtmlSnippet %> <% } %> <% - files.css.forEach(file => { %> + htmlWebpackPlugin.files.css.forEach(file => { %> <% }); %> @@ -23,25 +23,21 @@ - <% if (typeof bodyHtmlSnippet !== 'undefined') { %> - <%= bodyHtmlSnippet %> - <% } %> + <% if (typeof bodyHtmlSnippet !== 'undefined') { %> <%= bodyHtmlSnippet %> <% } %>
<% if (typeof globals !== 'undefined' && Object.keys(globals).length) { %> - - <% } %> - - <% files.js.forEach(file => { %> - + + <% } %> <% htmlWebpackPlugin.files.js.forEach(file => { %> + <% }); %> diff --git a/lib/manager-webpack4/src/presets/manager-preset.ts b/lib/manager-webpack4/src/presets/manager-preset.ts index 5c911d820774..2929646fe78a 100644 --- a/lib/manager-webpack4/src/presets/manager-preset.ts +++ b/lib/manager-webpack4/src/presets/manager-preset.ts @@ -93,10 +93,8 @@ export async function managerWebpack( chunksSortMode: 'none' as any, alwaysWriteToDisk: true, inject: false, - templateParameters: (compilation, files, options) => ({ - compilation, - files, - options, + template, + templateParameters: { version, globals: { CONFIG_TYPE: configType, @@ -109,8 +107,7 @@ export async function managerWebpack( SERVER_CHANNEL_URL: serverChannelUrl, }, headHtmlSnippet, - }), - template, + }, }) as any) as WebpackPluginInstance, (new CaseSensitivePathsPlugin() as any) as WebpackPluginInstance, // graphql sources check process variable diff --git a/lib/manager-webpack5/src/presets/manager-preset.ts b/lib/manager-webpack5/src/presets/manager-preset.ts index 6a4ed1e9447e..6fe9535cd611 100644 --- a/lib/manager-webpack5/src/presets/manager-preset.ts +++ b/lib/manager-webpack5/src/presets/manager-preset.ts @@ -92,10 +92,8 @@ export async function managerWebpack( chunksSortMode: 'none' as any, alwaysWriteToDisk: true, inject: false, - templateParameters: (compilation, files, options) => ({ - compilation, - files, - options, + template, + templateParameters: { version, globals: { CONFIG_TYPE: configType, @@ -108,8 +106,7 @@ export async function managerWebpack( SERVER_CHANNEL_URL: serverChannelUrl, }, headHtmlSnippet, - }), - template, + }, }) as any) as WebpackPluginInstance, (new CaseSensitivePathsPlugin() as any) as WebpackPluginInstance, // graphql sources check process variable