Skip to content

Commit 30819ba

Browse files
authored
Merge pull request #461 from easyops-cn/steve/fix-require-resolve
fix: use `require.resolve` for generated js, fixes #459
2 parents a37e86f + 4728b28 commit 30819ba

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

docusaurus-search-local/src/server/utils/generate.spec.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ describe("generate", () => {
4444
expect.stringMatching(
4545
/^require\(".+\/|\\lunr-languages\/|\\lunr\.stemmer\.support\.js"\)\(lunr\);$/
4646
),
47-
'require("@easyops-cn/docusaurus-search-local/dist/client/shared/lunrLanguageZh").lunrLanguageZh(lunr);',
47+
expect.stringMatching(
48+
/^require\(".+\/lunrLanguageZh\.js"\)\.lunrLanguageZh\(lunr\);$/
49+
),
4850
'export const language = ["zh"];',
4951
"export const removeDefaultStopWordFilter = false;",
5052
"export const removeDefaultStemmer = false;",
@@ -129,7 +131,9 @@ describe("generate", () => {
129131
expect.stringMatching(
130132
/^require\(".+\/|\\lunr-languages\/|\\lunr\.stemmer\.support\.js"\)\(lunr\);$/
131133
),
132-
'require("@easyops-cn/docusaurus-search-local/dist/client/shared/lunrLanguageZh").lunrLanguageZh(lunr);',
134+
expect.stringMatching(
135+
/^require\(".+\/lunrLanguageZh\.js"\)\.lunrLanguageZh\(lunr\);$/
136+
),
133137
expect.stringMatching(
134138
/^require\(".+\/|\\lunr-languages\/|\\lunr\.multi\.js"\)\(lunr\);$/
135139
),
@@ -161,7 +165,9 @@ describe("generate", () => {
161165
expect.stringMatching(
162166
/^require\(".+\/|\\lunr-languages\/|\\lunr\.es\.js"\)\(lunr\);$/
163167
),
164-
'require("@easyops-cn/docusaurus-search-local/dist/client/shared/lunrLanguageZh").lunrLanguageZh(lunr);',
168+
expect.stringMatching(
169+
/^require\(".+\/lunrLanguageZh\.js"\)\.lunrLanguageZh\(lunr\);$/
170+
),
165171
expect.stringMatching(
166172
/^require\(".+\/|\\lunr-languages\/|\\lunr\.multi\.js"\)\(lunr\);$/
167173
),

docusaurus-search-local/src/server/utils/generate.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ export function generate(config: ProcessedPluginOptions, dir: string): string {
5050
}
5151
if (language.includes("zh")) {
5252
contents.push(
53-
'require("@easyops-cn/docusaurus-search-local/dist/client/shared/lunrLanguageZh").lunrLanguageZh(lunr);'
53+
`require(${JSON.stringify(
54+
require.resolve(
55+
"@easyops-cn/docusaurus-search-local/dist/client/shared/lunrLanguageZh"
56+
)
57+
)}).lunrLanguageZh(lunr);`
5458
);
5559
}
5660
if (language.length > 1) {

0 commit comments

Comments
 (0)