Skip to content

Commit b45f444

Browse files
jhildenbiddlejhildenbiddle
authored
Merge branch 'develop' into fix/1383
2 parents e8d3b5e + 7f0c42e commit b45f444

166 files changed

Lines changed: 15707 additions & 10158 deletions

File tree

Some content is hidden

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

‎.eslintignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ packages/docsify-server-renderer/build.js
33
node_modules
44
build
55
server.js
6-
cypress
76
lib
87
themes
98
build
109
docs/
11-
**/*.md
10+
**/*.md

‎.eslintrc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ module.exports = {
66
ecmaVersion: 2019,
77
},
88
env: {
9-
jest: true,
109
browser: true,
1110
node: true,
1211
es6: true,

‎.github/workflows/e2e.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/workflows/lint.yml‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
name: Linting Checks
1+
name: Lint
22

3-
on:
3+
on:
44
push:
5-
branches:
6-
- master
7-
- develop
5+
branches:
6+
- master
7+
- develop
88
pull_request:
9-
branches:
10-
- master
11-
- develop
9+
branches:
10+
- master
11+
- develop
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-16.04
15+
runs-on: ubuntu-latest
1616
strategy:
17+
fail-fast: false
1718
matrix:
18-
node-version: [10.x, 12.x, 13.x]
19+
node-version: [12.x, 14.x]
1920

2021
steps:
21-
- uses: actions/checkout@v1
22-
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v1
24-
with:
25-
node-version: ${{ matrix.node-version }}
26-
- name: bootstrap
27-
run: npm run bootstrap
28-
- name: Build
29-
run: npm run build
30-
- name: Linting
31-
run: npm run lint
22+
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
- name: Install
28+
run: npm i --ignore-scripts
29+
- name: Lint
30+
run: npm run lint

‎.github/workflows/test.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Build & Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
pull_request:
9+
branches:
10+
- master
11+
- develop
12+
13+
jobs:
14+
build:
15+
runs-on: ${{ matrix.os }}
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
node-version: [12.x, 14.x]
20+
os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Use Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v1
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
- name: bootstrap
29+
run: npm run bootstrap
30+
- name: unit tests
31+
run: npm run test:unit -- -ci --runInBand
32+
- name: integration tests
33+
run: npm run test:integration -- -ci --runInBand
34+
- uses: microsoft/playwright-github-action@v1.3.0
35+
- name: e2e tests
36+
run: npm run test:e2e -- --ci --runInBand
37+
- name: Upload artifacts (diff output)
38+
uses: actions/upload-artifact@v2
39+
if: failure()
40+
with:
41+
name: ${{ matrix.os }}-${{ matrix.node-version }}-diff-output
42+
path: ${{ github.workspace }}/test/**/__diff_output__/*

‎.github/workflows/unit.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
*.log
22
.DS_Store
33
.idea
4+
__diff_output__
5+
lib/
46
node_modules
5-
/themes/
6-
/lib/
7-
/cypress/integration/examples
8-
/cypress/fixtures/docs
7+
themes/
98

109
# exceptions
1110
!.gitkeep

‎.vscode/launch.json‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "node",
9+
"request": "launch",
10+
"name": "Run tests",
11+
"runtimeExecutable": "npm",
12+
"runtimeArgs": ["run-script", "test"],
13+
"console": "integratedTerminal"
14+
},
15+
{
16+
"type": "node",
17+
"request": "launch",
18+
"name": "Run current test file",
19+
"runtimeExecutable": "npm",
20+
"runtimeArgs": ["run-script", "test"],
21+
"args": ["--", "-i", "${relativeFile}", "--testPathIgnorePatterns"],
22+
"console": "integratedTerminal"
23+
},
24+
{
25+
"type": "node",
26+
"request": "launch",
27+
"name": "Run selected test name",
28+
"runtimeExecutable": "npm",
29+
"runtimeArgs": ["run-script", "test"],
30+
"args": [
31+
"--",
32+
"-i",
33+
"${relativeFile}",
34+
"-t",
35+
"${selectedText}",
36+
"--testPathIgnorePatterns"
37+
],
38+
"console": "integratedTerminal"
39+
},
40+
{
41+
"type": "node",
42+
"request": "launch",
43+
"name": "Update current test file snapshot(s)",
44+
"runtimeExecutable": "npm",
45+
"runtimeArgs": ["run-script", "test"],
46+
"args": [
47+
"--",
48+
"-i",
49+
"${relativeFile}",
50+
"--updateSnapshot",
51+
"--testPathIgnorePatterns"
52+
],
53+
"console": "integratedTerminal"
54+
},
55+
{
56+
"type": "node",
57+
"request": "launch",
58+
"name": "Update selected test name snapshot(s)",
59+
"runtimeExecutable": "npm",
60+
"runtimeArgs": ["run-script", "test"],
61+
"args": [
62+
"--",
63+
"-i",
64+
"${relativeFile}",
65+
"-t",
66+
"${selectedText}",
67+
"--updateSnapshot",
68+
"--testPathIgnorePatterns"
69+
],
70+
"console": "integratedTerminal"
71+
}
72+
]
73+
}

‎babel.config.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/preset-env',
5+
{
6+
targets: {
7+
node: 'current',
8+
},
9+
},
10+
],
11+
],
12+
};

‎cypress/fixtures/tpl/docs.index.html‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)