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
react-cosmos · Apr 10, 2023 · 69fd664 · 69fd664
1 parent 0d1dbd5
commit 69fd664
Show file tree

Hide file tree

Showing 153 changed files with 117 additions and 119 deletions.
diff --git 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
@@ -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
@@ -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':
-      '<rootDir>/packages/react-cosmos/src/server/testMocks/playground.bundle.js.map',
+      '<rootDir>/packages/react-cosmos/src/testMocks/playground.bundle.js.map',
     'react-cosmos-ui/dist/playground.bundle.js':
-      '<rootDir>/packages/react-cosmos/src/server/testMocks/playground.bundle.js',
+      '<rootDir>/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ages/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/customExportConfig.ts b/...ages/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
@@ -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/...ges/react-cosmos-plugin-webpack/src/server/webpackConfig/__tests__/defaultExportConfig.ts b/...ges/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);