From 961bf6fd5e1d6045296ac63bd7c46db57004bfcc Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 30 Oct 2024 14:41:06 +1100 Subject: [PATCH] Revert "Add `ctx.projectMetadata.hasRouter`" This reverts commit 5b5eea5344cef5c4835934f29bcbcec09704dec6. --- node-src/lib/getHasRouter.ts | 33 ---------------------------- node-src/tasks/storybookInfo.test.ts | 32 +-------------------------- node-src/tasks/storybookInfo.ts | 6 ----- node-src/types.ts | 3 --- 4 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 node-src/lib/getHasRouter.ts diff --git a/node-src/lib/getHasRouter.ts b/node-src/lib/getHasRouter.ts deleted file mode 100644 index 41d0bc0a6..000000000 --- a/node-src/lib/getHasRouter.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Context } from '../../dist/node'; - -const routerPackages = [ - 'react-router', - 'react-router-dom', - 'remix', - '@tanstack/react-router', - 'expo-router', - '@reach/router', - 'react-easy-router', - '@remix-run/router', - 'wouter', - 'wouter-preact', - 'preact-router', - 'vue-router', - 'unplugin-vue-router', - '@angular/router', - '@solidjs/router', - - // metaframeworks that imply routing - 'next', - 'react-scripts', - 'gatsby', - 'nuxt', - '@sveltejs/kit', -]; - -export function getHasRouter(packageJson: Context['packageJson']) { - // NOTE: we just check real dependencies; if it is in dev dependencies, it may just be an example - return !!Object.keys(packageJson?.dependencies ?? {}).find((depName) => - routerPackages.includes(depName) - ); -} diff --git a/node-src/tasks/storybookInfo.test.ts b/node-src/tasks/storybookInfo.test.ts index b925bbfb7..b1bc59a14 100644 --- a/node-src/tasks/storybookInfo.test.ts +++ b/node-src/tasks/storybookInfo.test.ts @@ -12,38 +12,8 @@ describe('storybookInfo', () => { const storybook = { version: '1.0.0', viewLayer: 'react', addons: [] }; getStorybookInfo.mockResolvedValue(storybook); - const ctx = { packageJson: {} } as any; + const ctx = {} as any; await setStorybookInfo(ctx); expect(ctx.storybook).toEqual(storybook); }); - - it('sets hasRouter=true if there is a routing package in package.json', async () => { - const ctx = { - packageJson: { - dependencies: { - react: '^18', - 'react-dom': '^18', - 'react-router': '^6', - }, - }, - } as any; - await setStorybookInfo(ctx); - expect(ctx.projectMetadata.hasRouter).toEqual(true); - }); - - it('sets hasRouter=false if there is a routing package in package.json dependenices', async () => { - const ctx = { - packageJson: { - dependencies: { - react: '^18', - 'react-dom': '^18', - }, - devDependencies: { - 'react-router': '^6', - }, - }, - } as any; - await setStorybookInfo(ctx); - expect(ctx.projectMetadata.hasRouter).toEqual(false); - }); }); diff --git a/node-src/tasks/storybookInfo.ts b/node-src/tasks/storybookInfo.ts index ec59a4d3b..74552c994 100644 --- a/node-src/tasks/storybookInfo.ts +++ b/node-src/tasks/storybookInfo.ts @@ -4,7 +4,6 @@ import getStorybookInfo from '../lib/getStorybookInfo'; import { createTask, transitionTo } from '../lib/tasks'; import { Context } from '../types'; import { initial, pending, success } from '../ui/tasks/storybookInfo'; -import { getHasRouter } from '../lib/getHasRouter'; export const setStorybookInfo = async (ctx: Context) => { ctx.storybook = (await getStorybookInfo(ctx)) as Context['storybook']; @@ -18,11 +17,6 @@ export const setStorybookInfo = async (ctx: Context) => { } Sentry.setContext('storybook', ctx.storybook); } - - // Also get some project-level data for analytics - ctx.projectMetadata = { - hasRouter: getHasRouter(ctx.packageJson), - }; }; /** diff --git a/node-src/types.ts b/node-src/types.ts index b668335c2..8e34eab82 100644 --- a/node-src/types.ts +++ b/node-src/types.ts @@ -250,9 +250,6 @@ export interface Context { }; mainConfigFilePath?: string; }; - projectMetadata: { - hasRouter: boolean; - }; storybookUrl?: string; announcedBuild: { id: string;