From 73407126fc2b5229d50cb146b8dc5023922d4f59 Mon Sep 17 00:00:00 2001
From: tooppaaa <clementdungler@gmail.com>
Date: Thu, 6 Aug 2020 18:59:28 +0200
Subject: [PATCH 1/4] cli: apply types for angular

---
 app/angular/src/client/index.ts               |  2 ++
 app/angular/src/client/preview/types-6-0.ts   | 23 +++++++++++++++++++
 app/angular/src/types-6-0.d.ts                |  1 +
 .../src/frameworks/angular/Button.stories.ts  |  6 +++--
 .../src/frameworks/angular/Header.stories.ts  |  6 +++--
 .../src/frameworks/angular/Page.stories.ts    |  6 +++--
 6 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 app/angular/src/client/preview/types-6-0.ts
 create mode 100644 app/angular/src/types-6-0.d.ts

diff --git a/app/angular/src/client/index.ts b/app/angular/src/client/index.ts
index 823d2918762..384e8f440cb 100644
--- a/app/angular/src/client/index.ts
+++ b/app/angular/src/client/index.ts
@@ -9,6 +9,8 @@ export {
   raw,
 } from './preview';
 
+export * from './preview/types-6-0';
+
 export { StoryFnAngularReturnType as IStory } from './preview/types';
 
 export { moduleMetadata } from './preview/angular/decorators';
diff --git a/app/angular/src/client/preview/types-6-0.ts b/app/angular/src/client/preview/types-6-0.ts
new file mode 100644
index 00000000000..5f66f80955c
--- /dev/null
+++ b/app/angular/src/client/preview/types-6-0.ts
@@ -0,0 +1,23 @@
+import { Args as DefaultArgs, Annotations, BaseMeta, BaseStory } from '@storybook/addons';
+import { StoryFnAngularReturnType } from './types';
+
+export { Args, ArgTypes, Parameters, StoryContext } from '@storybook/addons';
+
+type AngularComponent = any;
+type AngularReturnType = StoryFnAngularReturnType;
+
+/**
+ * Metadata to configure the stories for a component.
+ *
+ * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export)
+ */
+export type Meta<Args = DefaultArgs> = BaseMeta<AngularComponent> &
+  Annotations<Args, AngularReturnType>;
+
+/**
+ * Story function that represents a component example.
+ *
+ * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports)
+ */
+export type Story<Args = DefaultArgs> = BaseStory<Args, AngularReturnType> &
+  Annotations<Args, AngularReturnType>;
diff --git a/app/angular/src/types-6-0.d.ts b/app/angular/src/types-6-0.d.ts
new file mode 100644
index 00000000000..6ed7da8e519
--- /dev/null
+++ b/app/angular/src/types-6-0.d.ts
@@ -0,0 +1 @@
+export * from './dist/client/preview/types-6-0.d';
diff --git a/lib/cli/src/frameworks/angular/Button.stories.ts b/lib/cli/src/frameworks/angular/Button.stories.ts
index 787e8d85cbd..feba4f551f7 100644
--- a/lib/cli/src/frameworks/angular/Button.stories.ts
+++ b/lib/cli/src/frameworks/angular/Button.stories.ts
@@ -1,3 +1,5 @@
+// also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
+import { Story, Meta } from '@storybook/angular/types-6-0';
 import Button from './button.component';
 
 export default {
@@ -6,9 +8,9 @@ export default {
   argTypes: {
     backgroundColor: { control: 'color' },
   },
-};
+} as Meta;
 
-const Template = (args: Button) => ({
+const Template: Story<Button> = (args: Button) => ({
   component: Button,
   props: args,
 });
diff --git a/lib/cli/src/frameworks/angular/Header.stories.ts b/lib/cli/src/frameworks/angular/Header.stories.ts
index 162abf8c394..e8f6cca9ee9 100644
--- a/lib/cli/src/frameworks/angular/Header.stories.ts
+++ b/lib/cli/src/frameworks/angular/Header.stories.ts
@@ -1,5 +1,7 @@
 import { moduleMetadata } from '@storybook/angular';
 import { CommonModule } from '@angular/common';
+// also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
+import { Story, Meta } from '@storybook/angular/types-6-0';
 
 import Button from './button.component';
 import Header from './header.component';
@@ -13,9 +15,9 @@ export default {
       imports: [CommonModule],
     }),
   ],
-};
+} as Meta;
 
-const Template = (args: Header) => ({
+const Template: Story<Header> = (args: Header) => ({
   component: Header,
   props: args,
 });
diff --git a/lib/cli/src/frameworks/angular/Page.stories.ts b/lib/cli/src/frameworks/angular/Page.stories.ts
index 203b510d84c..793c9f9130f 100644
--- a/lib/cli/src/frameworks/angular/Page.stories.ts
+++ b/lib/cli/src/frameworks/angular/Page.stories.ts
@@ -1,5 +1,7 @@
 import { moduleMetadata } from '@storybook/angular';
 import { CommonModule } from '@angular/common';
+// also exported from '@storybook/react' if you can deal with breaking changes in 6.1
+import { Story, Meta } from '@storybook/angular/types-6-0';
 
 import Button from './button.component';
 import Header from './header.component';
@@ -16,9 +18,9 @@ export default {
       imports: [CommonModule],
     }),
   ],
