fix: prevent parsing MDX files from filesystem

ccontrols · Mar 5, 2020 · 5fb3c47 · 5fb3c47
1 parent 3cf5964
commit 5fb3c47
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/core/instrument/src/babel/extract-component.ts b/core/instrument/src/babel/extract-component.ts
@@ -46,13 +46,15 @@ const componentFromParams = (
 export const extractComponent = async (
   componentName: string,
   filePath: string,
+  source?: string,
   parserOptions?: parser.ParserOptions,
   resolveOptions?: resolve.SyncOpts,
   initialAST?: File,
 ): Promise<StoryComponent | undefined> => {
   const follow = followImports(
     componentName,
     filePath,
+    source,
     parserOptions,
     resolveOptions,
     initialAST,
@@ -72,6 +74,7 @@ export const extractComponent = async (
 export const extractSotreComponent = async (
   store: StoriesStore,
   filePath: string,
+  source: string,
   parserOptions?: parser.ParserOptions,
   resolveOptions?: resolve.SyncOpts,
   initialAST?: File,
@@ -85,6 +88,7 @@ export const extractSotreComponent = async (
       const component = await extractComponent(
         componentName,
         filePath,
+        source,
         parserOptions,
         resolveOptions,
         initialAST,
@@ -102,6 +106,7 @@ export const extractSotreComponent = async (
       const component = await extractComponent(
         componentName,
         filePath,
+        source,
         parserOptions,
         resolveOptions,
         initialAST,

diff --git a/core/instrument/src/babel/follow-imports.ts b/core/instrument/src/babel/follow-imports.ts
@@ -24,11 +24,12 @@ export interface FollowImportType {
 export const followImports = (
   importName: string,
   filePath: string,
+  fileSource?: string,
   parserOptions?: parser.ParserOptions,
   resolveOptions?: resolve.SyncOpts,
   initialAST?: File,
 ): FollowImportType | undefined => {
-  const source = fs.readFileSync(filePath, 'utf8');
+  const source = fileSource || fs.readFileSync(filePath, 'utf8');
   const ast = initialAST || parser.parse(source, parserOptions);
 
   const baseImportedName = importName.split('.')[0];
@@ -59,6 +60,7 @@ export const followImports = (
       const imported = followImports(
         findExport.internalName,
         resolvedFilePath,
+        undefined,
         parserOptions,
         resolveOptions,
       );
@@ -81,6 +83,7 @@ export const followImports = (
         foundInExportAll = followImports(
           baseImportedName,
           resolvedFilePath,
+          undefined,
           parserOptions,
           resolveOptions,
         );
@@ -102,6 +105,7 @@ export const followImports = (
       const imported = followImports(
         findImport.importedName,
         resolvedFilePath,
+        undefined,
         parserOptions,
         resolveOptions,
       );

diff --git a/core/instrument/src/index.ts b/core/instrument/src/index.ts
@@ -92,10 +92,17 @@ const parseSource = async (
       {},
     );
   }
-  await extractSotreComponent(store, filePath, mergedParserOptions, {
-    ...defaultResolveOptions,
-    ...resolveOptions,
-  });
+  await extractSotreComponent(
+    store,
+    filePath,
+    source,
+    mergedParserOptions,
+    {
+      ...defaultResolveOptions,
+      ...resolveOptions,
+    },
+    ast,
+  );
   const kindsNames = Object.keys(store.kinds);
   for (let i = 0; i < kindsNames.length; i += 1) {
     const kind: StoriesKind = store.kinds[kindsNames[i]];