react-cosmos 5.6.7 → 5.7.2

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

@@ -12,7 +12,7 @@ var _lodash = require("lodash");
 
 var _playgroundHtml = require("../../../shared/playgroundHtml");
 
-var _shared = require("./shared");
+var _plugins = require("./plugins");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -37,7 +37,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function ensureHtmlWebackPlugin(_ref, plugins) {
   var rootDir = _ref.rootDir;
 
-  if ((0, _shared.hasPlugin)(plugins, 'HtmlWebpackPlugin')) {
+  if ((0, _plugins.hasPlugin)(plugins, 'HtmlWebpackPlugin')) {
     return plugins.map(function (plugin) {
       return isHtmlWebpackPlugin(plugin) ? changeHtmlPluginFilename(plugin) : plugin;
     });
@@ -60,7 +60,7 @@ function getHtmlWebpackPlugin(rootDir) {
 }
 
 function isHtmlWebpackPlugin(plugin) {
-  return (0, _shared.isInstanceOfPlugin)(plugin, 'HtmlWebpackPlugin');
+  return (0, _plugins.isInstanceOfWebpackPlugin)(plugin, 'HtmlWebpackPlugin');
 }
 
 function changeHtmlPluginFilename(htmlPlugin) {

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

@@ -0,0 +1,5 @@
+import webpack from 'webpack';
+import { CosmosConfig } from '../../../config/shared';
+export declare function getGlobalsPlugin({ publicUrl }: CosmosConfig, userWebpack: typeof webpack, devServerOn: boolean): webpack.DefinePlugin;
+export declare function hasPlugin(plugins: void | webpack.WebpackPluginInstance[], pluginName: string): boolean | void;
+export declare function isInstanceOfWebpackPlugin(plugin: webpack.WebpackPluginInstance, constructorName: string): boolean;

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getGlobalsPlugin = getGlobalsPlugin;
+exports.hasPlugin = hasPlugin;
+exports.isInstanceOfWebpackPlugin = isInstanceOfWebpackPlugin;
+
+var _getWebpackNodeEnv = require("./getWebpackNodeEnv");
+
+function getGlobalsPlugin(_ref, userWebpack, devServerOn) {
+  var publicUrl = _ref.publicUrl;
+  var cleanPublicUrl = removeTrailingSlash(publicUrl);
+  return new userWebpack.DefinePlugin({
+    // "if (__DEV__)" blocks get stripped when compiling a static export build
+    __DEV__: JSON.stringify(devServerOn),
+    'process.env': {
+      NODE_ENV: JSON.stringify((0, _getWebpackNodeEnv.getWebpackNodeEnv)()),
+      PUBLIC_URL: JSON.stringify(cleanPublicUrl)
+    }
+  });
+}
+
+function hasPlugin(plugins, pluginName) {
+  return plugins && plugins.filter(function (p) {
+    return isInstanceOfWebpackPlugin(p, pluginName);
+  }).length > 0;
+}
+
+function isInstanceOfWebpackPlugin(plugin, constructorName) {
+  return plugin.constructor && plugin.constructor.name === constructorName;
+}
+
+function removeTrailingSlash(url) {
+  return url.replace(/\/$/, '');
+}

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

@@ -0,0 +1 @@
+export declare function resolveWebpackClientPath(relPath: string): string;

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

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveWebpackClientPath = resolveWebpackClientPath;
+
+function resolveWebpackClientPath(relPath) {
+  return require.resolve("../client/".concat(relPath));
+}

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

@@ -1,15 +1,15 @@
 "use strict";
 
-var _config = require("../../../config");
+var _detectCosmosConfig = require("../../../config/detectCosmosConfig");
 
-var _userDeps = require("../../../shared/userDeps");
+var _generateUserDepsModule = require("../../../userDeps/generateUserDepsModule");
 
 var _dom = require("../cosmosConfig/dom");
 
 module.exports = function injectUserDeps() {
   var _this = this;
 
-  var cosmosConfig = (0, _config.detectCosmosConfig)(); // This ensures this loader is invalidated whenever a new file is added to or
+  var cosmosConfig = (0, _detectCosmosConfig.detectCosmosConfig)(); // This ensures this loader is invalidated whenever a new file is added to or
   // removed from user's project, which in turn triggers react-cosmos-voyager2
   // to detect fixture files and finally update fixture list inside Playground.
   // Note that while this may not be very performant, it's not the equivalent
@@ -28,7 +28,7 @@ module.exports = function injectUserDeps() {
   var rendererConfig = {
     containerQuerySelector: containerQuerySelector
   };
-  return (0, _userDeps.generateUserDepsModule)({
+  return (0, _generateUserDepsModule.generateUserDepsModule)({
     cosmosConfig: cosmosConfig,
     rendererConfig: rendererConfig,
     relativeToDir: null

package/dist/shared/playgroundHtml.d.ts

@@ -1,6 +1,6 @@
 import { CosmosPluginConfig } from 'react-cosmos-plugin';
-import { CosmosConfig } from '../config';
-import { PlatformType } from './shared';
+import { CosmosConfig } from '../config/shared';
+import { PlatformType } from './types';
 export declare const RENDERER_FILENAME = "_renderer.html";
 export declare function getDevPlaygroundHtml(platformType: PlatformType, cosmosConfig: CosmosConfig, pluginConfigs: CosmosPluginConfig[]): string;
 export declare function getExportPlaygroundHtml(cosmosConfig: CosmosConfig, pluginConfigs: CosmosPluginConfig[]): string;

package/dist/shared/playgroundHtml.js

@@ -13,10 +13,10 @@ var _pkgUp = _interopRequireDefault(require("pkg-up"));
 
 var _url = _interopRequireDefault(require("url"));
 
-var _shared = require("./shared");
-
 var _static = require("./static");
 
+var _utils = require("./utils");
+
 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); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -106,7 +106,7 @@ function getWebRendererUrl(_ref) {
 }
 
 function getPlaygroundHtml(playgroundArgs) {
-  return (0, _shared.replaceKeys)(getPlaygroundHtmlTemplate(), {
+  return (0, _utils.replaceKeys)(getPlaygroundHtmlTemplate(), {
     __PLAYGROUND_ARGS: JSON.stringify(playgroundArgs)
   });
 }

package/dist/shared/pluginConfigs.d.ts

@@ -1,2 +1,2 @@
-import { CosmosConfig } from '../config';
+import { CosmosConfig } from '../config/shared';
 export declare function getPluginConfigs(cosmosConfig: CosmosConfig): import("react-cosmos-plugin").CosmosPluginConfig[];

package/dist/shared/static.js

@@ -10,7 +10,7 @@ var _express = _interopRequireDefault(require("express"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _shared = require("./shared");
+var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -22,7 +22,7 @@ function serveStaticDir(app, staticPath, publicUrl) {
   var relStaticPath = _path.default.relative(process.cwd(), staticPath);
 
   console.log("[Cosmos] Serving static files from ".concat(relStaticPath));
-  app.use((0, _shared.removeLeadingDot)(publicUrl), _express.default.static(staticPath, {
+  app.use((0, _utils.removeLeadingDot)(publicUrl), _express.default.static(staticPath, {
     // Ensure loader index (generated by html-webpack-plugin) loads instead
     // of the index.html from staticPath
     index: false

package/dist/shared/types.d.ts

@@ -0,0 +1 @@
+export declare type PlatformType = 'web' | 'native';

package/dist/shared/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/shared/{shared.d.ts → utils.d.ts}

@@ -1,4 +1,3 @@
-export declare type PlatformType = 'web' | 'native';
 export declare function replaceKeys(str: string, map: {
     [key: string]: string;
 }): string;

package/dist/{nativeServer.js → startNativeServer.js}

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startNativeServer = startNativeServer;
 
+var _startDevServer = require("./devServer/startDevServer");
+
 var _openFile = require("./plugins/openFile");
 
 var _userDepsFile = require("./plugins/userDepsFile");
 
-var _devServer = require("./shared/devServer");
-
 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); }); }; }
@@ -26,7 +26,7 @@ function _startNativeServer() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _devServer.startDevServer)('native', [_userDepsFile.userDepsFile, _openFile.openFile]);
+            return (0, _startDevServer.startDevServer)('native', [_userDepsFile.userDepsFile, _openFile.openFile]);
 
           case 2:
           case "end":

package/dist/{webServer.js → startWebServer.js}

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startWebServer = startWebServer;
 
+var _startDevServer = require("./devServer/startDevServer");
+
 var _httpProxy = require("./plugins/httpProxy");
 
 var _openFile = require("./plugins/openFile");
@@ -13,8 +15,6 @@ var _userDepsFile = require("./plugins/userDepsFile");
 
 var _webpack = require("./plugins/webpack");
 
-var _devServer = require("./shared/devServer");
-
 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); }); }; }
@@ -30,7 +30,7 @@ function _startWebServer() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _devServer.startDevServer)('web', [_openFile.openFile, _webpack.webpackDevServer, _httpProxy.httpProxy, _userDepsFile.userDepsFile]);
+            return (0, _startDevServer.startDevServer)('web', [_openFile.openFile, _webpack.webpackDevServer, _httpProxy.httpProxy, _userDepsFile.userDepsFile]);
 
           case 2:
           case "end":

package/dist/{shared/userDeps → userDeps}/generateUserDepsModule.d.ts

@@ -1,4 +1,4 @@
-import { CosmosConfig } from '../../config';
+import { CosmosConfig } from '../config/shared';
 import { Json } from './shared';
 declare type Args = {
     cosmosConfig: CosmosConfig;

package/dist/userDeps/getUserModules.d.ts

@@ -0,0 +1,8 @@
+import { ReactDecorators, ReactFixtureExports } from 'react-cosmos-shared2/react';
+import { CosmosConfig } from '../config/shared';
+declare type UserModules = {
+    fixtures: ReactFixtureExports;
+    decorators: ReactDecorators;
+};
+export declare function getUserModules({ rootDir, fixturesDir, fixtureFileSuffix, }: CosmosConfig): UserModules;
+export {};

package/dist/{shared/userDeps → userDeps}/getUserModules.js

@@ -7,10 +7,10 @@ exports.getUserModules = getUserModules;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _ = require(".");
-
 var _slash = _interopRequireDefault(require("slash"));
 
+var _findUserModulePaths2 = require("./findUserModulePaths");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getUserModules(_ref) {
@@ -18,7 +18,7 @@ function getUserModules(_ref) {
       fixturesDir = _ref.fixturesDir,
       fixtureFileSuffix = _ref.fixtureFileSuffix;
 
-  var _findUserModulePaths = (0, _.findUserModulePaths)({
+  var _findUserModulePaths = (0, _findUserModulePaths2.findUserModulePaths)({
     rootDir: rootDir,
     fixturesDir: fixturesDir,
     fixtureFileSuffix: fixtureFileSuffix
@@ -27,12 +27,12 @@ function getUserModules(_ref) {
       decoratorPaths = _findUserModulePaths.decoratorPaths;
 
   return {
-    fixtureExportsByPath: getDefaultExportsByPath(fixturePaths, rootDir),
-    decoratorsByPath: getDefaultExportsByPath(decoratorPaths, rootDir)
+    fixtures: getDefaultExports(fixturePaths, rootDir),
+    decorators: getDefaultExports(decoratorPaths, rootDir)
   };
 }
 
-function getDefaultExportsByPath(paths, rootDir) {
+function getDefaultExports(paths, rootDir) {
   var exportsByPath = {};
   paths.forEach(function (p) {
     // Converting to forward slashes on Windows is important because the

package/dist/{shared/userDeps → userDeps}/shared.js

@@ -7,7 +7,7 @@ exports.getDecoratorPatterns = getDecoratorPatterns;
 exports.getFixturePatterns = getFixturePatterns;
 exports.getIgnorePatterns = getIgnorePatterns;
 
-var _shared = require("../shared");
+var _utils = require("../shared/utils");
 
 // NODE: These can be made configurable if a proper need arises
 var FIXTURE_PATTERNS = ['**/<fixturesDir>/**/*.{js,jsx,ts,tsx}', '**/*.<fixtureFileSuffix>.{js,jsx,ts,tsx}'];
@@ -16,7 +16,7 @@ var IGNORE_PATTERNS = ['**/node_modules/**'];
 
 function getFixturePatterns(fixturesDir, fixtureFileSuffix) {
   return FIXTURE_PATTERNS.map(function (pattern) {
-    return (0, _shared.replaceKeys)(pattern, {
+    return (0, _utils.replaceKeys)(pattern, {
       '<fixturesDir>': fixturesDir,
       '<fixtureFileSuffix>': fixtureFileSuffix
     });

package/dist/{shared/userDeps → userDeps}/userDepsTemplate.js

@@ -35,7 +35,7 @@ function userDepsTemplate(_ref) {
   }).join("\n"), "\n\n").concat(decoratorKeys.map(function (k, i) {
     return "import decorator".concat(i, " from '").concat(decorators[k], "';");
   }).join("\n"), "\n\nexport const rendererConfig = ").concat(JSON.stringify(rendererConfig, null, 2), ";\n\nexport const fixtures = {\n").concat(fixtureKeys.map(function (k, i) {
-    return "  '".concat(k, "': fixture").concat(i);
+    return "  '".concat(k, "': { module: { default: fixture").concat(i, " } }");
   }).join(",\n"), "\n};\n\nexport const decorators = {\n").concat(decoratorKeys.map(function (k, i) {
     return "  '".concat(k, "': decorator").concat(i);
   }).join(",\n"), "\n};\n").trimLeft();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cosmos",
-  "version": "5.6.7",
+  "version": "5.7.2",
   "description": "CLI for running React Cosmos inside webpack-powered apps",
   "repository": "https://github.com/react-cosmos/react-cosmos/tree/main/packages/react-cosmos",
   "license": "MIT",
@@ -20,9 +20,9 @@
     "open": "^8.4.0",
     "pem": "^1.14.4",
     "pkg-up": "^3.1.0",
-    "react-cosmos-playground2": "^5.6.7",
+    "react-cosmos-playground2": "^5.7.2",
     "react-cosmos-plugin": "^5.6.0",
-    "react-cosmos-shared2": "^5.6.7",
+    "react-cosmos-shared2": "^5.7.1",
     "react-error-overlay": "6.0.9",
     "regenerator-runtime": "^0.13.9",
     "resolve-from": "^5.0.0",
@@ -38,5 +38,5 @@
     "cosmos-export": "./bin/cosmos-export.js",
     "cosmos-native": "./bin/cosmos-native.js"
   },
-  "gitHead": "1839af43c194b514f3c1ceeef490ffaf41d4d800"
+  "gitHead": "a796ba262ccd58881a39d2b17d7e4443561d07b4"
 }

package/dist/config/index.d.ts

@@ -1,5 +0,0 @@
-export { createCosmosConfig } from './createCosmosConfig';
-export { detectCosmosConfig, detectCosmosConfigPath, } from './detectCosmosConfig';
-export { getCosmosConfigAtPath } from './getCosmosConfigAtPath';
-export { resolveModule } from './resolve';
-export { CosmosConfig } from './shared';

package/dist/config/index.js

@@ -1,51 +0,0 @@
-"use strict";
-
-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() {
-    return _createCosmosConfig.createCosmosConfig;
-  }
-});
-Object.defineProperty(exports, "detectCosmosConfig", {
-  enumerable: true,
-  get: function get() {
-    return _detectCosmosConfig.detectCosmosConfig;
-  }
-});
-Object.defineProperty(exports, "detectCosmosConfigPath", {
-  enumerable: true,
-  get: function get() {
-    return _detectCosmosConfig.detectCosmosConfigPath;
-  }
-});
-Object.defineProperty(exports, "getCosmosConfigAtPath", {
-  enumerable: true,
-  get: function get() {
-    return _getCosmosConfigAtPath.getCosmosConfigAtPath;
-  }
-});
-Object.defineProperty(exports, "resolveModule", {
-  enumerable: true,
-  get: function get() {
-    return _resolve.resolveModule;
-  }
-});
-
-var _createCosmosConfig = require("./createCosmosConfig");
-
-var _detectCosmosConfig = require("./detectCosmosConfig");
-
-var _getCosmosConfigAtPath = require("./getCosmosConfigAtPath");
-
-var _resolve = require("./resolve");
-
-var _shared = require("./shared");

package/dist/native.d.ts

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

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

@@ -1,2 +0,0 @@
-export { getDevWebpackConfig } from './devServer';
-export { getExportWebpackConfig } from './export';

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

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getDevWebpackConfig", {
-  enumerable: true,
-  get: function get() {
-    return _devServer.getDevWebpackConfig;
-  }
-});
-Object.defineProperty(exports, "getExportWebpackConfig", {
-  enumerable: true,
-  get: function get() {
-    return _export.getExportWebpackConfig;
-  }
-});
-
-var _devServer = require("./devServer");
-
-var _export = require("./export");

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

@@ -1,3 +0,0 @@
-export declare function getDefaultExport(module: any | {
-    default: any;
-}): any;

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

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDefaultExport = getDefaultExport;
-
-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); }
-
-// Get "default" export from either an ES or CJS module
-// More context: https://github.com/react-cosmos/react-cosmos/issues/895
-function getDefaultExport(module) {
-  if (_typeof(module) === 'object' && 'default' in module) {
-    return module.default;
-  }
-
-  return module;
-}

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

@@ -1,11 +0,0 @@
-import webpack from 'webpack';
-import { CosmosConfig } from '../../../config';
-export declare function getUserWebpackConfig(cosmosConfig: CosmosConfig, userWebpack: typeof webpack): Promise<webpack.Configuration>;
-export declare function getBaseWebpackConfig(cosmosConfig: CosmosConfig, userWebpack: typeof webpack): Promise<webpack.Configuration>;
-export declare function resolveClientPath(relPath: string): string;
-export declare function getUserDepsLoaderRule(): webpack.RuleSetRule;
-export declare function resolveLocalReactDeps(cosmosConfig: CosmosConfig, baseWebpackConfig: webpack.Configuration): webpack.ResolveOptions;
-export declare function getGlobalsPlugin({ publicUrl }: CosmosConfig, userWebpack: typeof webpack, devServerOn: boolean): webpack.DefinePlugin;
-export declare function hasPlugin(plugins: void | webpack.WebpackPluginInstance[], pluginName: string): boolean | void;
-export declare function isInstanceOfPlugin(plugin: webpack.WebpackPluginInstance, constructorName: string): boolean;
-export declare function getNodeEnv(): "production" | "development";