react-cosmos 6.0.0-alpha.5 → 6.0.0-alpha.7

package/config.schema.json

@@ -50,6 +50,12 @@
       "type": "string",
       "minLength": 1
     },
+    "ignore": {
+      "description": "Patterns for ignoring fixture and decorator files (eg. [\"**/dist/**\"]]).",
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 },
+      "uniqueItems": true
+    },
     "watchDirs": {
       "description": "Directories where the Cosmos server watches for fixture files changes while running. [default: [\".\"]]",
       "type": "array",

package/dist/server/cosmosConfig/createCosmosConfig.js

@@ -14,6 +14,7 @@ export function createCosmosConfig(rootDir, cosmosConfigInput = {}) {
         hostname: getHostname(cosmosConfigInput),
         https: getHttps(cosmosConfigInput),
         httpsOptions: getHttpsOptions(cosmosConfigInput, rootDir),
+        ignore: getIgnore(cosmosConfigInput),
         port: getPort(cosmosConfigInput),
         plugins: getPlugins(cosmosConfigInput, rootDir),
         publicUrl: getPublicUrl(cosmosConfigInput),
@@ -46,6 +47,9 @@ function getHttpsOptions(cosmosConfigInput, rootDir) {
     }
     return null;
 }
+function getIgnore({ ignore = [] }) {
+    return ['**/node_modules/**', ...ignore];
+}
 function getPublicUrl({ publicUrl = '/' }) {
     return publicUrl;
 }

package/dist/server/cosmosConfig/types.d.ts

@@ -12,6 +12,7 @@ export type CosmosConfig = {
     hostname: null | string;
     https: boolean;
     httpsOptions: null | HttpsOptions;
+    ignore: string[];
     port: number;
     plugins: string[];
     publicUrl: string;

package/dist/server/cosmosPlugin/pluginConfigs.js

@@ -9,7 +9,7 @@ export async function getPluginConfigs({ cosmosConfig, relativePaths, }) {
         return moduleConfigs;
     const localConfigs = await findCosmosPluginConfigs({
         rootDir,
-        ignore: [`${exportPath}/**`],
+        ignore: ['**/node_modules/**', `${exportPath}/**`],
         relativePaths,
     });
     return [...moduleConfigs, ...localConfigs];

package/dist/server/devServer/startDevServer.js

@@ -31,6 +31,9 @@ export async function startDevServer(platformType) {
     const app = await createExpressApp(platformType, cosmosConfig, pluginConfigs);
     const httpServer = await createHttpServer(cosmosConfig, app);
     const msgHandler = createMessageHandler(httpServer.server);
+    // Make Playground available as soon as possible and show a loading screen
+    // while plugins are initializing
+    await httpServer.start();
     const pluginCleanupCallbacks = [];
     async function cleanUp() {
         await Promise.all(pluginCleanupCallbacks.map(cleanup => cleanup()));
@@ -72,7 +75,6 @@ export async function startDevServer(platformType) {
     if (cosmosConfig.staticPath) {
         serveStaticDir(app, cosmosConfig.staticPath, cosmosConfig.publicUrl);
     }
-    await httpServer.start();
     return cleanUp;
 }
 function logCosmosConfigInfo() {

package/dist/server/getFixtures/getFixtures.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { createFixtureTree, flattenFixtureTree, getDecoratedFixtureElement, getFixtureListFromExports, getSortedDecoratorsForFixturePath, stringifyPlaygroundUrlQuery, stringifyRendererUrlQuery, } from 'react-cosmos-core';
 import { RENDERER_FILENAME } from '../shared/playgroundHtml.js';
-import { resolveUrlPath } from '../shared/resolveUrlPath.js';
+import { resolveRendererUrl } from '../shared/resolveRendererUrl.js';
 import { getUserModules } from '../userDeps/getUserModules.js';
 export function getFixtures(cosmosConfig) {
     const { fixturesDir, fixtureFileSuffix, rootDir } = cosmosConfig;
@@ -47,8 +47,8 @@ function getRendererUrl(cosmosConfig, fixtureId) {
     if (rendererUrl)
         return `${rendererUrl}?${query}`;
     const host = getPlaygroundHost(cosmosConfig);
-    const urlPath = resolveUrlPath(publicUrl, RENDERER_FILENAME);
-    return `${host}${urlPath}?${query}`;
+    const urlPath = resolveRendererUrl(publicUrl, RENDERER_FILENAME);
+    return new URL(`${urlPath}?${query}`, host).toString();
 }
 function getPlaygroundHost({ hostname, port, https }) {
     return `${https ? 'https' : 'http'}://${hostname || 'localhost'}:${port}`;

package/dist/server/shared/playgroundHtml.js

@@ -3,7 +3,7 @@ import { readFile } from 'fs/promises';
 import path from 'path';
 import { pkgUpSync } from 'pkg-up';
 import { replaceKeys } from 'react-cosmos-core';
-import { resolveUrlPath } from './resolveUrlPath.js';
+import { resolveRendererUrl } from './resolveRendererUrl.js';
 import { getStaticPath } from './staticPath.js';
 export const RENDERER_FILENAME = '_renderer.html';
 export async function getDevPlaygroundHtml(platformType, cosmosConfig, pluginConfigs) {
@@ -39,7 +39,7 @@ async function getDevCoreConfig(platformType, cosmosConfig) {
                 ...(await getSharedCoreConfig(cosmosConfig)),
                 devServerOn: true,
                 webRendererUrl: cosmosConfig.rendererUrl ||
-                    resolveUrlPath(cosmosConfig.publicUrl, RENDERER_FILENAME),
+                    resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME),
             };
         default:
             throw new Error(`Invalid platform type: ${platformType}`);
@@ -49,7 +49,7 @@ async function getExportCoreConfig(cosmosConfig) {
     return {
         ...(await getSharedCoreConfig(cosmosConfig)),
         devServerOn: false,
-        webRendererUrl: resolveUrlPath(cosmosConfig.publicUrl, RENDERER_FILENAME),
+        webRendererUrl: resolveRendererUrl(cosmosConfig.publicUrl, RENDERER_FILENAME),
     };
 }
 async function getSharedCoreConfig(cosmosConfig) {

package/dist/server/shared/resolveRendererUrl.d.ts

@@ -0,0 +1 @@
+export declare function resolveRendererUrl(publicUrl: string, filename: string): string;

package/dist/server/shared/resolveRendererUrl.js

@@ -0,0 +1,7 @@
+export function resolveRendererUrl(publicUrl, filename) {
+    if (publicUrl === './')
+        return filename;
+    if (publicUrl.endsWith('/'))
+        return publicUrl + filename;
+    return `${publicUrl}/${filename}`;
+}

package/dist/server/userDeps/findUserModulePaths.d.ts

@@ -2,10 +2,11 @@ type FindUserModulePathsArgs = {
     rootDir: string;
     fixturesDir: string;
     fixtureFileSuffix: string;
+    ignore: string[];
 };
 type UserModulePaths = {
     fixturePaths: string[];
     decoratorPaths: string[];
 };
-export declare function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, }: FindUserModulePathsArgs): UserModulePaths;
+export declare function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }: FindUserModulePathsArgs): UserModulePaths;
 export {};

package/dist/server/userDeps/findUserModulePaths.js

@@ -1,11 +1,11 @@
 import glob from 'glob';
 import micromatch from 'micromatch';
-import { getDecoratorPatterns, getFixturePatterns, getIgnorePatterns, } from './shared.js';
-export function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, }) {
+import { getDecoratorPatterns, getFixturePatterns } from './shared.js';
+export function findUserModulePaths({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }) {
     const paths = glob.sync('**/*', {
         cwd: rootDir,
         absolute: true,
-        ignore: getIgnorePatterns(),
+        ignore,
     });
     const fixturePatterns = getFixturePatterns(fixturesDir, fixtureFileSuffix);
     const fixturePaths = getMatchingPaths(paths, fixturePatterns);

package/dist/server/userDeps/fixtureWatcher.js

@@ -1,16 +1,16 @@
 import { watch } from 'chokidar';
 import { debounce } from 'lodash-es';
-import { getDecoratorPatterns, getFixturePatterns, getIgnorePatterns, } from './shared.js';
+import { getDecoratorPatterns, getFixturePatterns } from './shared.js';
 const DEBOUNCE_INTERVAL = 50;
 export async function startFixtureWatcher(cosmosConfig, event, callback) {
-    const { fixturesDir, fixtureFileSuffix } = cosmosConfig;
+    const { fixturesDir, fixtureFileSuffix, ignore } = cosmosConfig;
     const FILE_PATTERNS = [
         ...getFixturePatterns(fixturesDir, fixtureFileSuffix),
         ...getDecoratorPatterns(),
     ];
     return new Promise(resolve => {
         const watcher = watch(FILE_PATTERNS, {
-            ignored: getIgnorePatterns(),
+            ignored: ignore,
             ignoreInitial: true,
             cwd: cosmosConfig.rootDir,
         })

package/dist/server/userDeps/generateUserDepsModule.js

@@ -1,11 +1,12 @@
 import { findUserModulePaths } from './findUserModulePaths.js';
 import { userDepsTemplate } from './userDepsTemplate.js';
 export function generateUserDepsModule({ cosmosConfig, rendererConfig, relativeToDir, }) {
-    const { rootDir, fixturesDir, fixtureFileSuffix, globalImports } = cosmosConfig;
+    const { rootDir, fixturesDir, fixtureFileSuffix, globalImports, ignore } = cosmosConfig;
     const { fixturePaths, decoratorPaths } = findUserModulePaths({
         rootDir,
         fixturesDir,
         fixtureFileSuffix,
+        ignore,
     });
     return userDepsTemplate({
         globalImports,

package/dist/server/userDeps/getUserModules.d.ts

@@ -4,5 +4,5 @@ type UserModules = {
     fixtures: ReactFixtureExports;
     decorators: ReactDecorators;
 };
-export declare function getUserModules({ rootDir, fixturesDir, fixtureFileSuffix, }: CosmosConfig): UserModules;
+export declare function getUserModules({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }: CosmosConfig): UserModules;
 export {};

package/dist/server/userDeps/getUserModules.js

@@ -1,11 +1,12 @@
 import path from 'path';
 import { slash } from '../utils/slash.js';
 import { findUserModulePaths } from './findUserModulePaths.js';
-export function getUserModules({ rootDir, fixturesDir, fixtureFileSuffix, }) {
+export function getUserModules({ rootDir, fixturesDir, fixtureFileSuffix, ignore, }) {
     const { fixturePaths, decoratorPaths } = findUserModulePaths({
         rootDir,
         fixturesDir,
         fixtureFileSuffix,
+        ignore,
     });
     return {
         fixtures: getDefaultExports(fixturePaths, rootDir),

package/dist/server/userDeps/shared.d.ts

@@ -3,4 +3,3 @@ export type Json = string | number | boolean | null | {
 } | Json[];
 export declare function getFixturePatterns(fixturesDir: string, fixtureFileSuffix: string): string[];
 export declare function getDecoratorPatterns(): string[];
-export declare function getIgnorePatterns(): string[];

package/dist/server/userDeps/shared.js

@@ -5,7 +5,6 @@ const FIXTURE_PATTERNS = [
     '**/*.<fixtureFileSuffix>.{js,jsx,ts,tsx}',
 ];
 const DECORATOR_PATTERNS = ['**/cosmos.decorator.{js,jsx,ts,tsx}'];
-const IGNORE_PATTERNS = ['**/node_modules/**'];
 export function getFixturePatterns(fixturesDir, fixtureFileSuffix) {
     return FIXTURE_PATTERNS.map(pattern => replaceKeys(pattern, {
         '<fixturesDir>': fixturesDir,
@@ -15,6 +14,3 @@ export function getFixturePatterns(fixturesDir, fixtureFileSuffix) {
 export function getDecoratorPatterns() {
     return DECORATOR_PATTERNS;
 }
-export function getIgnorePatterns() {
-    return IGNORE_PATTERNS;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cosmos",
-  "version": "6.0.0-alpha.5",
+  "version": "6.0.0-alpha.7",
   "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,15 +17,15 @@
     "open": "^8.4.2",
     "pem": "^1.14.6",
     "pkg-up": "^4.0.0",
-    "react-cosmos-core": "^6.0.0-alpha.5",
-    "react-cosmos-ui": "^6.0.0-alpha.5",
+    "react-cosmos-core": "^6.0.0-alpha.6",
+    "react-cosmos-ui": "^6.0.0-alpha.7",
     "ws": "^8.12.1",
-    "yargs": "^17.7.0"
+    "yargs": "^17.7.1"
   },
   "bin": {
     "cosmos": "./bin/cosmos.js",
     "cosmos-export": "./bin/cosmos-export.js",
     "cosmos-native": "./bin/cosmos-native.js"
   },
-  "gitHead": "8863f21db29b091bf83638d154dae45d7bc510a7"
+  "gitHead": "f4702e164485966e21a8b3ec4cac8377914ee3dc"
 }

package/dist/server/shared/resolveUrlPath.d.ts

@@ -1 +0,0 @@
-export declare function resolveUrlPath(base: string, urlPath: string): string;

package/dist/server/shared/resolveUrlPath.js

@@ -1,12 +0,0 @@
-// resolveUrlPath('/', '_renderer.html') => '/_renderer.html'
-// resolveUrlPath('./', '_renderer.html') => '/_renderer.html'
-// resolveUrlPath('http://localhost:5000', '_renderer.html') => 'http://localhost:5000/_renderer.html'
-export function resolveUrlPath(base, urlPath) {
-    // The 'resolve://' protocol is only added when base is a relative URL.
-    const resolvedUrl = new URL(urlPath, new URL(base, 'resolve://'));
-    if (resolvedUrl.protocol === 'resolve:') {
-        const { pathname, search, hash } = resolvedUrl;
-        return pathname + search + hash;
-    }
-    return resolvedUrl.toString();
-}