Remove deprecated component and propsMeta field from Angular Stor…

…y type
storybookjs · Mar 30, 2023 · 9baf46a · 9baf46a
1 parent 4029c71
commit 9baf46a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 209 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -38,6 +38,7 @@
     - [Postcss removed](#postcss-removed)
     - [Removed DLL flags](#removed-dll-flags)
   - [7.0 Framework-specific changes](#70-framework-specific-changes)
+    - [Angular: Removed deprecated `component` and `propsMeta` field](#angular-removed-deprecated-component-and-propsmeta-field)
     - [Angular: Drop support for Angular \< 14](#angular-drop-support-for-angular--14)
     - [Angular: Drop support for calling Storybook directly](#angular-drop-support-for-calling-storybook-directly)
     - [Angular: Application providers and ModuleWithProviders](#angular-application-providers-and-modulewithproviders)
@@ -921,6 +922,10 @@ Earlier versions of Storybook used Webpack DLLs as a performance crutch. In 6.1,
 
 ### 7.0 Framework-specific changes
 
+#### Angular: Removed deprecated `component` and `propsMeta` field
+
+The deprecated fields `component` and `propsMeta` on the NgStory type have been removed.
+
 #### Angular: Drop support for Angular < 14
 
 Starting in 7.0, we drop support for Angular < 14

diff --git a/code/addons/storyshots-core/src/frameworks/angular/types.ts b/code/addons/storyshots-core/src/frameworks/angular/types.ts
@@ -11,11 +11,7 @@ export interface ICollection {
 }
 
 export interface NgStory {
-  /** @deprecated `component` story input is deprecated, and will be removed in Storybook 7.0. */
-  component?: any;
   props: ICollection;
-  /** @deprecated `propsMeta` story input is deprecated, and will be removed in Storybook 7.0. */
-  propsMeta?: ICollection;
   moduleMetadata?: NgModuleMetadata;
   template?: string;
 }
diff --git a/code/frameworks/angular/src/client/angular/app.component.ts b/code/frameworks/angular/src/client/angular/app.component.ts
diff --git a/code/frameworks/angular/src/client/angular/app.token.ts b/code/frameworks/angular/src/client/angular/app.token.ts
diff --git a/code/frameworks/angular/src/client/decorateStory.test.ts b/code/frameworks/angular/src/client/decorateStory.test.ts
@@ -194,40 +194,6 @@ describe('decorateStory', () => {
       });
     });
 
-    it('should include legacy story components in decorators', () => {
-      const decorators: DecoratorFunction<AngularRenderer>[] = [
-        (s) => {
-          const story = s();
-          return {
-            ...story,
-            template: `<parent>${story.template}</parent>`,
-          };
-        },
-        (s) => {
-          const story = s();
-          return {
-            ...story,
-            template: `<grandparent>${story.template}</grandparent>`,
-          };
-        },
-        (s) => {
-          const story = s();
-          return {
-            ...story,
-            template: `<great-grandparent>${story.template}</great-grandparent>`,
-          };
-        },
-      ];
-      const decorated = decorateStory(() => ({ component: FooComponent }), decorators);
-
-      expect(decorated(makeContext({}))).toEqual({
-        template:
-          '<great-grandparent><grandparent><parent><foo></foo></parent></grandparent></great-grandparent>',
-        component: FooComponent,
-        userDefinedTemplate: false,
-      });
-    });
-
     it('should keep template with an empty value', () => {
       const decorators: DecoratorFunction<AngularRenderer>[] = [
         componentWrapperDecorator(ParentComponent),

diff --git a/code/frameworks/angular/src/client/decorators.test.ts b/code/frameworks/angular/src/client/decorators.test.ts
@@ -37,15 +37,12 @@ describe('moduleMetadata', () => {
       imports: [MockModule],
       providers: [MockService],
     })(
-      () => ({
-        component: MockComponent,
-      }),
+      () => ({}),
       // deepscan-disable-next-line
       defaultContext
     );
 
     expect(result).toEqual({
-      component: MockComponent,
       moduleMetadata: {
         declarations: [],
         entryComponents: [],

diff --git a/code/frameworks/angular/src/client/types.ts b/code/frameworks/angular/src/client/types.ts
@@ -28,11 +28,7 @@ export interface ICollection {
 }
 
 export interface StoryFnAngularReturnType {
-  /** @deprecated `component` story input is deprecated, and will be removed in Storybook 7.0. */
-  component?: any;
   props?: ICollection;
-  /** @deprecated `propsMeta` story input is deprecated, and will be removed in Storybook 7.0. */
-  propsMeta?: ICollection;
   moduleMetadata?: NgModuleMetadata;
   applicationConfig?: ApplicationConfig;
   template?: string;

diff --git a/...template/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts b/...template/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts
@@ -1,5 +1,5 @@
 import { OnDestroy, OnInit, Component } from '@angular/core';
-import { Meta, StoryFn } from '@storybook/angular';
+import { Meta, StoryObj } from '@storybook/angular';
 
 @Component({
   selector: 'on-destroy',
@@ -37,6 +37,4 @@ export default {
   },
 } as Meta;
 
-export const SimpleComponent: StoryFn = () => ({
-  component: OnDestroyComponent,
-});
+export const SimpleComponent: StoryObj = {};