-};
+} as Meta;
 
-const Template = (args: Page) => ({
+const Template: Story<Page> = (args: Page) => ({
   component: Page,
   props: args,
 });

From c24a19c0bb0a108dae819b7dfc357a82cba096ae Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Fri, 7 Aug 2020 17:23:04 +0800
Subject: [PATCH 2/4] Fix angular csf type exports

---
 app/angular/{src => }/types-6-0.d.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/angular/{src => }/types-6-0.d.ts (100%)

diff --git a/app/angular/src/types-6-0.d.ts b/app/angular/types-6-0.d.ts
similarity index 100%
rename from app/angular/src/types-6-0.d.ts
rename to app/angular/types-6-0.d.ts

From 421a49bbbef3b2fe68cf465f9807dfc54ef8255a Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Fri, 7 Aug 2020 18:19:43 +0800
Subject: [PATCH 3/4] Angular typed CSF examples

---
 examples/angular-cli/src/stories/addon-controls.stories.ts | 5 +++--
 examples/angular-cli/src/stories/core.stories.ts           | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/angular-cli/src/stories/addon-controls.stories.ts b/examples/angular-cli/src/stories/addon-controls.stories.ts
index e24225f92fa..48f43ba022a 100644
--- a/examples/angular-cli/src/stories/addon-controls.stories.ts
+++ b/examples/angular-cli/src/stories/addon-controls.stories.ts
@@ -1,12 +1,13 @@
+import { Story, Meta } from '@storybook/angular/types-6-0';
 import { ButtonComponent } from './doc-button/doc-button.component';
 
 export default {
   title: 'Addon/Controls',
   component: ButtonComponent,
   parameters: { docs: { iframeHeight: 120 } },
-};
+} as Meta;
 
-const Template = (args) => ({
+const Template: Story = (args) => ({
   component: ButtonComponent,
   props: args,
 });
diff --git a/examples/angular-cli/src/stories/core.stories.ts b/examples/angular-cli/src/stories/core.stories.ts
index 42b151282cd..fcfce5c5d49 100644
--- a/examples/angular-cli/src/stories/core.stories.ts
+++ b/examples/angular-cli/src/stories/core.stories.ts
@@ -1,5 +1,6 @@
 import { addParameters } from '@storybook/angular';
 import { Button } from '@storybook/angular/demo';
+import { Story, Meta } from '@storybook/angular/types-6-0';
 
 const globalParameter = 'globalParameter';
 const chapterParameter = 'chapterParameter';
@@ -12,9 +13,9 @@ export default {
   parameters: {
     chapterParameter,
   },
-};
+} as Meta;
 
-export const PassedToStory = (_args, { parameters: { fileName, ...parameters } }) => ({
+export const PassedToStory: Story = (_args, { parameters: { fileName, ...parameters } }) => ({
   component: Button,
   props: {
     text: `Parameters are ${JSON.stringify(parameters, null, 2)}`,

From 6349031e923f51ceadd25bd779e6ff1465e8bace Mon Sep 17 00:00:00 2001
From: tooppaaa <clementdungler@gmail.com>
Date: Fri, 7 Aug 2020 12:30:39 +0200
Subject: [PATCH 4/4] remove angualr v7 v8 e2e (typings issues)

---
 scripts/run-e2e-config.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/run-e2e-config.ts b/scripts/run-e2e-config.ts
index 188c788284c..d801914880b 100644
--- a/scripts/run-e2e-config.ts
+++ b/scripts/run-e2e-config.ts
@@ -28,17 +28,18 @@ const baseAngular: Parameters = {
 //   additionalDeps: [...baseAngular.additionalDeps, 'core-js'],
 // };
 
-export const angularv7: Parameters = {
-  ...baseAngular,
-  version: 'v7-lts',
-  additionalDeps: [...baseAngular.additionalDeps, 'core-js'],
-};
+// TODO: enable back when typings issues are resolved
+// export const angularv7: Parameters = {
+//   ...baseAngular,
+//   version: 'v7-lts',
+//   additionalDeps: [...baseAngular.additionalDeps, 'core-js'],
+// };
 
-export const angularv8: Parameters = {
-  ...baseAngular,
-  version: 'v8-lts',
-  additionalDeps: [...baseAngular.additionalDeps, 'core-js'],
-};
+// export const angularv8: Parameters = {
+//   ...baseAngular,
+//   version: 'v8-lts',
+//   additionalDeps: [...baseAngular.additionalDeps, 'core-js'],
+// };
 
 export const angularv9: Parameters = {
   ...baseAngular,