react-cosmos 6.0.0-alpha.0 → 6.0.0-canary.1dc3b1b.0

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cosmos",
-  "version": "6.0.0-alpha.0",
+  "version": "6.0.0-canary.1dc3b1b.0+1dc3b1b",
   "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,8 +17,8 @@
     "open": "^8.4.2",
     "pem": "^1.14.6",
     "pkg-up": "^4.0.0",
-    "react-cosmos-core": "^6.0.0-alpha.0",
-    "react-cosmos-ui": "^6.0.0-alpha.0",
+    "react-cosmos-core": "^6.0.0-canary.1dc3b1b.0+1dc3b1b",
+    "react-cosmos-ui": "^6.0.0-canary.1dc3b1b.0+1dc3b1b",
     "ws": "^8.12.1",
     "yargs": "^17.7.0"
   },
@@ -27,5 +27,5 @@
     "cosmos-export": "./bin/cosmos-export.js",
     "cosmos-native": "./bin/cosmos-native.js"
   },
-  "gitHead": "b021231584639f3028fe08deacd418f0ec4cc002"
+  "gitHead": "1dc3b1b21c10e66337a35847f1e4578a41bbef3a"
 }

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();
-}