Skip to content

Commit ee4ec2b

Browse files
committed
Merge branch 'master' into beta
2 parents f1503c0 + 3908d79 commit ee4ec2b

File tree

8 files changed

+108
-5
lines changed

8 files changed

+108
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ coverage
4444
.nyc_output
4545
package-lock.json
4646
build
47+
typedoc_out

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,13 @@ also "disable" has been removed
199199
* **typescript:** upgrade to version 5.0.4 ([d531dde](https://github.com/nodkz/mongodb-memory-server/commit/d531ddea767cef2c038e228597812507e0590c2a))
200200
* **uuid:** remove package ([41b2551](https://github.com/nodkz/mongodb-memory-server/commit/41b2551a89df0eb806511efb85d5bd5f6419664c))
201201

202+
## [8.16.0](https://github.com/nodkz/mongodb-memory-server/compare/v8.15.1...v8.16.0) (2023-10-05)
203+
204+
205+
### Dependencies
206+
207+
* **typedoc:** add dev-dependency ([f8c671c](https://github.com/nodkz/mongodb-memory-server/commit/f8c671c2663d3c2a67314392d5f18cb08933ebfb))
208+
202209
## [8.15.1](https://github.com/nodkz/mongodb-memory-server/compare/v8.15.0...v8.15.1) (2023-08-17)
203210

204211

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"semantic-release": "^19.0.5",
3232
"semantic-release-replace-plugin": "1.2.0",
3333
"ts-jest": "29.1.1",
34-
"typescript": "5.0.4"
34+
"typescript": "5.0.4",
35+
"typedoc": "^0.21.x"
3536
},
3637
"workspaces": {
3738
"packages": [
@@ -54,6 +55,7 @@
5455
"semantic-release": "semantic-release",
5556
"readme:toc": "doctoc ./README.md",
5657
"postinstall": "husky install",
57-
"website": "yarn --cwd website/ run start"
58+
"website": "yarn --cwd website/ run start",
59+
"typedoc": "typedoc packages/mongodb-memory-server-core/src/index.ts --out typedoc_out --tsconfig packages/mongodb-memory-server-core/tsconfig.build.json"
5860
}
5961
}

scripts/ghPagesDeploy.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const path = require('node:path');
77
/* Constants / Config */
88

99
/** keep ".git", ".github", "website" and "scripts" */
10-
const keepRegex = /^(?:\.git|website|scripts|versions)/;
10+
const keepRegex = /^(?:\.git|website|scripts|versions|typedoc_out)/;
1111
/** Regex to filter and get versions output from git ls-tree */
1212
const versionsFilter = /^versions\/(\d+\.x|beta)\/?$/;
1313
/** Which branch to deploy to */
@@ -42,6 +42,11 @@ function main() {
4242
execSync(`git config user.name "${commiterInfo.name}"`, { stdio: 'inherit' });
4343
execSync(`git config user.email "${commiterInfo.email}"`, { stdio: 'inherit' });
4444

45+
console.log('\nInstall of root\n');
46+
47+
// make sure everything is correctly installed
48+
execSync('yarn install', { stdio: 'inherit' });
49+
4550
console.log('\nInstall & Build of website\n');
4651

4752
// make sure everything is correctly installed
@@ -50,6 +55,9 @@ function main() {
5055
// build the website
5156
execSync('yarn --cwd ./website build', { stdio: 'inherit' });
5257

58+
// build the typedoc website
59+
execSync('yarn run typedoc', { stdio: 'inherit' });
60+
5361
console.log('\nSwitching Branches\n');
5462

5563
// ensure there is nothing blocking from changing branches
@@ -93,6 +101,14 @@ function main() {
93101
fs.renameSync(from, to);
94102
}
95103

104+
// move typedoc to "deployAs"
105+
{
106+
const from = 'typedoc_out';
107+
const to = path.join(deployInfo.deployPath, 'typedoc');
108+
console.log('rename', from, '->', to); // always log what is renamed
109+
fs.renameSync(from, to);
110+
}
111+
96112
// remove website
97113
fs.rmSync('website', { recursive: true });
98114

website/docusaurus.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ module.exports = {
5959
label: 'API',
6060
position: 'right',
6161
},
62+
{
63+
type: 'custom-link',
64+
href: 'typedoc/index.html',
65+
prependBaseUrlToHref: true,
66+
label: 'Typedoc',
67+
position: 'right',
68+
},
6269
{
6370
href: 'https://github.com/nodkz/mongodb-memory-server/blob/master/CHANGELOG.md',
6471
label: 'Changelog',
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from 'react';
2+
import useBaseUrl from '@docusaurus/useBaseUrl';
3+
4+
// this is a workaround, because without this non-absolute links will be seen as routable links by react
5+
// see https://github.com/facebook/docusaurus/discussions/9376
6+
7+
export default function NavbarLinkNoReact({ href, label }) {
8+
const normalizedHref = useBaseUrl(href, { forcePrependBaseUrl: true });
9+
10+
return (
11+
<a href={normalizedHref} class="navbar__item navbar__link">
12+
{label}
13+
</a>
14+
);
15+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import OriginalComponentTypes from '@theme-original/NavbarItem/ComponentTypes';
22
import NavbarVersionsSelector from '../../components/NavbarVersionsSelector';
33
import NavbarBetaNotice from '../../components/NavbarBetaNotice';
4+
import NavbarLinkNoReact from '../../components/NavbarExternalLink';
45

56
const ComponentTypes = {
67
...OriginalComponentTypes,
78
'custom-versions-selector': NavbarVersionsSelector,
89
'custom-beta-notice': NavbarBetaNotice,
10+
'custom-link': NavbarLinkNoReact,
911
};
1012
export default ComponentTypes;

yarn.lock

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,7 +3258,7 @@ glob@^10.2.2, glob@^10.3.7:
32583258
minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
32593259
path-scurry "^1.10.1"
32603260

3261-
glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
3261+
glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0:
32623262
version "7.2.3"
32633263
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
32643264
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4263,6 +4263,11 @@ json5@^2.2.3:
42634263
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
42644264
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
42654265

4266+
jsonc-parser@^3.0.0:
4267+
version "3.2.0"
4268+
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
4269+
integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
4270+
42664271
jsonfile@^6.0.1:
42674272
version "6.1.0"
42684273
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -4629,6 +4634,11 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
46294634
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
46304635
integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
46314636

4637+
lunr@^2.3.9:
4638+
version "2.3.9"
4639+
resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
4640+
integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
4641+
46324642
make-dir@^3.0.2:
46334643
version "3.1.0"
46344644
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -4953,7 +4963,7 @@ min-indent@^1.0.0:
49534963
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
49544964
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
49554965

4956-
minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
4966+
minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
49574967
version "3.1.2"
49584968
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
49594969
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5795,6 +5805,11 @@ process-nextick-args@~2.0.0:
57955805
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
57965806
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
57975807

5808+
progress@^2.0.3:
5809+
version "2.0.3"
5810+
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
5811+
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
5812+
57985813
promise-all-reject-late@^1.0.0:
57995814
version "1.0.1"
58005815
resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
@@ -6258,6 +6273,15 @@ shebang-regex@^3.0.0:
62586273
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
62596274
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
62606275

6276+
shiki@^0.9.8:
6277+
version "0.9.15"
6278+
resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.9.15.tgz#2481b46155364f236651319d2c18e329ead6fa44"
6279+
integrity sha512-/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw==
6280+
dependencies:
6281+
jsonc-parser "^3.0.0"
6282+
vscode-oniguruma "^1.6.1"
6283+
vscode-textmate "5.2.0"
6284+
62616285
signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
62626286
version "3.0.7"
62636287
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -6819,6 +6843,25 @@ type-fest@^3.0.0:
68196843
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706"
68206844
integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==
68216845

6846+
typedoc-default-themes@^0.12.10:
6847+
version "0.12.10"
6848+
resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz#614c4222fe642657f37693ea62cad4dafeddf843"
6849+
integrity sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==
6850+
6851+
typedoc@^0.21.x:
6852+
version "0.21.10"
6853+
resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.21.10.tgz#1abfcc1b0be2be9608461572d4a4153e2658c8bf"
6854+
integrity sha512-Y0wYIehkjkPfsp3pv86fp3WPHUcOf8pnQUDLwG1PqSccUSqdsv7Pz1Gd5WrTJvXQB2wO1mKlZ8qW8qMiopKyjA==
6855+
dependencies:
6856+
glob "^7.1.7"
6857+
handlebars "^4.7.7"
6858+
lunr "^2.3.9"
6859+
marked "^4.0.10"
6860+
minimatch "^3.0.0"
6861+
progress "^2.0.3"
6862+
shiki "^0.9.8"
6863+
typedoc-default-themes "^0.12.10"
6864+
68226865
68236866
version "5.0.4"
68246867
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
@@ -6998,6 +7041,16 @@ vfile@^4.0.0:
69987041
unist-util-stringify-position "^2.0.0"
69997042
vfile-message "^2.0.0"
70007043

7044+
vscode-oniguruma@^1.6.1:
7045+
version "1.7.0"
7046+
resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
7047+
integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
7048+
7049+
7050+
version "5.2.0"
7051+
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
7052+
integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
7053+
70017054
walk-up-path@^1.0.0:
70027055
version "1.0.0"
70037056
resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"

0 commit comments

Comments
 (0)