diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 627d2c5e..f78ce59c 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -6,7 +6,7 @@ export default defineUserConfig({ lang: 'zh', title: 'Plume Theme', description: '', - public: path.resolve(__dirname, '../public'), + public: path.resolve(__dirname, 'public'), theme: '@vuepress-plume/vuepress-theme-plume', themeConfig: { logo: 'https://pengzhanbo.cn/g.gif', diff --git a/docs/.vuepress/public/CNAME b/docs/.vuepress/public/CNAME new file mode 100644 index 00000000..ca1fd696 --- /dev/null +++ b/docs/.vuepress/public/CNAME @@ -0,0 +1 @@ +pengzhanbo.cn diff --git a/docs/public/g.gif b/docs/.vuepress/public/g.gif similarity index 100% rename from docs/public/g.gif rename to docs/.vuepress/public/g.gif diff --git a/docs/public/images/1px-lines.png b/docs/.vuepress/public/images/1px-lines.png similarity index 100% rename from docs/public/images/1px-lines.png rename to docs/.vuepress/public/images/1px-lines.png diff --git a/docs/public/images/big-banner.jpg b/docs/.vuepress/public/images/big-banner.jpg similarity index 100% rename from docs/public/images/big-banner.jpg rename to docs/.vuepress/public/images/big-banner.jpg diff --git a/docs/public/images/blogger.jpg b/docs/.vuepress/public/images/blogger.jpg similarity index 100% rename from docs/public/images/blogger.jpg rename to docs/.vuepress/public/images/blogger.jpg diff --git a/docs/public/images/jenkins_globalconfig.png b/docs/.vuepress/public/images/jenkins_globalconfig.png similarity index 100% rename from docs/public/images/jenkins_globalconfig.png rename to docs/.vuepress/public/images/jenkins_globalconfig.png diff --git a/docs/public/images/viewport.jpg b/docs/.vuepress/public/images/viewport.jpg similarity index 100% rename from docs/public/images/viewport.jpg rename to docs/.vuepress/public/images/viewport.jpg diff --git a/docs/public/images/viewport.png b/docs/.vuepress/public/images/viewport.png similarity index 100% rename from docs/public/images/viewport.png rename to docs/.vuepress/public/images/viewport.png diff --git a/docs/10.面试/面试2.md b/docs/10.面试/面试2.md index fa30c45e..f0a27ae4 100644 --- a/docs/10.面试/面试2.md +++ b/docs/10.面试/面试2.md @@ -4,3 +4,54 @@ createTime: 2022/04/04 01:48:00 author: pengzhanbo permalink: /article/exavsmm1 --- + +:::: code-group + +::: code-group-item yarn +``` bash +yarn add +``` +::: + +::: code-group-item npm +``` bash +npm install +``` +::: + +:::: + +::: tip +提示 +::: + +::: info +信息 +::: + +::: note +注释 +::: + +::: warning +警告 +::: + +::: danger +危险 +::: + +::: details +详情 +::: + + +- [ ] todo +- [x] todo + +::: demo 普通代码 +```html +

这是一个代码片段

+??? +``` +::: diff --git a/docs/public/CNAME b/docs/public/CNAME deleted file mode 100644 index 14268748..00000000 --- a/docs/public/CNAME +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: CNAME -createTime: 2022/04/06 12:46:57 -author: pengzhanbo -permalink: /article/i7k2vzbu/ ---- -pengzhanbo.cn diff --git a/package.json b/package.json index ebecc85a..ef5b497c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,5 @@ { "name": "vuepress-theme-plume", - "version": "1.0.0-beta.10", - "private": true, "workspaces": [ "packages/*" ], @@ -25,7 +23,7 @@ "license": "MIT", "prettier": "prettier-config-vuepress", "devDependencies": { - "@vuepress/cli": "^2.0.0-beta.37", + "@vuepress/cli": "^2.0.0-beta.38", "concurrently": "^7.0.0", "cpx2": "^4.2.0", "cross-env": "^7.0.3", @@ -37,8 +35,8 @@ "prettier-config-vuepress": "^1.3.0", "rimraf": "^3.0.2", "typescript": "^4.6.3", - "vuepress-vite": "^2.0.0-beta.37", - "vuepress-webpack": "^2.0.0-beta.37", + "vuepress-vite": "^2.0.0-beta.38", + "vuepress-webpack": "^2.0.0-beta.38", "webpack-env": "^0.8.0" }, "dependencies": { diff --git a/packages/plugin-caniuse/package.json b/packages/plugin-caniuse/package.json index 5240347e..b135d4ef 100644 --- a/packages/plugin-caniuse/package.json +++ b/packages/plugin-caniuse/package.json @@ -3,12 +3,19 @@ "version": "1.0.0-beta.6", "description": "The Plugin for VuePres 2, Support Can-I-Use feature", "author": "pengzhanbo ", - "homepage": "", + "homepage": "https://github.com/pengzhanbo/vuepress-theme-plume#readme", "license": "MIT", "main": "lib/node/index.js", "files": [ "lib" ], + "repository": { + "type": "git", + "url": "git+https://github.com/pengzhanbo/vuepress-theme-plume.git" + }, + "bugs": { + "url": "https://github.com/pengzhanbo/vuepress-theme-plume/issues" + }, "scripts": { "ts": "tsc -b tsconfig.build.json", "ts:watch": "tsc -b tsconfig.build.json --watch", @@ -17,11 +24,14 @@ "build": "yarn clean && yarn ts" }, "dependencies": { - "@vuepress/client": "^2.0.0-beta.37", - "@vuepress/core": "^2.0.0-beta.37", - "@vuepress/utils": "^2.0.0-beta.37", + "@vuepress/client": "^2.0.0-beta.38", + "@vuepress/core": "^2.0.0-beta.38", + "@vuepress/utils": "^2.0.0-beta.38", "markdown-it-container": "^3.0.0" }, + "peerDependencies": { + "vuepress": "^2.0.0-beta.38" + }, "publishConfig": { "access": "public" }, diff --git a/packages/theme/package.json b/packages/theme/package.json index 66c66e3e..cb3f8362 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -3,13 +3,20 @@ "version": "1.0.0-beta.7", "description": "A Blog Theme for VuePress 2.0", "author": "pengzhanbo ", - "homepage": "", + "homepage": "https://github.com/pengzhanbo/vuepress-theme-plume#readme", "license": "MIT", "main": "lib/node/index.js", "files": [ "lib", "template" ], + "repository": { + "type": "git", + "url": "git+https://github.com/pengzhanbo/vuepress-theme-plume.git" + }, + "bugs": { + "url": "https://github.com/pengzhanbo/vuepress-theme-plume/issues" + }, "scripts": { "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", "copy:watch": "yarn copy -w", @@ -22,19 +29,21 @@ "dependencies": { "@types/lodash.merge": "^4.6.6", "@vuepress-plume/vuepress-plugin-caniuse": "1.0.0-beta.6", - "@vuepress/client": "^2.0.0-beta.37", - "@vuepress/core": "^2.0.0-beta.37", - "@vuepress/plugin-container": "^2.0.0-beta.37", - "@vuepress/plugin-docsearch": "^2.0.0-beta.37", - "@vuepress/plugin-external-link-icon": "^2.0.0-beta.37", - "@vuepress/plugin-medium-zoom": "^2.0.0-beta.37", - "@vuepress/plugin-nprogress": "^2.0.0-beta.37", - "@vuepress/plugin-prismjs": "^2.0.0-beta.37", - "@vuepress/plugin-search": "^2.0.0-beta.36", - "@vuepress/plugin-theme-data": "^2.0.0-beta.37", - "@vuepress/plugin-toc": "^2.0.0-beta.37", - "@vuepress/shared": "^2.0.0-beta.37", - "@vuepress/utils": "^2.0.0-beta.37", + "@vuepress/client": "^2.0.0-beta.38", + "@vuepress/core": "^2.0.0-beta.38", + "@vuepress/plugin-active-header-links": "^2.0.0-beta.38", + "@vuepress/plugin-container": "^2.0.0-beta.38", + "@vuepress/plugin-docsearch": "^2.0.0-beta.38", + "@vuepress/plugin-external-link-icon": "^2.0.0-beta.38", + "@vuepress/plugin-medium-zoom": "^2.0.0-beta.38", + "@vuepress/plugin-nprogress": "^2.0.0-beta.38", + "@vuepress/plugin-palette": "^2.0.0-beta.38", + "@vuepress/plugin-prismjs": "^2.0.0-beta.38", + "@vuepress/plugin-search": "^2.0.0-beta.38", + "@vuepress/plugin-theme-data": "^2.0.0-beta.38", + "@vuepress/plugin-toc": "^2.0.0-beta.38", + "@vuepress/shared": "^2.0.0-beta.38", + "@vuepress/utils": "^2.0.0-beta.38", "@vueuse/core": "^8.2.3", "chokidar": "^3.5.3", "date-fns": "^2.28.0", @@ -45,7 +54,12 @@ "sass": "^1.49.9", "sass-loader": "^12.6.0", "vue": "^3.2.31", - "vue-router": "^4.0.14" + "vue-router": "^4.0.14", + "vuepress-plugin-copy-code2": "^2.0.0-beta.36", + "vuepress-plugin-md-enhance": "^2.0.0-beta.36", + "vuepress-plugin-reading-time2": "^2.0.0-beta.36", + "vuepress-plugin-seo2": "^2.0.0-beta.36", + "vuepress-plugin-sitemap2": "^2.0.0-beta.36" }, "publishConfig": { "access": "public" diff --git a/packages/theme/src/client/clientAppEnhance.ts b/packages/theme/src/client/clientAppEnhance.ts index 5fb71f77..750f3800 100644 --- a/packages/theme/src/client/clientAppEnhance.ts +++ b/packages/theme/src/client/clientAppEnhance.ts @@ -12,11 +12,4 @@ export default defineClientAppEnhance(({ app }) => { } return null }) - app.component('Toc', () => { - const Toc = app.component('TocCom') - if (Toc) { - return h(Toc) - } - return null - }) }) diff --git a/packages/theme/src/client/components/Archive.vue b/packages/theme/src/client/components/Archive.vue index b6c24999..a2ebe6aa 100644 --- a/packages/theme/src/client/components/Archive.vue +++ b/packages/theme/src/client/components/Archive.vue @@ -1,27 +1,54 @@