From 0c8b9ac0d94c9bf0aa5cc5ca76634e5eeeae8e31 Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Wed, 9 Sep 2020 16:52:18 +0800
Subject: [PATCH] Soruce-loader: Export extract-source in its own entry point

---
 addons/docs/src/blocks/enhanceSource.ts | 2 +-
 lib/source-loader/extract-source.d.ts   | 1 +
 lib/source-loader/extract-source.js     | 1 +
 lib/source-loader/src/extract-source.ts | 2 ++
 lib/source-loader/src/index.ts          | 4 ----
 5 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 lib/source-loader/extract-source.d.ts
 create mode 100644 lib/source-loader/extract-source.js

diff --git a/addons/docs/src/blocks/enhanceSource.ts b/addons/docs/src/blocks/enhanceSource.ts
index e64b2bfab86..e336c63c650 100644
--- a/addons/docs/src/blocks/enhanceSource.ts
+++ b/addons/docs/src/blocks/enhanceSource.ts
@@ -1,6 +1,6 @@
 import { combineParameters } from '@storybook/client-api';
 import { StoryContext, Parameters } from '@storybook/addons';
-import { extractSource, LocationsMap } from '@storybook/source-loader';
+import { extractSource, LocationsMap } from '@storybook/source-loader/extract-source';
 
 interface StorySource {
   source: string;
diff --git a/lib/source-loader/extract-source.d.ts b/lib/source-loader/extract-source.d.ts
new file mode 100644
index 00000000000..7fff1094d59
--- /dev/null
+++ b/lib/source-loader/extract-source.d.ts
@@ -0,0 +1 @@
+export * from './dist/extract-source.d';
diff --git a/lib/source-loader/extract-source.js b/lib/source-loader/extract-source.js
new file mode 100644
index 00000000000..60d737b3b03
--- /dev/null
+++ b/lib/source-loader/extract-source.js
@@ -0,0 +1 @@
+module.exports = require('./dist/extract-source');
diff --git a/lib/source-loader/src/extract-source.ts b/lib/source-loader/src/extract-source.ts
index 59fa9c11f57..72092adadc3 100644
--- a/lib/source-loader/src/extract-source.ts
+++ b/lib/source-loader/src/extract-source.ts
@@ -1,5 +1,7 @@
 import type { SourceBlock } from './types';
 
+export * from './types';
+
 /**
  * given a location, extract the text from the full source
  */
diff --git a/lib/source-loader/src/index.ts b/lib/source-loader/src/index.ts
index 5e84ea8c826..757efdfeac6 100644
--- a/lib/source-loader/src/index.ts
+++ b/lib/source-loader/src/index.ts
@@ -2,7 +2,3 @@
 import { transform } from './build';
 
 export default transform;
-
-export * from './types';
-
-export { extractSource } from './extract-source';