react-cosmos 6.0.0-beta.3 → 6.0.0-beta.5

package/dist/corePlugins/{openFile.d.ts → fixtureWatcherPlugin.d.ts}

@@ -1,2 +1,2 @@
 import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
-export declare const openFileServerPlugin: CosmosServerPlugin;
+export declare const fixtureWatcherPlugin: CosmosServerPlugin;

package/dist/corePlugins/{exposeImports.js → fixtureWatcherPlugin.js}

@@ -2,17 +2,25 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { pickRendererUrl, } from 'react-cosmos-core';
 import { getPlaygroundUrl } from '../shared/playgroundUrl.js';
+import { updateFixtureListCache } from '../shared/serverFixtureList.js';
+import { findUserModulePaths } from '../userModules/findUserModulePaths.js';
 import { startFixtureWatcher } from '../userModules/fixtureWatcher.js';
 import { generateUserImports } from '../userModules/generateUserImports.js';
 import { moduleExists } from '../utils/fs.js';
-export const exposeImportsServerPlugin = {
-    name: 'exposeImports',
+export const fixtureWatcherPlugin = {
+    name: 'fixtureWatcher',
     async devServer({ cosmosConfig, platform }) {
-        if (!shouldExposeImports(platform, cosmosConfig))
-            return;
-        await generateImportsFile(cosmosConfig, 'dev');
+        const exposeImports = shouldExposeImports(platform, cosmosConfig);
+        if (exposeImports) {
+            const modulePaths = findUserModulePaths(cosmosConfig);
+            await generateImportsFile(cosmosConfig, 'dev', modulePaths);
+        }
         const watcher = await startFixtureWatcher(cosmosConfig, 'all', () => {
-            generateImportsFile(cosmosConfig, 'dev');
+            const modulePaths = findUserModulePaths(cosmosConfig);
+            updateFixtureListCache(cosmosConfig.rootDir, modulePaths.fixturePaths);
+            if (exposeImports) {
+                generateImportsFile(cosmosConfig, 'dev', modulePaths);
+            }
         });
         return () => {
             watcher.close();
@@ -20,14 +28,15 @@ export const exposeImportsServerPlugin = {
     },
     async export({ cosmosConfig }) {
         if (shouldExposeImports('web', cosmosConfig)) {
-            await generateImportsFile(cosmosConfig, 'export');
+            const modulePaths = findUserModulePaths(cosmosConfig);
+            await generateImportsFile(cosmosConfig, 'export', modulePaths);
         }
     },
 };
 function shouldExposeImports(platform, cosmosConfig) {
     return platform === 'native' || Boolean(cosmosConfig.exposeImports);
 }
-async function generateImportsFile(cosmosConfig, command) {
+async function generateImportsFile(cosmosConfig, command, modulePaths) {
     const { exposeImports } = cosmosConfig;
     const filePath = typeof exposeImports === 'string'
         ? exposeImports
@@ -39,6 +48,7 @@ async function generateImportsFile(cosmosConfig, command) {
     };
     const fileSource = generateUserImports({
         cosmosConfig,
+        modulePaths,
         rendererConfig,
         relativeToDir: path.dirname(filePath),
         typeScript,

package/dist/corePlugins/httpProxyPlugin.d.ts

@@ -0,0 +1,2 @@
+import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
+export declare const httpProxyPlugin: CosmosServerPlugin;

package/dist/corePlugins/{httpProxy.js → httpProxyPlugin.js}

@@ -1,5 +1,5 @@
 import { createProxyMiddleware } from 'http-proxy-middleware';
-export const httpProxyServerPlugin = {
+export const httpProxyPlugin = {
     name: 'httpProxy',
     devServer({ cosmosConfig, platform, expressApp }) {
         if (platform !== 'web')

package/dist/corePlugins/index.js

@@ -1,12 +1,15 @@
-import { exposeImportsServerPlugin } from './exposeImports.js';
-import { httpProxyServerPlugin } from './httpProxy.js';
-import { openFileServerPlugin } from './openFile.js';
-import { pluginEndpointServerPlugin } from './pluginEndpoint.js';
-import { portRetryServerPlugin } from './portRetry.js';
+import { fixtureWatcherPlugin } from './fixtureWatcherPlugin.js';
+import { httpProxyPlugin } from './httpProxyPlugin.js';
+import { openFilePlugin } from './openFilePlugin.js';
+import { pluginEndpointPlugin } from './pluginEndpointPlugin.js';
+import { portRetryPlugin } from './portRetryPlugin.js';
 export const coreServerPlugins = [
-    portRetryServerPlugin,
-    exposeImportsServerPlugin,
-    httpProxyServerPlugin,
-    openFileServerPlugin,
-    pluginEndpointServerPlugin,
+    portRetryPlugin,
+    httpProxyPlugin,
+    openFilePlugin,
+    pluginEndpointPlugin,
 ];
+// Omit starting chokidar in Jest tests for performance reasons
+if (process.env.JEST_WORKER_ID === undefined) {
+    coreServerPlugins.push(fixtureWatcherPlugin);
+}

package/dist/corePlugins/openFilePlugin.d.ts

@@ -0,0 +1,2 @@
+import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
+export declare const openFilePlugin: CosmosServerPlugin;

package/dist/corePlugins/{openFile.js → openFilePlugin.js}

@@ -2,7 +2,7 @@ import launchEditor from '@skidding/launch-editor';
 import fs from 'fs';
 import open from 'open';
 import path from 'path';
-export const openFileServerPlugin = {
+export const openFilePlugin = {
     name: 'openFile',
     devServer({ cosmosConfig, expressApp }) {
         expressApp.get('/_open', (req, res) => {

package/dist/corePlugins/pluginEndpointPlugin.d.ts

@@ -0,0 +1,2 @@
+import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
+export declare const pluginEndpointPlugin: CosmosServerPlugin;

package/dist/corePlugins/{pluginEndpoint.js → pluginEndpointPlugin.js}

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { resolveSilent } from '../utils/resolveSilent.js';
-export const pluginEndpointServerPlugin = {
+export const pluginEndpointPlugin = {
     name: 'pluginEndpoint',
     devServer({ expressApp }) {
         expressApp.get('/_plugin/*.js', (req, res) => {

package/dist/corePlugins/portRetryPlugin.d.ts

@@ -0,0 +1,2 @@
+import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
+export declare const portRetryPlugin: CosmosServerPlugin;

package/dist/corePlugins/{portRetry.js → portRetryPlugin.js}

@@ -1,5 +1,5 @@
 import { findNextAvailablePort } from '../shared/findNextAvailablePort.js';
-export const portRetryServerPlugin = {
+export const portRetryPlugin = {
     name: 'portRetry',
     async config({ cosmosConfig, command }) {
         if (command === 'export') {

package/dist/devServer/expressApp.js

@@ -4,9 +4,8 @@ import { getStaticPath } from '../shared/staticPath.js';
 import { resolve } from '../utils/resolve.js';
 export async function createExpressApp(platform, cosmosConfig, pluginConfigs) {
     const app = express();
-    const playgroundHtml = await getDevPlaygroundHtml(platform, cosmosConfig, pluginConfigs);
-    app.get('/', (req, res) => {
-        res.send(playgroundHtml);
+    app.get('/', async (req, res) => {
+        res.send(await getDevPlaygroundHtml(platform, cosmosConfig, pluginConfigs));
     });
     app.get('/playground.bundle.js', (req, res) => {
         res.sendFile(resolve('react-cosmos-ui/dist/playground.bundle.js'));

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export * from './shared/findNextAvailablePort.js';
 export * from './shared/playgroundUrl.js';
 export * from './shared/staticServer.js';
 export * from './testHelpers/cwd.js';
+export * from './userModules/findUserModulePaths.js';
 export * from './userModules/fixtureWatcher.js';
 export * from './userModules/generateUserImports.js';
 export * from './utils/cli.js';

package/dist/index.js

@@ -10,6 +10,7 @@ export * from './shared/findNextAvailablePort.js';
 export * from './shared/playgroundUrl.js';
 export * from './shared/staticServer.js';
 export * from './testHelpers/cwd.js';
+export * from './userModules/findUserModulePaths.js';
 export * from './userModules/fixtureWatcher.js';
 export * from './userModules/generateUserImports.js';
 export * from './utils/cli.js';

package/dist/shared/playgroundHtml.js

@@ -3,8 +3,7 @@ import { readFile } from 'fs/promises';
 import path from 'path';
 import { pkgUpSync } from 'pkg-up';
 import { pickRendererUrl, replaceKeys, } from 'react-cosmos-core';
-import { findUserModulePaths } from '../userModules/findUserModulePaths.js';
-import { importKeyPath } from '../userModules/shared.js';
+import { getServerFixtureList } from './serverFixtureList.js';
 import { getStaticPath } from './staticPath.js';
 export async function getDevPlaygroundHtml(platform, cosmosConfig, pluginConfigs) {
     const { ui } = cosmosConfig;
@@ -13,7 +12,7 @@ export async function getDevPlaygroundHtml(platform, cosmosConfig, pluginConfigs
             ...ui,
             core: await getCoreConfig(cosmosConfig, true),
             rendererCore: {
-                fixtures: getFixtureList(cosmosConfig),
+                fixtures: getServerFixtureList(cosmosConfig),
                 rendererUrl: platform === 'web'
                     ? pickRendererUrl(cosmosConfig.rendererUrl, 'dev')
                     : null,
@@ -29,7 +28,7 @@ export async function getExportPlaygroundHtml(cosmosConfig, pluginConfigs) {
             ...ui,
             core: await getCoreConfig(cosmosConfig, false),
             rendererCore: {
-                fixtures: getFixtureList(cosmosConfig),
+                fixtures: getServerFixtureList(cosmosConfig),
                 rendererUrl: pickRendererUrl(cosmosConfig.rendererUrl, 'export'),
             },
         },
@@ -68,10 +67,3 @@ function getPlaygroundHtml(playgroundArgs) {
 function getPlaygroundHtmlTemplate() {
     return fs.readFileSync(getStaticPath('index.html'), 'utf8');
 }
-function getFixtureList(cosmosConfig) {
-    const { fixturePaths } = findUserModulePaths(cosmosConfig);
-    return fixturePaths.reduce((acc, fixturePath) => ({
-        ...acc,
-        [importKeyPath(fixturePath, cosmosConfig.rootDir)]: { type: 'single' },
-    }), {});
-}

package/dist/shared/serverFixtureList.d.ts

@@ -0,0 +1,4 @@
+import { FixtureList } from 'react-cosmos-core';
+import { CosmosConfig } from '../cosmosConfig/types.js';
+export declare function getServerFixtureList(cosmosConfig: CosmosConfig): FixtureList;
+export declare function updateFixtureListCache(rootDir: string, fixturePaths: string[]): void;

package/dist/shared/serverFixtureList.js

@@ -0,0 +1,19 @@
+import { findUserModulePaths } from '../userModules/findUserModulePaths.js';
+import { importKeyPath } from '../userModules/shared.js';
+let fixtureListCache = null;
+export function getServerFixtureList(cosmosConfig) {
+    if (!fixtureListCache) {
+        const { fixturePaths } = findUserModulePaths(cosmosConfig);
+        fixtureListCache = createFixtureList(cosmosConfig.rootDir, fixturePaths);
+    }
+    return fixtureListCache;
+}
+export function updateFixtureListCache(rootDir, fixturePaths) {
+    fixtureListCache = createFixtureList(rootDir, fixturePaths);
+}
+function createFixtureList(rootDir, fixturePaths) {
+    return fixturePaths.reduce((acc, fixturePath) => ({
+        ...acc,
+        [importKeyPath(fixturePath, rootDir)]: { type: 'single' },
+    }), {});
+}

package/dist/userModules/findUserModulePaths.d.ts

@@ -1,12 +1,9 @@
+import { UserModulePaths } from './shared.js';
 type FindUserModulePathsArgs = {
     rootDir: string;
     fixturesDir: string;
     fixtureFileSuffix: string;
     ignore: string[];
 };
-type UserModulePaths = {
-    fixturePaths: string[];
-    decoratorPaths: string[];
-};
 export declare function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }: FindUserModulePathsArgs): UserModulePaths;
 export {};

package/dist/userModules/findUserModulePaths.js

@@ -1,6 +1,6 @@
 import { globSync } from 'glob';
 import micromatch from 'micromatch';
-import { getDecoratorPatterns, getFixturePatterns } from './shared.js';
+import { getDecoratorPatterns, getFixturePatterns, } from './shared.js';
 export function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }) {
     const paths = globSync('**/*', {
         cwd: rootDir,

package/dist/userModules/generateUserImports.d.ts

@@ -1,10 +1,12 @@
 import { RendererConfig } from 'react-cosmos-core';
 import { CosmosConfig } from '../cosmosConfig/types.js';
+import { UserModulePaths } from './shared.js';
 type Args<T extends RendererConfig> = {
     cosmosConfig: CosmosConfig;
+    modulePaths: UserModulePaths;
     rendererConfig: T;
     relativeToDir: string | null;
     typeScript: boolean;
 };
-export declare function generateUserImports<T extends RendererConfig>({ cosmosConfig, rendererConfig, relativeToDir, typeScript, }: Args<T>): string;
+export declare function generateUserImports<T extends RendererConfig>({ cosmosConfig, modulePaths, rendererConfig, relativeToDir, typeScript, }: Args<T>): string;
 export {};

package/dist/userModules/generateUserImports.js

@@ -1,23 +1,15 @@
-import { findUserModulePaths } from './findUserModulePaths.js';
 import { userImportsLazyTemplate } from './userImportsLazyTemplate.js';
 import { userImportsTemplate } from './userImportsTemplate.js';
-export function generateUserImports({ cosmosConfig, rendererConfig, relativeToDir, typeScript, }) {
-    const { rootDir, fixturesDir, fixtureFileSuffix, globalImports, ignore } = cosmosConfig;
-    const { fixturePaths, decoratorPaths } = findUserModulePaths({
-        rootDir,
-        fixturesDir,
-        fixtureFileSuffix,
-        ignore,
-    });
+export function generateUserImports({ cosmosConfig, modulePaths, rendererConfig, relativeToDir, typeScript, }) {
+    const { rootDir, globalImports } = cosmosConfig;
     const template = cosmosConfig.lazy
         ? userImportsLazyTemplate
         : userImportsTemplate;
     return template({
+        rootDir,
+        modulePaths,
         globalImports,
-        fixturePaths,
-        decoratorPaths,
         rendererConfig,
-        rootDir,
         relativeToDir,
         typeScript,
     });

package/dist/userModules/shared.d.ts

@@ -1,10 +1,13 @@
 import { RendererConfig } from 'react-cosmos-core';
-export type UserImportsTemplateArgs = {
-    globalImports: string[];
+export type UserModulePaths = {
     fixturePaths: string[];
     decoratorPaths: string[];
-    rendererConfig: RendererConfig;
+};
+export type UserImportsTemplateArgs = {
     rootDir: string;
+    modulePaths: UserModulePaths;
+    globalImports: string[];
+    rendererConfig: RendererConfig;
     relativeToDir: string | null;
     typeScript: boolean;
 };

package/dist/userModules/shared.js

@@ -3,8 +3,8 @@ import { replaceKeys } from 'react-cosmos-core';
 import { slash } from '../utils/slash.js';
 // NODE: These can be made configurable if a proper need arises
 const FIXTURE_PATTERNS = [
-    '**/<fixturesDir>/**/*.{js,jsx,ts,tsx}',
-    '**/*.<fixtureFileSuffix>.{js,jsx,ts,tsx}',
+    '**/<fixturesDir>/**/*.{js,jsx,ts,tsx,md,mdx}',
+    '**/*.<fixtureFileSuffix>.{js,jsx,ts,tsx,md,mdx}',
 ];
 const DECORATOR_PATTERNS = ['**/cosmos.decorator.{js,jsx,ts,tsx}'];
 export function getFixturePatterns(fixturesDir, fixtureFileSuffix) {

package/dist/userModules/userImportsLazyTemplate.d.ts

@@ -1,2 +1,2 @@
 import { UserImportsTemplateArgs } from './shared.js';
-export declare function userImportsLazyTemplate({ globalImports, fixturePaths, decoratorPaths, rendererConfig, rootDir, relativeToDir, typeScript, }: UserImportsTemplateArgs): string;
+export declare function userImportsLazyTemplate({ globalImports, modulePaths: { fixturePaths, decoratorPaths }, rendererConfig, rootDir, relativeToDir, typeScript, }: UserImportsTemplateArgs): string;

package/dist/userModules/userImportsLazyTemplate.js

@@ -1,6 +1,6 @@
 import { flatten } from 'lodash-es';
 import { createImportMap, importPath, } from './shared.js';
-export function userImportsLazyTemplate({ globalImports, fixturePaths, decoratorPaths, rendererConfig, rootDir, relativeToDir, typeScript, }) {
+export function userImportsLazyTemplate({ globalImports, modulePaths: { fixturePaths, decoratorPaths }, rendererConfig, rootDir, relativeToDir, typeScript, }) {
     function ext(filePath) {
         // Add compat with projects where allowImportingTsExtensions isn't enabled
         return typeScript ? filePath.replace(/\.tsx?$/, '') : filePath;

package/dist/userModules/userImportsTemplate.d.ts

@@ -1,2 +1,2 @@
 import { UserImportsTemplateArgs } from './shared.js';
-export declare function userImportsTemplate({ globalImports, fixturePaths, decoratorPaths, rendererConfig, rootDir, relativeToDir, typeScript, }: UserImportsTemplateArgs): string;
+export declare function userImportsTemplate({ globalImports, modulePaths: { fixturePaths, decoratorPaths }, rendererConfig, rootDir, relativeToDir, typeScript, }: UserImportsTemplateArgs): string;

package/dist/userModules/userImportsTemplate.js

@@ -1,6 +1,6 @@
 import { flatten } from 'lodash-es';
 import { createImportMap, importPath, } from './shared.js';
-export function userImportsTemplate({ globalImports, fixturePaths, decoratorPaths, rendererConfig, rootDir, relativeToDir, typeScript, }) {
+export function userImportsTemplate({ globalImports, modulePaths: { fixturePaths, decoratorPaths }, rendererConfig, rootDir, relativeToDir, typeScript, }) {
     function ext(filePath) {
         // Add compat with projects where allowImportingTsExtensions isn't enabled
         return typeScript ? filePath.replace(/\.tsx?$/, '') : filePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cosmos",
-  "version": "6.0.0-beta.3",
+  "version": "6.0.0-beta.5",
   "description": "Sandbox for developing and testing UI components in isolation",
   "repository": "https://github.com/react-cosmos/react-cosmos/tree/main/packages/react-cosmos",
   "license": "MIT",
@@ -17,9 +17,9 @@
     "open": "^8.4.2",
     "pem": "^1.14.7",
     "pkg-up": "^4.0.0",
-    "react-cosmos-core": "6.0.0-beta.3",
-    "react-cosmos-renderer": "6.0.0-beta.3",
-    "react-cosmos-ui": "6.0.0-beta.3",
+    "react-cosmos-core": "6.0.0-beta.5",
+    "react-cosmos-renderer": "6.0.0-beta.5",
+    "react-cosmos-ui": "6.0.0-beta.5",
     "ws": "^8.13.0",
     "yargs": "^17.7.2"
   },
@@ -28,5 +28,5 @@
     "cosmos-export": "./bin/cosmos-export.js",
     "cosmos-native": "./bin/cosmos-native.js"
   },
-  "gitHead": "7f33cc2b818523978ef6c7fe574bf1fd8d15b50a"
+  "gitHead": "43919661a2ceb070ebc958bb7f6e52d5422ddc65"
 }

package/dist/corePlugins/exposeImports.d.ts

@@ -1,2 +0,0 @@
-import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
-export declare const exposeImportsServerPlugin: CosmosServerPlugin;

package/dist/corePlugins/httpProxy.d.ts

@@ -1,2 +0,0 @@
-import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
-export declare const httpProxyServerPlugin: CosmosServerPlugin;

package/dist/corePlugins/pluginEndpoint.d.ts

@@ -1,2 +0,0 @@
-import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
-export declare const pluginEndpointServerPlugin: CosmosServerPlugin;

package/dist/corePlugins/portRetry.d.ts

@@ -1,2 +0,0 @@
-import { CosmosServerPlugin } from '../cosmosPlugin/types.js';
-export declare const portRetryServerPlugin: CosmosServerPlugin;