Skip to content

Commit 4bd36c0

Browse files
3y33y3
committed
fix: Move search scripts to assets
1 parent f9b923f commit 4bd36c0

File tree

9 files changed

+2376
-1224
lines changed

9 files changed

+2376
-1224
lines changed

‎package-lock.json‎

Lines changed: 2201 additions & 1215 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
},
5555
"dependencies": {
5656
"@diplodoc/client": "^3.1.3",
57-
"@diplodoc/search-extension": "^1.1.4",
5857
"@diplodoc/translation": "^1.4.3",
5958
"katex": "^0.16.9",
6059
"shelljs": "0.8.5",
@@ -68,6 +67,7 @@
6867
"@diplodoc/mermaid-extension": "^1.3.1",
6968
"@diplodoc/openapi-extension": "^2.4.1",
7069
"@diplodoc/prettier-config": "^2.0.0",
70+
"@diplodoc/search-extension": "^1.1.4",
7171
"@diplodoc/transform": "^4.32.3",
7272
"@diplodoc/tsconfig": "^1.0.2",
7373
"@octokit/core": "4.2.4",

‎scripts/build.cli.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ const esbuild = require('esbuild');
33
const tsPaths = require('./ts-paths');
44
const shell = require('shelljs');
55

6+
const SEARCH_API = require.resolve('@diplodoc/search-extension/worker');
7+
const SEARCH_LANGS = require.resolve('@diplodoc/search-extension/worker/langs');
68
const CLIENT_PATH = dirname(require.resolve('@diplodoc/client/manifest'));
79
const ASSETS_PATH = resolve(__dirname, '..', 'assets');
810

11+
const SEARCH_API_OUTPUT = join(ASSETS_PATH, 'search', 'index.js');
12+
const SEARCH_LANGS_OUTPUT = join(ASSETS_PATH, 'search', 'langs');
13+
914
const clientManifest = require('@diplodoc/client/manifest');
1015
const assets = [
1116
...clientManifest.app.js,
@@ -33,6 +38,8 @@ const commonConfig = {
3338
],
3439
define: {
3540
VERSION: JSON.stringify(version),
41+
SEARCH_API: JSON.stringify(SEARCH_API_OUTPUT),
42+
SEARCH_LANGS: JSON.stringify(SEARCH_LANGS_OUTPUT),
3643
},
3744
};
3845

@@ -61,8 +68,12 @@ Promise.all(builds.map(([entries, outfile]) => {
6168

6269
return esbuild.build(currentConfig);
6370
})).then(() => {
71+
shell.mkdir('-p', ASSETS_PATH);
6472
for (const file of assets) {
65-
shell.mkdir('-p', ASSETS_PATH);
6673
shell.cp('-f', join(CLIENT_PATH, file), join(ASSETS_PATH, file));
6774
}
75+
76+
shell.mkdir('-p', SEARCH_LANGS_OUTPUT);
77+
shell.cp('-f', SEARCH_API, SEARCH_API_OUTPUT);
78+
shell.cp('-f', join(dirname(SEARCH_LANGS), '*'), SEARCH_LANGS_OUTPUT);
6879
});

‎src/globals.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
declare const VERSION: string;
2+
declare const SEARCH_API: string;
3+
declare const SEARCH_LANGS: string;
24

35
type Hash<T = any> = Record<string, T>;

‎src/services/search.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {DocInnerProps, DocPageData} from '@diplodoc/client';
22
import type {Lang} from '../constants';
33

4-
import {dirname, join} from 'node:path';
4+
import {join} from 'node:path';
55
import {mkdirSync, writeFileSync} from 'node:fs';
66

77
import {Indexer} from '@diplodoc/search-extension/indexer';
@@ -11,9 +11,6 @@ import {ArgvService} from '.';
1111
import {generateStaticSearch} from '../pages';
1212
import {copyFileSync} from 'fs';
1313

14-
const apiPath = require.resolve('@diplodoc/search-extension/worker');
15-
const langsPath = require.resolve('@diplodoc/search-extension/worker/langs');
16-
1714
let indexer: Indexer;
1815

1916
function init() {
@@ -59,7 +56,7 @@ async function release() {
5956

6057
if (isLocalSearchEnabled()) {
6158
mkdirSync(bundleDir(), {recursive: true});
62-
copyFileSync(apiPath, apiLink());
59+
copyFileSync(SEARCH_API, apiLink());
6360
}
6461

6562
for (const lang of indexer.langs) {
@@ -72,7 +69,7 @@ async function release() {
7269
writeFileSync(pageLink(lang), generateStaticSearch(lang as Lang), 'utf8');
7370

7471
if (isLocalSearchEnabled() && langs.includes(lang)) {
75-
copyFileSync(join(dirname(langsPath), lang + '.js'), languageLink(lang));
72+
copyFileSync(join(SEARCH_LANGS, lang + '.js'), languageLink(lang));
7673
}
7774
}
7875
}

‎tests/e2e/__snapshots__/load-custom-resources.spec.ts.snap‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,37 @@ exports[`Allow load custom resources md2html single page with custom resources 1
1010
"_bundle/search-css-2",
1111
"_bundle/search-js-0",
1212
"_bundle/search-js-1",
13+
"_bundle/search/index.js",
14+
"_bundle/search/langs/ar.js",
15+
"_bundle/search/langs/da.js",
16+
"_bundle/search/langs/de.js",
17+
"_bundle/search/langs/du.js",
18+
"_bundle/search/langs/el.js",
19+
"_bundle/search/langs/es.js",
20+
"_bundle/search/langs/fi.js",
21+
"_bundle/search/langs/fr.js",
22+
"_bundle/search/langs/he.js",
23+
"_bundle/search/langs/hi.js",
24+
"_bundle/search/langs/hu.js",
25+
"_bundle/search/langs/hy.js",
26+
"_bundle/search/langs/index.js",
27+
"_bundle/search/langs/it.js",
28+
"_bundle/search/langs/ja.js",
29+
"_bundle/search/langs/jp.js",
30+
"_bundle/search/langs/kn.js",
31+
"_bundle/search/langs/ko.js",
32+
"_bundle/search/langs/nl.js",
33+
"_bundle/search/langs/no.js",
34+
"_bundle/search/langs/pt.js",
35+
"_bundle/search/langs/ro.js",
36+
"_bundle/search/langs/ru.js",
37+
"_bundle/search/langs/sa.js",
38+
"_bundle/search/langs/sv.js",
39+
"_bundle/search/langs/ta.js",
40+
"_bundle/search/langs/te.js",
41+
"_bundle/search/langs/th.js",
42+
"_bundle/search/langs/tr.js",
43+
"_bundle/search/langs/vi.js",
1344
"_bundle/search-css-0",
1445
"_bundle/search-js-2",
1546
"_bundle/search-css-1",
@@ -283,6 +314,37 @@ exports[`Allow load custom resources md2html with custom resources 1`] = `
283314
"_bundle/search-css-2",
284315
"_bundle/search-js-0",
285316
"_bundle/search-js-1",
317+
"_bundle/search/index.js",
318+
"_bundle/search/langs/ar.js",
319+
"_bundle/search/langs/da.js",
320+
"_bundle/search/langs/de.js",
321+
"_bundle/search/langs/du.js",
322+
"_bundle/search/langs/el.js",
323+
"_bundle/search/langs/es.js",
324+
"_bundle/search/langs/fi.js",
325+
"_bundle/search/langs/fr.js",
326+
"_bundle/search/langs/he.js",
327+
"_bundle/search/langs/hi.js",
328+
"_bundle/search/langs/hu.js",
329+
"_bundle/search/langs/hy.js",
330+
"_bundle/search/langs/index.js",
331+
"_bundle/search/langs/it.js",
332+
"_bundle/search/langs/ja.js",
333+
"_bundle/search/langs/jp.js",
334+
"_bundle/search/langs/kn.js",
335+
"_bundle/search/langs/ko.js",
336+
"_bundle/search/langs/nl.js",
337+
"_bundle/search/langs/no.js",
338+
"_bundle/search/langs/pt.js",
339+
"_bundle/search/langs/ro.js",
340+
"_bundle/search/langs/ru.js",
341+
"_bundle/search/langs/sa.js",
342+
"_bundle/search/langs/sv.js",
343+
"_bundle/search/langs/ta.js",
344+
"_bundle/search/langs/te.js",
345+
"_bundle/search/langs/th.js",
346+
"_bundle/search/langs/tr.js",
347+
"_bundle/search/langs/vi.js",
286348
"_bundle/search-css-0",
287349
"_bundle/search-js-2",
288350
"_bundle/search-css-1",

‎tests/e2e/__snapshots__/metadata.spec.ts.snap‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,37 @@ exports[`Allow load custom resources md2html with metadata 1`] = `
88
"_bundle/search-css-2",
99
"_bundle/search-js-0",
1010
"_bundle/search-js-1",
11+
"_bundle/search/index.js",
12+
"_bundle/search/langs/ar.js",
13+
"_bundle/search/langs/da.js",
14+
"_bundle/search/langs/de.js",
15+
"_bundle/search/langs/du.js",
16+
"_bundle/search/langs/el.js",
17+
"_bundle/search/langs/es.js",
18+
"_bundle/search/langs/fi.js",
19+
"_bundle/search/langs/fr.js",
20+
"_bundle/search/langs/he.js",
21+
"_bundle/search/langs/hi.js",
22+
"_bundle/search/langs/hu.js",
23+
"_bundle/search/langs/hy.js",
24+
"_bundle/search/langs/index.js",
25+
"_bundle/search/langs/it.js",
26+
"_bundle/search/langs/ja.js",
27+
"_bundle/search/langs/jp.js",
28+
"_bundle/search/langs/kn.js",
29+
"_bundle/search/langs/ko.js",
30+
"_bundle/search/langs/nl.js",
31+
"_bundle/search/langs/no.js",
32+
"_bundle/search/langs/pt.js",
33+
"_bundle/search/langs/ro.js",
34+
"_bundle/search/langs/ru.js",
35+
"_bundle/search/langs/sa.js",
36+
"_bundle/search/langs/sv.js",
37+
"_bundle/search/langs/ta.js",
38+
"_bundle/search/langs/te.js",
39+
"_bundle/search/langs/th.js",
40+
"_bundle/search/langs/tr.js",
41+
"_bundle/search/langs/vi.js",
1142
"_bundle/search-css-0",
1243
"_bundle/search-js-2",
1344
"_bundle/search-css-1",

‎tests/e2e/__snapshots__/rtl.spec.ts.snap‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,37 @@ exports[`Generate html document with correct lang and dir attributes. Load corre
88
"_bundle/search-css-2",
99
"_bundle/search-js-0",
1010
"_bundle/search-js-1",
11+
"_bundle/search/index.js",
12+
"_bundle/search/langs/ar.js",
13+
"_bundle/search/langs/da.js",
14+
"_bundle/search/langs/de.js",
15+
"_bundle/search/langs/du.js",
16+
"_bundle/search/langs/el.js",
17+
"_bundle/search/langs/es.js",
18+
"_bundle/search/langs/fi.js",
19+
"_bundle/search/langs/fr.js",
20+
"_bundle/search/langs/he.js",
21+
"_bundle/search/langs/hi.js",
22+
"_bundle/search/langs/hu.js",
23+
"_bundle/search/langs/hy.js",
24+
"_bundle/search/langs/index.js",
25+
"_bundle/search/langs/it.js",
26+
"_bundle/search/langs/ja.js",
27+
"_bundle/search/langs/jp.js",
28+
"_bundle/search/langs/kn.js",
29+
"_bundle/search/langs/ko.js",
30+
"_bundle/search/langs/nl.js",
31+
"_bundle/search/langs/no.js",
32+
"_bundle/search/langs/pt.js",
33+
"_bundle/search/langs/ro.js",
34+
"_bundle/search/langs/ru.js",
35+
"_bundle/search/langs/sa.js",
36+
"_bundle/search/langs/sv.js",
37+
"_bundle/search/langs/ta.js",
38+
"_bundle/search/langs/te.js",
39+
"_bundle/search/langs/th.js",
40+
"_bundle/search/langs/tr.js",
41+
"_bundle/search/langs/vi.js",
1142
"_bundle/search-css-0",
1243
"_bundle/search-js-2",
1344
"_bundle/search-css-1",
@@ -128,6 +159,37 @@ exports[`Generate html document with correct lang and dir attributes. Load corre
128159
"_bundle/search-css-2",
129160
"_bundle/search-js-0",
130161
"_bundle/search-js-1",
162+
"_bundle/search/index.js",
163+
"_bundle/search/langs/ar.js",
164+
"_bundle/search/langs/da.js",
165+
"_bundle/search/langs/de.js",
166+
"_bundle/search/langs/du.js",
167+
"_bundle/search/langs/el.js",
168+
"_bundle/search/langs/es.js",
169+
"_bundle/search/langs/fi.js",
170+
"_bundle/search/langs/fr.js",
171+
"_bundle/search/langs/he.js",
172+
"_bundle/search/langs/hi.js",
173+
"_bundle/search/langs/hu.js",
174+
"_bundle/search/langs/hy.js",
175+
"_bundle/search/langs/index.js",
176+
"_bundle/search/langs/it.js",
177+
"_bundle/search/langs/ja.js",
178+
"_bundle/search/langs/jp.js",
179+
"_bundle/search/langs/kn.js",
180+
"_bundle/search/langs/ko.js",
181+
"_bundle/search/langs/nl.js",
182+
"_bundle/search/langs/no.js",
183+
"_bundle/search/langs/pt.js",
184+
"_bundle/search/langs/ro.js",
185+
"_bundle/search/langs/ru.js",
186+
"_bundle/search/langs/sa.js",
187+
"_bundle/search/langs/sv.js",
188+
"_bundle/search/langs/ta.js",
189+
"_bundle/search/langs/te.js",
190+
"_bundle/search/langs/th.js",
191+
"_bundle/search/langs/tr.js",
192+
"_bundle/search/langs/vi.js",
131193
"_bundle/search-css-0",
132194
"_bundle/search-js-2",
133195
"_bundle/search-css-1",

‎tests/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"~/*": ["../src/*"]
1010
},
1111
"types": ["node", "jest"]
12-
}
12+
},
13+
"include": ["../src/globals.d.ts"]
1314
}

0 commit comments

Comments
 (0)