Merge pull request #28410 from storybookjs/norbert/cpc-followup

CPC: Remove externalization of `memoizerific` and remove need for `util-deprecate`
storybookjs · Jul 1, 2024 · 4931b38 · 4931b38
2 parents 453f933 + e9bc1e2
commit 4931b38
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/code/core/package.json b/code/core/package.json
@@ -300,7 +300,6 @@
     "@types/react-syntax-highlighter": "11.0.5",
     "@types/react-transition-group": "^4",
     "@types/semver": "^7.3.4",
-    "@types/util-deprecate": "^1.0.0",
     "@types/ws": "^8",
     "@vitest/utils": "^1.3.1",
     "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
@@ -384,7 +383,6 @@
     "unique-string": "^3.0.0",
     "use-resize-observer": "^9.1.0",
     "util": "^0.12.4",
-    "util-deprecate": "^1.0.2",
     "watchpack": "^2.2.0"
   },
   "publishConfig": {

diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts
@@ -33,8 +33,6 @@ export const getEntries = (cwd: string) => {
       'react-dom',
       '@storybook/csf',
       '@storybook/global',
-      'memoizerific',
-      'util-deprecate',
     ]),
     define('src/theming/index.ts', ['browser', 'node'], true, ['react']),
     define('src/theming/create.ts', ['browser', 'node'], true, ['react']),

diff --git a/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts b/code/core/src/preview-api/modules/store/csf/normalizeStory.test.ts
@@ -3,6 +3,8 @@ import type { Renderer, StoryAnnotationsOrFn } from '@storybook/core/types';
 
 import { normalizeStory } from './normalizeStory';
 
+vi.mock('@storybook/core/client-logger');
+
 describe('normalizeStory', () => {
   describe('id generation', () => {
     it('respects component id', () => {

diff --git a/code/core/src/preview-api/modules/store/csf/normalizeStory.ts b/code/core/src/preview-api/modules/store/csf/normalizeStory.ts
@@ -8,8 +8,7 @@ import type {
 } from '@storybook/core/types';
 import { storyNameFromExport, toId } from '@storybook/csf';
 import { dedent } from 'ts-dedent';
-import { logger } from '@storybook/core/client-logger';
-import deprecate from 'util-deprecate';
+import { logger, deprecate } from '@storybook/core/client-logger';
 import { normalizeInputTypes } from './normalizeInputTypes';
 import { normalizeArrays } from './normalizeArrays';
 import type {
@@ -24,8 +23,6 @@ CSF .story annotations deprecated; annotate story functions directly:
 See https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#hoisted-csf-annotations for details and codemod.
 `;
 
-const deprecatedStoryAnnotationWarning = deprecate(() => {}, deprecatedStoryAnnotation);
-
 export function normalizeStory<TRenderer extends Renderer>(
   key: StoryId,
   storyAnnotations: LegacyStoryAnnotationsOrFn<TRenderer>,
@@ -38,7 +35,7 @@ export function normalizeStory<TRenderer extends Renderer>(
   const { story } = storyObject;
   if (story) {
     logger.debug('deprecated story', story);
-    deprecatedStoryAnnotationWarning();
+    deprecate(deprecatedStoryAnnotation);
   }
 
   const exportName = storyNameFromExport(key);

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -5764,7 +5764,6 @@ __metadata:
     "@types/react-syntax-highlighter": "npm:11.0.5"
     "@types/react-transition-group": "npm:^4"
     "@types/semver": "npm:^7.3.4"
-    "@types/util-deprecate": "npm:^1.0.0"
     "@types/ws": "npm:^8"
     "@vitest/utils": "npm:^1.3.1"
     "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10"
@@ -5852,7 +5851,6 @@ __metadata:
     unique-string: "npm:^3.0.0"
     use-resize-observer: "npm:^9.1.0"
     util: "npm:^0.12.4"
-    util-deprecate: "npm:^1.0.2"
     watchpack: "npm:^2.2.0"
     ws: "npm:^8.2.3"
   languageName: unknown