react-cosmos 5.6.4 → 5.6.8

package/config.schema.json

@@ -152,6 +152,10 @@
         "hotReload": {
           "description": "Enable webpack's Hot Module Replacement. [default: true]",
           "type": "boolean"
+        },
+        "reloadOnFail": {
+          "description": "When using webpack's Hot Module Replacement, enable automatic location reload after webpack fails to update modules. [default: true]",
+          "type": "boolean"
         }
       }
     },

package/dist/config/createCosmosConfig.js

@@ -13,9 +13,9 @@ var _resolve = require("./resolve");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/dist/config/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "CosmosConfig", {
+  enumerable: true,
+  get: function get() {
+    return _shared.CosmosConfig;
+  }
+});
 Object.defineProperty(exports, "createCosmosConfig", {
   enumerable: true,
   get: function get() {
@@ -33,12 +39,6 @@ Object.defineProperty(exports, "resolveModule", {
     return _resolve.resolveModule;
   }
 });
-Object.defineProperty(exports, "CosmosConfig", {
-  enumerable: true,
-  get: function get() {
-    return _shared.CosmosConfig;
-  }
-});
 
 var _createCosmosConfig = require("./createCosmosConfig");
 

package/dist/dom/DomFixtureLoader.d.ts

@@ -1,7 +1,8 @@
-import { ReactDecoratorsByPath, ReactFixtureExportsByPath } from 'react-cosmos-shared2/react';
+/// <reference types="react" />
+import { ReactDecorators, ReactFixtureWrappers } from 'react-cosmos-shared2/react';
 declare type Props = {
-    fixtures: ReactFixtureExportsByPath;
-    decorators: ReactDecoratorsByPath;
+    fixtures: ReactFixtureWrappers;
+    decorators: ReactDecorators;
     onErrorReset?: () => unknown;
 };
 export declare function DomFixtureLoader({ fixtures, decorators, onErrorReset, }: Props): JSX.Element;

package/dist/dom/ErrorCatch.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -19,15 +19,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 

package/dist/dom/index.d.ts

@@ -1,4 +1,4 @@
-import { ReactDecoratorsByPath, ReactFixtureExportsByPath } from 'react-cosmos-shared2/react';
+import { ReactDecorators, ReactFixtureWrappers } from 'react-cosmos-shared2/react';
 import { DomRendererConfig } from '../shared/rendererConfig';
 import './globalErrorHandler';
 import { rendererConnect } from './rendererConnect';
@@ -6,8 +6,8 @@ import { rendererId } from './rendererId';
 export { rendererId, rendererConnect };
 declare type Args = {
     rendererConfig: DomRendererConfig;
-    fixtures: ReactFixtureExportsByPath;
-    decorators: ReactDecoratorsByPath;
+    fixtures: ReactFixtureWrappers;
+    decorators: ReactDecorators;
     onErrorReset?: () => unknown;
 };
 export declare function mountDomRenderer({ rendererConfig, fixtures, decorators, onErrorReset, }: Args): void;

package/dist/dom/renderMessage.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare function renderMessage({ msg }: {
     msg: string;
 }): JSX.Element;

package/dist/fixture.js

@@ -9,22 +9,22 @@ Object.defineProperty(exports, "FixtureContext", {
     return _FixtureLoader.FixtureContext;
   }
 });
-Object.defineProperty(exports, "useSelect", {
+Object.defineProperty(exports, "Viewport", {
   enumerable: true,
   get: function get() {
-    return _FixtureLoader.useSelect;
+    return _FixtureLoader.Viewport;
   }
 });
-Object.defineProperty(exports, "useValue", {
+Object.defineProperty(exports, "useSelect", {
   enumerable: true,
   get: function get() {
-    return _FixtureLoader.useValue;
+    return _FixtureLoader.useSelect;
   }
 });
-Object.defineProperty(exports, "Viewport", {
+Object.defineProperty(exports, "useValue", {
   enumerable: true,
   get: function get() {
-    return _FixtureLoader.Viewport;
+    return _FixtureLoader.useValue;
   }
 });
 

package/dist/getFixtureUrls.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFixtureUrlsSync = getFixtureUrlsSync;
 exports.getFixtureUrls = void 0;
+exports.getFixtureUrlsSync = getFixtureUrlsSync;
 
 var _react = require("react-cosmos-shared2/react");
 
@@ -53,19 +53,18 @@ function getFixtureUrlsSync(_ref2) {
   }
 
   var _getUserModules = (0, _userDeps.getUserModules)(cosmosConfig),
-      fixtureExportsByPath = _getUserModules.fixtureExportsByPath;
+      fixtures = _getUserModules.fixtures;
 
-  var fixtureNamesByPath = (0, _react.getFixtureNamesByPath)(fixtureExportsByPath);
-  Object.keys(fixtureNamesByPath).forEach(function (fixturePath) {
-    var fixtureNames = fixtureNamesByPath[fixturePath];
+  var fixtureList = (0, _react.getFixtureListFromExports)(fixtures);
+  Object.keys(fixtureList).forEach(function (fixturePath) {
+    var fixtureItem = fixtureList[fixturePath];
 
-    if (fixtureNames === null) {
+    if (fixtureItem.type === 'single') {
       pushFixtureUrl({
-        path: fixturePath,
-        name: null
+        path: fixturePath
       });
-    } else {
-      fixtureNames.forEach(function (fixtureName) {
+    } else if (fixtureItem.type === 'multi') {
+      fixtureItem.fixtureNames.forEach(function (fixtureName) {
         pushFixtureUrl({
           path: fixturePath,
           name: fixtureName

package/dist/getFixtures.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFixturesSync = getFixturesSync;
 exports.getFixtures = void 0;
+exports.getFixturesSync = getFixturesSync;
 
 var _FixtureLoader = require("react-cosmos-shared2/FixtureLoader");
 
@@ -43,12 +43,12 @@ function getFixturesSync(_ref2) {
   var cosmosConfig = _ref2.cosmosConfig;
 
   var _getUserModules = (0, _userDeps.getUserModules)(cosmosConfig),
-      fixtureExportsByPath = _getUserModules.fixtureExportsByPath,
-      decoratorsByPath = _getUserModules.decoratorsByPath;
+      fixtures = _getUserModules.fixtures,
+      decorators = _getUserModules.decorators;
 
-  var fixtures = [];
-  Object.keys(fixtureExportsByPath).forEach(function (fixturePath) {
-    var fixtureExport = fixtureExportsByPath[fixturePath];
+  var result = [];
+  Object.keys(fixtures).forEach(function (fixturePath) {
+    var fixtureExport = fixtures[fixturePath];
 
     if ((0, _react.isMultiFixture)(fixtureExport)) {
       // FIXME: Why does fixtureExport need to be cast as ReactFixtureMap when
@@ -59,23 +59,22 @@ function getFixturesSync(_ref2) {
           path: fixturePath,
           name: fixtureName
         };
-        fixtures.push({
+        result.push({
           fixtureId: fixtureId,
-          getElement: createFixtureElementGetter(multiFixtureExport[fixtureName], fixturePath, decoratorsByPath)
+          getElement: createFixtureElementGetter(multiFixtureExport[fixtureName], fixturePath, decorators)
         });
       });
     } else {
       var fixtureId = {
-        path: fixturePath,
-        name: null
+        path: fixturePath
       };
-      fixtures.push({
+      result.push({
         fixtureId: fixtureId,
-        getElement: createFixtureElementGetter(fixtureExport, fixturePath, decoratorsByPath)
+        getElement: createFixtureElementGetter(fixtureExport, fixturePath, decorators)
       });
     }
   });
-  return fixtures;
+  return result;
 }
 
 function createFixtureElementGetter(fixture, fixturePath, decoratorsByPath) {

package/dist/getFixtures2.js

@@ -42,12 +42,12 @@ function getFixtures2(cosmosConfig) {
   var fixtureInfo = [];
 
   var _getUserModules = (0, _userDeps.getUserModules)(cosmosConfig),
-      fixtureExportsByPath = _getUserModules.fixtureExportsByPath,
-      decoratorsByPath = _getUserModules.decoratorsByPath;
+      fixtures = _getUserModules.fixtures,
+      decorators = _getUserModules.decorators;
 
-  var fixtureNamesByPath = (0, _react.getFixtureNamesByPath)(fixtureExportsByPath);
+  var fixtureList = (0, _react.getFixtureListFromExports)(fixtures);
   var fixtureTree = (0, _fixtureTree.createFixtureTree)({
-    fixtures: fixtureNamesByPath,
+    fixtures: fixtureList,
     fixturesDir: fixturesDir,
     fixtureFileSuffix: fixtureFileSuffix
   });
@@ -57,14 +57,14 @@ function getFixtures2(cosmosConfig) {
         fixtureId = _ref.fixtureId,
         name = _ref.name,
         parents = _ref.parents;
-    var fixtureExport = fixtureExportsByPath[fixtureId.path];
-    var fixture = fixtureId.name === null ? fixtureExport : fixtureExport[fixtureId.name];
+    var fixtureExport = fixtures[fixtureId.path];
+    var fixture = fixtureId.name === undefined ? fixtureExport : fixtureExport[fixtureId.name];
     var treePath = [].concat(_toConsumableArray(parents), [fileName]);
     if (name) treePath.push(name);
     fixtureInfo.push({
       absoluteFilePath: _path.default.join(rootDir, fixtureId.path),
       fileName: fileName,
-      getElement: createFixtureElementGetter(fixture, fixtureId.path, decoratorsByPath),
+      getElement: createFixtureElementGetter(fixture, fixtureId.path, decorators),
       name: name,
       parents: parents,
       playgroundUrl: getPlaygroundUrl(cosmosConfig, fixtureId),

package/dist/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "FixtureApi", {
+  enumerable: true,
+  get: function get() {
+    return _getFixtures2.FixtureApi;
+  }
+});
 Object.defineProperty(exports, "createCosmosConfig", {
   enumerable: true,
   get: function get() {
@@ -21,22 +27,22 @@ Object.defineProperty(exports, "getCosmosConfigAtPath", {
     return _config.getCosmosConfigAtPath;
   }
 });
-Object.defineProperty(exports, "getFixtures", {
+Object.defineProperty(exports, "getFixtureUrls", {
   enumerable: true,
   get: function get() {
-    return _getFixtures.getFixtures;
+    return _getFixtureUrls.getFixtureUrls;
   }
 });
-Object.defineProperty(exports, "getFixturesSync", {
+Object.defineProperty(exports, "getFixtureUrlsSync", {
   enumerable: true,
   get: function get() {
-    return _getFixtures.getFixturesSync;
+    return _getFixtureUrls.getFixtureUrlsSync;
   }
 });
-Object.defineProperty(exports, "FixtureApi", {
+Object.defineProperty(exports, "getFixtures", {
   enumerable: true,
   get: function get() {
-    return _getFixtures2.FixtureApi;
+    return _getFixtures.getFixtures;
   }
 });
 Object.defineProperty(exports, "getFixtures2", {
@@ -45,16 +51,10 @@ Object.defineProperty(exports, "getFixtures2", {
     return _getFixtures2.getFixtures2;
   }
 });
-Object.defineProperty(exports, "getFixtureUrls", {
-  enumerable: true,
-  get: function get() {
-    return _getFixtureUrls.getFixtureUrls;
-  }
-});
-Object.defineProperty(exports, "getFixtureUrlsSync", {
+Object.defineProperty(exports, "getFixturesSync", {
   enumerable: true,
   get: function get() {
-    return _getFixtureUrls.getFixtureUrlsSync;
+    return _getFixtures.getFixturesSync;
   }
 });
 

package/dist/native.d.ts

@@ -1,9 +1,10 @@
-import { ReactDecoratorsByPath, ReactFixtureExportsByPath } from 'react-cosmos-shared2/react';
+/// <reference types="react" />
+import { ReactDecorators, ReactFixtureWrappers } from 'react-cosmos-shared2/react';
 import { NativeRendererConfig } from './shared/rendererConfig';
 declare type Props = {
     rendererConfig: NativeRendererConfig;
-    fixtures: ReactFixtureExportsByPath;
-    decorators: ReactDecoratorsByPath;
+    fixtures: ReactFixtureWrappers;
+    decorators: ReactDecorators;
 };
 export declare function NativeFixtureLoader({ rendererConfig: { port }, fixtures, decorators, }: Props): JSX.Element;
 export {};

package/dist/native.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true

package/dist/plugins/httpProxy.js

@@ -7,7 +7,7 @@ exports.httpProxy = httpProxy;
 
 var _httpProxyMiddleware = require("http-proxy-middleware");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function httpProxy(_ref) {
   var cosmosConfig = _ref.cosmosConfig,

package/dist/plugins/webpack/client/errorOverlay/reactErrorOverlay.js

@@ -1,12 +1,12 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.init = init;
 exports.dismiss = dismiss;
+exports.init = init;
 
 var _url = require("react-cosmos-shared2/url");
 

package/dist/plugins/webpack/client/userDeps.d.ts

@@ -1,5 +1,5 @@
-import { ReactDecoratorsByPath, ReactFixtureExportsByPath } from 'react-cosmos-shared2/react';
+import { ReactDecorators, ReactFixtureWrappers } from 'react-cosmos-shared2/react';
 import { DomRendererConfig } from '../../../shared/rendererConfig';
 export declare const rendererConfig: DomRendererConfig;
-export declare const fixtures: ReactFixtureExportsByPath;
-export declare const decorators: ReactDecoratorsByPath;
+export declare const fixtures: ReactFixtureWrappers;
+export declare const decorators: ReactDecorators;

package/dist/plugins/webpack/client/userDeps.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.decorators = exports.fixtures = exports.rendererConfig = void 0;
+exports.rendererConfig = exports.fixtures = exports.decorators = void 0;
 // NOTE: Renderer data is statically injected at compile time
 var rendererConfig = {
   containerQuerySelector: null

package/dist/plugins/webpack/cosmosConfig/webpack.d.ts

@@ -4,6 +4,7 @@ declare type WebpackCosmosConfig = {
     overridePath: null | string;
     includeHashInOutputFilename: boolean;
     hotReload: boolean;
+    reloadOnFail: boolean;
 };
 export declare function createWebpackCosmosConfig(cosmosConfig: CosmosConfig): WebpackCosmosConfig;
 export {};

package/dist/plugins/webpack/cosmosConfig/webpack.js

@@ -20,7 +20,8 @@ function createWebpackCosmosConfig(cosmosConfig) {
     configPath: getWebpackConfigPath(configInput, rootDir),
     overridePath: getWebpackOverridePath(configInput, rootDir),
     includeHashInOutputFilename: getIncludeHashInOutputFilename(configInput),
-    hotReload: getHotReload(configInput)
+    hotReload: getHotReload(configInput),
+    reloadOnFail: getReloadOnFail(configInput)
   };
 }
 
@@ -85,4 +86,10 @@ function getHotReload(_ref4) {
   var _ref4$hotReload = _ref4.hotReload,
       hotReload = _ref4$hotReload === void 0 ? true : _ref4$hotReload;
   return hotReload;
+}
+
+function getReloadOnFail(_ref5) {
+  var _ref5$reloadOnFail = _ref5.reloadOnFail,
+      reloadOnFail = _ref5$reloadOnFail === void 0 ? true : _ref5$reloadOnFail;
+  return reloadOnFail;
 }

package/dist/plugins/webpack/export.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,13 +11,17 @@ var _shared = require("./shared");
 
 var _webpackConfig = require("./webpackConfig");
 
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
@@ -131,5 +135,5 @@ var WebpackCompilationError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return WebpackCompilationError;
+  return _createClass(WebpackCompilationError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));

package/dist/plugins/webpack/webpackConfig/devServer.js

@@ -9,15 +9,23 @@ var _path = _interopRequireDefault(require("path"));
 
 var _webpack = require("../cosmosConfig/webpack");
 
+var _getUserWebpackConfig = require("./getUserWebpackConfig");
+
+var _getWebpackConfigResolve = require("./getWebpackConfigResolve");
+
+var _getWebpackConfigModule = require("./getWebpackConfigModule");
+
 var _htmlPlugin = require("./htmlPlugin");
 
-var _shared = require("./shared");
+var _plugins = require("./plugins");
+
+var _resolveWebpackClientPath = require("./resolveWebpackClientPath");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -51,17 +59,15 @@ function _getDevWebpackConfig() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _shared.getUserWebpackConfig)(cosmosConfig, userWebpack);
+            return (0, _getUserWebpackConfig.getUserWebpackConfig)(cosmosConfig, userWebpack);
 
           case 2:
             baseWebpackConfig = _context.sent;
             webpackConfig = _objectSpread(_objectSpread({}, baseWebpackConfig), {}, {
               entry: getEntry(cosmosConfig),
               output: getOutput(cosmosConfig),
-              module: _objectSpread(_objectSpread({}, baseWebpackConfig.module), {}, {
-                rules: getRules(baseWebpackConfig)
-              }),
-              resolve: (0, _shared.resolveLocalReactDeps)(cosmosConfig, baseWebpackConfig),
+              module: (0, _getWebpackConfigModule.getWebpackConfigModule)(baseWebpackConfig),
+              resolve: (0, _getWebpackConfigResolve.getWebpackConfigResolve)(cosmosConfig, baseWebpackConfig),
               plugins: getPlugins(cosmosConfig, baseWebpackConfig, userWebpack)
             }); // optimization.splitChunks.name = false breaks auto fixture file discovery.
             // When the splitChunks.name is set to false, existing fixtures hot reload
@@ -93,13 +99,14 @@ function _getDevWebpackConfig() {
 
 function getEntry(cosmosConfig) {
   var _createWebpackCosmosC = (0, _webpack.createWebpackCosmosConfig)(cosmosConfig),
-      hotReload = _createWebpackCosmosC.hotReload; // The React devtools hook needs to be imported before any other module that
+      hotReload = _createWebpackCosmosC.hotReload,
+      reloadOnFail = _createWebpackCosmosC.reloadOnFail; // The React devtools hook needs to be imported before any other module that
   // might import React
 
 
-  var devtoolsHook = (0, _shared.resolveClientPath)('reactDevtoolsHook');
-  var clientIndex = (0, _shared.resolveClientPath)('index');
-  return hotReload ? [devtoolsHook, getHotMiddlewareEntry(), clientIndex] : [devtoolsHook, clientIndex];
+  var devtoolsHook = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('reactDevtoolsHook');
+  var clientIndex = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('index');
+  return hotReload ? [devtoolsHook, getHotMiddlewareEntry(reloadOnFail), clientIndex] : [devtoolsHook, clientIndex];
 }
 
 function getOutput(_ref) {
@@ -115,21 +122,16 @@ function getOutput(_ref) {
   };
 }
 
-function getRules(baseWebpackConfig) {
-  var existingRules = baseWebpackConfig.module && baseWebpackConfig.module.rules || [];
-  return [].concat(_toConsumableArray(existingRules), [(0, _shared.getUserDepsLoaderRule)()]);
-}
-
 function getPlugins(cosmosConfig, baseWebpackConfig, userWebpack) {
   var existingPlugins = baseWebpackConfig.plugins || [];
-  var globalsPlugin = (0, _shared.getGlobalsPlugin)(cosmosConfig, userWebpack, true);
+  var globalsPlugin = (0, _plugins.getGlobalsPlugin)(cosmosConfig, userWebpack, true);
   var noEmitErrorsPlugin = new userWebpack.NoEmitOnErrorsPlugin();
   var plugins = [].concat(_toConsumableArray(existingPlugins), [globalsPlugin, noEmitErrorsPlugin]);
 
   var _createWebpackCosmosC2 = (0, _webpack.createWebpackCosmosConfig)(cosmosConfig),
       hotReload = _createWebpackCosmosC2.hotReload;
 
-  if (hotReload && !(0, _shared.hasPlugin)(plugins, 'HotModuleReplacementPlugin')) {
+  if (hotReload && !(0, _plugins.hasPlugin)(plugins, 'HotModuleReplacementPlugin')) {
     var hmrPlugin = new userWebpack.HotModuleReplacementPlugin();
     plugins = [].concat(_toConsumableArray(plugins), [hmrPlugin]);
   }
@@ -137,8 +139,8 @@ function getPlugins(cosmosConfig, baseWebpackConfig, userWebpack) {
   return (0, _htmlPlugin.ensureHtmlWebackPlugin)(cosmosConfig, plugins);
 }
 
-function getHotMiddlewareEntry() {
+function getHotMiddlewareEntry(reloadOnFail) {
   var clientPath = require.resolve('@skidding/webpack-hot-middleware/client');
 
-  return "".concat(clientPath, "?reload=true&overlay=false");
+  return "".concat(clientPath, "?reload=").concat(reloadOnFail, "&overlay=false");
 }