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

package/lib/index.js

@@ -93,7 +93,8 @@ async function createPackageJson(mode, pkg, {
   siteName,
   siteDescription,
   bundler,
-  injectNpmScripts
+  injectNpmScripts,
+  useTs
 }) {
   if (mode === 1 /* create */) {
     pkg.name = kebabCase(siteName);
@@ -101,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}`;
       }
     }
@@ -133,14 +136,15 @@ async function createPackageJson(mode, pkg, {
   pkg.devDependencies[`@vuepress/bundler-${bundler}`] = `${meta.vuepress}`;
   pkg.devDependencies.vuepress = `${meta.vuepress}`;
   pkg.devDependencies["vuepress-theme-plume"] = `${context.version}`;
-  pkg.devDependencies["http-server"] = "^14.1.1";
-  const deps = [];
+  const deps = ["http-server"];
   if (!hasDep("vue"))
     deps.push("vue");
   if (bundler === "webpack" && !hasDep("sass-loader"))
     deps.push("sass-loader");
   if (!hasDep("sass-embedded"))
     deps.push("sass-embedded");
+  if (useTs)
+    deps.push("typescript");
   for (const dep of deps)
     pkg.devDependencies[dep] = meta[dep];
   return {
@@ -254,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}`)));
   }
@@ -507,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);
@@ -515,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")}
@@ -538,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.105");
+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.106",
+  "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",
@@ -38,7 +38,9 @@
     "vuepress": "2.0.0-rc.17",
     "vue": "^3.5.10",
     "sass-embedded": "^1.79.4",
-    "sass-loader": "^16.0.2"
+    "sass-loader": "^16.0.2",
+    "http-server": "^14.1.1",
+    "typescript": "^5.6.2"
   },
   "scripts": {
     "build": "tsup"