From c1ae449ce2a9aaf5a789c9ac731081b8747af14f Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Tue, 26 Mar 2024 04:36:30 -0700
Subject: [PATCH] Android,Desktop: Plugin API: Fix unable to require
 `@codemirror/search`  (#10205)

---
 packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts       | 2 ++
 .../generator-joplin/generators/app/templates/webpack.config.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts b/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
index 319cc89d5..55a843a6c 100644
--- a/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
+++ b/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
@@ -1,6 +1,7 @@
 
 import * as codeMirrorView from '@codemirror/view';
 import * as codeMirrorState from '@codemirror/state';
+import * as codeMirrorSearch from '@codemirror/search';
 import * as codeMirrorLanguage from '@codemirror/language';
 import * as codeMirrorAutocomplete from '@codemirror/autocomplete';
 import * as codeMirrorCommands from '@codemirror/commands';
@@ -21,6 +22,7 @@ import * as lezerMarkdown from '@lezer/markdown';
 const libraryNameToPackage: Record<string, any> = {
 	'@codemirror/view': codeMirrorView,
 	'@codemirror/state': codeMirrorState,
+	'@codemirror/search': codeMirrorSearch,
 	'@codemirror/language': codeMirrorLanguage,
 	'@codemirror/autocomplete': codeMirrorAutocomplete,
 	'@codemirror/commands': codeMirrorCommands,
diff --git a/packages/generator-joplin/generators/app/templates/webpack.config.js b/packages/generator-joplin/generators/app/templates/webpack.config.js
index cc5308b1a..e5e88c847 100644
--- a/packages/generator-joplin/generators/app/templates/webpack.config.js
+++ b/packages/generator-joplin/generators/app/templates/webpack.config.js
@@ -224,6 +224,7 @@ const pluginConfig = { ...baseConfig, entry: './src/index.ts',
 const externalContentScriptLibraries = [
 	'@codemirror/view',
 	'@codemirror/state',
+	'@codemirror/search',
 	'@codemirror/language',
 	'@codemirror/autocomplete',
 	'@codemirror/commands',