create-jnrs-template-vue 1.0.3 → 1.0.5

package/bin/create.js

@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'url'
 import { dirname, join, relative } from 'path'
-import { promises as fs } from 'fs'
+import { promises as fs, existsSync } from 'fs' // ✅ 同时导入 promises 和 existsSync
 import { execSync, spawnSync } from 'child_process'
 import minimist from 'minimist'
 import prompts from 'prompts'
@@ -10,7 +10,6 @@ const __dirname = dirname(__filename)
 
 // 检测系统中可用的包管理器
 function detectPackageManager() {
-  // 按优先级：pnpm > yarn > npm
   try {
     const pnpmVersion = spawnSync('pnpm', ['--version'], { stdio: 'ignore' })
     if (pnpmVersion.status === 0) return 'pnpm'
@@ -24,7 +23,6 @@ function detectPackageManager() {
   return 'npm'
 }
 
-// 获取安装命令
 function getInstallCommand(packageManager) {
   switch (packageManager) {
     case 'pnpm':
@@ -36,7 +34,6 @@ function getInstallCommand(packageManager) {
   }
 }
 
-// 获取运行命令（用于提示）
 function getRunCommand(packageManager, script) {
   switch (packageManager) {
     case 'pnpm':
@@ -66,6 +63,7 @@ async function main() {
   const argv = minimist(process.argv.slice(2), { string: ['_'] })
   let targetDir = argv._[0]
 
+  // 交互式输入项目名
   if (!targetDir) {
     const { name } = await prompts({
       type: 'text',
@@ -74,7 +72,7 @@ async function main() {
       initial: 'my-vue-app',
       validate: (input) => {
         if (!input) return 'Project name is required.'
-        if (fs.existsSync(input)) return 'Directory already exists.'
+        if (existsSync(input)) return 'Directory already exists.' // ✅ 使用 existsSync
         if (!isValidPackageName(input)) {
           return 'Invalid package name. Use lowercase, hyphens, and no special characters.'
         }
@@ -84,42 +82,40 @@ async function main() {
     if (!name) process.exit(1)
     targetDir = name
   } else {
+    // 非交互模式：校验包名和目录
     if (!isValidPackageName(targetDir)) {
       console.error('❌ Invalid project name:', targetDir)
       console.error('   Package name must be valid (lowercase, no spaces, etc.)')
       process.exit(1)
     }
+    if (existsSync(join(process.cwd(), targetDir))) {
+      // ✅ 同步检查
+      console.error(`❌ Directory "${targetDir}" already exists.`)
+      process.exit(1)
+    }
   }
 
   const root = join(process.cwd(), targetDir.trim())
 
-  try {
-    await fs.access(root)
-    console.error(`❌ Directory "${targetDir}" already exists.`)
-    process.exit(1)
-  } catch {}
-
   // 复制模板
   const templateDir = join(__dirname, '..', 'jnrs-template-vue')
   await fs.cp(templateDir, root, { recursive: true })
 
-  // 更新 package.json name
+  // 更新 package.json
   const pkgPath = join(root, 'package.json')
   const pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8'))
   pkg.name = toValidPackageName(targetDir)
   await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2))
 
-  // 自动写入 .npmrc（推荐 pnpm 用户启用 symlinked node linker）
-  const npmrcPath = join(root, '.npmrc')
-  await fs.writeFile(npmrcPath, `# Config for pnpm\nshamefully-hoist=true\n`)
+  // 写入 .npmrc（适配 pnpm）
+  await fs.writeFile(join(root, '.npmrc'), '# Config for pnpm\nshamefully-hoist=true\n')
 
-  // 检测包管理器
+  // 安装依赖
   const packageManager = detectPackageManager()
   console.log(`\n📦 Detected package manager: ${packageManager}`)
   console.log(`Installing dependencies with ${packageManager}...\n`)
 
   const [cmd, ...args] = getInstallCommand(packageManager)
-
   try {
     execSync(`${cmd} ${args.join(' ')}`, {
       cwd: root,
@@ -128,12 +124,12 @@ async function main() {
     })
   } catch (e) {
     console.error(
-      `\n⚠️  Failed to install dependencies. Run manually:\n   ${cmd} ${args.join(' ')}`
+      `\n⚠️  Failed to install dependencies. Run manually:\n   cd ${relative(process.cwd(), root)} && ${cmd} ${args.join(' ')}`
     )
     process.exit(1)
   }
 
-  // 输出成功信息
+  // 成功提示
   const relativePath = relative(process.cwd(), root)
   const devCmd = getRunCommand(packageManager, 'dev')
 
@@ -144,5 +140,6 @@ async function main() {
 
 main().catch((err) => {
   console.error(`\n🚨 Error: ${err.message}`)
+  console.trace(err) // 可选：开发时显示堆栈
   process.exit(1)
 })

package/bin/release.mjs

@@ -2,7 +2,7 @@
  * @Author : TanRui
  * @WeChat : Tan578853789
  * @File   : release.mjs
- * @Date   : 2025/10/12
+ * @Date   : 2025/11/12
  * @Desc.  : 发布脚本：自动化版本更新、发布及提交
  */
 
@@ -40,6 +40,8 @@ function incrementPatchVersion(version) {
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const pkgPath = path.resolve(__dirname, '..', 'package.json')
+// 新增：模板 package.json 路径
+const templatePkgPath = path.resolve(__dirname, '..', 'jnrs-template-vue', 'package.json')
 
 try {
   // 读取原始 package.json
@@ -54,11 +56,60 @@ try {
     process.exit(1)
   }
 
-  // 手动计算新版本
+  // ========== 新增逻辑开始：处理 jnrs-template-vue/package.json ==========
+  console.log('📦🔧 正在处理模板包 jnrs-template-vue/package.json...')
+
+  // 1. 读取模板 package.json
+  const templatePkgContent = await fs.readFile(templatePkgPath, 'utf8')
+  const templatePkg = JSON.parse(templatePkgContent)
+  const originalTemplateVersion = templatePkg.version
+  let hasModifiedTemplate = false
+
+  try {
+    // 2. 替换所有 "workspace:*" 为 "*"
+    const replaceWorkspaceRefs = (obj) => {
+      for (const key in obj) {
+        if (typeof obj[key] === 'string' && obj[key] === 'workspace:*') {
+          obj[key] = '*'
+        } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+          replaceWorkspaceRefs(obj[key])
+        }
+      }
+    }
+
+    // 执行替换
+    replaceWorkspaceRefs(templatePkg.dependencies || {})
+    replaceWorkspaceRefs(templatePkg.devDependencies || {})
+    replaceWorkspaceRefs(templatePkg.optionalDependencies || {})
+    hasModifiedTemplate = true
+
+    // 3. version +1
+    templatePkg.version = incrementPatchVersion(originalTemplateVersion)
+
+    // 4. 写入修改后的模板 package.json
+    await fs.writeFile(templatePkgPath, JSON.stringify(templatePkg, null, 2) + '\n')
+    console.log(`📦 模板包版本已更新至 ${templatePkg.version}，workspace:* 已替换为 *`)
+  } catch (err) {
+    // 回滚模板修改
+    console.log('↩️ 正在回滚 jnrs-template-vue/package.json 的修改...')
+    try {
+      if (hasModifiedTemplate) {
+        // 恢复 workspace:* 和原始 version
+        const rollbackPkg = JSON.parse(templatePkgContent)
+        await fs.writeFile(templatePkgPath, JSON.stringify(rollbackPkg, null, 2) + '\n')
+      }
+    } catch (e2) {
+      console.error('❌ 回滚模板文件时出错:', e2.message)
+    }
+    throw new Error(`处理模板包失败: ${err.message}`)
+  }
+  // ========== 新增逻辑结束 ==========
+
+  // 手动计算新版本（主包）
   const newVersion = incrementPatchVersion(originalVersion)
   console.log(`🆕 新版本: ${newVersion}`)
 
-  // 写入新版本
+  // 写入新版本（主包）
   pkg.version = newVersion
   await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
 
@@ -76,19 +127,25 @@ try {
     try {
       console.log('💾 正在提交版本变更...')
       run('git add package.json')
+      run(`git add ${templatePkgPath.replace(/\\/g, '/')}`) // 确保路径兼容 Windows
       const commitMsg = `🅒🅘🅒🅓 ${pkg.name}@${newVersion} 发布成功！👌`
       run(`git commit -m "${commitMsg}"`)
       console.log(`\n✅ 包 ${pkg.name} 发布流程已完成！🎉🎉🎉`)
     } catch (err) {
-      console.error('⚠️ 提交失败，但发布已成功。请手动提交 package.json:', err.message)
+      console.error('⚠️ 提交失败，但发布已成功。请手动提交 package.json 和模板包:', err.message)
       console.log(`\n✅ 包 ${pkg.name} 发布流程已完成！🎉🎉🎉`)
     }
   } else {
-    // 回滚
-    console.log('↩️ 正在回滚 version 修改...')
+    // 回滚主包
+    console.log('↩️ 正在回滚主包 version 修改...')
     pkg.version = originalVersion
     await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
-    console.log('✅ 已还原 package.json 到原始版本')
+
+    // 回滚模板包
+    console.log('↩️ 正在回滚模板包修改...')
+    await fs.writeFile(templatePkgPath, templatePkgContent)
+
+    console.log('📦 已还原 package.json 和模板包到原始状态')
     process.exit(1)
   }
 } catch (err) {

package/jnrs-template-vue/node_modules/.vue-global-types/vue_3.5_0.d.ts

@@ -2,6 +2,8 @@
 export {};
 
 ; declare global {
+	var __VLS_PROPS_FALLBACK: Record<string, unknown>;
+
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('vue').unref;
 	const __VLS_placeholder: any;
@@ -35,7 +37,7 @@ export {};
 			attrs?: any;
 			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>;
 			emit?: T extends { $emit: infer Emit } ? Emit : {};
-			props?: (T extends { $props: infer Props } ? Props : {}) & Record<string, unknown>;
+			props?: typeof props;
 			expose?: (exposed: T) => void;
 		};
 	};

package/jnrs-template-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jnrs-template-vue",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "As the name suggests.",
   "author": "Talia-Tan",
   "private": true,
@@ -21,9 +21,9 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@jnrs/shared": "workspace:*",
-    "@jnrs/core": "workspace:*",
-    "@jnrs/vue-core": "workspace:*",
+    "@jnrs/shared": "*",
+    "@jnrs/core": "*",
+    "@jnrs/vue-core": "*",
     "@element-plus/icons-vue": "^2.3.2",
     "async-validator": "^4.2.5",
     "element-plus": "^2.11.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jnrs-template-vue",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A Vue3 + Vite + TS project template with monorepo packages for JNRS.",
   "keywords": [
     "vue",