react-cosmos-plugin-vite 6.0.0-canary.fe0c7d1.0 → 6.0.0

package/dist/constants.d.ts

@@ -0,0 +1 @@
+export declare const RENDERER_FILENAME = "renderer.html";

package/dist/constants.js

@@ -0,0 +1 @@
+export const RENDERER_FILENAME = 'renderer.html';

package/dist/createCosmosViteConfig.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { fileExists, moduleExists, resolveLoose, } from 'react-cosmos';
+import { fileExists, resolveFromSilent, resolveLoose, } from 'react-cosmos';
 export function createCosmosViteConfig(cosmosConfig) {
     const { rootDir } = cosmosConfig;
     const configInput = cosmosConfig.vite || {};
@@ -24,8 +24,9 @@ function getViteConfigPath({ configPath }, rootDir) {
         return false;
     }
     if (typeof configPath == 'undefined') {
-        const defaultAbsPath = resolveLoose(rootDir, 'vite.config.js');
-        return moduleExists(defaultAbsPath) ? defaultAbsPath : false;
+        return (resolveFromSilent(rootDir, './vite.config.ts') ||
+            resolveFromSilent(rootDir, './vite.config.js') ||
+            false);
     }
     const absPath = resolveLoose(rootDir, configPath);
     if (!fileExists(absPath)) {

package/dist/createViteRendererIndex.d.ts

@@ -1 +1 @@
-export declare function createViteRendererIndex(userDepsModuleId: string): string;
+export declare function createViteRendererIndex(userImportsModuleId: string): string;

package/dist/createViteRendererIndex.js

@@ -1,12 +1,12 @@
-export function createViteRendererIndex(userDepsModuleId) {
+export function createViteRendererIndex(userImportsModuleId) {
     return `
-import { mountDomRenderer } from 'react-cosmos-dom';
+import { mountDomRenderer } from 'react-cosmos-plugin-vite/dom';
 
 mount();
 
 async function mount() {
   // Use dynamic import to reload updated modules upon hot reloading
-  const args = await import('${userDepsModuleId}');
+  const args = await import('${userImportsModuleId}');
   mountDomRenderer(args);
 }
 

package/dist/dom.d.ts

@@ -0,0 +1 @@
+export * from 'react-cosmos-dom';

package/dist/dom.js

@@ -0,0 +1 @@
+export * from 'react-cosmos-dom';

package/dist/reactCosmosViteRollupPlugin.d.ts

@@ -1,6 +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 const userImportsVirtualModuleId = "virtual:cosmos-imports";
+export declare const userImportsResolvedModuleId: string;
 export declare function reactCosmosViteRollupPlugin(cosmosConfig: CosmosConfig, cosmosViteConfig: CosmosViteConfig): Plugin;

package/dist/reactCosmosViteRollupPlugin.js

@@ -1,29 +1,32 @@
 import path from 'node:path';
-import { generateUserDepsModule, getPlaygroundUrl, } from 'react-cosmos';
+import { findUserModulePaths, generateUserImports, getPlaygroundUrl, slash, } from 'react-cosmos';
 import { createViteRendererIndex } from './createViteRendererIndex.js';
-export const userDepsVirtualModuleId = 'virtual:cosmos-userdeps';
-export const userDepsResolvedModuleId = '\0' + userDepsVirtualModuleId;
+export const userImportsVirtualModuleId = 'virtual:cosmos-imports';
+export const userImportsResolvedModuleId = '\0' + userImportsVirtualModuleId;
 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) {
-            if (id === userDepsVirtualModuleId) {
-                return userDepsResolvedModuleId;
+            if (id === userImportsVirtualModuleId) {
+                return userImportsResolvedModuleId;
             }
             else {
                 return null;
             }
         },
         load(id) {
-            if (id == userDepsResolvedModuleId) {
-                return generateUserDepsModule({
+            if (id == userImportsResolvedModuleId) {
+                const modulePaths = findUserModulePaths(cosmosConfig);
+                return generateUserImports({
                     cosmosConfig,
+                    modulePaths,
                     rendererConfig: {
                         playgroundUrl: getPlaygroundUrl(cosmosConfig),
                         containerQuerySelector: cosmosConfig.dom.containerQuerySelector,
                     },
                     relativeToDir: null,
+                    typeScript: false,
                 });
             }
             else {
@@ -31,14 +34,16 @@ export function reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig) {
             }
         },
         transform(src, id) {
-            const isRendererIndex = cosmosViteConfig.indexPath
-                ? cosmosViteConfig.indexPath === id
+            const absPath = cosmosViteConfig.indexPath &&
+                absoluteIndexPath(cosmosViteConfig.indexPath, cosmosConfig.rootDir);
+            const isRendererIndex = absPath
+                ? absPath === 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),
+                    code: createViteRendererIndex(userImportsVirtualModuleId),
                     map: null,
                 };
             }
@@ -48,3 +53,8 @@ export function reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig) {
         },
     };
 }
+function absoluteIndexPath(indexPath, rootDir) {
+    return indexPath.startsWith(rootDir)
+        ? indexPath
+        : slash(path.join(rootDir, indexPath));
+}

package/dist/viteConfigPlugin.d.ts

@@ -1,2 +1,2 @@
 import { CosmosConfig, CosmosConfigPluginArgs } from 'react-cosmos';
-export declare function viteConfigPlugin({ cosmosConfig, }: CosmosConfigPluginArgs): Promise<CosmosConfig>;
+export declare function viteConfigPlugin({ cosmosConfig, command, }: CosmosConfigPluginArgs): Promise<CosmosConfig>;

package/dist/viteConfigPlugin.js

@@ -1,10 +1,17 @@
+import path from 'node:path';
 import { findNextAvailablePort, } from 'react-cosmos';
+import { RENDERER_FILENAME } from './constants.js';
 import { getCosmosVitePort } from './createCosmosViteConfig.js';
-export async function viteConfigPlugin({ cosmosConfig, }) {
-    const { rendererUrl } = cosmosConfig;
-    if (rendererUrl) {
+export async function viteConfigPlugin({ cosmosConfig, command, }) {
+    if (cosmosConfig.rendererUrl) {
         return cosmosConfig;
     }
+    if (command === 'export') {
+        return {
+            ...cosmosConfig,
+            rendererUrl: path.join(cosmosConfig.publicUrl, RENDERER_FILENAME),
+        };
+    }
     const cosmosViteConfig = cosmosConfig.vite || {};
     const port = await findNextAvailablePort(getCosmosVitePort(cosmosViteConfig), cosmosConfig.portRetries);
     return {

package/dist/viteDevServerPlugin.d.ts

@@ -1,2 +1,2 @@
 import { DevServerPluginArgs } from 'react-cosmos';
-export declare function viteDevServerPlugin({ platformType, cosmosConfig, }: DevServerPluginArgs): Promise<(() => void) | undefined>;
+export declare function viteDevServerPlugin({ cosmosConfig, platform, }: DevServerPluginArgs): Promise<(() => void) | undefined>;

package/dist/viteDevServerPlugin.js

@@ -1,13 +1,14 @@
 import { startFixtureWatcher } from 'react-cosmos';
+import { pickRendererUrl } from 'react-cosmos-core';
 import { createServer } from 'vite';
 import { createCosmosViteConfig } from './createCosmosViteConfig.js';
-import { reactCosmosViteRollupPlugin, userDepsResolvedModuleId, } from './reactCosmosViteRollupPlugin.js';
-export async function viteDevServerPlugin({ platformType, cosmosConfig, }) {
-    if (platformType !== 'web')
+import { reactCosmosViteRollupPlugin, userImportsResolvedModuleId, } from './reactCosmosViteRollupPlugin.js';
+export async function viteDevServerPlugin({ cosmosConfig, platform, }) {
+    if (platform !== 'web')
         return;
-    const { rendererUrl } = cosmosConfig;
+    const rendererUrl = pickRendererUrl(cosmosConfig.rendererUrl, 'dev');
     if (!rendererUrl) {
-        throw new Error('Vite plugin requires cosmosConfig.rendererUrl to be set (eg. "http://localhost:5050")');
+        throw new Error('Vite plugin requires cosmosConfig.rendererUrl to be set');
     }
     const { rootDir } = cosmosConfig;
     const cosmosViteConfig = createCosmosViteConfig(cosmosConfig);
@@ -16,18 +17,22 @@ export async function viteDevServerPlugin({ platformType, cosmosConfig, }) {
         // https://github.com/vitejs/vite/blob/07bd6d14e545d05c6a29cf341f117fcfe9536ba4/packages/vite/src/node/config.ts#L418
         configFile: cosmosViteConfig.configPath,
         root: rootDir,
+        base: cosmosConfig.publicUrl,
         server: {
             // https://vitejs.dev/config/server-options.html#server-host
             host: '0.0.0.0',
             port: parseInt(new URL(rendererUrl).port, 10),
+            // Prevent auto opening Cosmos renderer in browser when user has this
+            // option enabled in their Vite config
+            open: false,
         },
         plugins: [reactCosmosViteRollupPlugin(cosmosConfig, cosmosViteConfig)],
     });
     await server.listen();
     const watcher = await startFixtureWatcher(cosmosConfig, 'add', () => {
-        const module = server.moduleGraph.getModuleById(userDepsResolvedModuleId);
+        const module = server.moduleGraph.getModuleById(userImportsResolvedModuleId);
         if (!module) {
-            throw new Error(`Vite module graph doesn't contain module with id ${userDepsResolvedModuleId}`);
+            throw new Error(`Vite module graph doesn't contain module with id ${userImportsResolvedModuleId}`);
         }
         server.moduleGraph.invalidateModule(module);
         server.reloadModule(module);

package/dist/viteExportPlugin.js

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

package/dom.js

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

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "react-cosmos-plugin-vite",
-  "version": "6.0.0-canary.fe0c7d1.0+fe0c7d1",
+  "version": "6.0.0",
   "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": {
-    "react-cosmos-core": "6.0.0-canary.fe0c7d1.0+fe0c7d1",
-    "react-cosmos-dom": "6.0.0-canary.fe0c7d1.0+fe0c7d1"
+    "react-cosmos-core": "^6.0.0",
+    "react-cosmos-dom": "^6.0.0"
   },
   "peerDependencies": {
     "vite": "*"
   },
-  "gitHead": "fe0c7d1b5b90f48d6109bc18a2750ab2a347d016"
+  "gitHead": "db4fd8fd917598f1f16d4c291be76217436422ee"
 }