Skip to content

Commit

Permalink
Merge branch 'main' into vuejs-main
Browse files Browse the repository at this point in the history
  • Loading branch information
georges-gomes authored Feb 3, 2022
2 parents b89a88d + 45b65ce commit f37a7eb
Show file tree
Hide file tree
Showing 25 changed files with 414 additions and 2,297 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ body:
id: additional-context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
description: Add any other context or screenshots about the bug report here.
- type: checkboxes
id: checkboxes
attributes:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ node_modules
TODOs.md
.vscode
.idea
pnpm-global
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
## [0.21.6](https://github.com/vuejs/vitepress/compare/v0.21.5...v0.21.6) (2022-01-19)

### Perf

- Avoid wrapping siteData as readonly proxy in production builds

## [0.21.5](https://github.com/vuejs/vitepress/compare/v0.21.4...v0.21.5) (2022-01-16)

### Bug Fixes

- allow overriding title if home is true ([#493](https://github.com/vuejs/vitepress/issues/493)) ([88d57a9](https://github.com/vuejs/vitepress/commit/88d57a93ef2689a8f5344b7f38b26db5ea86759b))
- **types:** fix vitepress/theme type ([eabf6d2](https://github.com/vuejs/vitepress/commit/eabf6d2aa69d2a5452042bbb59edbbbc95aece87)), closes [#489](https://github.com/vuejs/vitepress/issues/489) [#438](https://github.com/vuejs/vitepress/issues/438) [#494](https://github.com/vuejs/vitepress/issues/494) [#442](https://github.com/vuejs/vitepress/issues/442)

### Features

- scrollOffset option ([b66785d](https://github.com/vuejs/vitepress/commit/b66785d68a86c118a7a036f3de8b3e504390f1da))

## [0.21.4](https://github.com/vuejs/vitepress/compare/v0.21.3...v0.21.4) (2022-01-07)

### Bug Fixes

- set \_\_data in md.render ([dfbc932](https://github.com/vuejs/vitepress/commit/dfbc932fac50d39b047b211cedca0dcce05aebc8))

## [0.21.3](https://github.com/vuejs/vitepress/compare/v0.21.2...v0.21.3) (2022-01-06)

### Bug Fixes
Expand Down
18 changes: 18 additions & 0 deletions __tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"compilerOptions": {
"baseUrl": ".",
"module": "esnext",
"moduleResolution": "node",
"strict": true,
"noUnusedLocals": true,
"skipLibCheck": true,
"esModuleInterop": true,
"lib": ["ESNext", "DOM"],
"types": ["node", "vitest/global"],
"paths": {
"node/*": ["../src/node/*"],
"client/*": ["../src/client/*"]
}
},
"include": ["../src", "."]
}
10 changes: 10 additions & 0 deletions __tests__/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import path from 'path'

export default {
resolve: {
alias: {
node: path.resolve(__dirname, '../src/node'),
client: path.resolve(__dirname, '../src/client')
}
}
}
2 changes: 1 addition & 1 deletion api-extractor.client.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",

"projectFolder": ".",
"projectFolder": "./src/client",

"mainEntryPointFilePath": "./dist/temp/index.d.ts",

Expand Down
2 changes: 1 addition & 1 deletion api-extractor.node.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",

"projectFolder": ".",
"projectFolder": "./src/node",

"mainEntryPointFilePath": "./dist/temp/index.d.ts",

Expand Down
8 changes: 0 additions & 8 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ export default defineConfig({
title: 'VitePress',
description: 'Vite & Vue powered static site generator.',

head: [
[
'script',
{},
'(() => { const afsefe = window.foo;\n console.log(afsefe);})()'
]
],

themeConfig: {
repo: 'vuejs/vitepress',
docsDir: 'docs',
Expand Down
13 changes: 0 additions & 13 deletions jest.config.js

This file was deleted.

37 changes: 23 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vitepress",
"version": "0.21.3",
"version": "0.21.6",
"description": "Vite & Vue powered static site generator",
"main": "dist/node/index.js",
"typings": "types/index.d.ts",
Expand All @@ -11,7 +11,8 @@
"bin",
"dist",
"types",
"client.d.ts"
"client.d.ts",
"theme.d.ts"
],
"scripts": {
"dev": "run-s dev-shared dev-start",
Expand All @@ -30,7 +31,7 @@
"lint": "run-s lint:js lint:ts",
"lint:js": "prettier --check --write \"{bin,docs,scripts,src}/**/*.js\"",
"lint:ts": "prettier --check --write --parser typescript \"{__tests__,src,docs,types}/**/*.ts\"",
"test": "jest",
"test": "vitest run __tests__ -c __tests__/vitest.config.js --global",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"release": "node scripts/release.js",
"docs": "run-p dev docs-dev",
Expand Down Expand Up @@ -74,8 +75,8 @@
"@docsearch/js": "^3.0.0-alpha.41",
"@vitejs/plugin-vue": "^2.0.0",
"prismjs": "^1.25.0",
"vite": "^2.7.0",
"vue": "^3.2.26"
"vite": "^2.7.12",
"vue": "^3.2.27"
},
"devDependencies": {
"@microsoft/api-extractor": "^7.18.9",
Expand All @@ -86,7 +87,6 @@
"@types/compression": "^1.7.0",
"@types/debug": "^4.1.7",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.23",
"@types/koa": "^2.13.1",
"@types/koa-static": "^4.0.1",
"@types/lru-cache": "^5.1.0",
Expand All @@ -101,22 +101,21 @@
"debug": "^4.3.2",
"diacritics": "^1.3.0",
"enquirer": "^2.3.6",
"esbuild": "^0.13.4",
"esbuild": "^0.14.0",
"escape-html": "^1.0.3",
"execa": "^5.0.0",
"fast-glob": "^3.2.7",
"fs-extra": "^10.0.0",
"globby": "^11.0.3",
"gray-matter": "^4.0.3",
"jest": "^27.0.1",
"lint-staged": "^11.0.0",
"lru-cache": "^6.0.0",
"markdown-it": "^12.0.6",
"markdown-it-anchor": "^8.1.2",
"markdown-it-attrs": "^4.0.0",
"markdown-it": "^12.3.2",
"markdown-it-anchor": "^8.4.1",
"markdown-it-attrs": "^4.1.3",
"markdown-it-container": "^3.0.0",
"markdown-it-emoji": "^2.0.0",
"markdown-it-table-of-contents": "^0.5.2",
"markdown-it-table-of-contents": "^0.6.0",
"micromatch": "^4.0.4",
"minimist": "^1.2.5",
"npm-run-all": "^4.1.5",
Expand All @@ -125,11 +124,21 @@
"prettier": "^2.3.0",
"rimraf": "^3.0.2",
"rollup": "^2.56.3",
"rollup-plugin-esbuild": "^4.5.0",
"rollup-plugin-esbuild": "^4.8.2",
"semver": "^7.3.5",
"sirv": "^1.0.12",
"ts-jest": "^27.0.1",
"typescript": "^4.3.2",
"vitest": "^0.1.19",
"yorkie": "^2.0.0"
},
"pnpm": {
"peerDependencyRules": {
"ignoreMissing": [
"@algolia/client-search",
"react",
"react-dom",
"@types/react"
]
}
}
}
Loading

0 comments on commit f37a7eb

Please sign in to comment.