fix: update types

ccontrols · Mar 26, 2020 · 3df3951 · 3df3951
1 parent c04a539
commit 3df3951
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 8 deletions.
diff --git a/core/loader/README.md b/core/loader/README.md
@@ -3,6 +3,7 @@
 -   [Overview](#overview)
 -   [Installation](#installation)
 -   [API](#api)
+    -   [deepMerge](#deepmerge)
     -   [injectedStories](#injectedstories)
     -   [storyStore](#storystore)
     -   [loadStoryStore](#loadstorystore)
@@ -34,6 +35,17 @@ $ npm install @component-controls/loader --save-dev
 
 <!-- START-TSDOC-TYPESCRIPT -->
 
+## deepMerge
+
+_defined in [@component-controls/loader/src/story-store-data.ts](https://github.com/ccontrols/component-controls/tree/master/core/loader/src/story-store-data.ts#L4)_
+
+
+
+### properties
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+
 ## injectedStories
 
 _defined in [@component-controls/loader/src/story-store-data.ts](https://github.com/ccontrols/component-controls/tree/master/core/loader/src/story-store-data.ts#L6)_

diff --git a/core/loader/src/story-store-data.ts b/core/loader/src/story-store-data.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/camelcase */
 import { StoriesStore, Story } from '@component-controls/specification';
-import * as deepMerge from 'deepmerge';
+const deepMerge = require('deepmerge');
 import { toId, storyNameFromExport } from '@storybook/csf';
 const injectedStories = '__STORIES_HASH__INJECTED_STORIES__';
 

diff --git a/core/loader/tmp-out-typedoc.json b/core/loader/tmp-out-typedoc.json
@@ -6,7 +6,7 @@
 	"originalName": "",
 	"children": [
 		{
-			"id": 79,
+			"id": 80,
 			"name": "\"loader/src/loader\"",
 			"kind": 1,
 			"kindString": "Module",
@@ -34,6 +34,27 @@
 			"children": [
 				{
 					"id": 75,
+					"name": "deepMerge",
+					"kind": 32,
+					"kindString": "Variable",
+					"flags": {
+						"isConst": true
+					},
+					"sources": [
+						{
+							"fileName": "loader/src/story-store-data.ts",
+							"line": 4,
+							"character": 15
+						}
+					],
+					"type": {
+						"type": "intrinsic",
+						"name": "any"
+					},
+					"defaultValue": "require('deepmerge')"
+				},
+				{
+					"id": 76,
 					"name": "injectedStories",
 					"kind": 32,
 					"kindString": "Variable",
@@ -54,7 +75,7 @@
 					"defaultValue": "\"__STORIES_HASH__INJECTED_STORIES__\""
 				},
 				{
-					"id": 76,
+					"id": 77,
 					"name": "storyStore",
 					"kind": 32,
 					"kindString": "Variable",
@@ -84,7 +105,7 @@
 					"defaultValue": "undefined"
 				},
 				{
-					"id": 77,
+					"id": 78,
 					"name": "loadStoryStore",
 					"kind": 64,
 					"kindString": "Function",
@@ -93,7 +114,7 @@
 					},
 					"signatures": [
 						{
-							"id": 78,
+							"id": 79,
 							"name": "loadStoryStore",
 							"kind": 4096,
 							"kindString": "Call signature",
@@ -128,14 +149,15 @@
 					"kind": 32,
 					"children": [
 						75,
-						76
+						76,
+						77
 					]
 				},
 				{
 					"title": "Functions",
 					"kind": 64,
 					"children": [
-						77
+						78
 					]
 				}
 			],
@@ -1817,7 +1839,7 @@
 			"title": "Modules",
 			"kind": 1,
 			"children": [
-				79,
+				80,
 				74,
 				1
 			]

diff --git a/integrations/storybook/src/config-legacy.ts b/integrations/storybook/src/config-legacy.ts
@@ -44,8 +44,13 @@ addDecorator(
             controls: ComponentControls;
           }[] = [];
           const injectedStoryStore = storyStoreData;
+
           Object.keys(injectedStoryStore.stories).forEach((id: string) => {
             const story = injectedStoryStore.stories[id];
+            if (storyStore._data[id]) {
+              story.storyFn = storyStore._data[id].storyFn;
+            }
+
             const { controls } = story;
             const parameters = story.parameters || {};
             const { addonControls = {} } = parameters;