@storybook/core-webpack 7.0.0-alpha.0 → 7.0.0-alpha.3

package/dist/cjs/check-webpack-version.js

@@ -1,9 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.object.freeze.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,13 +9,9 @@ var _nodeLogger = require("@storybook/node-logger");
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
-var _templateObject;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var checkWebpackVersion = function checkWebpackVersion(webpack, specifier, caption) {
+const checkWebpackVersion = (webpack, specifier, caption) => {
   if (!webpack.version) {
     _nodeLogger.logger.info('Skipping webpack version check, no version available');
 
@@ -27,7 +19,15 @@ var checkWebpackVersion = function checkWebpackVersion(webpack, specifier, capti
   }
 
   if (webpack.version !== specifier) {
-    _nodeLogger.logger.warn((0, _tsDedent.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      Unexpected webpack version in ", ":\n      - Received '", "'\n      - Expected '", "'\n\n      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build\n\n      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting\n    "])), caption, webpack.version, specifier));
+    _nodeLogger.logger.warn((0, _tsDedent.default)`
+      Unexpected webpack version in ${caption}:
+      - Received '${webpack.version}'
+      - Expected '${specifier}'
+
+      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
+
+      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
+    `);
   }
 };
 

package/dist/cjs/index.js

@@ -1,11 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/web.dom-collections.for-each.js");
-
-require("core-js/modules/es.object.keys.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,7 +11,7 @@ Object.keys(_types).forEach(function (key) {
   if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _types[key];
     }
   });
@@ -30,7 +24,7 @@ Object.keys(_loadCustomWebpackConfig).forEach(function (key) {
   if (key in exports && exports[key] === _loadCustomWebpackConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _loadCustomWebpackConfig[key];
     }
   });
@@ -43,7 +37,7 @@ Object.keys(_checkWebpackVersion).forEach(function (key) {
   if (key in exports && exports[key] === _checkWebpackVersion[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _checkWebpackVersion[key];
     }
   });
@@ -56,7 +50,7 @@ Object.keys(_mergeWebpackConfig).forEach(function (key) {
   if (key in exports && exports[key] === _mergeWebpackConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _mergeWebpackConfig[key];
     }
   });

package/dist/cjs/load-custom-webpack-config.js

@@ -5,20 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadCustomWebpackConfig = void 0;
 
-require("core-js/modules/es.array.map.js");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _coreCommon = require("@storybook/core-common");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var webpackConfigs = ['webpack.config', 'webpackfile'];
+const webpackConfigs = ['webpack.config', 'webpackfile'];
 
-var loadCustomWebpackConfig = function loadCustomWebpackConfig(configDir) {
-  return (0, _coreCommon.serverRequire)(webpackConfigs.map(function (configName) {
-    return _path.default.resolve(configDir, configName);
-  }));
-};
+const loadCustomWebpackConfig = configDir => (0, _coreCommon.serverRequire)(webpackConfigs.map(configName => _path.default.resolve(configDir, configName)));
 
 exports.loadCustomWebpackConfig = loadCustomWebpackConfig;

package/dist/cjs/merge-webpack-config.js

@@ -1,110 +1,72 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-
-require("core-js/modules/es.symbol.description.js");
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.symbol.iterator.js");
-
-require("core-js/modules/es.array.iterator.js");
-
-require("core-js/modules/es.string.iterator.js");
-
-require("core-js/modules/web.dom-collections.iterator.js");
-
-require("core-js/modules/es.array.from.js");
-
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.function.name.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeConfigs = mergeConfigs;
 
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.object.assign.js");
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function plugins(_ref, _ref2) {
-  var _ref$plugins = _ref.plugins,
-      defaultPlugins = _ref$plugins === void 0 ? [] : _ref$plugins;
-  var _ref2$plugins = _ref2.plugins,
-      customPlugins = _ref2$plugins === void 0 ? [] : _ref2$plugins;
-  return [].concat(_toConsumableArray(defaultPlugins), _toConsumableArray(customPlugins));
+function plugins({
+  plugins: defaultPlugins = []
+}, {
+  plugins: customPlugins = []
+}) {
+  return [...defaultPlugins, ...customPlugins];
 }
 
-function rules(_ref3, _ref4) {
-  var _ref3$rules = _ref3.rules,
-      defaultRules = _ref3$rules === void 0 ? [] : _ref3$rules;
-  var _ref4$rules = _ref4.rules,
-      customRules = _ref4$rules === void 0 ? [] : _ref4$rules;
-  return [].concat(_toConsumableArray(defaultRules), _toConsumableArray(customRules));
+function rules({
+  rules: defaultRules = []
+}, {
+  rules: customRules = []
+}) {
+  return [...defaultRules, ...customRules];
 }
 
-function extensions(_ref5, _ref6) {
-  var _ref5$extensions = _ref5.extensions,
-      defaultExtensions = _ref5$extensions === void 0 ? [] : _ref5$extensions;
-  var _ref6$extensions = _ref6.extensions,
-      customExtensions = _ref6$extensions === void 0 ? [] : _ref6$extensions;
-  return [].concat(_toConsumableArray(defaultExtensions), _toConsumableArray(customExtensions));
+function extensions({
+  extensions: defaultExtensions = []
+}, {
+  extensions: customExtensions = []
+}) {
+  return [...defaultExtensions, ...customExtensions];
 }
 
-function alias(_ref7, _ref8) {
-  var _ref7$alias = _ref7.alias,
-      defaultAlias = _ref7$alias === void 0 ? {} : _ref7$alias;
-  var _ref8$alias = _ref8.alias,
-      customAlias = _ref8$alias === void 0 ? {} : _ref8$alias;
+function alias({
+  alias: defaultAlias = {}
+}, {
+  alias: customAlias = {}
+}) {
   return Object.assign({}, defaultAlias, customAlias);
 }
 
-function _module(_ref9, _ref10) {
-  var _ref9$module = _ref9.module,
-      defaultModule = _ref9$module === void 0 ? {
+function _module({
+  module: defaultModule = {
     rules: []
-  } : _ref9$module;
-  var _ref10$module = _ref10.module,
-      customModule = _ref10$module === void 0 ? {
+  }
+}, {
+  module: customModule = {
     rules: []
-  } : _ref10$module;
+  }
+}) {
   return Object.assign({}, defaultModule, customModule, {
     rules: rules(defaultModule, customModule)
   });
 }
 
-function resolve(_ref11, _ref12) {
-  var _ref11$resolve = _ref11.resolve,
-      defaultResolve = _ref11$resolve === void 0 ? {} : _ref11$resolve;
-  var _ref12$resolve = _ref12.resolve,
-      customResolve = _ref12$resolve === void 0 ? {} : _ref12$resolve;
+function resolve({
+  resolve: defaultResolve = {}
+}, {
+  resolve: customResolve = {}
+}) {
   return Object.assign({}, defaultResolve, customResolve, {
     alias: alias(defaultResolve, customResolve),
     extensions: extensions(defaultResolve, customResolve)
   });
 }
 
-function optimization(_ref13, _ref14) {
-  var _ref13$optimization = _ref13.optimization,
-      defaultOptimization = _ref13$optimization === void 0 ? {} : _ref13$optimization;
-  var _ref14$optimization = _ref14.optimization,
-      customOptimization = _ref14$optimization === void 0 ? {} : _ref14$optimization;
+function optimization({
+  optimization: defaultOptimization = {}
+}, {
+  optimization: customOptimization = {}
+}) {
   return Object.assign({}, defaultOptimization, customOptimization);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-alpha.3",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -33,8 +33,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core-common": "7.0.0-alpha.0",
-    "@storybook/node-logger": "7.0.0-alpha.0",
+    "@storybook/core-common": "7.0.0-alpha.3",
+    "@storybook/node-logger": "7.0.0-alpha.3",
     "@types/node": "^14.0.10 || ^16.0.0",
     "core-js": "^3.8.2",
     "ts-dedent": "^2.0.0"
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c82d897ea765da8cf4fbbcc2af1f28c808a93e23"
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9"
 }