dedupp templates from builders

storybookjs · Feb 4, 2021 · 2a5895c · 2a5895c
1 parent 1657325
commit 2a5895c
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 486 deletions.
diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
@@ -18,7 +18,6 @@ import { createBabelLoader } from './babel-loader-preview';
 
 import { toRequireContextString } from './to-require-context';
 import { useBaseTsSupport } from '../config/useBaseTsSupport';
-import { getPreviewBodyHtml, getPreviewHeadHtml } from '../template';
 import { loadEnv, nodeModulesPaths } from '../common/utils';
 import { es6Transpiler } from '../common/es6Transpiler';
 
@@ -60,14 +59,11 @@ export default async ({
 }: any) => {
   const logLevel = await presets.apply('logLevel', undefined);
   const frameworkOptions = await presets.apply(`${framework}Options`, {});
-  const headHtmlSnippet = await presets.apply(
-    'previewHead',
-    getPreviewHeadHtml(configDir, process.env)
-  );
-  const bodyHtmlSnippet = await presets.apply(
-    'previewBody',
-    getPreviewBodyHtml(configDir, process.env)
-  );
+
+  const headHtmlSnippet = await presets.apply('previewHeadTemplate');
+  const bodyHtmlSnippet = await presets.apply('previewBodyTemplate');
+  const template = await presets.apply('previewMainTemplate');
+
   const { raw, stringified } = loadEnv({ production: true });
   const babelLoader = createBabelLoader(babelOptions, framework);
   const isProd = configType === 'PRODUCTION';
@@ -159,7 +155,7 @@ export default async ({
           removeStyleLinkTypeAttributes: true,
           useShortDoctype: true,
         },
-        template: require.resolve(`../templates/index.ejs`),
+        template,
       }),
       new DefinePlugin({
         'process.env': stringified,

diff --git a/lib/builder-webpack4/src/template.ts b/lib/builder-webpack4/src/template.ts
diff --git a/lib/builder-webpack4/src/templates/base-preview-body.html b/lib/builder-webpack4/src/templates/base-preview-body.html
diff --git a/lib/builder-webpack4/src/templates/base-preview-head.html b/lib/builder-webpack4/src/templates/base-preview-head.html
diff --git a/lib/builder-webpack4/src/templates/index.ejs b/lib/builder-webpack4/src/templates/index.ejs
diff --git a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -18,7 +18,6 @@ import { createBabelLoader } from './babel-loader-preview';
 
 import { toRequireContextString } from './to-require-context';
 import { useBaseTsSupport } from '../config/useBaseTsSupport';
-import { getPreviewBodyHtml, getPreviewHeadHtml } from '../template';
 import { loadEnv, nodeModulesPaths } from '../common/utils';
 import { es6Transpiler } from '../common/es6Transpiler';
 
@@ -60,14 +59,11 @@ export default async ({
 }: any) => {
   const logLevel = await presets.apply('logLevel', undefined);
   const frameworkOptions = await presets.apply(`${framework}Options`, {});
-  const headHtmlSnippet = await presets.apply(
-    'previewHead',
-    getPreviewHeadHtml(configDir, process.env)
-  );
-  const bodyHtmlSnippet = await presets.apply(
-    'previewBody',
-    getPreviewBodyHtml(configDir, process.env)
-  );
+
+  const headHtmlSnippet = await presets.apply('previewHeadTemplate');
+  const bodyHtmlSnippet = await presets.apply('previewBodyTemplate');
+  const template = await presets.apply('previewMainTemplate');
+
   const { raw, stringified } = loadEnv({ production: true });
   const babelLoader = createBabelLoader(babelOptions, framework);
   const isProd = configType === 'PRODUCTION';
@@ -159,7 +155,7 @@ export default async ({
           removeStyleLinkTypeAttributes: true,
           useShortDoctype: true,
         },
-        template: require.resolve(`../templates/index.ejs`),
+        template,
       }),
       new DefinePlugin({
         'process.env': stringified,

diff --git a/lib/builder-webpack5/src/template.ts b/lib/builder-webpack5/src/template.ts
diff --git a/lib/builder-webpack5/src/templates/base-preview-body.html b/lib/builder-webpack5/src/templates/base-preview-body.html