react-cosmos 5.6.5 → 5.7.0

package/dist/plugins/openFile.d.ts

@@ -1,2 +1,2 @@
-import { DevServerPluginArgs } from '../shared/devServer';
+import { DevServerPluginArgs } from '../devServer/startDevServer';
 export declare function openFile({ cosmosConfig, expressApp }: DevServerPluginArgs): void;

package/dist/plugins/openFile.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.openFile = openFile;
 
-var _fs = _interopRequireDefault(require("fs"));
+var _launchEditor = _interopRequireDefault(require("@skidding/launch-editor"));
 
-var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
 
 var _open = _interopRequireDefault(require("open"));
 
-var _launchEditor = _interopRequireDefault(require("@skidding/launch-editor"));
+var _path = _interopRequireDefault(require("path"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/dist/plugins/userDepsFile.d.ts

@@ -1,2 +1,2 @@
-import { DevServerPluginArgs } from '../shared/devServer';
+import { DevServerPluginArgs } from '../devServer/startDevServer';
 export declare function userDepsFile(args: DevServerPluginArgs): Promise<(() => void) | undefined>;

package/dist/plugins/userDepsFile.js

@@ -17,7 +17,9 @@ var _util = _interopRequireDefault(require("util.promisify"));
 
 var _cli = require("../shared/cli");
 
-var _userDeps = require("../shared/userDeps");
+var _generateUserDepsModule = require("../userDeps/generateUserDepsModule");
+
+var _shared = require("../userDeps/shared");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -103,10 +105,10 @@ function _startFixtureFileWatcher() {
         switch (_context2.prev = _context2.next) {
           case 0:
             fixturesDir = cosmosConfig.fixturesDir, fixtureFileSuffix = cosmosConfig.fixtureFileSuffix;
-            FILE_PATTERNS = [].concat(_toConsumableArray((0, _userDeps.getFixturePatterns)(fixturesDir, fixtureFileSuffix)), _toConsumableArray((0, _userDeps.getDecoratorPatterns)()));
+            FILE_PATTERNS = [].concat(_toConsumableArray((0, _shared.getFixturePatterns)(fixturesDir, fixtureFileSuffix)), _toConsumableArray((0, _shared.getDecoratorPatterns)()));
             return _context2.abrupt("return", new Promise(function (resolve) {
               var watcher = (0, _chokidar.watch)(FILE_PATTERNS, {
-                ignored: (0, _userDeps.getIgnorePatterns)(),
+                ignored: (0, _shared.getIgnorePatterns)(),
                 ignoreInitial: true,
                 cwd: cosmosConfig.rootDir
               }).on('ready', function () {
@@ -141,7 +143,7 @@ function _generateUserDepsFile() {
             rendererConfig = {
               port: port
             };
-            userDepsModule = (0, _userDeps.generateUserDepsModule)({
+            userDepsModule = (0, _generateUserDepsModule.generateUserDepsModule)({
               cosmosConfig: cosmosConfig,
               rendererConfig: rendererConfig,
               relativeToDir: _path.default.dirname(userDepsFilePath)

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/dom.d.ts

@@ -1,4 +1,4 @@
-import { CosmosConfig } from '../../../config';
+import { CosmosConfig } from '../../../config/shared';
 declare type DomCosmosConfig = {
     containerQuerySelector: null | string;
 };

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

@@ -1,4 +1,4 @@
-import { CosmosConfig } from '../../../config';
+import { CosmosConfig } from '../../../config/shared';
 declare type WebpackCosmosConfig = {
     configPath: null | string;
     overridePath: null | string;

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

@@ -7,7 +7,7 @@ exports.createWebpackCosmosConfig = createWebpackCosmosConfig;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _config = require("../../../config");
+var _resolveModule = require("../../../config/resolveModule");
 
 var _fs = require("../../../shared/fs");
 
@@ -29,7 +29,7 @@ function getWebpackConfigPath(_ref, rootDir) {
   var configPath = _ref.configPath;
 
   if (typeof configPath === 'undefined') {
-    return (0, _config.resolveModule)(rootDir, 'webpack.config.js');
+    return (0, _resolveModule.resolveModule)(rootDir, 'webpack.config.js');
   } // User can choose to prevent automatical use of an existing webpack.config.js
   // file (relative to the root dir) by setting configPath to null
 
@@ -38,7 +38,7 @@ function getWebpackConfigPath(_ref, rootDir) {
     return null;
   }
 
-  var absPath = (0, _config.resolveModule)(rootDir, configPath);
+  var absPath = (0, _resolveModule.resolveModule)(rootDir, configPath);
 
   if (!(0, _fs.fileExists)(absPath)) {
     var relPath = _path.default.relative(process.cwd(), absPath);
@@ -53,7 +53,7 @@ function getWebpackOverridePath(_ref2, rootDir) {
   var overridePath = _ref2.overridePath;
 
   if (typeof overridePath === 'undefined') {
-    return (0, _config.resolveModule)(rootDir, 'webpack.override.js');
+    return (0, _resolveModule.resolveModule)(rootDir, 'webpack.override.js');
   } // User can choose to prevent automatical use of an existing webpack.override.js
   // file (relative to the root dir) by setting overridePath to null
 
@@ -62,7 +62,7 @@ function getWebpackOverridePath(_ref2, rootDir) {
     return null;
   }
 
-  var absPath = (0, _config.resolveModule)(rootDir, overridePath);
+  var absPath = (0, _resolveModule.resolveModule)(rootDir, overridePath);
 
   if (!(0, _fs.fileExists)(absPath)) {
     var relPath = _path.default.relative(process.cwd(), absPath);

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

@@ -1,2 +1,2 @@
-import { DevServerPluginArgs } from '../../shared/devServer';
+import { DevServerPluginArgs } from '../../devServer/startDevServer';
 export declare function webpackDevServer({ cosmosConfig, expressApp, sendMessage, }: DevServerPluginArgs): Promise<(() => Promise<void>) | undefined>;

package/dist/plugins/webpack/devServer.js

@@ -9,15 +9,15 @@ var _webpackHotMiddleware = _interopRequireDefault(require("@skidding/webpack-ho
 
 var _path = _interopRequireDefault(require("path"));
 
-var _shared = require("../../shared/shared");
-
 var _static = require("../../shared/static");
 
+var _utils = require("../../shared/utils");
+
 var _webpack = require("./cosmosConfig/webpack");
 
-var _shared2 = require("./shared");
+var _shared = require("./shared");
 
-var _webpackConfig = require("./webpackConfig");
+var _getDevWebpackConfig = require("./webpackConfig/getDevWebpackConfig");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -51,7 +51,7 @@ function _webpackDevServer() {
             return _context2.abrupt("return");
 
           case 4:
-            userWebpack = (0, _shared2.getWebpack)(cosmosConfig.rootDir);
+            userWebpack = (0, _shared.getWebpack)(cosmosConfig.rootDir);
 
             if (userWebpack) {
               _context2.next = 7;
@@ -62,7 +62,7 @@ function _webpackDevServer() {
 
           case 7:
             _context2.next = 9;
-            return (0, _webpackConfig.getDevWebpackConfig)(cosmosConfig, userWebpack);
+            return (0, _getDevWebpackConfig.getDevWebpackConfig)(cosmosConfig, userWebpack);
 
           case 9:
             webpackConfig = _context2.sent;
@@ -121,7 +121,7 @@ function _webpackDevServer() {
             wdmInst = wdm(webpackCompiler, {
               // publicPath is the base path for the webpack assets and has to match
               // webpack.output.path
-              publicPath: (0, _shared.removeLeadingDot)(cosmosConfig.publicUrl)
+              publicPath: (0, _utils.removeLeadingDot)(cosmosConfig.publicUrl)
             });
             expressApp.use(wdmInst);
             _createWebpackCosmosC = (0, _webpack.createWebpackCosmosConfig)(cosmosConfig), hotReload = _createWebpackCosmosC.hotReload;

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

@@ -1,2 +1,2 @@
-import { ExportPluginArgs } from '../../shared/export';
+import { ExportPluginArgs } from '../../export/generateExport';
 export declare function webpackExport({ cosmosConfig }: ExportPluginArgs): Promise<void>;

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
@@ -9,15 +9,19 @@ exports.webpackExport = webpackExport;
 
 var _shared = require("./shared");
 
-var _webpackConfig = require("./webpackConfig");
+var _getExportWebpackConfig = require("./webpackConfig/getExportWebpackConfig");
+
+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; }
 
@@ -62,7 +66,7 @@ function _webpackExport() {
 
           case 4:
             _context.next = 6;
-            return (0, _webpackConfig.getExportWebpackConfig)(cosmosConfig, userWebpack);
+            return (0, _getExportWebpackConfig.getExportWebpackConfig)(cosmosConfig, userWebpack);
 
           case 6:
             webpackConfig = _context.sent;
@@ -131,5 +135,5 @@ var WebpackCompilationError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return WebpackCompilationError;
+  return _createClass(WebpackCompilationError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));

package/dist/plugins/webpack/webpackConfig/{default.js → getDefaultWebpackConfig.js}

@@ -9,15 +9,15 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 
 var _playgroundHtml = require("../../../shared/playgroundHtml");
 
-var _shared = require("./shared");
+var _getWebpackNodeEnv = require("./getWebpackNodeEnv");
 
 var _htmlPlugin = require("./htmlPlugin");
 
 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; }
 
@@ -141,7 +141,7 @@ function getDefaultWebpackConfig(userWebpack, rootDir) {
   }
 
   return _objectSpread(_objectSpread({}, config), {}, {
-    mode: (0, _shared.getNodeEnv)(),
+    mode: (0, _getWebpackNodeEnv.getWebpackNodeEnv)(),
     optimization: {
       // Cosmos reads component names at run-time, so it is crucial to not
       // minify even when building with production env (ie. when exporting)

package/dist/plugins/webpack/webpackConfig/{devServer.d.ts → getDevWebpackConfig.d.ts}

@@ -1,3 +1,3 @@
 import webpack from 'webpack';
-import { CosmosConfig } from '../../../config';
+import { CosmosConfig } from '../../../config/shared';
 export declare function getDevWebpackConfig(cosmosConfig: CosmosConfig, userWebpack: typeof webpack): Promise<webpack.Configuration>;

package/dist/plugins/webpack/webpackConfig/{devServer.js → getDevWebpackConfig.js}

@@ -9,15 +9,23 @@ var _path = _interopRequireDefault(require("path"));
 
 var _webpack = require("../cosmosConfig/webpack");
 
+var _getUserWebpackConfig = require("./getUserWebpackConfig");
+
+var _getWebpackConfigModule = require("./getWebpackConfigModule");
+
+var _getWebpackConfigResolve = require("./getWebpackConfigResolve");
+
 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
@@ -98,8 +104,8 @@ function getEntry(cosmosConfig) {
   // might import React
 
 
-  var devtoolsHook = (0, _shared.resolveClientPath)('reactDevtoolsHook');
-  var clientIndex = (0, _shared.resolveClientPath)('index');
+  var devtoolsHook = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('reactDevtoolsHook');
+  var clientIndex = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('index');
   return hotReload ? [devtoolsHook, getHotMiddlewareEntry(reloadOnFail), clientIndex] : [devtoolsHook, clientIndex];
 }
 
@@ -116,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]);
   }

package/dist/plugins/webpack/webpackConfig/{export.d.ts → getExportWebpackConfig.d.ts}

@@ -1,3 +1,3 @@
 import webpack from 'webpack';
-import { CosmosConfig } from '../../../config';
+import { CosmosConfig } from '../../../config/shared';
 export declare function getExportWebpackConfig(cosmosConfig: CosmosConfig, userWebpack: typeof webpack): Promise<webpack.Configuration>;

package/dist/plugins/webpack/webpackConfig/{export.js → getExportWebpackConfig.js}

@@ -7,19 +7,27 @@ exports.getExportWebpackConfig = getExportWebpackConfig;
 
 var _path = _interopRequireDefault(require("path"));
 
+var _utils = require("../../../shared/utils");
+
 var _webpack = require("../cosmosConfig/webpack");
 
-var _shared = require("../../../shared/shared");
+var _getUserWebpackConfig = require("./getUserWebpackConfig");
+
+var _getWebpackConfigModule = require("./getWebpackConfigModule");
+
+var _getWebpackConfigResolve = require("./getWebpackConfigResolve");
 
 var _htmlPlugin = require("./htmlPlugin");
 
-var _shared2 = 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 _getExportWebpackConfig() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _shared2.getUserWebpackConfig)(cosmosConfig, userWebpack);
+            return (0, _getUserWebpackConfig.getUserWebpackConfig)(cosmosConfig, userWebpack);
 
           case 2:
             baseWebpackConfig = _context.sent;
             return _context.abrupt("return", _objectSpread(_objectSpread({}, baseWebpackConfig), {}, {
               entry: getEntry(),
               output: getOutput(cosmosConfig),
-              module: _objectSpread(_objectSpread({}, baseWebpackConfig.module), {}, {
-                rules: getRules(baseWebpackConfig)
-              }),
-              resolve: (0, _shared2.resolveLocalReactDeps)(cosmosConfig, baseWebpackConfig),
+              module: (0, _getWebpackConfigModule.getWebpackConfigModule)(baseWebpackConfig),
+              resolve: (0, _getWebpackConfigResolve.getWebpackConfigResolve)(cosmosConfig, baseWebpackConfig),
               plugins: getPlugins(cosmosConfig, baseWebpackConfig, userWebpack)
             }));
 
@@ -78,8 +84,8 @@ function _getExportWebpackConfig() {
 function getEntry() {
   // The React devtools hook needs to be imported before any other module that
   // might import React
-  var devtoolsHook = (0, _shared2.resolveClientPath)('reactDevtoolsHook');
-  var clientIndex = (0, _shared2.resolveClientPath)('index');
+  var devtoolsHook = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('reactDevtoolsHook');
+  var clientIndex = (0, _resolveWebpackClientPath.resolveWebpackClientPath)('index');
   return [devtoolsHook, clientIndex];
 }
 
@@ -91,20 +97,15 @@ function getOutput(cosmosConfig) {
       includeHashInOutputFilename = _createWebpackCosmosC.includeHashInOutputFilename;
 
   return {
-    path: _path.default.resolve(exportPath, (0, _shared.removeLeadingSlash)(publicUrl)),
+    path: _path.default.resolve(exportPath, (0, _utils.removeLeadingSlash)(publicUrl)),
     filename: includeHashInOutputFilename ? '[name].[contenthash].js' : '[name].js',
     publicPath: publicUrl
   };
 }
 
-function getRules(baseWebpackConfig) {
-  var existingRules = baseWebpackConfig.module && baseWebpackConfig.module.rules || [];
-  return [].concat(_toConsumableArray(existingRules), [(0, _shared2.getUserDepsLoaderRule)()]);
-}
-
 function getPlugins(cosmosConfig, baseWebpackConfig, userWebpack) {
   var existingPlugins = baseWebpackConfig.plugins || [];
-  var globalsPlugin = (0, _shared2.getGlobalsPlugin)(cosmosConfig, userWebpack, false);
+  var globalsPlugin = (0, _plugins.getGlobalsPlugin)(cosmosConfig, userWebpack, false);
   var noEmitErrorsPlugin = new userWebpack.NoEmitOnErrorsPlugin();
   return (0, _htmlPlugin.ensureHtmlWebackPlugin)(cosmosConfig, [].concat(_toConsumableArray(existingPlugins), [globalsPlugin, noEmitErrorsPlugin]));
 }

package/dist/plugins/webpack/webpackConfig/getUserWebpackConfig.d.ts

@@ -0,0 +1,3 @@
+import webpack from 'webpack';
+import { CosmosConfig } from '../../../config/shared';
+export declare function getUserWebpackConfig(cosmosConfig: CosmosConfig, userWebpack: typeof webpack): Promise<webpack.Configuration>;

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

@@ -0,0 +1,136 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUserWebpackConfig = getUserWebpackConfig;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _cli = require("../../../shared/cli");
+
+var _fs = require("../../../shared/fs");
+
+var _webpack = require("../cosmosConfig/webpack");
+
+var _getDefaultWebpackConfig = require("./getDefaultWebpackConfig");
+
+var _getWebpackNodeEnv = require("./getWebpackNodeEnv");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function getUserWebpackConfig(_x, _x2) {
+  return _getUserWebpackConfig.apply(this, arguments);
+}
+
+function _getUserWebpackConfig() {
+  _getUserWebpackConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(cosmosConfig, userWebpack) {
+    var baseWebpackConfig, _createWebpackCosmosC, overridePath, relPath, webpackOverride;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return getBaseWebpackConfig(cosmosConfig, userWebpack);
+
+          case 2:
+            baseWebpackConfig = _context.sent;
+            _createWebpackCosmosC = (0, _webpack.createWebpackCosmosConfig)(cosmosConfig), overridePath = _createWebpackCosmosC.overridePath;
+
+            if (!(!overridePath || !(0, _fs.moduleExists)(overridePath))) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return", baseWebpackConfig);
+
+          case 6:
+            relPath = _path.default.relative(process.cwd(), overridePath);
+            console.log("[Cosmos] Overriding webpack config at ".concat(relPath));
+            webpackOverride = getDefaultExport((0, _fs.requireModule)(overridePath));
+            return _context.abrupt("return", webpackOverride(baseWebpackConfig, (0, _getWebpackNodeEnv.getWebpackNodeEnv)()));
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getUserWebpackConfig.apply(this, arguments);
+}
+
+function getBaseWebpackConfig(_x3, _x4) {
+  return _getBaseWebpackConfig.apply(this, arguments);
+} // Get "default" export from either an ES or CJS module
+// More context: https://github.com/react-cosmos/react-cosmos/issues/895
+
+
+function _getBaseWebpackConfig() {
+  _getBaseWebpackConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(cosmosConfig, userWebpack) {
+    var rootDir, _createWebpackCosmosC2, configPath, relPath, userConfigExport, cliArgs;
+
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            rootDir = cosmosConfig.rootDir;
+            _createWebpackCosmosC2 = (0, _webpack.createWebpackCosmosConfig)(cosmosConfig), configPath = _createWebpackCosmosC2.configPath;
+
+            if (!(!configPath || !(0, _fs.moduleExists)(configPath))) {
+              _context2.next = 5;
+              break;
+            }
+
+            console.log('[Cosmos] Using default webpack config');
+            return _context2.abrupt("return", (0, _getDefaultWebpackConfig.getDefaultWebpackConfig)(userWebpack, rootDir));
+
+          case 5:
+            relPath = _path.default.relative(process.cwd(), configPath);
+            console.log("[Cosmos] Using webpack config found at ".concat(relPath));
+            userConfigExport = getDefaultExport((0, _fs.requireModule)(configPath));
+            cliArgs = (0, _cli.getCliArgs)();
+
+            if (!(typeof userConfigExport === 'function')) {
+              _context2.next = 15;
+              break;
+            }
+
+            _context2.next = 12;
+            return userConfigExport(cliArgs.env || (0, _getWebpackNodeEnv.getWebpackNodeEnv)(), cliArgs);
+
+          case 12:
+            _context2.t0 = _context2.sent;
+            _context2.next = 16;
+            break;
+
+          case 15:
+            _context2.t0 = userConfigExport;
+
+          case 16:
+            return _context2.abrupt("return", _context2.t0);
+
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _getBaseWebpackConfig.apply(this, arguments);
+}
+
+function getDefaultExport(module) {
+  if (_typeof(module) === 'object' && 'default' in module) {
+    return module.default;
+  }
+
+  return module;
+}

package/dist/plugins/webpack/webpackConfig/getWebpackConfigModule.d.ts

@@ -0,0 +1,2 @@
+import webpack from 'webpack';
+export declare function getWebpackConfigModule(webpackConfig: webpack.Configuration): webpack.ModuleOptions;