react-cosmos 6.0.0-alpha.18 → 6.0.0-alpha.19

package/client.d.ts

@@ -0,0 +1 @@
+export * from './dist/client.js';

package/client.js

@@ -0,0 +1 @@
+export * from './dist/client.js';

package/dist/client.d.ts

@@ -0,0 +1 @@
+export { Viewport, useSelect, useValue } from 'react-cosmos-renderer/client';

package/dist/client.js

@@ -0,0 +1 @@
+export { Viewport, useSelect, useValue } from 'react-cosmos-renderer/client';

package/dist/getFixtures/getFixtures.js

@@ -1,5 +1,6 @@
 import path from 'path';
-import { createFixtureTree, flattenFixtureTree, getDecoratedFixtureElement, getFixtureListFromExports, getSortedDecoratorsForFixturePath, stringifyPlaygroundUrlQuery, stringifyRendererUrlQuery, } from 'react-cosmos-core';
+import { buildPlaygroundQueryString, buildRendererQueryString, createFixtureTree, flattenFixtureTree, getFixtureFromExport, getFixtureListFromExports, getSortedDecoratorsForFixturePath, } from 'react-cosmos-core';
+import { createFixtureNode, decorateFixture } from 'react-cosmos-renderer';
 import { RENDERER_FILENAME } from '../shared/playgroundHtml.js';
 import { resolveRendererUrl } from '../shared/resolveRendererUrl.js';
 import { importUserModules } from '../userModules/importUserModules.js';
