react-cosmos-plugin-vite 6.0.0-alpha.13 → 6.0.0-alpha.15

package/dist/createCosmosViteConfig.d.ts

@@ -0,0 +1,10 @@
+import { CosmosConfig } from 'react-cosmos';
+export type CosmosViteConfig = {
+    configPath: string | false;
+    indexPath: string | null;
+    port: number;
+};
+type CosmosViteConfigInput = Partial<CosmosViteConfig>;
+export declare function createCosmosViteConfig(cosmosConfig: CosmosConfig): CosmosViteConfig;
+export declare function getCosmosVitePort(cosmosViteConfig: CosmosViteConfigInput): number;
+export {};

package/dist/createCosmosViteConfig.js

@@ -0,0 +1,45 @@
+import path from 'node:path';
+import { fileExists, moduleExists, resolveLoose, } from 'react-cosmos';
+export function createCosmosViteConfig(cosmosConfig) {
+    const { rootDir } = cosmosConfig;
+    const configInput = cosmosConfig.vite || {};
+    const configPath = getViteConfigPath(configInput, rootDir);
+    logViteConfigInfo(configPath);
+    return {
+        configPath,
+        indexPath: configInput.indexPath
+            ? resolveLoose(rootDir, configInput.indexPath)
+            : null,
+        port: getCosmosVitePort(configInput),
+    };
+}
+export function getCosmosVitePort(cosmosViteConfig) {
+    const { port = 5050 } = cosmosViteConfig;
+    return port;
+}
+function getViteConfigPath({ configPath }, rootDir) {
+    // User can choose to prevent automatical use of an existing vite.config.js
+    // file (relative to the root dir) by setting configPath to false
+    if (configPath === false) {
+        return false;
+    }
+    if (typeof configPath == 'undefined') {
+        const defaultAbsPath = resolveLoose(rootDir, 'vite.config.js');
+        return moduleExists(defaultAbsPath) ? defaultAbsPath : false;
+    }
+    const absPath = resolveLoose(rootDir, configPath);
+    if (!fileExists(absPath)) {
+        const relPath = path.relative(process.cwd(), absPath);
+        throw new Error(`Vite config not found at path: ${relPath}`);
+    }
+    return absPath;
+}
+function logViteConfigInfo(viteConfigPath) {
+    if (viteConfigPath) {
+        const relPath = path.relative(process.cwd(), viteConfigPath);
+        console.log(`[Cosmos] Using vite config found at ${relPath}`);
+    }
+    else {
+        console.log(`[Cosmos] No vite config found, using default settings`);
+    }
+}

package/dist/reactCosmosViteRollupPlugin.d.ts

@@ -1,5 +1,6 @@
 import { CosmosConfig } from 'react-cosmos';
 import { Plugin } from 'rollup';
+import { CosmosViteConfig } from './createCosmosViteConfig.js';
 export declare const userDepsVirtualModuleId = "virtual:cosmos-userdeps";
 export declare const userDepsResolvedModuleId: string;
-export declare function reactCosmosViteRollupPlugin(cosmosConfig: CosmosConfig): Plugin;
+export declare function reactCosmosViteRollupPlugin(cosmosConfig: CosmosConfig, cosmosViteConfig: CosmosViteConfig): Plugin;

package/dist/reactCosmosViteRollupPlugin.js

@@ -1,10 +1,10 @@
-import path from 'path';
+import path from 'node:path';
 import { generateUserDepsModule, getPlaygroundUrl, } from 'react-cosmos';
 import { createViteRendererIndex } from './createViteRendererIndex.js';
 export const userDepsVirtualModuleId = 'virtual:cosmos-userdeps';
 export const userDepsResolvedModuleId = '\0' + userDepsVirtualModuleId;
