From 69fd664fc093ab08df5ebd980a0ace4ebd233dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ovidiu=20Chereche=C8=99?= Date: Mon, 10 Apr 2023 17:16:50 +0300 Subject: [PATCH] Clean up main package file structure (#1442) * Remove extra server nesting * Fix paths * Use main react-cosmos entry point * Prettify * Run test workflows on main branch --- .github/workflows/test-pnp.yml | 5 ++++- .github/workflows/test.yml | 5 ++++- .jest/config.cjs | 10 ++++----- .prettierignore | 1 + examples/webpack/tests/fixtures.test.ts | 2 +- .../__tests__/fixtureStateChange.tsx | 2 +- .../FixtureLoader/__tests__/valuesNumber.tsx | 2 +- .../FixtureLoader/__tests__/valuesObject.tsx | 2 +- .../FixtureLoader/__tests__/viewport.tsx | 2 +- .../react-cosmos-core/src/renderer/types.ts | 2 +- .../src/createViteCosmosConfig.ts | 2 +- .../src/reactCosmosViteRollupPlugin.ts | 2 +- .../src/viteConfigPlugin.ts | 2 +- .../src/viteDevServerPlugin.ts | 5 +---- .../src/viteExportPlugin.ts | 2 +- .../src/viteServerPlugin.ts | 2 +- .../cosmosConfig/createWebpackCosmosConfig.ts | 2 +- .../__tests__/customDevConfig.ts | 2 +- .../__tests__/customExportConfig.ts | 2 +- .../__tests__/defaultDevConfig.ts | 6 +++-- .../__tests__/defaultExportConfig.ts | 6 +++-- .../__tests__/moduleScopePlugin.ts | 2 +- .../webpackConfig/__tests__/reactAliases.ts | 2 +- .../webpackConfig/getDefaultWebpackConfig.ts | 2 +- .../webpackConfig/getDevWebpackConfig.ts | 2 +- .../webpackConfig/getExportWebpackConfig.ts | 2 +- .../webpackConfig/getUserWebpackConfig.ts | 2 +- .../webpackConfig/getWebpackConfigResolve.ts | 2 +- .../src/server/webpackConfig/htmlPlugin.ts | 2 +- .../src/server/webpackConfig/plugins.ts | 4 ++-- .../server/webpackConfig/userDepsLoader.cjs | 8 +++---- .../src/server/webpackDevServerPlugin.ts | 2 +- .../src/server/webpackExportPlugin.ts | 2 +- .../src/server/webpackServerPlugin.ts | 2 +- .../src/plugins/BuildNotifications/index.ts | 2 +- .../ContentOverlay/__tests__/notFound.tsx | 2 +- .../__tests__/rendererNotResponding.tsx | 2 +- .../__tests__/selectedFixture.tsx | 2 +- .../ContentOverlay/__tests__/waiting.tsx | 2 +- .../ContentOverlay/__tests__/welcome.tsx | 2 +- .../src/plugins/Core/index.test.tsx | 2 +- .../src/plugins/FullScreenButton/index.tsx | 2 +- .../Notifications/__tests__/sticky.tsx | 2 +- .../__tests__/stickyMultiple.tsx | 2 +- .../plugins/Notifications/__tests__/timed.tsx | 2 +- .../Notifications/__tests__/timedMultiple.tsx | 2 +- .../RemoteRenderer/__tests__/button.tsx | 2 +- .../__tests__/isRendererConnected.ts | 2 +- .../__tests__/onRouterFixtureChangeSelect.ts | 2 +- .../onRouterFixtureChangeUnselect.ts | 2 +- .../__tests__/selectPrimaryRenderer.ts | 2 +- .../__tests__/fixtureListUpdate.ts | 2 +- .../__tests__/fixtureStateChange.ts | 2 +- .../__tests__/rendererReady.ts | 2 +- .../__tests__/rendererReadyInitialFixture.ts | 2 +- .../__tests__/rendererReadyMultiRenderers.ts | 2 +- .../__tests__/rendererReadySelectedFixture.ts | 2 +- .../ResponsivePreview/__tests__/button.tsx | 2 +- .../__tests__/fixtureViewport.tsx | 2 +- .../src/plugins/Root/__tests__/storage.tsx | 2 +- .../Router/__tests__/getSelectedFixtureId.ts | 2 +- .../plugins/Router/__tests__/selectFixture.ts | 2 +- .../Router/__tests__/unselectFixture.ts | 2 +- .../src/plugins/Router/__tests__/urlChange.ts | 2 +- packages/react-cosmos/bin/cosmos-export.js | 4 +--- packages/react-cosmos/bin/cosmos-native.js | 4 +--- packages/react-cosmos/bin/cosmos.js | 4 +--- packages/react-cosmos/server.d.ts | 1 - packages/react-cosmos/server.js | 1 - .../src/{server => }/corePlugins/httpProxy.ts | 0 .../src/{server => }/corePlugins/index.ts | 0 .../src/{server => }/corePlugins/openFile.ts | 0 .../corePlugins/pluginEndpoint.ts | 0 .../src/{server => }/corePlugins/portRetry.ts | 0 .../{server => }/corePlugins/userDepsFile.ts | 0 .../__tests__/cosmosConfigFile.ts | 0 .../cosmosConfig/__tests__/exportPath.ts | 0 .../__tests__/fixtureFileSuffix.ts | 0 .../cosmosConfig/__tests__/fixturesDir.ts | 0 .../cosmosConfig/__tests__/globalImports.ts | 0 .../cosmosConfig/__tests__/hostname.ts | 0 .../cosmosConfig/__tests__/port.ts | 0 .../cosmosConfig/__tests__/publicUrl.ts | 0 .../cosmosConfig/__tests__/rootDir.ts | 0 .../cosmosConfig/__tests__/staticPath.ts | 0 .../__tests__/userDepsFilePath.ts | 0 .../cosmosConfig/__tests__/watchDirs.ts | 0 .../cosmosConfig/createCosmosConfig.ts | 0 .../cosmosConfig/detectCosmosConfig.ts | 0 .../cosmosConfig/getCosmosConfigAtPath.ts | 0 .../src/{server => }/cosmosConfig/shared.ts | 0 .../src/{server => }/cosmosConfig/types.ts | 0 .../findCosmosPluginConfigs.test.ts | 2 +- .../cosmosPlugin/findCosmosPluginConfigs.ts | 0 .../cosmosPlugin/pluginConfigs.ts | 0 .../cosmosPlugin/readCosmosPluginConfig.ts | 0 .../src/{server => }/cosmosPlugin/types.ts | 0 .../devServer/__tests__/devServerPlugin.ts | 0 .../devServer/__tests__/devServerUiPlugin.ts | 0 .../devServer/__tests__/startDevServer.ts | 0 .../src/{server => }/devServer/expressApp.ts | 0 .../src/{server => }/devServer/httpServer.ts | 0 .../{server => }/devServer/messageHandler.ts | 0 .../{server => }/devServer/startDevServer.ts | 0 .../export/__tests__/exportServerPlugin.ts | 0 .../export/__tests__/exportUiPlugin.ts | 0 .../export/__tests__/generateExport.ts | 0 .../src/{server => }/export/generateExport.ts | 0 .../{server => }/getFixtures/getFixtures.ts | 0 packages/react-cosmos/src/index.ts | 21 ++++++++++++++++++ packages/react-cosmos/src/jest.ts | 14 ++++++------ packages/react-cosmos/src/server.ts | 21 ------------------ .../shared/findNextAvailablePort.ts | 0 .../shared/importServerPlugins.ts | 0 .../src/{server => }/shared/logPluginInfo.ts | 0 .../src/{server => }/shared/playgroundHtml.ts | 0 .../src/{server => }/shared/playgroundUrl.ts | 0 .../shared/resolveRendererUrl.test.ts | 0 .../{server => }/shared/resolveRendererUrl.ts | 0 .../src/{server => }/shared/staticPath.ts | 0 .../src/{server => }/shared/staticServer.ts | 0 .../src/{server => }/static/favicon.ico | Bin .../src/{server => }/static/index.html | 0 .../src/{server => }/testHelpers/cwd.ts | 0 .../{server => }/testHelpers/jestWorkerId.ts | 0 .../{server => }/testHelpers/mockConsole.ts | 0 .../testHelpers/mockCosmosPlugins.ts | 0 .../testHelpers/mockEsmRequire.ts | 0 .../testHelpers/mockEsmResolve.ts | 0 .../testHelpers/mockEsmStaticPath.ts | 0 .../src/{server => }/testHelpers/mockFetch.ts | 0 .../src/{server => }/testHelpers/mockFs.ts | 0 .../src/{server => }/testHelpers/mockYargs.ts | 0 .../testMocks/playground.bundle.js | 0 .../testMocks/playground.bundle.js.map | 0 .../userDepsTemplate.test.ts.snap | 0 .../userDeps/findUserModulePaths.ts | 0 .../{server => }/userDeps/fixtureWatcher.ts | 0 .../userDeps/generateUserDepsModule.ts | 0 .../{server => }/userDeps/getUserModules.ts | 0 .../src/{server => }/userDeps/shared.ts | 0 .../userDeps/userDepsTemplate.test.ts | 0 .../{server => }/userDeps/userDepsTemplate.ts | 0 .../src/{server => }/utils/cli.ts | 0 .../react-cosmos/src/{server => }/utils/fs.ts | 0 .../src/{server => }/utils/isNodeError.ts | 0 .../src/{server => }/utils/requireModule.ts | 0 .../src/{server => }/utils/requireSilent.ts | 0 .../src/{server => }/utils/resolve.ts | 0 .../src/{server => }/utils/resolveLoose.ts | 0 .../src/{server => }/utils/resolveSilent.ts | 0 .../src/{server => }/utils/slash.ts | 0 scripts/build.ts | 4 +--- 153 files changed, 117 insertions(+), 119 deletions(-) delete mode 100644 packages/react-cosmos/server.d.ts delete mode 100644 packages/react-cosmos/server.js rename packages/react-cosmos/src/{server => }/corePlugins/httpProxy.ts (100%) rename packages/react-cosmos/src/{server => }/corePlugins/index.ts (100%) rename packages/react-cosmos/src/{server => }/corePlugins/openFile.ts (100%) rename packages/react-cosmos/src/{server => }/corePlugins/pluginEndpoint.ts (100%) rename packages/react-cosmos/src/{server => }/corePlugins/portRetry.ts (100%) rename packages/react-cosmos/src/{server => }/corePlugins/userDepsFile.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/cosmosConfigFile.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/exportPath.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/fixtureFileSuffix.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/fixturesDir.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/globalImports.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/hostname.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/port.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/publicUrl.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/rootDir.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/staticPath.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/userDepsFilePath.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/__tests__/watchDirs.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/createCosmosConfig.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/detectCosmosConfig.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/getCosmosConfigAtPath.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/shared.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosConfig/types.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosPlugin/findCosmosPluginConfigs.test.ts (96%) rename packages/react-cosmos/src/{server => }/cosmosPlugin/findCosmosPluginConfigs.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosPlugin/pluginConfigs.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosPlugin/readCosmosPluginConfig.ts (100%) rename packages/react-cosmos/src/{server => }/cosmosPlugin/types.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/__tests__/devServerPlugin.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/__tests__/devServerUiPlugin.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/__tests__/startDevServer.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/expressApp.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/httpServer.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/messageHandler.ts (100%) rename packages/react-cosmos/src/{server => }/devServer/startDevServer.ts (100%) rename packages/react-cosmos/src/{server => }/export/__tests__/exportServerPlugin.ts (100%) rename packages/react-cosmos/src/{server => }/export/__tests__/exportUiPlugin.ts (100%) rename packages/react-cosmos/src/{server => }/export/__tests__/generateExport.ts (100%) rename packages/react-cosmos/src/{server => }/export/generateExport.ts (100%) rename packages/react-cosmos/src/{server => }/getFixtures/getFixtures.ts (100%) delete mode 100644 packages/react-cosmos/src/server.ts rename packages/react-cosmos/src/{server => }/shared/findNextAvailablePort.ts (100%) rename packages/react-cosmos/src/{server => }/shared/importServerPlugins.ts (100%) rename packages/react-cosmos/src/{server => }/shared/logPluginInfo.ts (100%) rename packages/react-cosmos/src/{server => }/shared/playgroundHtml.ts (100%) rename packages/react-cosmos/src/{server => }/shared/playgroundUrl.ts (100%) rename packages/react-cosmos/src/{server => }/shared/resolveRendererUrl.test.ts (100%) rename packages/react-cosmos/src/{server => }/shared/resolveRendererUrl.ts (100%) rename packages/react-cosmos/src/{server => }/shared/staticPath.ts (100%) rename packages/react-cosmos/src/{server => }/shared/staticServer.ts (100%) rename packages/react-cosmos/src/{server => }/static/favicon.ico (100%) rename packages/react-cosmos/src/{server => }/static/index.html (100%) rename packages/react-cosmos/src/{server => }/testHelpers/cwd.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/jestWorkerId.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockConsole.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockCosmosPlugins.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockEsmRequire.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockEsmResolve.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockEsmStaticPath.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockFetch.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockFs.ts (100%) rename packages/react-cosmos/src/{server => }/testHelpers/mockYargs.ts (100%) rename packages/react-cosmos/src/{server => }/testMocks/playground.bundle.js (100%) rename packages/react-cosmos/src/{server => }/testMocks/playground.bundle.js.map (100%) rename packages/react-cosmos/src/{server => }/userDeps/__snapshots__/userDepsTemplate.test.ts.snap (100%) rename packages/react-cosmos/src/{server => }/userDeps/findUserModulePaths.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/fixtureWatcher.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/generateUserDepsModule.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/getUserModules.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/shared.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/userDepsTemplate.test.ts (100%) rename packages/react-cosmos/src/{server => }/userDeps/userDepsTemplate.ts (100%) rename packages/react-cosmos/src/{server => }/utils/cli.ts (100%) rename packages/react-cosmos/src/{server => }/utils/fs.ts (100%) rename packages/react-cosmos/src/{server => }/utils/isNodeError.ts (100%) rename packages/react-cosmos/src/{server => }/utils/requireModule.ts (100%) rename packages/react-cosmos/src/{server => }/utils/requireSilent.ts (100%) rename packages/react-cosmos/src/{server => }/utils/resolve.ts (100%) rename packages/react-cosmos/src/{server => }/utils/resolveLoose.ts (100%) rename packages/react-cosmos/src/{server => }/utils/resolveSilent.ts (100%) rename packages/react-cosmos/src/{server => }/utils/slash.ts (100%) diff --git a/.github/workflows/test-pnp.yml b/.github/workflows/test-pnp.yml index 24c41fafbd..36e14ee586 100644 --- a/.github/workflows/test-pnp.yml +++ b/.github/workflows/test-pnp.yml @@ -1,5 +1,8 @@ name: test-pnp -on: [pull_request] +on: + pull_request: + push: + branches: main jobs: pnp-install-and-run: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db64d505ad..8f42f1d869 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,8 @@ name: test -on: [pull_request] +on: + pull_request: + push: + branches: main jobs: source: strategy: diff --git a/.jest/config.cjs b/.jest/config.cjs index 2e8f8191f2..add47d817d 100644 --- a/.jest/config.cjs +++ b/.jest/config.cjs @@ -32,9 +32,9 @@ module.exports = { // These files are mocked because they are only available after // Cosmos packages are built, and tests should run with source code only. 'react-cosmos-ui/dist/playground.bundle.js.map': - '/packages/react-cosmos/src/server/testMocks/playground.bundle.js.map', + '/packages/react-cosmos/src/testMocks/playground.bundle.js.map', 'react-cosmos-ui/dist/playground.bundle.js': - '/packages/react-cosmos/src/server/testMocks/playground.bundle.js', + '/packages/react-cosmos/src/testMocks/playground.bundle.js', }, // https://kulshekhar.github.io/ts-jest/docs/getting-started/options/tsconfig transform: { @@ -61,9 +61,9 @@ module.exports = { '!packages/react-cosmos-ui/src/plugins/PluginList/**', '!packages/react-cosmos-ui/src/plugins/RendererSelect/**', // Ignore coverage from unsupported ES modules - '!packages/react-cosmos/src/server/utils/requireModule.ts', - '!packages/react-cosmos/src/server/utils/resolve.ts', - '!packages/react-cosmos/src/server/shared/staticPath.ts', + '!packages/react-cosmos/src/utils/requireModule.ts', + '!packages/react-cosmos/src/utils/resolve.ts', + '!packages/react-cosmos/src/shared/staticPath.ts', '!packages/react-cosmos-plugin-webpack/src/client/index.ts', '!packages/react-cosmos-plugin-webpack/src/client/errorOverlay/index.ts', '!packages/react-cosmos-plugin-webpack/src/server/utils/requireModule.ts', diff --git a/.prettierignore b/.prettierignore index c027ec2c4f..5e27815d40 100644 --- a/.prettierignore +++ b/.prettierignore @@ -8,3 +8,4 @@ package.json packages/*/dist packages/*/package.json website/dist +testMocks diff --git a/examples/webpack/tests/fixtures.test.ts b/examples/webpack/tests/fixtures.test.ts index e51f9b8298..a198444fa6 100644 --- a/examples/webpack/tests/fixtures.test.ts +++ b/examples/webpack/tests/fixtures.test.ts @@ -2,7 +2,7 @@ import 'react-cosmos/jest'; import path from 'path'; -import { getCosmosConfigAtPath, getFixtures } from 'react-cosmos/server'; +import { getCosmosConfigAtPath, getFixtures } from 'react-cosmos'; it('returns fixture info', async () => { const cosmosConfig = await getCosmosConfigAtPath( diff --git a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/fixtureStateChange.tsx b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/fixtureStateChange.tsx index 246261d0b3..6aa1fd63df 100644 --- a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/fixtureStateChange.tsx +++ b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/fixtureStateChange.tsx @@ -1,8 +1,8 @@ import retry from '@skidding/async-retry'; import React from 'react'; import { ReactTestRenderer } from 'react-test-renderer'; -import { uuid } from '../../../utils/uuid.js'; import { FixtureContext } from '../../../fixture/FixtureContext.js'; +import { uuid } from '../../../utils/uuid.js'; import { testFixtureLoader } from '../testHelpers/index.js'; import { wrapFixtures } from '../testHelpers/wrapFixture.js'; diff --git a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesNumber.tsx b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesNumber.tsx index b14dd639a0..9545b3311f 100644 --- a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesNumber.tsx +++ b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesNumber.tsx @@ -1,9 +1,9 @@ import retry from '@skidding/async-retry'; import React from 'react'; import { ReactTestRenderer, ReactTestRendererJSON } from 'react-test-renderer'; +import { useValue } from '../../../fixture/useValue/index.js'; import { createValue } from '../../../fixtureState/createValues.js'; import { uuid } from '../../../utils/uuid.js'; -import { useValue } from '../../../fixture/useValue/index.js'; import { testFixtureLoader } from '../testHelpers/index.js'; import { wrapFixtures } from '../testHelpers/wrapFixture.js'; diff --git a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesObject.tsx b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesObject.tsx index 297c5e737d..c205c82432 100644 --- a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesObject.tsx +++ b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/valuesObject.tsx @@ -1,9 +1,9 @@ import retry from '@skidding/async-retry'; import React from 'react'; import { ReactTestRenderer, ReactTestRendererJSON } from 'react-test-renderer'; +import { useValue } from '../../../fixture/useValue/index.js'; import { createValue } from '../../../fixtureState/createValues.js'; import { uuid } from '../../../utils/uuid.js'; -import { useValue } from '../../../fixture/useValue/index.js'; import { testFixtureLoader } from '../testHelpers/index.js'; import { wrapFixtures } from '../testHelpers/wrapFixture.js'; diff --git a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/viewport.tsx b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/viewport.tsx index 8e7784d766..e0aa990637 100644 --- a/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/viewport.tsx +++ b/packages/react-cosmos-core/src/renderer/FixtureLoader/__tests__/viewport.tsx @@ -1,9 +1,9 @@ import retry from '@skidding/async-retry'; import React from 'react'; +import { Viewport } from '../../../fixture/Viewport.js'; import { uuid } from '../../../utils/uuid.js'; import { testFixtureLoader } from '../testHelpers/index.js'; import { wrapFixtures } from '../testHelpers/wrapFixture.js'; -import { Viewport } from '../../../fixture/Viewport.js'; const rendererId = uuid(); const fixtures = wrapFixtures({ diff --git a/packages/react-cosmos-core/src/renderer/types.ts b/packages/react-cosmos-core/src/renderer/types.ts index c9e1be98b3..9faab039c9 100644 --- a/packages/react-cosmos-core/src/renderer/types.ts +++ b/packages/react-cosmos-core/src/renderer/types.ts @@ -1,5 +1,5 @@ -import { FixtureState } from '../fixtureState/types.js'; import { FixtureId, FixtureList } from '../fixture/types.js'; +import { FixtureState } from '../fixtureState/types.js'; // FYI: Renderer ids are self assigned in remote environments, so uniqueness // cannot be established by consensus diff --git a/packages/react-cosmos-plugin-vite/src/createViteCosmosConfig.ts b/packages/react-cosmos-plugin-vite/src/createViteCosmosConfig.ts index 76b9f9869c..747cf55c1f 100644 --- a/packages/react-cosmos-plugin-vite/src/createViteCosmosConfig.ts +++ b/packages/react-cosmos-plugin-vite/src/createViteCosmosConfig.ts @@ -1,4 +1,4 @@ -import { CosmosConfig } from 'react-cosmos/server.js'; +import { CosmosConfig } from 'react-cosmos'; type ViteCosmosConfig = { port: number; diff --git a/packages/react-cosmos-plugin-vite/src/reactCosmosViteRollupPlugin.ts b/packages/react-cosmos-plugin-vite/src/reactCosmosViteRollupPlugin.ts index 4fd048d356..5ad589ab0e 100644 --- a/packages/react-cosmos-plugin-vite/src/reactCosmosViteRollupPlugin.ts +++ b/packages/react-cosmos-plugin-vite/src/reactCosmosViteRollupPlugin.ts @@ -3,7 +3,7 @@ import { CosmosConfig, generateUserDepsModule, getPlaygroundUrl, -} from 'react-cosmos/server.js'; +} from 'react-cosmos'; import { Plugin } from 'rollup'; import { createViteRendererIndex } from './createViteRendererIndex.js'; diff --git a/packages/react-cosmos-plugin-vite/src/viteConfigPlugin.ts b/packages/react-cosmos-plugin-vite/src/viteConfigPlugin.ts index a0f0a0b497..44922efe3c 100644 --- a/packages/react-cosmos-plugin-vite/src/viteConfigPlugin.ts +++ b/packages/react-cosmos-plugin-vite/src/viteConfigPlugin.ts @@ -2,7 +2,7 @@ import { CosmosConfig, CosmosConfigPluginArgs, findNextAvailablePort, -} from 'react-cosmos/server.js'; +} from 'react-cosmos'; import { createViteCosmosConfig } from './createViteCosmosConfig.js'; export async function viteConfigPlugin({ diff --git a/packages/react-cosmos-plugin-vite/src/viteDevServerPlugin.ts b/packages/react-cosmos-plugin-vite/src/viteDevServerPlugin.ts index fcc4f8e2dd..21fd0d32a3 100644 --- a/packages/react-cosmos-plugin-vite/src/viteDevServerPlugin.ts +++ b/packages/react-cosmos-plugin-vite/src/viteDevServerPlugin.ts @@ -1,7 +1,4 @@ -import { - DevServerPluginArgs, - startFixtureWatcher, -} from 'react-cosmos/server.js'; +import { DevServerPluginArgs, startFixtureWatcher } from 'react-cosmos'; import { createServer } from 'vite'; import { reactCosmosViteRollupPlugin, diff --git a/packages/react-cosmos-plugin-vite/src/viteExportPlugin.ts b/packages/react-cosmos-plugin-vite/src/viteExportPlugin.ts index 4b9a904016..063fa36e3d 100644 --- a/packages/react-cosmos-plugin-vite/src/viteExportPlugin.ts +++ b/packages/react-cosmos-plugin-vite/src/viteExportPlugin.ts @@ -1,7 +1,7 @@ import { rename } from 'node:fs/promises'; import path from 'path'; +import { ExportPluginArgs, RENDERER_FILENAME } from 'react-cosmos'; import { removeLeadingSlash } from 'react-cosmos-core'; -import { ExportPluginArgs, RENDERER_FILENAME } from 'react-cosmos/server.js'; import { build } from 'vite'; import { reactCosmosViteRollupPlugin } from './reactCosmosViteRollupPlugin.js'; diff --git a/packages/react-cosmos-plugin-vite/src/viteServerPlugin.ts b/packages/react-cosmos-plugin-vite/src/viteServerPlugin.ts index 337a09049c..b58a90b487 100644 --- a/packages/react-cosmos-plugin-vite/src/viteServerPlugin.ts +++ b/packages/react-cosmos-plugin-vite/src/viteServerPlugin.ts @@ -1,4 +1,4 @@ -import { CosmosServerPlugin } from 'react-cosmos/server.js'; +import { CosmosServerPlugin } from 'react-cosmos'; import { viteConfigPlugin } from './viteConfigPlugin.js'; import { viteDevServerPlugin } from './viteDevServerPlugin.js'; import { viteExportPlugin } from './viteExportPlugin.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/cosmosConfig/createWebpackCosmosConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/cosmosConfig/createWebpackCosmosConfig.ts index 5e7b3c5a78..f4579b7ce9 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/cosmosConfig/createWebpackCosmosConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/cosmosConfig/createWebpackCosmosConfig.ts @@ -1,5 +1,5 @@ import path from 'path'; -import { CosmosConfig, fileExists } from 'react-cosmos/server.js'; +import { CosmosConfig, fileExists } from 'react-cosmos'; import { resolveLoose } from '../utils/resolveLoose.js'; type WebpackCosmosConfig = { diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customDevConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customDevConfig.ts index 0c38142824..328015f094 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customDevConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customDevConfig.ts @@ -10,7 +10,7 @@ import '../../testHelpers/mockEsmLoaderPath.js'; import '../../testHelpers/mockEsmRequire.js'; import '../../testHelpers/mockEsmResolve.js'; -import { createCosmosConfig, RENDERER_FILENAME } from 'react-cosmos/server.js'; +import { createCosmosConfig, RENDERER_FILENAME } from 'react-cosmos'; import webpack from 'webpack'; import { getDevWebpackConfig } from '../getDevWebpackConfig.js'; import { HtmlWebpackPlugin } from '../htmlPlugin.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customExportConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customExportConfig.ts index 8e8745fb1a..0b055279b4 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customExportConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customExportConfig.ts @@ -13,7 +13,7 @@ import { createCosmosConfig, getCwdPath, RENDERER_FILENAME, -} from 'react-cosmos/server.js'; +} from 'react-cosmos'; import webpack from 'webpack'; import { getExportWebpackConfig } from '../getExportWebpackConfig.js'; import { HtmlWebpackPlugin } from '../htmlPlugin.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultDevConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultDevConfig.ts index 3eee947a4d..9ffa31f711 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultDevConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultDevConfig.ts @@ -5,7 +5,7 @@ import '../../testHelpers/mockEsmLoaderPath.js'; import '../../testHelpers/mockEsmRequire.js'; import '../../testHelpers/mockEsmResolve.js'; -import { createCosmosConfig, RENDERER_FILENAME } from 'react-cosmos/server.js'; +import { createCosmosConfig, RENDERER_FILENAME } from 'react-cosmos'; import webpack from 'webpack'; import { getDevWebpackConfig } from '../getDevWebpackConfig.js'; import { HtmlWebpackPlugin } from '../htmlPlugin.js'; @@ -17,7 +17,9 @@ afterAll(() => { async function getDefaultDevWebpackConfig() { return mockConsole(async ({ expectLog }) => { expectLog('[Cosmos] Using default webpack config'); - expectLog('[Cosmos] Learn how to override webpack config for cosmos: https://github.com/react-cosmos/react-cosmos/tree/main/docs#webpack-config-override'); + expectLog( + '[Cosmos] Learn how to override webpack config for cosmos: https://github.com/react-cosmos/react-cosmos/tree/main/docs#webpack-config-override' + ); const cosmosConfig = createCosmosConfig(process.cwd()); return await getDevWebpackConfig(cosmosConfig, webpack); }); diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultExportConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultExportConfig.ts index cd49c70a55..4802afd673 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultExportConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultExportConfig.ts @@ -9,7 +9,7 @@ import { createCosmosConfig, getCwdPath, RENDERER_FILENAME, -} from 'react-cosmos/server.js'; +} from 'react-cosmos'; import webpack from 'webpack'; import { getExportWebpackConfig } from '../getExportWebpackConfig.js'; import { HtmlWebpackPlugin } from '../htmlPlugin.js'; @@ -21,7 +21,9 @@ afterAll(() => { async function getDefaultExportWebpackConfig() { return mockConsole(async ({ expectLog }) => { expectLog('[Cosmos] Using default webpack config'); - expectLog('[Cosmos] Learn how to override webpack config for cosmos: https://github.com/react-cosmos/react-cosmos/tree/main/docs#webpack-config-override'); + expectLog( + '[Cosmos] Learn how to override webpack config for cosmos: https://github.com/react-cosmos/react-cosmos/tree/main/docs#webpack-config-override' + ); const cosmosConfig = createCosmosConfig(process.cwd()); return await getExportWebpackConfig(cosmosConfig, webpack); }); diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/moduleScopePlugin.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/moduleScopePlugin.ts index e1ee5b7371..901762881d 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/moduleScopePlugin.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/moduleScopePlugin.ts @@ -5,7 +5,7 @@ import '../../testHelpers/mockEsmLoaderPath.js'; import '../../testHelpers/mockEsmRequire.js'; import '../../testHelpers/mockEsmResolve.js'; -import { createCosmosConfig } from 'react-cosmos/server.js'; +import { createCosmosConfig } from 'react-cosmos'; import webpack from 'webpack'; import { getDevWebpackConfig } from '../getDevWebpackConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/reactAliases.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/reactAliases.ts index 58317a62b3..c604d64aa6 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/reactAliases.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/reactAliases.ts @@ -6,7 +6,7 @@ import '../../testHelpers/mockEsmRequire.js'; import '../../testHelpers/mockEsmResolve.js'; import path from 'path'; -import { createCosmosConfig } from 'react-cosmos/server.js'; +import { createCosmosConfig } from 'react-cosmos'; import webpack from 'webpack'; import { getDevWebpackConfig } from '../getDevWebpackConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDefaultWebpackConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDefaultWebpackConfig.ts index 2034638119..2d69d0fe6b 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDefaultWebpackConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDefaultWebpackConfig.ts @@ -1,4 +1,4 @@ -import { RENDERER_FILENAME } from 'react-cosmos/server.js'; +import { RENDERER_FILENAME } from 'react-cosmos'; import webpack from 'webpack'; import { resolveFromSilent } from '../utils/resolveSilent.js'; import { getWebpackNodeEnv } from './getWebpackNodeEnv.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDevWebpackConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDevWebpackConfig.ts index dc95a8ab4f..e2dd2d4162 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDevWebpackConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getDevWebpackConfig.ts @@ -1,5 +1,5 @@ import path from 'path'; -import { CosmosConfig } from 'react-cosmos/server.js'; +import { CosmosConfig } from 'react-cosmos'; import webpack from 'webpack'; import { createWebpackCosmosConfig } from '../cosmosConfig/createWebpackCosmosConfig.js'; import { resolve } from '../utils/resolve.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getExportWebpackConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getExportWebpackConfig.ts index 9a72bc5e1b..99ead7bad4 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getExportWebpackConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getExportWebpackConfig.ts @@ -1,6 +1,6 @@ import path from 'path'; +import { CosmosConfig } from 'react-cosmos'; import { removeLeadingSlash } from 'react-cosmos-core'; -import { CosmosConfig } from 'react-cosmos/server.js'; import webpack from 'webpack'; import { createWebpackCosmosConfig } from '../cosmosConfig/createWebpackCosmosConfig.js'; import { getUserWebpackConfig } from './getUserWebpackConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getUserWebpackConfig.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getUserWebpackConfig.ts index 63b03fe7e9..d06ad93291 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getUserWebpackConfig.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getUserWebpackConfig.ts @@ -4,7 +4,7 @@ import { getCliArgs, importModule, moduleExists, -} from 'react-cosmos/server.js'; +} from 'react-cosmos'; import webpack from 'webpack'; import { createWebpackCosmosConfig } from '../cosmosConfig/createWebpackCosmosConfig.js'; import { getDefaultWebpackConfig } from './getDefaultWebpackConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getWebpackConfigResolve.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getWebpackConfigResolve.ts index 67a9c72075..96cf255ce3 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getWebpackConfigResolve.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/getWebpackConfigResolve.ts @@ -1,5 +1,5 @@ import path from 'path'; -import { CosmosConfig } from 'react-cosmos/server.js'; +import { CosmosConfig } from 'react-cosmos'; import webpack from 'webpack'; import { resolveFromSilent } from '../utils/resolveSilent.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/htmlPlugin.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/htmlPlugin.ts index 14876e10ce..9a083df19a 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/htmlPlugin.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/htmlPlugin.ts @@ -1,6 +1,6 @@ import { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin'; import { omit } from 'lodash-es'; -import { CosmosConfig, RENDERER_FILENAME } from 'react-cosmos/server.js'; +import { CosmosConfig, RENDERER_FILENAME } from 'react-cosmos'; import webpack from 'webpack'; import { requireFromSilent } from '../utils/requireSilent.js'; import { hasPlugin, isInstanceOfWebpackPlugin } from './plugins.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/plugins.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/plugins.ts index 87c879db23..774718abc7 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/plugins.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/plugins.ts @@ -1,4 +1,4 @@ -import { CosmosConfig } from 'react-cosmos/server.js'; +import { CosmosConfig } from 'react-cosmos'; import webpack from 'webpack'; import { getWebpackNodeEnv } from './getWebpackNodeEnv.js'; @@ -12,7 +12,7 @@ export function getGlobalsPlugin( // "if (__DEV__)" blocks get stripped when compiling a static export build __DEV__: JSON.stringify(devServerOn), 'process.env.NODE_ENV': JSON.stringify(getWebpackNodeEnv()), - 'process.env.PUBLIC_URL': JSON.stringify(cleanPublicUrl) + 'process.env.PUBLIC_URL': JSON.stringify(cleanPublicUrl), }); } diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/userDepsLoader.cjs b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/userDepsLoader.cjs index ce4e116f76..a554667697 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/userDepsLoader.cjs +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackConfig/userDepsLoader.cjs @@ -3,9 +3,9 @@ // To circumvent this we use this CJS source file that's manually copied in the // dist folder as part of the build process module.exports = async function injectUserDeps() { - const server = await import('react-cosmos/server.js'); + const cosmos = await import('react-cosmos'); - const cosmosConfig = await server.detectCosmosConfig(); + const cosmosConfig = await cosmos.detectCosmosConfig(); // This ensures this loader is invalidated whenever a new file is added to or // removed from user's project, which in turn triggers react-cosmos-voyager2 @@ -19,10 +19,10 @@ module.exports = async function injectUserDeps() { const { containerQuerySelector } = cosmosConfig.dom; const rendererConfig = { - playgroundUrl: server.getPlaygroundUrl(cosmosConfig), + playgroundUrl: cosmos.getPlaygroundUrl(cosmosConfig), containerQuerySelector, }; - return server.generateUserDepsModule({ + return cosmos.generateUserDepsModule({ cosmosConfig, rendererConfig, relativeToDir: null, diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackDevServerPlugin.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackDevServerPlugin.ts index fc8ea7c2c4..80a0644c70 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackDevServerPlugin.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackDevServerPlugin.ts @@ -1,6 +1,6 @@ import path from 'path'; +import { DevServerPluginArgs, serveStaticDir } from 'react-cosmos'; import { removeLeadingDot, ServerMessage } from 'react-cosmos-core'; -import { DevServerPluginArgs, serveStaticDir } from 'react-cosmos/server.js'; import webpack from 'webpack'; import webpackHotMiddleware from 'webpack-hot-middleware'; import { createWebpackCosmosConfig } from './cosmosConfig/createWebpackCosmosConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackExportPlugin.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackExportPlugin.ts index 32c351f737..7ba3aa8ced 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackExportPlugin.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackExportPlugin.ts @@ -1,4 +1,4 @@ -import { ExportPluginArgs } from 'react-cosmos/server.js'; +import { ExportPluginArgs } from 'react-cosmos'; import webpack, { StatsCompilation } from 'webpack'; import { getWebpack } from './getWebpack.js'; import { getExportWebpackConfig } from './webpackConfig/getExportWebpackConfig.js'; diff --git a/packages/react-cosmos-plugin-webpack/src/server/webpackServerPlugin.ts b/packages/react-cosmos-plugin-webpack/src/server/webpackServerPlugin.ts index 1d6e59813d..daf747b271 100644 --- a/packages/react-cosmos-plugin-webpack/src/server/webpackServerPlugin.ts +++ b/packages/react-cosmos-plugin-webpack/src/server/webpackServerPlugin.ts @@ -1,4 +1,4 @@ -import { CosmosServerPlugin } from 'react-cosmos/server.js'; +import { CosmosServerPlugin } from 'react-cosmos'; import { webpackDevServerPlugin } from './webpackDevServerPlugin.js'; import { webpackExportPlugin } from './webpackExportPlugin.js'; diff --git a/packages/react-cosmos-ui/src/plugins/BuildNotifications/index.ts b/packages/react-cosmos-ui/src/plugins/BuildNotifications/index.ts index 3e4671f329..3cc8914aa3 100644 --- a/packages/react-cosmos-ui/src/plugins/BuildNotifications/index.ts +++ b/packages/react-cosmos-ui/src/plugins/BuildNotifications/index.ts @@ -1,4 +1,4 @@ -import { ServerMessage, MessageType } from 'react-cosmos-core'; +import { MessageType, ServerMessage } from 'react-cosmos-core'; import { createPlugin, PluginContext } from 'react-plugin'; import { MessageHandlerSpec } from '../MessageHandler/spec.js'; import { NotificationsSpec } from '../Notifications/spec.js'; diff --git a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/notFound.tsx b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/notFound.tsx index cfcd2546a8..24c2ac4437 100644 --- a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/notFound.tsx +++ b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/notFound.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockRendererPreview, mockRouter, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/rendererNotResponding.tsx b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/rendererNotResponding.tsx index eb086d1c19..96295bdf4a 100644 --- a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/rendererNotResponding.tsx +++ b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/rendererNotResponding.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockRendererPreview, mockRouter, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/selectedFixture.tsx b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/selectedFixture.tsx index 6d0f9e473d..aeab12a5a5 100644 --- a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/selectedFixture.tsx +++ b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/selectedFixture.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockRendererPreview, mockRouter, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/waiting.tsx b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/waiting.tsx index 8a8684406d..72951507e3 100644 --- a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/waiting.tsx +++ b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/waiting.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockRendererPreview, mockRouter, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/welcome.tsx b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/welcome.tsx index a3c39c357e..5743a01930 100644 --- a/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/welcome.tsx +++ b/packages/react-cosmos-ui/src/plugins/ContentOverlay/__tests__/welcome.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockRendererPreview, mockRouter, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Core/index.test.tsx b/packages/react-cosmos-ui/src/plugins/Core/index.test.tsx index f3af94f06d..b892b0aa2c 100644 --- a/packages/react-cosmos-ui/src/plugins/Core/index.test.tsx +++ b/packages/react-cosmos-ui/src/plugins/Core/index.test.tsx @@ -1,6 +1,6 @@ import { loadPlugins, resetPlugins } from 'react-plugin'; -import { getCoreMethods, mockStorage } from '../../testHelpers/pluginMocks.js'; import { register } from '.'; +import { getCoreMethods, mockStorage } from '../../testHelpers/pluginMocks.js'; import { CoreSpec } from './spec.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/FullScreenButton/index.tsx b/packages/react-cosmos-ui/src/plugins/FullScreenButton/index.tsx index ed567a50fc..fc790b1d12 100644 --- a/packages/react-cosmos-ui/src/plugins/FullScreenButton/index.tsx +++ b/packages/react-cosmos-ui/src/plugins/FullScreenButton/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { createPlugin } from 'react-plugin'; import { stringifyRendererUrlQuery } from 'react-cosmos-core'; +import { createPlugin } from 'react-plugin'; import { RendererActionSlotProps } from '../../slots/RendererActionSlot.js'; import { CoreSpec } from '../Core/spec.js'; import { FullScreenButton } from './FullScreenButton.js'; diff --git a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/sticky.tsx b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/sticky.tsx index 64f1c9c255..8677b6bb11 100644 --- a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/sticky.tsx +++ b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/sticky.tsx @@ -1,8 +1,8 @@ import { act, render } from '@testing-library/react'; import React from 'react'; import { ArraySlot, loadPlugins, resetPlugins } from 'react-plugin'; -import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; import { register } from '..'; +import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/stickyMultiple.tsx b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/stickyMultiple.tsx index 77e2de95e7..fbcc89cc49 100644 --- a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/stickyMultiple.tsx +++ b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/stickyMultiple.tsx @@ -1,8 +1,8 @@ import { act, render } from '@testing-library/react'; import React from 'react'; import { ArraySlot, loadPlugins, resetPlugins } from 'react-plugin'; -import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; import { register } from '..'; +import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timed.tsx b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timed.tsx index b986ebbbab..826b511ef9 100644 --- a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timed.tsx +++ b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timed.tsx @@ -6,8 +6,8 @@ import { loadPlugins, resetPlugins, } from 'react-plugin'; -import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; import { register } from '..'; +import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timedMultiple.tsx b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timedMultiple.tsx index 899f433306..5e654e467e 100644 --- a/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timedMultiple.tsx +++ b/packages/react-cosmos-ui/src/plugins/Notifications/__tests__/timedMultiple.tsx @@ -1,8 +1,8 @@ import { act, render } from '@testing-library/react'; import React from 'react'; import { ArraySlot, loadPlugins, resetPlugins } from 'react-plugin'; -import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; import { register } from '..'; +import { getNotificationsMethods } from '../../../testHelpers/pluginMocks.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RemoteRenderer/__tests__/button.tsx b/packages/react-cosmos-ui/src/plugins/RemoteRenderer/__tests__/button.tsx index 510f82f5f5..7c37792fe9 100644 --- a/packages/react-cosmos-ui/src/plugins/RemoteRenderer/__tests__/button.tsx +++ b/packages/react-cosmos-ui/src/plugins/RemoteRenderer/__tests__/button.tsx @@ -2,12 +2,12 @@ import { waitFor } from '@testing-library/dom'; import { fireEvent, render } from '@testing-library/react'; import React from 'react'; import { ArraySlot, loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { mockCore, mockMessageHandler, mockNotifications, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/isRendererConnected.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/isRendererConnected.ts index 925180cead..651489095e 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/isRendererConnected.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/isRendererConnected.ts @@ -1,10 +1,10 @@ import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRendererCoreMethods, mockNotifications, mockRouter, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; import { mockRendererReady } from '../testHelpers/index.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeSelect.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeSelect.ts index 95448ec22c..ad0c7a0046 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeSelect.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeSelect.ts @@ -1,5 +1,6 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRendererCoreMethods, getRouterContext, @@ -7,7 +8,6 @@ import { mockRouter, onRendererCore, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; import { mockRendererReady } from '../testHelpers/index.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeUnselect.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeUnselect.ts index b4127bdf28..e3bd00cbaa 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeUnselect.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/onRouterFixtureChangeUnselect.ts @@ -1,5 +1,6 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRendererCoreMethods, getRouterContext, @@ -7,7 +8,6 @@ import { mockRouter, onRendererCore, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; import { mockRendererReady } from '../testHelpers/index.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/selectPrimaryRenderer.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/selectPrimaryRenderer.ts index b97b5c5b4c..7a9abb5245 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/selectPrimaryRenderer.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/__tests__/selectPrimaryRenderer.ts @@ -1,11 +1,11 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRendererCoreMethods, mockNotifications, mockRouter, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; import { mockRendererReady } from '../testHelpers/index.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureListUpdate.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureListUpdate.ts index 137b0ab95a..91142ba811 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureListUpdate.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureListUpdate.ts @@ -1,12 +1,12 @@ import { waitFor } from '@testing-library/dom'; import { FixtureList, RendererId } from 'react-cosmos-core'; import { loadPlugins, resetPlugins } from 'react-plugin'; -import { register } from '../../index.js'; import { getRendererCoreMethods, mockNotifications, mockRouter, } from '../../../../testHelpers/pluginMocks.js'; +import { register } from '../../index.js'; import { createFixtureListUpdateResponse, mockRendererReady, diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureStateChange.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureStateChange.ts index a81abf78df..41f12e309e 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureStateChange.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/fixtureStateChange.ts @@ -1,13 +1,13 @@ import { waitFor } from '@testing-library/dom'; import { FixtureList, RendererId } from 'react-cosmos-core'; import { loadPlugins, resetPlugins } from 'react-plugin'; -import { register } from '../../index.js'; import { getRendererCoreMethods, mockNotifications, mockRouter, onRendererCore, } from '../../../../testHelpers/pluginMocks.js'; +import { register } from '../../index.js'; import { createFixtureStateChangeResponse, mockRendererReady, diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReady.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReady.ts index 3a8e3ffbac..89ef9a2d1e 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReady.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReady.ts @@ -1,12 +1,12 @@ import { waitFor } from '@testing-library/dom'; import { FixtureList } from 'react-cosmos-core'; import { loadPlugins, resetPlugins } from 'react-plugin'; -import { register } from '../../index.js'; import { getRendererCoreMethods, mockNotifications, mockRouter, } from '../../../../testHelpers/pluginMocks.js'; +import { register } from '../../index.js'; import { mockFixtureStateChange, mockRendererReady, diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyInitialFixture.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyInitialFixture.ts index 01546a9cab..77756d90b1 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyInitialFixture.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyInitialFixture.ts @@ -1,11 +1,11 @@ import { waitFor } from '@testing-library/dom'; import { FixtureList } from 'react-cosmos-core'; import { loadPlugins, resetPlugins } from 'react-plugin'; -import { register } from '../../index.js'; import { mockNotifications, mockRouter, } from '../../../../testHelpers/pluginMocks.js'; +import { register } from '../../index.js'; import { mockRendererReady } from '../../testHelpers/index.js'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyMultiRenderers.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyMultiRenderers.ts index 28fe57482b..7c6ee43078 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyMultiRenderers.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadyMultiRenderers.ts @@ -1,6 +1,6 @@ import { waitFor } from '@testing-library/dom'; -import { loadPlugins, resetPlugins } from 'react-plugin'; import { FixtureList } from 'react-cosmos-core'; +import { loadPlugins, resetPlugins } from 'react-plugin'; import { getRendererCoreMethods, mockNotifications, diff --git a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadySelectedFixture.ts b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadySelectedFixture.ts index 8957de379f..fb9b49216d 100644 --- a/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadySelectedFixture.ts +++ b/packages/react-cosmos-ui/src/plugins/RendererCore/receiveResponse/__tests__/rendererReadySelectedFixture.ts @@ -1,12 +1,12 @@ import { waitFor } from '@testing-library/dom'; import { FixtureList } from 'react-cosmos-core'; import { loadPlugins, resetPlugins } from 'react-plugin'; -import { register } from '../../index.js'; import { mockNotifications, mockRouter, onRendererCore, } from '../../../../testHelpers/pluginMocks.js'; +import { register } from '../../index.js'; import { mockFixtureStateChange, mockRendererReady, diff --git a/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/button.tsx b/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/button.tsx index b6f0c03a74..342b5a7683 100644 --- a/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/button.tsx +++ b/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/button.tsx @@ -1,13 +1,13 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { RendererActionSlot } from '../../../slots/RendererActionSlot.js'; import { mockCore, mockRendererCore, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/fixtureViewport.tsx b/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/fixtureViewport.tsx index 14c53c8770..a4f1da2969 100644 --- a/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/fixtureViewport.tsx +++ b/packages/react-cosmos-ui/src/plugins/ResponsivePreview/__tests__/fixtureViewport.tsx @@ -1,11 +1,11 @@ import { render } from '@testing-library/react'; import React from 'react'; import { loadPlugins, resetPlugins, Slot } from 'react-plugin'; +import { register } from '..'; import { mockRendererCore, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Root/__tests__/storage.tsx b/packages/react-cosmos-ui/src/plugins/Root/__tests__/storage.tsx index 54c80b4b80..1e73cd6770 100644 --- a/packages/react-cosmos-ui/src/plugins/Root/__tests__/storage.tsx +++ b/packages/react-cosmos-ui/src/plugins/Root/__tests__/storage.tsx @@ -1,10 +1,10 @@ import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { mockCore, mockRendererCore, mockStorage, } from '../../../testHelpers/pluginMocks.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Router/__tests__/getSelectedFixtureId.ts b/packages/react-cosmos-ui/src/plugins/Router/__tests__/getSelectedFixtureId.ts index c4fff964b7..6cad7bd1d5 100644 --- a/packages/react-cosmos-ui/src/plugins/Router/__tests__/getSelectedFixtureId.ts +++ b/packages/react-cosmos-ui/src/plugins/Router/__tests__/getSelectedFixtureId.ts @@ -1,11 +1,11 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRouterMethods } from '../../../testHelpers/pluginMocks.js'; import { pushUrlParams, resetUrlParams, } from '../../../testHelpers/urlParams.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Router/__tests__/selectFixture.ts b/packages/react-cosmos-ui/src/plugins/Router/__tests__/selectFixture.ts index 4116c199cf..69430da304 100644 --- a/packages/react-cosmos-ui/src/plugins/Router/__tests__/selectFixture.ts +++ b/packages/react-cosmos-ui/src/plugins/Router/__tests__/selectFixture.ts @@ -1,5 +1,6 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRouterMethods, onRouter, @@ -8,7 +9,6 @@ import { getUrlParams, resetUrlParams, } from '../../../testHelpers/urlParams.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Router/__tests__/unselectFixture.ts b/packages/react-cosmos-ui/src/plugins/Router/__tests__/unselectFixture.ts index 595dcdad24..6ec469f43c 100644 --- a/packages/react-cosmos-ui/src/plugins/Router/__tests__/unselectFixture.ts +++ b/packages/react-cosmos-ui/src/plugins/Router/__tests__/unselectFixture.ts @@ -1,5 +1,6 @@ import { waitFor } from '@testing-library/dom'; import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { getRouterMethods, onRouter, @@ -9,7 +10,6 @@ import { pushUrlParams, resetUrlParams, } from '../../../testHelpers/urlParams.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos-ui/src/plugins/Router/__tests__/urlChange.ts b/packages/react-cosmos-ui/src/plugins/Router/__tests__/urlChange.ts index a2ad461397..fc166ba32e 100644 --- a/packages/react-cosmos-ui/src/plugins/Router/__tests__/urlChange.ts +++ b/packages/react-cosmos-ui/src/plugins/Router/__tests__/urlChange.ts @@ -1,11 +1,11 @@ import { loadPlugins, resetPlugins } from 'react-plugin'; +import { register } from '..'; import { onRouter } from '../../../testHelpers/pluginMocks.js'; import { popUrlParams, pushUrlParams, resetUrlParams, } from '../../../testHelpers/urlParams.js'; -import { register } from '..'; beforeEach(register); diff --git a/packages/react-cosmos/bin/cosmos-export.js b/packages/react-cosmos/bin/cosmos-export.js index 4285f15bf8..2ada44ba3c 100755 --- a/packages/react-cosmos/bin/cosmos-export.js +++ b/packages/react-cosmos/bin/cosmos-export.js @@ -3,9 +3,7 @@ // Set the env before any code reads it process.env.NODE_ENV = process.env.NODE_ENV || 'production'; -const { generateExport } = await import( - '../dist/server/export/generateExport.js' -); +const { generateExport } = await import('../dist/export/generateExport.js'); generateExport().catch(err => { console.log('[Cosmos] Export failed...'); diff --git a/packages/react-cosmos/bin/cosmos-native.js b/packages/react-cosmos/bin/cosmos-native.js index d8e680d167..8150510322 100755 --- a/packages/react-cosmos/bin/cosmos-native.js +++ b/packages/react-cosmos/bin/cosmos-native.js @@ -3,9 +3,7 @@ // Set the env before any code reads it process.env.NODE_ENV = process.env.NODE_ENV || 'development'; -const { startDevServer } = await import( - '../dist/server/devServer/startDevServer.js' -); +const { startDevServer } = await import('../dist/devServer/startDevServer.js'); startDevServer('native').catch(err => { console.log('[Cosmos] Server crashed...'); diff --git a/packages/react-cosmos/bin/cosmos.js b/packages/react-cosmos/bin/cosmos.js index 151bdb4d34..53275fd7ca 100755 --- a/packages/react-cosmos/bin/cosmos.js +++ b/packages/react-cosmos/bin/cosmos.js @@ -3,9 +3,7 @@ // Set the env before any code reads it process.env.NODE_ENV = process.env.NODE_ENV || 'development'; -const { startDevServer } = await import( - '../dist/server/devServer/startDevServer.js' -); +const { startDevServer } = await import('../dist/devServer/startDevServer.js'); // Auto disable Fast Refresh in CRA 4 until integration is implemented // https://github.com/react-cosmos/react-cosmos/issues/1272 diff --git a/packages/react-cosmos/server.d.ts b/packages/react-cosmos/server.d.ts deleted file mode 100644 index 214d5de2f7..0000000000 --- a/packages/react-cosmos/server.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/server.js'; diff --git a/packages/react-cosmos/server.js b/packages/react-cosmos/server.js deleted file mode 100644 index 214d5de2f7..0000000000 --- a/packages/react-cosmos/server.js +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/server.js'; diff --git a/packages/react-cosmos/src/server/corePlugins/httpProxy.ts b/packages/react-cosmos/src/corePlugins/httpProxy.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/httpProxy.ts rename to packages/react-cosmos/src/corePlugins/httpProxy.ts diff --git a/packages/react-cosmos/src/server/corePlugins/index.ts b/packages/react-cosmos/src/corePlugins/index.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/index.ts rename to packages/react-cosmos/src/corePlugins/index.ts diff --git a/packages/react-cosmos/src/server/corePlugins/openFile.ts b/packages/react-cosmos/src/corePlugins/openFile.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/openFile.ts rename to packages/react-cosmos/src/corePlugins/openFile.ts diff --git a/packages/react-cosmos/src/server/corePlugins/pluginEndpoint.ts b/packages/react-cosmos/src/corePlugins/pluginEndpoint.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/pluginEndpoint.ts rename to packages/react-cosmos/src/corePlugins/pluginEndpoint.ts diff --git a/packages/react-cosmos/src/server/corePlugins/portRetry.ts b/packages/react-cosmos/src/corePlugins/portRetry.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/portRetry.ts rename to packages/react-cosmos/src/corePlugins/portRetry.ts diff --git a/packages/react-cosmos/src/server/corePlugins/userDepsFile.ts b/packages/react-cosmos/src/corePlugins/userDepsFile.ts similarity index 100% rename from packages/react-cosmos/src/server/corePlugins/userDepsFile.ts rename to packages/react-cosmos/src/corePlugins/userDepsFile.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/cosmosConfigFile.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/cosmosConfigFile.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/cosmosConfigFile.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/cosmosConfigFile.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/exportPath.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/exportPath.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/exportPath.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/exportPath.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/fixtureFileSuffix.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/fixtureFileSuffix.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/fixtureFileSuffix.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/fixtureFileSuffix.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/fixturesDir.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/fixturesDir.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/fixturesDir.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/fixturesDir.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/globalImports.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/globalImports.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/globalImports.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/globalImports.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/hostname.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/hostname.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/hostname.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/hostname.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/port.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/port.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/port.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/port.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/publicUrl.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/publicUrl.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/publicUrl.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/publicUrl.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/rootDir.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/rootDir.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/rootDir.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/rootDir.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/staticPath.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/staticPath.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/staticPath.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/staticPath.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/userDepsFilePath.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/userDepsFilePath.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/userDepsFilePath.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/userDepsFilePath.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/__tests__/watchDirs.ts b/packages/react-cosmos/src/cosmosConfig/__tests__/watchDirs.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/__tests__/watchDirs.ts rename to packages/react-cosmos/src/cosmosConfig/__tests__/watchDirs.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/createCosmosConfig.ts b/packages/react-cosmos/src/cosmosConfig/createCosmosConfig.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/createCosmosConfig.ts rename to packages/react-cosmos/src/cosmosConfig/createCosmosConfig.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/detectCosmosConfig.ts b/packages/react-cosmos/src/cosmosConfig/detectCosmosConfig.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/detectCosmosConfig.ts rename to packages/react-cosmos/src/cosmosConfig/detectCosmosConfig.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/getCosmosConfigAtPath.ts b/packages/react-cosmos/src/cosmosConfig/getCosmosConfigAtPath.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/getCosmosConfigAtPath.ts rename to packages/react-cosmos/src/cosmosConfig/getCosmosConfigAtPath.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/shared.ts b/packages/react-cosmos/src/cosmosConfig/shared.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/shared.ts rename to packages/react-cosmos/src/cosmosConfig/shared.ts diff --git a/packages/react-cosmos/src/server/cosmosConfig/types.ts b/packages/react-cosmos/src/cosmosConfig/types.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosConfig/types.ts rename to packages/react-cosmos/src/cosmosConfig/types.ts diff --git a/packages/react-cosmos/src/server/cosmosPlugin/findCosmosPluginConfigs.test.ts b/packages/react-cosmos/src/cosmosPlugin/findCosmosPluginConfigs.test.ts similarity index 96% rename from packages/react-cosmos/src/server/cosmosPlugin/findCosmosPluginConfigs.test.ts rename to packages/react-cosmos/src/cosmosPlugin/findCosmosPluginConfigs.test.ts index 3c60f41146..1a42b0b045 100644 --- a/packages/react-cosmos/src/server/cosmosPlugin/findCosmosPluginConfigs.test.ts +++ b/packages/react-cosmos/src/cosmosPlugin/findCosmosPluginConfigs.test.ts @@ -14,7 +14,7 @@ jest.mock('../utils/resolveSilent.js', () => { }); it('loads mono repo plugins', async () => { - const packagesDir = path.join(__dirname, '../../../..'); + const packagesDir = path.join(__dirname, '../../..'); const configs = await findCosmosPluginConfigs({ rootDir: packagesDir, diff --git a/packages/react-cosmos/src/server/cosmosPlugin/findCosmosPluginConfigs.ts b/packages/react-cosmos/src/cosmosPlugin/findCosmosPluginConfigs.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosPlugin/findCosmosPluginConfigs.ts rename to packages/react-cosmos/src/cosmosPlugin/findCosmosPluginConfigs.ts diff --git a/packages/react-cosmos/src/server/cosmosPlugin/pluginConfigs.ts b/packages/react-cosmos/src/cosmosPlugin/pluginConfigs.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosPlugin/pluginConfigs.ts rename to packages/react-cosmos/src/cosmosPlugin/pluginConfigs.ts diff --git a/packages/react-cosmos/src/server/cosmosPlugin/readCosmosPluginConfig.ts b/packages/react-cosmos/src/cosmosPlugin/readCosmosPluginConfig.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosPlugin/readCosmosPluginConfig.ts rename to packages/react-cosmos/src/cosmosPlugin/readCosmosPluginConfig.ts diff --git a/packages/react-cosmos/src/server/cosmosPlugin/types.ts b/packages/react-cosmos/src/cosmosPlugin/types.ts similarity index 100% rename from packages/react-cosmos/src/server/cosmosPlugin/types.ts rename to packages/react-cosmos/src/cosmosPlugin/types.ts diff --git a/packages/react-cosmos/src/server/devServer/__tests__/devServerPlugin.ts b/packages/react-cosmos/src/devServer/__tests__/devServerPlugin.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/__tests__/devServerPlugin.ts rename to packages/react-cosmos/src/devServer/__tests__/devServerPlugin.ts diff --git a/packages/react-cosmos/src/server/devServer/__tests__/devServerUiPlugin.ts b/packages/react-cosmos/src/devServer/__tests__/devServerUiPlugin.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/__tests__/devServerUiPlugin.ts rename to packages/react-cosmos/src/devServer/__tests__/devServerUiPlugin.ts diff --git a/packages/react-cosmos/src/server/devServer/__tests__/startDevServer.ts b/packages/react-cosmos/src/devServer/__tests__/startDevServer.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/__tests__/startDevServer.ts rename to packages/react-cosmos/src/devServer/__tests__/startDevServer.ts diff --git a/packages/react-cosmos/src/server/devServer/expressApp.ts b/packages/react-cosmos/src/devServer/expressApp.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/expressApp.ts rename to packages/react-cosmos/src/devServer/expressApp.ts diff --git a/packages/react-cosmos/src/server/devServer/httpServer.ts b/packages/react-cosmos/src/devServer/httpServer.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/httpServer.ts rename to packages/react-cosmos/src/devServer/httpServer.ts diff --git a/packages/react-cosmos/src/server/devServer/messageHandler.ts b/packages/react-cosmos/src/devServer/messageHandler.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/messageHandler.ts rename to packages/react-cosmos/src/devServer/messageHandler.ts diff --git a/packages/react-cosmos/src/server/devServer/startDevServer.ts b/packages/react-cosmos/src/devServer/startDevServer.ts similarity index 100% rename from packages/react-cosmos/src/server/devServer/startDevServer.ts rename to packages/react-cosmos/src/devServer/startDevServer.ts diff --git a/packages/react-cosmos/src/server/export/__tests__/exportServerPlugin.ts b/packages/react-cosmos/src/export/__tests__/exportServerPlugin.ts similarity index 100% rename from packages/react-cosmos/src/server/export/__tests__/exportServerPlugin.ts rename to packages/react-cosmos/src/export/__tests__/exportServerPlugin.ts diff --git a/packages/react-cosmos/src/server/export/__tests__/exportUiPlugin.ts b/packages/react-cosmos/src/export/__tests__/exportUiPlugin.ts similarity index 100% rename from packages/react-cosmos/src/server/export/__tests__/exportUiPlugin.ts rename to packages/react-cosmos/src/export/__tests__/exportUiPlugin.ts diff --git a/packages/react-cosmos/src/server/export/__tests__/generateExport.ts b/packages/react-cosmos/src/export/__tests__/generateExport.ts similarity index 100% rename from packages/react-cosmos/src/server/export/__tests__/generateExport.ts rename to packages/react-cosmos/src/export/__tests__/generateExport.ts diff --git a/packages/react-cosmos/src/server/export/generateExport.ts b/packages/react-cosmos/src/export/generateExport.ts similarity index 100% rename from packages/react-cosmos/src/server/export/generateExport.ts rename to packages/react-cosmos/src/export/generateExport.ts diff --git a/packages/react-cosmos/src/server/getFixtures/getFixtures.ts b/packages/react-cosmos/src/getFixtures/getFixtures.ts similarity index 100% rename from packages/react-cosmos/src/server/getFixtures/getFixtures.ts rename to packages/react-cosmos/src/getFixtures/getFixtures.ts diff --git a/packages/react-cosmos/src/index.ts b/packages/react-cosmos/src/index.ts index e69de29bb2..96c54b441e 100644 --- a/packages/react-cosmos/src/index.ts +++ b/packages/react-cosmos/src/index.ts @@ -0,0 +1,21 @@ +export * from './cosmosConfig/createCosmosConfig.js'; +export * from './cosmosConfig/detectCosmosConfig.js'; +export * from './cosmosConfig/getCosmosConfigAtPath.js'; +export * from './cosmosConfig/types.js'; +export * from './cosmosPlugin/findCosmosPluginConfigs.js'; +export * from './cosmosPlugin/pluginConfigs.js'; +export * from './cosmosPlugin/types.js'; +export * from './getFixtures/getFixtures.js'; +export * from './shared/findNextAvailablePort.js'; +export { RENDERER_FILENAME } from './shared/playgroundHtml.js'; +export * from './shared/playgroundUrl.js'; +export * from './shared/staticServer.js'; +export * from './testHelpers/cwd.js'; +export * from './userDeps/fixtureWatcher.js'; +export * from './userDeps/generateUserDepsModule.js'; +export * from './utils/cli.js'; +export * from './utils/fs.js'; +export * from './utils/requireSilent.js'; +export * from './utils/resolve.js'; +export * from './utils/resolveLoose.js'; +export * from './utils/resolveSilent.js'; diff --git a/packages/react-cosmos/src/jest.ts b/packages/react-cosmos/src/jest.ts index b84fbec7d6..a953b3e9e6 100644 --- a/packages/react-cosmos/src/jest.ts +++ b/packages/react-cosmos/src/jest.ts @@ -1,7 +1,7 @@ -export * from './server/testHelpers/mockConsole.js'; -export * from './server/testHelpers/mockEsmRequire.js'; -export * from './server/testHelpers/mockEsmResolve.js'; -export * from './server/testHelpers/mockEsmStaticPath.js'; -export * from './server/testHelpers/mockFetch.js'; -export * from './server/testHelpers/mockFs.js'; -export * from './server/testHelpers/mockYargs.js'; +export * from './testHelpers/mockConsole.js'; +export * from './testHelpers/mockEsmRequire.js'; +export * from './testHelpers/mockEsmResolve.js'; +export * from './testHelpers/mockEsmStaticPath.js'; +export * from './testHelpers/mockFetch.js'; +export * from './testHelpers/mockFs.js'; +export * from './testHelpers/mockYargs.js'; diff --git a/packages/react-cosmos/src/server.ts b/packages/react-cosmos/src/server.ts deleted file mode 100644 index 06b5f1eea3..0000000000 --- a/packages/react-cosmos/src/server.ts +++ /dev/null @@ -1,21 +0,0 @@ -export * from './server/cosmosConfig/createCosmosConfig.js'; -export * from './server/cosmosConfig/detectCosmosConfig.js'; -export * from './server/cosmosConfig/getCosmosConfigAtPath.js'; -export * from './server/cosmosConfig/types.js'; -export * from './server/cosmosPlugin/findCosmosPluginConfigs.js'; -export * from './server/cosmosPlugin/pluginConfigs.js'; -export * from './server/cosmosPlugin/types.js'; -export * from './server/getFixtures/getFixtures.js'; -export * from './server/shared/findNextAvailablePort.js'; -export { RENDERER_FILENAME } from './server/shared/playgroundHtml.js'; -export * from './server/shared/playgroundUrl.js'; -export * from './server/shared/staticServer.js'; -export * from './server/testHelpers/cwd.js'; -export * from './server/userDeps/fixtureWatcher.js'; -export * from './server/userDeps/generateUserDepsModule.js'; -export * from './server/utils/cli.js'; -export * from './server/utils/fs.js'; -export * from './server/utils/requireSilent.js'; -export * from './server/utils/resolve.js'; -export * from './server/utils/resolveLoose.js'; -export * from './server/utils/resolveSilent.js'; diff --git a/packages/react-cosmos/src/server/shared/findNextAvailablePort.ts b/packages/react-cosmos/src/shared/findNextAvailablePort.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/findNextAvailablePort.ts rename to packages/react-cosmos/src/shared/findNextAvailablePort.ts diff --git a/packages/react-cosmos/src/server/shared/importServerPlugins.ts b/packages/react-cosmos/src/shared/importServerPlugins.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/importServerPlugins.ts rename to packages/react-cosmos/src/shared/importServerPlugins.ts diff --git a/packages/react-cosmos/src/server/shared/logPluginInfo.ts b/packages/react-cosmos/src/shared/logPluginInfo.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/logPluginInfo.ts rename to packages/react-cosmos/src/shared/logPluginInfo.ts diff --git a/packages/react-cosmos/src/server/shared/playgroundHtml.ts b/packages/react-cosmos/src/shared/playgroundHtml.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/playgroundHtml.ts rename to packages/react-cosmos/src/shared/playgroundHtml.ts diff --git a/packages/react-cosmos/src/server/shared/playgroundUrl.ts b/packages/react-cosmos/src/shared/playgroundUrl.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/playgroundUrl.ts rename to packages/react-cosmos/src/shared/playgroundUrl.ts diff --git a/packages/react-cosmos/src/server/shared/resolveRendererUrl.test.ts b/packages/react-cosmos/src/shared/resolveRendererUrl.test.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/resolveRendererUrl.test.ts rename to packages/react-cosmos/src/shared/resolveRendererUrl.test.ts diff --git a/packages/react-cosmos/src/server/shared/resolveRendererUrl.ts b/packages/react-cosmos/src/shared/resolveRendererUrl.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/resolveRendererUrl.ts rename to packages/react-cosmos/src/shared/resolveRendererUrl.ts diff --git a/packages/react-cosmos/src/server/shared/staticPath.ts b/packages/react-cosmos/src/shared/staticPath.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/staticPath.ts rename to packages/react-cosmos/src/shared/staticPath.ts diff --git a/packages/react-cosmos/src/server/shared/staticServer.ts b/packages/react-cosmos/src/shared/staticServer.ts similarity index 100% rename from packages/react-cosmos/src/server/shared/staticServer.ts rename to packages/react-cosmos/src/shared/staticServer.ts diff --git a/packages/react-cosmos/src/server/static/favicon.ico b/packages/react-cosmos/src/static/favicon.ico similarity index 100% rename from packages/react-cosmos/src/server/static/favicon.ico rename to packages/react-cosmos/src/static/favicon.ico diff --git a/packages/react-cosmos/src/server/static/index.html b/packages/react-cosmos/src/static/index.html similarity index 100% rename from packages/react-cosmos/src/server/static/index.html rename to packages/react-cosmos/src/static/index.html diff --git a/packages/react-cosmos/src/server/testHelpers/cwd.ts b/packages/react-cosmos/src/testHelpers/cwd.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/cwd.ts rename to packages/react-cosmos/src/testHelpers/cwd.ts diff --git a/packages/react-cosmos/src/server/testHelpers/jestWorkerId.ts b/packages/react-cosmos/src/testHelpers/jestWorkerId.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/jestWorkerId.ts rename to packages/react-cosmos/src/testHelpers/jestWorkerId.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockConsole.ts b/packages/react-cosmos/src/testHelpers/mockConsole.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockConsole.ts rename to packages/react-cosmos/src/testHelpers/mockConsole.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockCosmosPlugins.ts b/packages/react-cosmos/src/testHelpers/mockCosmosPlugins.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockCosmosPlugins.ts rename to packages/react-cosmos/src/testHelpers/mockCosmosPlugins.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockEsmRequire.ts b/packages/react-cosmos/src/testHelpers/mockEsmRequire.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockEsmRequire.ts rename to packages/react-cosmos/src/testHelpers/mockEsmRequire.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockEsmResolve.ts b/packages/react-cosmos/src/testHelpers/mockEsmResolve.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockEsmResolve.ts rename to packages/react-cosmos/src/testHelpers/mockEsmResolve.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockEsmStaticPath.ts b/packages/react-cosmos/src/testHelpers/mockEsmStaticPath.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockEsmStaticPath.ts rename to packages/react-cosmos/src/testHelpers/mockEsmStaticPath.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockFetch.ts b/packages/react-cosmos/src/testHelpers/mockFetch.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockFetch.ts rename to packages/react-cosmos/src/testHelpers/mockFetch.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockFs.ts b/packages/react-cosmos/src/testHelpers/mockFs.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockFs.ts rename to packages/react-cosmos/src/testHelpers/mockFs.ts diff --git a/packages/react-cosmos/src/server/testHelpers/mockYargs.ts b/packages/react-cosmos/src/testHelpers/mockYargs.ts similarity index 100% rename from packages/react-cosmos/src/server/testHelpers/mockYargs.ts rename to packages/react-cosmos/src/testHelpers/mockYargs.ts diff --git a/packages/react-cosmos/src/server/testMocks/playground.bundle.js b/packages/react-cosmos/src/testMocks/playground.bundle.js similarity index 100% rename from packages/react-cosmos/src/server/testMocks/playground.bundle.js rename to packages/react-cosmos/src/testMocks/playground.bundle.js diff --git a/packages/react-cosmos/src/server/testMocks/playground.bundle.js.map b/packages/react-cosmos/src/testMocks/playground.bundle.js.map similarity index 100% rename from packages/react-cosmos/src/server/testMocks/playground.bundle.js.map rename to packages/react-cosmos/src/testMocks/playground.bundle.js.map diff --git a/packages/react-cosmos/src/server/userDeps/__snapshots__/userDepsTemplate.test.ts.snap b/packages/react-cosmos/src/userDeps/__snapshots__/userDepsTemplate.test.ts.snap similarity index 100% rename from packages/react-cosmos/src/server/userDeps/__snapshots__/userDepsTemplate.test.ts.snap rename to packages/react-cosmos/src/userDeps/__snapshots__/userDepsTemplate.test.ts.snap diff --git a/packages/react-cosmos/src/server/userDeps/findUserModulePaths.ts b/packages/react-cosmos/src/userDeps/findUserModulePaths.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/findUserModulePaths.ts rename to packages/react-cosmos/src/userDeps/findUserModulePaths.ts diff --git a/packages/react-cosmos/src/server/userDeps/fixtureWatcher.ts b/packages/react-cosmos/src/userDeps/fixtureWatcher.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/fixtureWatcher.ts rename to packages/react-cosmos/src/userDeps/fixtureWatcher.ts diff --git a/packages/react-cosmos/src/server/userDeps/generateUserDepsModule.ts b/packages/react-cosmos/src/userDeps/generateUserDepsModule.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/generateUserDepsModule.ts rename to packages/react-cosmos/src/userDeps/generateUserDepsModule.ts diff --git a/packages/react-cosmos/src/server/userDeps/getUserModules.ts b/packages/react-cosmos/src/userDeps/getUserModules.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/getUserModules.ts rename to packages/react-cosmos/src/userDeps/getUserModules.ts diff --git a/packages/react-cosmos/src/server/userDeps/shared.ts b/packages/react-cosmos/src/userDeps/shared.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/shared.ts rename to packages/react-cosmos/src/userDeps/shared.ts diff --git a/packages/react-cosmos/src/server/userDeps/userDepsTemplate.test.ts b/packages/react-cosmos/src/userDeps/userDepsTemplate.test.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/userDepsTemplate.test.ts rename to packages/react-cosmos/src/userDeps/userDepsTemplate.test.ts diff --git a/packages/react-cosmos/src/server/userDeps/userDepsTemplate.ts b/packages/react-cosmos/src/userDeps/userDepsTemplate.ts similarity index 100% rename from packages/react-cosmos/src/server/userDeps/userDepsTemplate.ts rename to packages/react-cosmos/src/userDeps/userDepsTemplate.ts diff --git a/packages/react-cosmos/src/server/utils/cli.ts b/packages/react-cosmos/src/utils/cli.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/cli.ts rename to packages/react-cosmos/src/utils/cli.ts diff --git a/packages/react-cosmos/src/server/utils/fs.ts b/packages/react-cosmos/src/utils/fs.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/fs.ts rename to packages/react-cosmos/src/utils/fs.ts diff --git a/packages/react-cosmos/src/server/utils/isNodeError.ts b/packages/react-cosmos/src/utils/isNodeError.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/isNodeError.ts rename to packages/react-cosmos/src/utils/isNodeError.ts diff --git a/packages/react-cosmos/src/server/utils/requireModule.ts b/packages/react-cosmos/src/utils/requireModule.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/requireModule.ts rename to packages/react-cosmos/src/utils/requireModule.ts diff --git a/packages/react-cosmos/src/server/utils/requireSilent.ts b/packages/react-cosmos/src/utils/requireSilent.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/requireSilent.ts rename to packages/react-cosmos/src/utils/requireSilent.ts diff --git a/packages/react-cosmos/src/server/utils/resolve.ts b/packages/react-cosmos/src/utils/resolve.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/resolve.ts rename to packages/react-cosmos/src/utils/resolve.ts diff --git a/packages/react-cosmos/src/server/utils/resolveLoose.ts b/packages/react-cosmos/src/utils/resolveLoose.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/resolveLoose.ts rename to packages/react-cosmos/src/utils/resolveLoose.ts diff --git a/packages/react-cosmos/src/server/utils/resolveSilent.ts b/packages/react-cosmos/src/utils/resolveSilent.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/resolveSilent.ts rename to packages/react-cosmos/src/utils/resolveSilent.ts diff --git a/packages/react-cosmos/src/server/utils/slash.ts b/packages/react-cosmos/src/utils/slash.ts similarity index 100% rename from packages/react-cosmos/src/server/utils/slash.ts rename to packages/react-cosmos/src/utils/slash.ts diff --git a/scripts/build.ts b/scripts/build.ts index 66ca47c93d..ef66b5140a 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -188,13 +188,11 @@ function runAsyncTask({ cmd, args, env = {} }: RunAsyncTaskArgs) { }); } -const STATIC_PATH = 'server/static'; - async function copyStaticAssets(pkgName: string) { const pkgDir = fileURLToPath( new URL(`../packages/${pkgName}`, import.meta.url) ); - await fs.cp(`${pkgDir}/src/${STATIC_PATH}`, `${pkgDir}/dist/${STATIC_PATH}`, { + await fs.cp(`${pkgDir}/src/static`, `${pkgDir}/dist/static`, { recursive: true, }); }