Merge remote-tracking branch 'origin/main' into auto-sidebar

nruffing · Jan 28, 2024 · fd793f0 · fd793f0
2 parents 6b89a01 + bbaee39
commit fd793f0
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 38 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -25,10 +25,9 @@ module.exports = {
       extends: 'plugin:cypress/recommended',
     },
     {
-      files: ['tools/create-helper/**/*.ts', 'tools/create-helper/**/*.vue'],
+      files: ['tools/create-vuepress/**/*.vue'],
       rules: {
-        'import/no-extraneous-dependencies': 'off',
-        'import/named': 'off',
+        'vue/no-v-html': 'off',
       },
     },
     {

diff --git a/plugins/plugin-active-header-links/package.json b/plugins/plugin-active-header-links/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-active-header-links"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-back-to-top/package.json b/plugins/plugin-back-to-top/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-back-to-top"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-container/package.json b/plugins/plugin-container/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-container"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-docsearch/package.json b/plugins/plugin-docsearch/package.json
@@ -16,7 +16,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-docsearch"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-external-link-icon/package.json b/plugins/plugin-external-link-icon/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-external-link-icon"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-git/package.json b/plugins/plugin-git/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-git"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-google-analytics/package.json b/plugins/plugin-google-analytics/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-google-analytics"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-medium-zoom/package.json b/plugins/plugin-medium-zoom/package.json
@@ -16,7 +16,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-medium-zoom"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-nprogress/package.json b/plugins/plugin-nprogress/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-nprogress"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-palette/package.json b/plugins/plugin-palette/package.json
@@ -19,7 +19,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-palette"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-prismjs/package.json b/plugins/plugin-prismjs/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-prismjs"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-pwa-popup/package.json b/plugins/plugin-pwa-popup/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-pwa-popup"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-pwa/package.json b/plugins/plugin-pwa/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-pwa"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-register-components/package.json b/plugins/plugin-register-components/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-register-components"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-search/package.json b/plugins/plugin-search/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-search"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-shiki/package.json b/plugins/plugin-shiki/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-shiki"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-theme-data/package.json b/plugins/plugin-theme-data/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-theme-data"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/plugins/plugin-toc/package.json b/plugins/plugin-toc/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "plugins/plugin-toc"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/themes/theme-default/package.json b/themes/theme-default/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "themes/theme-default"
   },
   "license": "MIT",
   "author": "meteorlxy",

diff --git a/tools/create-vuepress/package.json b/tools/create-vuepress/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/ecosystem.git"
+    "url": "git+https://github.com/vuepress/ecosystem.git",
+    "directory": "tools/create-vuepress"
   },
   "license": "MIT",
   "author": {

diff --git a/tools/create-vuepress/src/flow/createPackageJson.ts b/tools/create-vuepress/src/flow/createPackageJson.ts
@@ -35,17 +35,14 @@ export const createPackageJson = async ({
   bundler,
 }: CreatePackageJsonOptions): Promise<void> => {
   const packageJsonPath = join(targetDir, 'package.json')
-  // TODO: Update it
   const devDependencies = {
-    '@vuepress/client': '^2.0.0-rc.2',
     [`@vuepress/bundler-${bundler}`]: '^2.0.0-rc.2',
     '@vuepress/theme-default': '^2.0.0-rc.2',
     'vue': '^3.4.0',
     'vuepress': '^2.0.0-rc.2',
   }
 
   if (preset === 'blog') {
-    devDependencies['@vuepress/core'] = '^2.0.0-rc.2'
     devDependencies['vue-router'] = '^4.2.5'
   }
 
@@ -86,13 +83,9 @@ export const createPackageJson = async ({
     ...result,
     type: 'module',
     scripts: {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      'docs:build': `vuepress build src`,
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      'docs:clean-dev': `vuepress dev src --clean-cache`,
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      'docs:dev': `vuepress dev src`,
-      // eslint-disable-next-line @typescript-eslint/naming-convention
+      'docs:build': `vuepress build docs`,
+      'docs:clean-dev': `vuepress dev docs --clean-cache`,
+      'docs:dev': `vuepress dev docs`,
       'docs:update-package': `${
         packageManager === 'npm' ? 'npx' : `${packageManager} dlx`
       } vp-update`,

diff --git a/tools/create-vuepress/src/flow/generateTemplate.ts b/tools/create-vuepress/src/flow/generateTemplate.ts
@@ -83,7 +83,7 @@ ${
           NODE_OPTIONS: --max_old_space_size=8192
         run: |-
           ${packageManager} run docs:build
-          > src/.vuepress/dist/.nojekyll
+          > docs/.vuepress/dist/.nojekyll
 
       - name: ${lang === '简体中文' ? '部署文档' : 'Deploy Docs'}
         uses: JamesIves/github-pages-deploy-action@v4
@@ -94,7 +94,7 @@ ${
               : 'This is the branch where the docs are deployed to'
           }
           branch: gh-pages
-          folder: src/.vuepress/dist
+          folder: docs/.vuepress/dist
 `
 
 interface GenerateTemplateOptions {
@@ -128,9 +128,9 @@ export const generateTemplate = async ({
   console.log(locale.flow.generateTemplate)
 
   // copy template
-  copy(join(templateFolder, preset), join(targetDirPath, 'src'))
+  copy(join(templateFolder, preset), join(targetDirPath, 'docs'))
 
-  const configFilePath = join(targetDirPath, 'src/.vuepress/config.js')
+  const configFilePath = join(targetDirPath, 'docs/.vuepress/config.js')
 
   const content = readFileSync(configFilePath, { encoding: 'utf-8' })
 

diff --git a/tools/create-vuepress/template/blog/.vuepress/blog-plugin.js b/tools/create-vuepress/template/blog/.vuepress/blog-plugin.js
@@ -1,4 +1,4 @@
-import { createPage } from '@vuepress/core'
+import { createPage } from 'vuepress/core'
 
 const slugify = (name) =>
   name