-const defaultIndexPattern = /^index\.(js|ts)x?$/;
-export function reactCosmosViteRollupPlugin(cosmosConfig) {
+const defaultIndexPattern = new RegExp(`^(src\\${path.sep})?(index|main)\.(js|ts)x?$`);
+export function reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig) {
     return {
         name: 'react-cosmos-vite-renderer',
         resolveId(id) {
@@ -21,7 +21,7 @@ export function reactCosmosViteRollupPlugin(cosmosConfig) {
                     cosmosConfig,
                     rendererConfig: {
                         playgroundUrl: getPlaygroundUrl(cosmosConfig),
-                        // TODO: Allow passing dom.containerQuerySelector
+                        containerQuerySelector: cosmosConfig.dom.containerQuerySelector,
                     },
                     relativeToDir: null,
                 });
@@ -31,8 +31,12 @@ export function reactCosmosViteRollupPlugin(cosmosConfig) {
             }
         },
         transform(src, id) {
-            // TODO: Allow indexFile customization via cosmosConfig.vite.indexFile
-            if (path.relative(cosmosConfig.rootDir, id).match(defaultIndexPattern)) {
+            const isRendererIndex = cosmosViteConfig.indexPath
+                ? cosmosViteConfig.indexPath === id
+                : path.relative(cosmosConfig.rootDir, id).match(defaultIndexPattern);
+            if (isRendererIndex) {
+                const relPath = path.relative(process.cwd(), id);
+                console.log(`[Cosmos] Replacing vite index module at ${relPath}`);
                 return {
                     code: createViteRendererIndex(userDepsVirtualModuleId),
                     map: null,

package/dist/viteConfigPlugin.js

@@ -1,17 +1,17 @@
 import { findNextAvailablePort, } from 'react-cosmos';
-import { createViteCosmosConfig } from './createViteCosmosConfig.js';
+import { getCosmosVitePort } from './createCosmosViteConfig.js';
 export async function viteConfigPlugin({ cosmosConfig, }) {
     const { rendererUrl } = cosmosConfig;
     if (rendererUrl) {
         return cosmosConfig;
     }
-    const viteCosmosConfig = createViteCosmosConfig(cosmosConfig);
-    const port = await findNextAvailablePort(viteCosmosConfig.port, cosmosConfig.portRetries);
+    const cosmosViteConfig = cosmosConfig.vite || {};
+    const port = await findNextAvailablePort(getCosmosVitePort(cosmosViteConfig), cosmosConfig.portRetries);
     return {
         ...cosmosConfig,
         rendererUrl: `http://localhost:${port}`,
         vite: {
-            ...viteCosmosConfig,
+            ...cosmosViteConfig,
             port: port,
         },
     };

package/dist/viteDevServerPlugin.js

@@ -1,6 +1,6 @@
-import viteReactPlugin from '@vitejs/plugin-react';
 import { startFixtureWatcher } from 'react-cosmos';
 import { createServer } from 'vite';
+import { createCosmosViteConfig } from './createCosmosViteConfig.js';
 import { reactCosmosViteRollupPlugin, userDepsResolvedModuleId, } from './reactCosmosViteRollupPlugin.js';
 export async function viteDevServerPlugin({ platformType, cosmosConfig, }) {
     if (platformType !== 'web')
@@ -9,18 +9,21 @@ export async function viteDevServerPlugin({ platformType, cosmosConfig, }) {
     if (!rendererUrl) {
         throw new Error('Vite plugin requires cosmosConfig.rendererUrl to be set (eg. "http://localhost:5050")');
     }
+    const { rootDir } = cosmosConfig;
+    const cosmosViteConfig = createCosmosViteConfig(cosmosConfig);
     const server = await createServer({
-        configFile: false,
-        root: cosmosConfig.rootDir,
+        // Last time I checked the config file is merged with this inline config:
+        // https://github.com/vitejs/vite/blob/07bd6d14e545d05c6a29cf341f117fcfe9536ba4/packages/vite/src/node/config.ts#L418
+        configFile: cosmosViteConfig.configPath,
+        root: rootDir,
         server: {
             // https://vitejs.dev/config/server-options.html#server-host
             host: '0.0.0.0',
             port: parseInt(new URL(rendererUrl).port, 10),
         },
-        plugins: [viteReactPlugin(), reactCosmosViteRollupPlugin(cosmosConfig)],
+        plugins: [reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig)],
     });
     await server.listen();
-    server.printUrls();
     const watcher = await startFixtureWatcher(cosmosConfig, 'add', () => {
         const module = server.moduleGraph.getModuleById(userDepsResolvedModuleId);
         if (!module) {

package/dist/viteExportPlugin.js

@@ -1,22 +1,23 @@
-import viteReactPlugin from '@vitejs/plugin-react';
 import { rename } from 'node:fs/promises';
 import path from 'path';
 import { RENDERER_FILENAME } from 'react-cosmos';
 import { removeLeadingSlash } from 'react-cosmos-core';
 import { build } from 'vite';
+import { createCosmosViteConfig } from './createCosmosViteConfig.js';
 import { reactCosmosViteRollupPlugin } from './reactCosmosViteRollupPlugin.js';
 export async function viteExportPlugin({ cosmosConfig }) {
-    const { exportPath, publicUrl } = cosmosConfig;
+    const { rootDir, exportPath, publicUrl } = cosmosConfig;
+    const cosmosViteConfig = createCosmosViteConfig(cosmosConfig);
     await build({
-        configFile: false,
-        root: cosmosConfig.rootDir,
+        configFile: cosmosViteConfig.configPath,
+        root: rootDir,
         base: publicUrl,
         build: {
             outDir: path.resolve(exportPath, removeLeadingSlash(publicUrl)),
             emptyOutDir: false,
             minify: false,
         },
-        plugins: [viteReactPlugin(), reactCosmosViteRollupPlugin(cosmosConfig)],
+        plugins: [reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig)],
     });
     // Make way for the Playground's index.html
     await rename(path.resolve(exportPath, 'index.html'), path.resolve(exportPath, RENDERER_FILENAME));

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "react-cosmos-plugin-vite",
-  "version": "6.0.0-alpha.13",
+  "version": "6.0.0-alpha.15",
   "description": "Vite plugin for React Cosmos",
   "repository": "https://github.com/react-cosmos/react-cosmos/tree/main/packages/react-cosmos-plugin-vite",
   "license": "MIT",
   "type": "module",
   "main": "cosmos.plugin.json",
   "dependencies": {
-    "@vitejs/plugin-react": "^3.1.0",
-    "react-cosmos-core": "6.0.0-alpha.13",
-    "react-cosmos-dom": "6.0.0-alpha.13"
+    "react-cosmos-core": "6.0.0-alpha.14",
+    "react-cosmos-dom": "6.0.0-alpha.14"
   },
   "peerDependencies": {
     "vite": "*"
   },
-  "gitHead": "cf95e67ce942f6a242f023ecebe45d6916d5b753"
+  "gitHead": "1de8663ae24b3e8c6b24590583718222d31b24c8"
 }

package/dist/createViteCosmosConfig.d.ts

@@ -1,6 +0,0 @@
-import { CosmosConfig } from 'react-cosmos';
-type ViteCosmosConfig = {
-    port: number;
-};
-export declare function createViteCosmosConfig(cosmosConfig: CosmosConfig): ViteCosmosConfig;
-export {};

package/dist/createViteCosmosConfig.js

@@ -1,6 +0,0 @@
-export function createViteCosmosConfig(cosmosConfig) {
-    const configInput = cosmosConfig.vite || {};
-    return {
-        port: configInput.port || 5050,
-    };
-}