create-vuepress-theme-plume 1.0.0-rc.105 → 1.0.0-rc.107

package/lib/index.js

@@ -39,17 +39,6 @@ import { execaCommand } from "execa";
 import path2 from "node:path";
 import { fileURLToPath } from "node:url";
 
-// src/utils/depsVersion.ts
-var api = "https://api.pengzhanbo.cn/npm/dependencies/version";
-async function getDependenciesVersion(dependencies, version = "latest") {
-  const result = await fetch(api, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ dependencies, version })
-  }).then((res) => res.json());
-  return result;
-}
-
 // src/utils/fs.ts
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -104,7 +93,8 @@ async function createPackageJson(mode, pkg, {
   siteName,
   siteDescription,
   bundler,
-  injectNpmScripts
+  injectNpmScripts,
+  useTs
 }) {
   if (mode === 1 /* create */) {
     pkg.name = kebabCase(siteName);
@@ -112,8 +102,10 @@ async function createPackageJson(mode, pkg, {
     pkg.version = "1.0.0";
     pkg.description = siteDescription;
     if (packageManager !== "npm") {
-      const version = await getPackageManagerVersion(packageManager);
+      let version = await getPackageManagerVersion(packageManager);
       if (version) {
+        if (packageManager === "yarn" && version.startsWith("1"))
+          version = "4.5.0";
         pkg.packageManager = `${packageManager}@${version}`;
       }
     }
@@ -138,22 +130,23 @@ async function createPackageJson(mode, pkg, {
     }
   }
   pkg.devDependencies ??= {};
+  const hasDep = (dep) => pkg.devDependencies?.[dep] || pkg.dependencies?.[dep];
   const context = await readJsonFile(resolve("package.json"));
-  const meta = context["theme-plume"];
+  const meta = context["plume-deps"];
+  pkg.devDependencies[`@vuepress/bundler-${bundler}`] = `${meta.vuepress}`;
   pkg.devDependencies.vuepress = `${meta.vuepress}`;
   pkg.devDependencies["vuepress-theme-plume"] = `${context.version}`;
-  pkg.devDependencies[`@vuepress/bundler-${bundler}`] = `${meta.vuepress}`;
-  pkg.devDependencies["http-server"] = "^14.1.1";
-  const deps = [];
-  if (!pkg.dependencies?.vue && !pkg.devDependencies.vue)
+  const deps = ["http-server"];
+  if (!hasDep("vue"))
     deps.push("vue");
-  if (bundler === "webpack" && !pkg.dependencies?.["sass-loader"] && !pkg.devDependencies["sass-loader"])
+  if (bundler === "webpack" && !hasDep("sass-loader"))
     deps.push("sass-loader");
-  if (!pkg.dependencies?.["sass-embedded"] && !pkg.devDependencies["sass-embedded"])
+  if (!hasDep("sass-embedded"))
     deps.push("sass-embedded");
-  const dv = await getDependenciesVersion(deps);
-  for (const [d, v] of Object.entries(dv))
-    pkg.devDependencies[d] = `^${v}`;
+  if (useTs)
+    deps.push("typescript");
+  for (const dep of deps)
+    pkg.devDependencies[dep] = meta[dep];
   return {
     filepath: "package.json",
     content: JSON.stringify(pkg, null, 2)
@@ -265,6 +258,12 @@ ${docs}/.vuepress/dist
       fileList.push(...gitFiles);
     }
   }
+  if (data.packageManager === "yarn") {
+    fileList.push({
+      filepath: ".yarnrc.yml",
+      content: "nodeLinker: 'node-modules'\n"
+    });
+  }
   if (data.deploy !== "custom" /* custom */) {
     fileList.push(...await readFiles(getTemplate(`deploy/${data.deploy}`)));
   }
@@ -518,7 +517,7 @@ async function run(mode, root) {
   if (data.install) {
     progress.message(t("spinner.install"));
     try {
-      await execaCommand3(pm === "yarn" ? "yarn" : `${pm} install`, { cwd });
+      await execaCommand3(`${pm} install`, { cwd });
     } catch (e) {
       console.error(`${colors.red("install dependencies error: ")}
 `, e);
@@ -526,8 +525,8 @@ async function run(mode, root) {
     }
   }
   const cdCommand = mode === 1 /* create */ ? colors.green(`cd ${data.root}`) : "";
-  const runCommand = colors.green(pm === "yarn" ? "yarn docs:dev" : `${pm} run docs:dev`);
-  const installCommand = colors.green(pm === "yarn" ? "yarn" : `${pm} install`);
+  const runCommand = colors.green(`${pm} run docs:dev`);
+  const installCommand = colors.green(`${pm} install`);
   progress.stop(t("spinner.stop"));
   if (mode === 1 /* create */) {
     outro(`${t("spinner.command")}
@@ -549,5 +548,5 @@ var cli = cac("create-vuepress-theme-plume");
 cli.command("[root]", "create a new vuepress-theme-plume project / \u521B\u5EFA\u65B0\u7684 vuepress-theme-plume \u9879\u76EE").action((root) => run(1 /* create */, root));
 cli.command("init [root]", "Initial vuepress-theme-plume in the existing project / \u5728\u73B0\u6709\u9879\u76EE\u4E2D\u521D\u59CB\u5316 vuepress-theme-plume").action((root) => run(0 /* init */, root));
 cli.help();
-cli.version("1.0.0-rc.104");
+cli.version("1.0.0-rc.106");
 cli.parse();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-vuepress-theme-plume",
   "type": "module",
-  "version": "1.0.0-rc.105",
+  "version": "1.0.0-rc.107",
   "description": "The cli for create vuepress-theme-plume's project",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github.com/pengzhanbo/)",
   "license": "MIT",
@@ -34,8 +34,13 @@
     "handlebars": "^4.7.8",
     "picocolors": "^1.1.0"
   },
-  "theme-plume": {
-    "vuepress": "2.0.0-rc.15"
+  "plume-deps": {
+    "vuepress": "2.0.0-rc.17",
+    "vue": "^3.5.10",
+    "sass-embedded": "^1.79.4",
+    "sass-loader": "^16.0.2",
+    "http-server": "^14.1.1",
+    "typescript": "^5.6.2"
   },
   "scripts": {
     "build": "tsup"

package/templates/.vuepress/config.ts.handlebars

@@ -1,5 +1,5 @@
-import { defineUserConfig } from 'vuepress'
 import { {{ bundler }}Bundler } from '@vuepress/bundler-{{ bundler }}'
+import { defineUserConfig } from 'vuepress'
 import { plumeTheme } from 'vuepress-theme-plume'
 
 export default defineUserConfig({
@@ -32,7 +32,7 @@ export default defineUserConfig({
        * @see https://theme-plume.vuejs.press/config/plugins/code-highlight/
        */
       // shiki: {
-      //   // 强烈建议预设代码块高亮语言，插件默认加载所有语言会产生不必要的时间开销
+           // 强烈建议预设代码块高亮语言，插件默认加载所有语言会产生不必要的时间开销
       //   languages: ['shell', 'bash', 'typescript', 'javascript'],
       // },
 

package/templates/common/README.md.handlebars

@@ -50,8 +50,8 @@ npm run docs:preview
 npm run vp-update
 ```
 {{/if}}
-{{#if (equal deploy "github")}}
 
+{{#if (equal deploy "github")}}
 ## Deploy to GitHub Pages
 
 The plume theme has been created with GitHub Actions: `.github/workflows/docs-deploy.yml`. You also need to make the following settings in the GitHub repository:

package/templates/common/README.zh-CN.md.handlebars

@@ -50,8 +50,8 @@ npm run docs:preview
 npm run vp-update
 ```
 {{/if}}
-{{#if (equal deploy "github")}}
 
+{{#if (equal deploy "github")}}
 ## 部署到 GitHub Pages
 
 主题已创建 github actions: `.github/workflows/docs-deploy.yml`，你还需要在 github 仓库中进行以下设置：