@@ -16,9 +17,10 @@ export function getFixtures(cosmosConfig) {
     const flatFixtureTree = flattenFixtureTree(fixtureTree);
     flatFixtureTree.forEach(({ fileName, fixtureId, name, parents }) => {
         const fixtureExport = fixtures[fixtureId.path];
-        const fixture = fixtureId.name === undefined
-            ? fixtureExport
-            : fixtureExport[fixtureId.name];
+        const fixture = getFixtureFromExport(fixtureExport, fixtureId.name);
+        if (!fixture) {
+            throw new Error(`Could not read fixture: ${JSON.stringify(fixtureId)}`);
+        }
         const treePath = [...parents, fileName];
         if (name)
             treePath.push(name);
@@ -38,26 +40,22 @@ export function getFixtures(cosmosConfig) {
 }
 function getPlaygroundUrl(cosmosConfig, fixtureId) {
     const host = getPlaygroundHost(cosmosConfig);
-    const query = stringifyPlaygroundUrlQuery({ fixtureId });
-    return `${host}/?${query}`;
+    const query = buildPlaygroundQueryString({ fixtureId });
+    return `${host}/${query}`;
 }
 function getRendererUrl(cosmosConfig, fixtureId) {
     const { publicUrl, rendererUrl } = cosmosConfig;
-    const query = stringifyRendererUrlQuery({ _fixtureId: fixtureId });
+    const query = buildRendererQueryString({ fixtureId });
     if (rendererUrl)
-        return `${rendererUrl}?${query}`;
+        return rendererUrl + query;
     const host = getPlaygroundHost(cosmosConfig);
     const urlPath = resolveRendererUrl(publicUrl, RENDERER_FILENAME);
-    return new URL(`${urlPath}?${query}`, host).toString();
+    return new URL(urlPath + query, host).toString();
 }
 function getPlaygroundHost({ hostname, port, https }) {
     return `${https ? 'https' : 'http'}://${hostname || 'localhost'}:${port}`;
 }
 function createFixtureElementGetter(fixture, fixturePath, decoratorsByPath) {
     const decorators = getSortedDecoratorsForFixturePath(fixturePath, decoratorsByPath);
-    return () => getDecoratedFixtureElement(fixture, decorators, {
-        fixtureState: {},
-        setFixtureState: () => { },
-        onErrorReset: () => { },
-    });
+    return () => decorateFixture(createFixtureNode(fixture), decorators);
 }

package/dist/shared/playgroundHtml.js

@@ -13,8 +13,11 @@ export async function getDevPlaygroundHtml(platformType, cosmosConfig, pluginCon
     return getPlaygroundHtml({
         playgroundConfig: {
             ...ui,
-            core: await getDevCoreConfig(platformType, cosmosConfig),
-            rendererCore: { fixtures: getFixtureList(cosmosConfig) },
+            core: await getCoreConfig(cosmosConfig, true),
+            rendererCore: {
+                fixtures: getFixtureList(cosmosConfig),
+                webRendererUrl: getDevServerWebRendereUrl(platformType, cosmosConfig),
+            },
         },
         pluginConfigs,
     });
@@ -24,45 +27,37 @@ export async function getExportPlaygroundHtml(cosmosConfig, pluginConfigs) {
     return getPlaygroundHtml({
         playgroundConfig: {
             ...ui,
-            core: await getExportCoreConfig(cosmosConfig),
-            rendererCore: { fixtures: getFixtureList(cosmosConfig) },
+            core: await getCoreConfig(cosmosConfig, false),
+            rendererCore: {
+                fixtures: getFixtureList(cosmosConfig),
+                webRendererUrl: getExportWebRendereUrl(cosmosConfig),
+            },
         },
         pluginConfigs,
     });
 }
-async function getDevCoreConfig(platformType, cosmosConfig) {
+async function getCoreConfig(cosmosConfig, devServerOn) {
+    const { rootDir, fixturesDir, fixtureFileSuffix } = cosmosConfig;
+    return {
+        projectId: await getProjectId(rootDir),
+        fixturesDir,
+        fixtureFileSuffix,
+        devServerOn,
+    };
+}
+function getDevServerWebRendereUrl(platformType, cosmosConfig) {
     switch (platformType) {
         case 'native':
-            return {
-                ...(await getSharedCoreConfig(cosmosConfig)),
-                devServerOn: true,
-                webRendererUrl: null,
-            };
+            return null;
         case 'web':
-            return {
-                ...(await getSharedCoreConfig(cosmosConfig)),
-                devServerOn: true,
-                webRendererUrl: cosmosConfig.rendererUrl ||
-                    resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME),
-            };
+            return (cosmosConfig.rendererUrl ||
+                resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME));
         default:
             throw new Error(`Invalid platform type: ${platformType}`);
     }
 }
-async function getExportCoreConfig(cosmosConfig) {
-    return {
-        ...(await getSharedCoreConfig(cosmosConfig)),
-        devServerOn: false,
-        webRendererUrl: resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME),
-    };
-}
-async function getSharedCoreConfig(cosmosConfig) {
-    const { rootDir, fixturesDir, fixtureFileSuffix } = cosmosConfig;
-    return {
-        projectId: await getProjectId(rootDir),
-        fixturesDir,
-        fixtureFileSuffix,
-    };
+function getExportWebRendereUrl(cosmosConfig) {
+    return resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME);
 }
 async function getProjectId(rootDir) {
     const pkgPath = pkgUpSync({ cwd: rootDir });

package/dist/userModules/generateUserImports.d.ts

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

package/dist/userModules/shared.d.ts

@@ -1,9 +1,9 @@
-import { Json } from '../utils/json.js';
+import { RendererConfig } from 'react-cosmos-core';
 export type UserImportsTemplateArgs = {
     globalImports: string[];
     fixturePaths: string[];
     decoratorPaths: string[];
-    rendererConfig: Json;
+    rendererConfig: RendererConfig;
     rootDir: string;
     relativeToDir: string | null;
     typeScript: boolean;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "react-cosmos",
-  "version": "6.0.0-alpha.18",
+  "version": "6.0.0-alpha.19",
   "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",
   "type": "module",
-  "main": "index.js",
+  "main": "./index.js",
   "dependencies": {
     "@skidding/launch-editor": "^2.2.3",
     "chokidar": "^3.5.3",
@@ -17,15 +17,16 @@
     "open": "^8.4.2",
     "pem": "^1.14.7",
     "pkg-up": "^4.0.0",
-    "react-cosmos-core": "6.0.0-alpha.18",
-    "react-cosmos-ui": "6.0.0-alpha.18",
+    "react-cosmos-core": "6.0.0-alpha.19",
+    "react-cosmos-renderer": "6.0.0-alpha.19",
+    "react-cosmos-ui": "6.0.0-alpha.19",
     "ws": "^8.13.0",
-    "yargs": "^17.7.1"
+    "yargs": "^17.7.2"
   },
   "bin": {
     "cosmos": "./bin/cosmos.js",
     "cosmos-export": "./bin/cosmos-export.js",
     "cosmos-native": "./bin/cosmos-native.js"
   },
-  "gitHead": "470aceb8ef9ac1a82f050edcfdaf4d62c7e97a61"
+  "gitHead": "e2ac66d70184f04b23853c3f57b2ec31c5684eb0"
 }