resolves #805 fix web preview (#806)

extension-browser.webpack.config.js

@@ -22,7 +22,7 @@ module.exports = {
             'https': false,
             'url': false,
             'zlib': false,
-            'os': false,
+            'os': require.resolve('os-browserify/browser'),
             'child_process': false,
             'crypto': false,
             'stream': false,

package.json

@@ -618,6 +618,7 @@
 		"@fontsource/open-sans": "4.5.14",
 		"@fontsource/roboto-mono": "4.5.10",
 		"@highlightjs/cdn-assets": "~11.8.0",
+		"@playwright/test": "^1.39.0",
 		"@types/lodash.throttle": "~4.1",
 		"@types/mocha": "~9.1",
 		"@types/node": "12.20.55",
@@ -658,6 +659,7 @@
 		"asciidoctor-kroki": "0.18.1",
 		"html-entities": "^2.4.0",
 		"js-yaml": "^4.1.0",
+		"os-browserify": "^0.3.0",
 		"querystring": "^0.2.1",
 		"tty-browserify": "^0.0.1",
 		"util": "^0.12.5",

src/features/asciidoctorConfig.ts

@@ -1,10 +1,6 @@
-import * as path from 'path'
 import * as vscode from 'vscode'
 import { Asciidoctor } from '@asciidoctor/core'
 import { AsciidoctorProcessor } from '../asciidoctorProcessor'
-import { getWorkspaceFolder } from '../util/workspace'
-
-const MAX_DEPTH_SEARCH_ASCIIDOCCONFIG = 100
 
 export interface AsciidoctorConfigProvider {
   activate(registry: Asciidoctor.Extensions.Registry, documentUri: vscode.Uri): Promise<void>;
@@ -46,49 +42,25 @@ export class AsciidoctorConfig implements AsciidoctorConfigProvider {
   }
 }
 
-async function exists (uri: vscode.Uri) {
-  try {
-    await vscode.workspace.fs.stat(uri)
-    return true
-  } catch (err) {
-    if (err && err.code === 'FileNotFound') {
-      return false
-    }
-    throw err
-  }
-}
-
 export async function getAsciidoctorConfigContent (documentUri: vscode.Uri): Promise<String | undefined> {
-  const workspaceFolder = getWorkspaceFolder(documentUri)
-  if (workspaceFolder === undefined) {
+  const asciidoctorConfigs = (await vscode.workspace.findFiles('**/.{asciidoctorconfig.adoc,asciidoctorconfig}', null))
+    .filter((uri) => {
+      const documentParentDirectory = documentUri.path.slice(0, documentUri.path.lastIndexOf('/'))
+      const asciidoctorConfigParentDirectory = uri.path.slice(0, uri.path.lastIndexOf('/'))
+      return documentParentDirectory.startsWith(asciidoctorConfigParentDirectory)
+    })
+    .sort((a, b) => a.path.localeCompare(b.path))
+  if (asciidoctorConfigs.length === 0) {
     return undefined
   }
-
-  const configContents: string[] = []
-  let currentFile: string = documentUri.fsPath
-  let increment = 0
-  while (currentFile !== undefined && currentFile !== workspaceFolder.uri.fsPath && increment < MAX_DEPTH_SEARCH_ASCIIDOCCONFIG) {
-    increment++
-    currentFile = path.dirname(currentFile)
-    configContents.push(await getConfigContent(currentFile, '.asciidoctorconfig.adoc'))
-    configContents.push(await getConfigContent(currentFile, '.asciidoctorconfig'))
-  }
-
-  const configContentsOrderedAndFiltered = configContents
-    .filter((config) => config !== undefined)
-    .reverse()
-
-  if (configContentsOrderedAndFiltered.length > 0) {
-    return configContentsOrderedAndFiltered.join('\n\n')
+  const configContents = []
+  for (const asciidoctorConfig of asciidoctorConfigs) {
+    const asciidoctorConfigContent = new TextDecoder().decode(await vscode.workspace.fs.readFile(asciidoctorConfig))
+    const asciidoctorConfigParentDirectory = asciidoctorConfig.path.slice(0, asciidoctorConfig.path.lastIndexOf('/'))
+    configContents.push(`:asciidoctorconfigdir: ${asciidoctorConfigParentDirectory}\n\n${asciidoctorConfigContent.trim()}\n\n`)
   }
-  return undefined
-}
-
-async function getConfigContent (folderPath: string, configFilename: string) {
-  const asciidoctorConfigUri = vscode.Uri.joinPath(vscode.Uri.file(folderPath), configFilename)
-  if (await exists(asciidoctorConfigUri)) {
-    const asciidoctorConfigContent = new TextDecoder().decode(await vscode.workspace.fs.readFile(asciidoctorConfigUri))
-    return `:asciidoctorconfigdir: ${folderPath}\n\n${asciidoctorConfigContent.trim()}\n\n`
+  if (configContents.length > 0) {
+    return configContents.join('\n\n')
   }
   return undefined
 }