fix: make sure node_module resolved path ignored

vue-styleguidist · May 15, 2019 · 7a1092a · 7a1092a
1 parent a4eed84
commit 7a1092a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/vue-docgen-api/src/script-handlers/extendsHandler.ts b/packages/vue-docgen-api/src/script-handlers/extendsHandler.ts
@@ -36,17 +36,16 @@ export default function extendsHandler(
 	resolveImmediatelyExportedRequire(pathResolver, extendsFilePath)
 
 	// only look for documentation in the current project not in node_modules
-	if (/^\./.test(extendsFilePath[extendsVariableName].filePath)) {
-		const fullFilePath = pathResolver(extendsFilePath[extendsVariableName].filePath)
-
+	const fullFilePath = pathResolver(extendsFilePath[extendsVariableName].filePath)
+	if (!/[\\/]node_modules[\\/]/.test(fullFilePath)) {
 		parseFile(documentation, {
 			...opt,
 			filePath: fullFilePath,
 			nameFilter: [extendsFilePath[extendsVariableName].exportName]
 		})
-		// make sure that the parent name does not bleed on the new doc
-		documentation.set('displayName', null)
 	}
+	// make sure that the parent name does not bleed on the new doc
+	documentation.set('displayName', null)
 }
 
 function getExtendsVariableName(compDef: NodePath): string | undefined {

diff --git a/packages/vue-docgen-api/src/script-handlers/mixinsHandler.ts b/packages/vue-docgen-api/src/script-handlers/mixinsHandler.ts
@@ -39,8 +39,8 @@ export default function mixinsHandler(
 	const files = new Map<string, string[]>()
 	for (const varName of Object.keys(mixinVarToFilePath)) {
 		const { filePath, exportName } = mixinVarToFilePath[varName]
-		if (/^\./.test(filePath)) {
-			const fullFilePath = pathResolver(filePath)
+		const fullFilePath = pathResolver(filePath)
+		if (!/[\\/]node_modules[\\/]/.test(fullFilePath)) {
 			const vars = files.get(fullFilePath) || []
 			vars.push(exportName)
 			files.set(fullFilePath, vars)