@storybook/builder-webpack5 6.3.0 → 6.3.4

package/dist/cjs/index.js

@@ -88,7 +88,7 @@ var start = async function ({
         hasErrors: function () {
           return true;
         },
-        hasWarngins: function () {
+        hasWarnings: function () {
           return false;
         },
         toJson: function () {
@@ -168,7 +168,8 @@ var build = async function ({
 
   var config = await getConfig(options);
   return new Promise(function (succeed, fail) {
-    webpackInstance(config).run(function (error, stats) {
+    var compiler = webpackInstance(config);
+    compiler.run(function (error, stats) {
       if (error || !stats || stats.hasErrors()) {
         _nodeLogger.logger.error('=> Failed to build the preview');
 
@@ -177,7 +178,10 @@ var build = async function ({
         if (error) {
           _nodeLogger.logger.error(error.message);
 
-          return fail(error);
+          compiler.close(function () {
+            return fail(error);
+          });
+          return;
         }
 
         if (stats && (stats.hasErrors() || stats.hasWarnings())) {
@@ -196,7 +200,10 @@ var build = async function ({
           warnings.forEach(function (e) {
             return _nodeLogger.logger.error(e.message);
           });
-          return fail(stats);
+          compiler.close(function () {
+            return fail(stats);
+          });
+          return;
         }
       }
 
@@ -211,9 +218,17 @@ var build = async function ({
         }).warnings.forEach(function (e) {
           return _nodeLogger.logger.warn(e.message);
         });
-      }
+      } // https://webpack.js.org/api/node/#run
+      // #15227
+
 
-      return succeed(stats);
+      compiler.close(function (closeErr) {
+        if (closeErr) {
+          return fail(closeErr);
+        }
+
+        return succeed(stats);
+      });
     });
   });
 };

package/dist/cjs/preview/iframe-webpack.config.js

@@ -62,7 +62,8 @@ var _default = async function _default({
   frameworkPath: frameworkPath,
   presets: presets,
   typescriptOptions: typescriptOptions,
-  modern: modern
+  modern: modern,
+  features: features
 }) {
   var envs = await presets.apply('env');
   var logLevel = await presets.apply('logLevel', undefined);
@@ -131,7 +132,6 @@ var _default = async function _default({
       logging: 'error'
     },
     watchOptions: {
-      aggregateTimeout: 10,
       ignored: /node_modules/
     },
     ignoreWarnings: [{
@@ -151,7 +151,8 @@ var _default = async function _default({
           version: packageJson.version,
           globals: {
             LOGLEVEL: logLevel,
-            FRAMEWORK_OPTIONS: frameworkOptions
+            FRAMEWORK_OPTIONS: frameworkOptions,
+            FEATURES: features
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet
@@ -169,9 +170,9 @@ var _default = async function _default({
     }), new _webpack.DefinePlugin({
       'process.env': (0, _coreCommon.stringifyEnvs)(envs),
       NODE_ENV: JSON.stringify(process.env.NODE_ENV)
-    }), isProd ? null : new _WatchMissingNodeModulesPlugin.default(_coreCommon.nodeModulesPaths), isProd ? null : new _webpack.HotModuleReplacementPlugin(), new _caseSensitivePathsWebpackPlugin.default(), quiet ? null : new _webpack.ProgressPlugin({}), new _dotenvWebpack.default({
+    }), isProd ? null : new _WatchMissingNodeModulesPlugin.default(_coreCommon.nodeModulesPaths), isProd ? null : new _webpack.HotModuleReplacementPlugin(), new _caseSensitivePathsWebpackPlugin.default(), quiet ? null : new _webpack.ProgressPlugin({}), (0, _coreCommon.hasDotenv)() ? new _dotenvWebpack.default({
       silent: true
-    }), shouldCheckTs ? new _forkTsCheckerWebpackPlugin.default(tsCheckOptions) : null].filter(Boolean),
+    }) : null, shouldCheckTs ? new _forkTsCheckerWebpackPlugin.default(tsCheckOptions) : null].filter(Boolean),
     module: {
       rules: [babelLoader, (0, _coreCommon.es6Transpiler)(), {
         test: /\.md$/,

package/dist/esm/index.js

@@ -62,7 +62,7 @@ export var start = async function ({
         hasErrors: function () {
           return true;
         },
-        hasWarngins: function () {
+        hasWarnings: function () {
           return false;
         },
         toJson: function () {
@@ -133,14 +133,18 @@ export var build = async function ({
   logger.info('=> Compiling preview..');
   var config = await getConfig(options);
   return new Promise(function (succeed, fail) {
-    webpackInstance(config).run(function (error, stats) {
+    var compiler = webpackInstance(config);
+    compiler.run(function (error, stats) {
       if (error || !stats || stats.hasErrors()) {
         logger.error('=> Failed to build the preview');
         process.exitCode = 1;
 
         if (error) {
           logger.error(error.message);
-          return fail(error);
+          compiler.close(function () {
+            return fail(error);
+          });
+          return;
         }
 
         if (stats && (stats.hasErrors() || stats.hasWarnings())) {
@@ -159,7 +163,10 @@ export var build = async function ({
           warnings.forEach(function (e) {
             return logger.error(e.message);
           });
-          return fail(stats);
+          compiler.close(function () {
+            return fail(stats);
+          });
+          return;
         }
       }
 
@@ -174,9 +181,17 @@ export var build = async function ({
         }).warnings.forEach(function (e) {
           return logger.warn(e.message);
         });
-      }
+      } // https://webpack.js.org/api/node/#run
+      // #15227
+
 
-      return succeed(stats);
+      compiler.close(function (closeErr) {
+        if (closeErr) {
+          return fail(closeErr);
+        }
+
+        return succeed(stats);
+      });
     });
   });
 };

package/dist/esm/preview/iframe-webpack.config.js

@@ -17,7 +17,7 @@ import TerserWebpackPlugin from 'terser-webpack-plugin';
 import VirtualModulePlugin from 'webpack-virtual-modules';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import themingPaths from '@storybook/theming/paths';
-import { toRequireContextString, es6Transpiler, stringifyEnvs, nodeModulesPaths, interpolate } from '@storybook/core-common';
+import { toRequireContextString, es6Transpiler, stringifyEnvs, nodeModulesPaths, interpolate, hasDotenv } from '@storybook/core-common';
 import { createBabelLoader } from './babel-loader-preview';
 import { useBaseTsSupport } from './useBaseTsSupport';
 var storybookPaths = ['addons', 'api', 'channels', 'channel-postmessage', 'components', 'core-events', 'router', 'theming', 'semver', 'client-api', 'client-logger'].reduce(function (acc, sbPackage) {
@@ -38,7 +38,8 @@ export default (async function ({
   frameworkPath: frameworkPath,
   presets: presets,
   typescriptOptions: typescriptOptions,
-  modern: modern
+  modern: modern,
+  features: features
 }) {
   var envs = await presets.apply('env');
   var logLevel = await presets.apply('logLevel', undefined);
@@ -104,7 +105,6 @@ export default (async function ({
       logging: 'error'
     },
     watchOptions: {
-      aggregateTimeout: 10,
       ignored: /node_modules/
     },
     ignoreWarnings: [{
@@ -124,7 +124,8 @@ export default (async function ({
           version: packageJson.version,
           globals: {
             LOGLEVEL: logLevel,
-            FRAMEWORK_OPTIONS: frameworkOptions
+            FRAMEWORK_OPTIONS: frameworkOptions,
+            FEATURES: features
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet
@@ -142,9 +143,9 @@ export default (async function ({
     }), new DefinePlugin({
       'process.env': stringifyEnvs(envs),
       NODE_ENV: JSON.stringify(process.env.NODE_ENV)
-    }), isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths), isProd ? null : new HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), quiet ? null : new ProgressPlugin({}), new Dotenv({
+    }), isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths), isProd ? null : new HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), quiet ? null : new ProgressPlugin({}), hasDotenv() ? new Dotenv({
       silent: true
-    }), shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null].filter(Boolean),
+    }) : null, shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null].filter(Boolean),
     module: {
       rules: [babelLoader, es6Transpiler(), {
         test: /\.md$/,

package/dist/modern/index.js

@@ -62,7 +62,7 @@ export var start = async function ({
         hasErrors: function () {
           return true;
         },
-        hasWarngins: function () {
+        hasWarnings: function () {
           return false;
         },
         toJson: function () {
@@ -133,14 +133,18 @@ export var build = async function ({
   logger.info('=> Compiling preview..');
   var config = await getConfig(options);
   return new Promise(function (succeed, fail) {
-    webpackInstance(config).run(function (error, stats) {
+    var compiler = webpackInstance(config);
+    compiler.run(function (error, stats) {
       if (error || !stats || stats.hasErrors()) {
         logger.error('=> Failed to build the preview');
         process.exitCode = 1;
 
         if (error) {
           logger.error(error.message);
-          return fail(error);
+          compiler.close(function () {
+            return fail(error);
+          });
+          return;
         }
 
         if (stats && (stats.hasErrors() || stats.hasWarnings())) {
@@ -159,7 +163,10 @@ export var build = async function ({
           warnings.forEach(function (e) {
             return logger.error(e.message);
           });
-          return fail(stats);
+          compiler.close(function () {
+            return fail(stats);
+          });
+          return;
         }
       }
 
@@ -174,9 +181,17 @@ export var build = async function ({
         }).warnings.forEach(function (e) {
           return logger.warn(e.message);
         });
-      }
+      } // https://webpack.js.org/api/node/#run
+      // #15227
+
 
-      return succeed(stats);
+      compiler.close(function (closeErr) {
+        if (closeErr) {
+          return fail(closeErr);
+        }
+
+        return succeed(stats);
+      });
     });
   });
 };

package/dist/modern/preview/iframe-webpack.config.js

@@ -17,7 +17,7 @@ import TerserWebpackPlugin from 'terser-webpack-plugin';
 import VirtualModulePlugin from 'webpack-virtual-modules';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import themingPaths from '@storybook/theming/paths';
-import { toRequireContextString, es6Transpiler, stringifyEnvs, nodeModulesPaths, interpolate } from '@storybook/core-common';
+import { toRequireContextString, es6Transpiler, stringifyEnvs, nodeModulesPaths, interpolate, hasDotenv } from '@storybook/core-common';
 import { createBabelLoader } from './babel-loader-preview';
 import { useBaseTsSupport } from './useBaseTsSupport';
 var storybookPaths = ['addons', 'api', 'channels', 'channel-postmessage', 'components', 'core-events', 'router', 'theming', 'semver', 'client-api', 'client-logger'].reduce(function (acc, sbPackage) {
@@ -38,7 +38,8 @@ export default (async function ({
   frameworkPath: frameworkPath,
   presets: presets,
   typescriptOptions: typescriptOptions,
-  modern: modern
+  modern: modern,
+  features: features
 }) {
   var envs = await presets.apply('env');
   var logLevel = await presets.apply('logLevel', undefined);
@@ -104,7 +105,6 @@ export default (async function ({
       logging: 'error'
     },
     watchOptions: {
-      aggregateTimeout: 10,
       ignored: /node_modules/
     },
     ignoreWarnings: [{
@@ -124,7 +124,8 @@ export default (async function ({
           version: packageJson.version,
           globals: {
             LOGLEVEL: logLevel,
-            FRAMEWORK_OPTIONS: frameworkOptions
+            FRAMEWORK_OPTIONS: frameworkOptions,
+            FEATURES: features
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet
@@ -142,9 +143,9 @@ export default (async function ({
     }), new DefinePlugin({
       'process.env': stringifyEnvs(envs),
       NODE_ENV: JSON.stringify(process.env.NODE_ENV)
-    }), isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths), isProd ? null : new HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), quiet ? null : new ProgressPlugin({}), new Dotenv({
+    }), isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths), isProd ? null : new HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), quiet ? null : new ProgressPlugin({}), hasDotenv() ? new Dotenv({
       silent: true
-    }), shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null].filter(Boolean),
+    }) : null, shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null].filter(Boolean),
     module: {
       rules: [babelLoader, es6Transpiler(), {
         test: /\.md$/,

package/dist/ts3.4/preview/iframe-webpack.config.d.ts

@@ -1,4 +1,4 @@
 import { Configuration } from 'webpack';
 import { Options } from '@storybook/core-common';
-declare const _default: ({ configDir, babelOptions, entries, stories, outputDir, quiet, packageJson, configType, framework, frameworkPath, presets, typescriptOptions, modern, }: Options & Record<string, any>) => Promise<Configuration>;
+declare const _default: ({ configDir, babelOptions, entries, stories, outputDir, quiet, packageJson, configType, framework, frameworkPath, presets, typescriptOptions, modern, features, }: Options & Record<string, any>) => Promise<Configuration>;
 export default _default;

package/dist/ts3.9/preview/iframe-webpack.config.d.ts

@@ -1,4 +1,4 @@
 import { Configuration } from 'webpack';
 import { Options } from '@storybook/core-common';
-declare const _default: ({ configDir, babelOptions, entries, stories, outputDir, quiet, packageJson, configType, framework, frameworkPath, presets, typescriptOptions, modern, }: Options & Record<string, any>) => Promise<Configuration>;
+declare const _default: ({ configDir, babelOptions, entries, stories, outputDir, quiet, packageJson, configType, framework, frameworkPath, presets, typescriptOptions, modern, features, }: Options & Record<string, any>) => Promise<Configuration>;
 export default _default;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "6.3.0",
+  "version": "6.3.4",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/master/lib/core",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/core",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
@@ -60,19 +60,19 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
-    "@storybook/addons": "6.3.0",
-    "@storybook/api": "6.3.0",
-    "@storybook/channel-postmessage": "6.3.0",
-    "@storybook/channels": "6.3.0",
-    "@storybook/client-api": "6.3.0",
-    "@storybook/client-logger": "6.3.0",
-    "@storybook/components": "6.3.0",
-    "@storybook/core-common": "6.3.0",
-    "@storybook/core-events": "6.3.0",
-    "@storybook/node-logger": "6.3.0",
-    "@storybook/router": "6.3.0",
+    "@storybook/addons": "6.3.4",
+    "@storybook/api": "6.3.4",
+    "@storybook/channel-postmessage": "6.3.4",
+    "@storybook/channels": "6.3.4",
+    "@storybook/client-api": "6.3.4",
+    "@storybook/client-logger": "6.3.4",
+    "@storybook/components": "6.3.4",
+    "@storybook/core-common": "6.3.4",
+    "@storybook/core-events": "6.3.4",
+    "@storybook/node-logger": "6.3.4",
+    "@storybook/router": "6.3.4",
     "@storybook/semver": "^7.3.2",
-    "@storybook/theming": "6.3.0",
+    "@storybook/theming": "6.3.4",
     "@types/node": "^14.0.10",
     "babel-loader": "^8.2.2",
     "babel-plugin-macros": "^3.0.1",
@@ -80,7 +80,7 @@
     "case-sensitive-paths-webpack-plugin": "^2.3.0",
     "core-js": "^3.8.2",
     "css-loader": "^5.0.1",
-    "dotenv-webpack": "^6.0.0",
+    "dotenv-webpack": "^7.0.0",
     "fork-ts-checker-webpack-plugin": "^6.0.4",
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
@@ -118,6 +118,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9a381339dee8faf13933265cf2600577ca2c20e8",
+  "gitHead": "b6fd5c62b15188baca1c1b9b8f71df6098a510ef",
   "sbmodern": "dist/modern/index.js"
 }