Skip to content

Commit 004e352

Browse files
authored
Merge branch 'develop' into fix/cover
2 parents a3192dc + b960519 commit 004e352

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3697
-460
lines changed

.github/workflows/crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
- name: Crowdin push
1919
uses: crowdin/github-action@v2

.github/workflows/emoji.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.repository == 'docsifyjs/docsify'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414

1515
- uses: actions/setup-node@v6
1616
with:

.github/workflows/test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
node-version: ['lts/*']
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- name: Setup Node.js ${{ matrix.node-version }}
1919
uses: actions/setup-node@v6
2020
with:
@@ -35,7 +35,7 @@ jobs:
3535
node-version: ['lts/*']
3636
os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939
- name: Setup Node.js ${{ matrix.node-version }}
4040
uses: actions/setup-node@v6
4141
with:
@@ -49,14 +49,16 @@ jobs:
4949
run: npm run test:unit -- --ci --runInBand
5050
- name: Integration Tests
5151
run: npm run test:integration -- --ci --runInBand
52+
- name: Consumption Tests
53+
run: npm run test:consume-types
5254

5355
test-playwright:
5456
runs-on: ubuntu-latest
5557
strategy:
5658
matrix:
5759
node-version: ['lts/*']
5860
steps:
59-
- uses: actions/checkout@v5
61+
- uses: actions/checkout@v6
6062
- name: Setup Node.js ${{ matrix.node-version }}
6163
uses: actions/setup-node@v6
6264
with:

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
.vercel
55
_playwright-report
66
_playwright-results
7-
dist
8-
lib
97
node_modules
108

119
# Files
@@ -14,3 +12,10 @@ node_modules
1412

1513
# Exceptions
1614
!.gitkeep
15+
16+
# Output folder for the global build only
17+
dist
18+
19+
# TypeScript declaration files for standard ESM consumption
20+
src/**/*.d.ts
21+
src/**/*.d.ts.map

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ _vars.css
88
_vars-advanced.css
99
CHANGELOG.md
1010
emoji-data.*
11-
HISTORY.md
11+
HISTORY.md

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"editor.defaultFormatter": "esbenp.prettier-vscode",
3-
"cSpell.words": ["coverpage"]
3+
"cSpell.words": ["coverpage"],
4+
"typescript.tsdk": "node_modules/typescript/lib"
45
}

docs/configuration.md

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ window.$docsify = {
456456

457457
## name
458458

459-
- Type: `String`
459+
- Type: `Boolean | String`
460460

461461
Website name as it appears in the sidebar.
462462

@@ -474,6 +474,22 @@ window.$docsify = {
474474
};
475475
```
476476

477+
If `true`, the website name will be inferred from the document's `<title>` tag.
478+
479+
```js
480+
window.$docsify = {
481+
name: true,
482+
};
483+
```
484+
485+
If `false` or empty, no name will be displayed.
486+
487+
```js
488+
window.$docsify = {
489+
name: false,
490+
};
491+
```
492+
477493
## nameLink
478494

479495
- Type: `String`
@@ -652,6 +668,10 @@ window.$docsify = {
652668
};
653669
```
654670

671+
## plugins
672+
673+
See [Plugins](./plugins.md).
674+
655675
## relativePath
656676

657677
- Type: `Boolean`
@@ -706,6 +726,8 @@ window.$docsify = {
706726
};
707727
```
708728

729+
If undefined or empty, no GitHub corner will be displayed.
730+
709731
## requestHeaders
710732

711733
- Type: `Object`
@@ -887,9 +909,9 @@ window.$docsify = {
887909
Determines if/how the site's [skip navigation link](https://webaim.org/techniques/skipnav/) will be rendered.
888910

889911
```js
890-
// Render skip link for all routes (default)
912+
// Render skip link for all routes
891913
window.$docsify = {
892-
skipLink: 'Skip to main content',
914+
skipLink: 'Skip to content',
893915
};
894916
```
895917

@@ -912,6 +934,13 @@ window.$docsify = {
912934
};
913935
```
914936

937+
```js
938+
// Use default
939+
window.$docsify = {
940+
skipLink: true, // "Skip to main content"
941+
};
942+
```
943+
915944
## subMaxLevel
916945

917946
- Type: `Number`

docs/plugins.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# List of Plugins
22

3+
These are built-in and external plugins for Docsify.
4+
5+
See also how to [Write a Plugin](./write-a-plugin.md).
6+
37
## Full text search
48

59
By default, the hyperlink on the current page is recognized and the content is saved in `IndexedDB`. You can also specify the path to the files.
@@ -25,7 +29,7 @@ By default, the hyperlink on the current page is recognized and the content is s
2529
insertBefore: '.sidebar-nav', // CSS selector in .sidebar scope
2630
2731
maxAge: 86400000, // Expiration time, the default one day
28-
paths: [], // or 'auto'
32+
paths: [], // string[] of files to search in, or 'auto' for discovery based on your sidebar
2933
placeholder: 'Type to search',
3034
3135
// Localization

0 commit comments

Comments
 (0)