remove cache and fix compatibility with VS code web

asciidoctor · Oct 8, 2024 · 27616c8 · 27616c8
1 parent 8aaa8aa
commit 27616c8
Show file tree

Hide file tree

Showing 18 changed files with 281 additions and 278 deletions.
diff --git a/extension-browser.webpack.config.js b/extension-browser.webpack.config.js
@@ -2,7 +2,7 @@
 
 const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const { ProvidePlugin } = require('webpack')
+const { ProvidePlugin, NormalModuleReplacementPlugin } = require('webpack')
 
 module.exports = {
     entry: {
@@ -53,7 +53,7 @@ module.exports = {
     externals: {
         'vscode': 'commonjs vscode', // ignored because it doesn't exist,
         'applicationinsights-native-metrics': 'commonjs applicationinsights-native-metrics', // ignored because we don't ship native module
-        '@opentelemetry/tracing': 'commonjs @opentelemetry/tracing' // ignored because we don't ship this module
+        '@opentelemetry/tracing': 'commonjs @opentelemetry/tracing', // ignored because we don't ship this module
     },
     performance: {
         hints: false
@@ -69,6 +69,19 @@ module.exports = {
     // yes, really source maps
     devtool: 'nosources-source-map',
     plugins: [
+        new NormalModuleReplacementPlugin(/antoraDocument$/, function (
+          resource
+        ) {
+            // replaced because Antora cannot run in a web environment
+            resource.request = resource.request.replace(
+              /antoraDocument/,
+              `antoraDocumentBrowserShim`
+            );
+
+            if (resource.createData) {
+                resource.createData.request = resource.request;
+            }
+        }),
         new CopyWebpackPlugin({
             patterns: [
                 {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -637,7 +637,7 @@
 		"@fontsource/open-sans": "4.5.14",
 		"@fontsource/roboto-mono": "4.5.10",
 		"@highlightjs/cdn-assets": "~11.9.0",
-		"@playwright/test": "~1.44.0",
+		"@playwright/test": "^1.47.2",
 		"@types/lodash.throttle": "~4.1",
 		"@types/mocha": "~10.0",
 		"@types/node": "~20.14",
@@ -677,6 +677,7 @@
 		"@asciidoctor/core": "2.2.7",
 		"@asciidoctor/docbook-converter": "2.0.0",
 		"@orcid/bibtex-parse-js": "0.0.25",
+		"@vscode/ripgrep": "1.15.9",
 		"asciidoctor-kroki": "0.18.1",
 		"html-entities": "^2.4.0",
 		"js-yaml": "^4.1.0",
@@ -686,7 +687,6 @@
 		"util": "^0.12.5",
 		"uuid": "8.3.2",
 		"vscode-nls": "5.2.0",
-		"vscode-ripgrep": "^1.13.2",
 		"vscode-uri": "^3.0.3",
 		"worker-thread": "^1.1.0"
 	},

diff --git a/src/asciidocEngine.ts b/src/asciidocEngine.ts
@@ -5,7 +5,8 @@ import { ExtensionContentSecurityPolicyArbiter } from './security'
 import { AsciidocPreviewConfigurationManager } from './features/previewConfig'
 import { SkinnyTextDocument } from './util/document'
 import { AsciidocContributionProvider } from './asciidocExtensions'
-import { AntoraSupportManager, getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraSupport'
+import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraDocument'
+import { AntoraSupportManager } from './features/antora/antoraContext'
 import { WebviewResourceProvider } from './util/resources'
 import { AsciidoctorConfigProvider } from './features/asciidoctorConfig'
 import { AsciidocTextDocument } from './asciidocTextDocument'

diff --git a/src/asciidocLoader.ts b/src/asciidocLoader.ts
@@ -8,7 +8,7 @@ import { SkinnyTextDocument } from './util/document'
 import { AsciidoctorAttributesConfig } from './features/asciidoctorAttributesConfig'
 import { AsciidoctorDiagnosticProvider } from './features/asciidoctorDiagnostic'
 import { AsciidoctorIncludeItemsProvider, IncludeItems } from './features/asciidoctorIncludeItems'
-import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraSupport'
+import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraDocument'
 import { IncludeProcessor } from './features/antora/includeProcessor'
 import { resolveIncludeFile } from './features/antora/resolveIncludeFile'
 

diff --git a/src/asciidoctorWebViewConverter.ts b/src/asciidoctorWebViewConverter.ts
@@ -7,7 +7,7 @@ import { Asciidoctor } from '@asciidoctor/core'
 import { SkinnyTextDocument } from './util/document'
 import * as nls from 'vscode-nls'
 import { AsciidocContributions } from './asciidocExtensions'
-import { AntoraDocumentContext } from './features/antora/antoraSupport'
+import { AntoraDocumentContext } from './features/antora/antoraContext'
 import { getWorkspaceFolder } from './util/workspace'
 
 const localize = nls.loadMessageBundle()

diff --git a/src/extension.ts b/src/extension.ts
@@ -15,7 +15,7 @@ import { AsciidocTargetPathAutoCompletionMonitor } from './util/includeAutoCompl
 import { AttributeReferenceProvider } from './features/attributeReferenceProvider'
 import { BuiltinDocumentAttributeProvider } from './features/builtinDocumentAttributeProvider'
 import AsciidocFoldingRangeProvider from './features/foldingProvider'
-import { AntoraSupportManager } from './features/antora/antoraSupport'
+import { AntoraSupportManager } from './features/antora/antoraContext'
 import { DropImageIntoEditorProvider } from './features/dropIntoEditor'
 import { AsciidoctorConfig } from './features/asciidoctorConfig'
 import { AsciidoctorExtensions } from './features/asciidoctorExtensions'

diff --git a/src/features/antora/antoraCompletionProvider.ts b/src/features/antora/antoraCompletionProvider.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import { getAttributes } from './antoraSupport'
+import { getAttributes } from './antoraDocument'
 
 export default class AntoraCompletionProvider {
   async provideCompletionItems (textDocument: vscode.TextDocument, position: vscode.Position): Promise<vscode.CompletionItem[]> {