Merge pull request #13 from electron-vite/v0.2.1

V0.2.1

Author: caoxiemeihao

CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.1 (2023-03-13)
+
+#### Main Changed
+
+- 8d52193 feat: support create project into exists directory | [see here](https://github.com/vitejs/vite/pull/12390#issuecomment-1465457917)

README.md

@@ -7,19 +7,19 @@ Scaffolding Your Electron + Vite Project
 NPM:
 
 ```sh
-$ npm create electron-vite@latest electron-vite-app
+$ npm create electron-vite@latest electron-vite-project
 ```
 
 Yarn:
 
 ```sh
-$ yarn create electron-vite electron-vite-app
+$ yarn create electron-vite electron-vite-project
 ```
 
 PNPM:
 
 ```sh
-$ pnpm create electron-vite electron-vite-app
+$ pnpm create electron-vite electron-vite-project
 ```
 
 ## Template repository

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-electron-vite",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Scaffolding Your Electron + Vite Project",
   "license": "MIT",
@@ -33,10 +33,12 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "fs-extra": "^11.1.0",
     "kolorist": "^1.6.0",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
+    "@types/fs-extra": "^11.0.1",
     "@types/node": "^18.11.18",
     "@types/prompts": "^2.4.2",
     "typescript": "^4.9.4",

pnpm-lock.yaml

@@ -1,16 +1,16 @@
+import fs from 'fs-extra'
+import path from 'node:path'
 import { spawn } from 'node:child_process'
-import * as path from 'node:path'
 import { red } from 'kolorist'
-import * as fs from 'node:fs'
 import prompts from 'prompts'
 
 const cwd = process.cwd()
 const argTargetDir = process.argv.slice(2).join(' ')
 
-const defaultTargetDir = 'electron-vite-app'
+const defaultTargetDir = 'electron-vite-project'
 
 async function init() {
-  let template: prompts.Answers<'projectName' | 'packageName' | 'repoName'>
+  let template: prompts.Answers<'projectName' | 'overwrite' | 'packageName' | 'repoName'>
 
   let targetDir = argTargetDir ?? defaultTargetDir
 
@@ -28,6 +28,25 @@ async function init() {
             targetDir = state?.value.trim().replace(/\/+$/g, '') ?? defaultTargetDir
           },
         },
+        {
+          type: () =>
+            !fs.existsSync(targetDir) || isEmpty(targetDir) ? null : 'confirm',
+          name: 'overwrite',
+          message: () =>
+            (targetDir === '.'
+              ? 'Current directory'
+              : `Target directory "${targetDir}"`) +
+            ` is not empty. Remove existing files and continue?`,
+        },
+        {
+          type: (_, { overwrite }: { overwrite?: boolean }) => {
+            if (overwrite === false) {
+              throw new Error(red('✖') + ' Operation cancelled')
+            }
+            return null
+          },
+          name: 'overwriteChecker',
+        },
         {
           type: () => (isValidPackageName(getProjectName()) ? null : 'text'),
           name: 'packageName',
@@ -66,22 +85,22 @@ async function init() {
     return
   }
 
-  const { repoName, packageName }: { repoName: string, packageName: string } = template
+  // user choice associated with prompts
+  const { overwrite, repoName, packageName } = template
 
-  const repo = `https://github.com/electron-vite/${repoName}`
+  const root = path.join(cwd, targetDir)
 
-  try {
-    if (fs.existsSync(targetDir) && fs.statSync(targetDir).isDirectory()) {
-      console.error(`🚧 Directory '${targetDir}' already exists.`)
-      process.exit(1)
-    }
+  // https://github.com/vitejs/vite/pull/12390#issuecomment-1465457917
+  if (overwrite) {
+    emptyDir(root)
+  } else if (!fs.existsSync(root)) {
+    fs.mkdirSync(root, { recursive: true })
+  }
 
-    await gitClone({ repo, targetDir, packageName })
+  const repo = `https://github.com/electron-vite/${repoName}`
 
-    fs.rmSync(path.join(cwd, targetDir, '.git'), {
-      recursive: true,
-      force: true,
-    })
+  try {
+    await gitClone({ repoName: repo, targetDir, packageName })
   } catch (err) {
     if (err instanceof Error) {
       console.error(err.message)
@@ -91,40 +110,74 @@ async function init() {
 }
 
 function gitClone({
-  repo,
+  repoName,
   targetDir,
   packageName,
   branch,
 }: {
-  repo: string
+  repoName: string
   targetDir: string
   packageName?: string
   branch?: string,
 }) {
   return new Promise((resolve, reject) => {
-    const _branch = branch ? ['-b', branch] : []
-    packageName = packageName ?? targetDir
-    spawn('git', ['clone', ..._branch, repo, targetDir, '--depth', '1'], {
-      stdio: 'inherit'
-    }).on('close', (code, signal) => {
+    const cloneTargetDir = `${targetDir}/.temp`
+
+    spawn(
+      'git',
+      [
+        'clone', ...(branch ? ['-b', branch] : []),
+        repoName,
+        cloneTargetDir,
+        '--depth',
+        '1',
+      ],
+      { stdio: 'inherit' },
+    ).on('close', (code, signal) => {
       if (code) {
         reject(code)
         return
       }
-      // Modify the name of package.json
+
+      const fullTargetDir = path.join(cwd, targetDir)
+      const fullCloneTargetDir = path.join(cwd, cloneTargetDir)
+
+      // extract files from the clone target dir
+      fs.copySync(fullCloneTargetDir, fullTargetDir)
+      fs.rmSync(fullCloneTargetDir, { recursive: true, force: true })
+
+      // modify the name of package.json
       try {
-        const packageJSON = fs.readFileSync(path.join(cwd, targetDir, 'package.json')).toString()
+        const packageJSON = fs.readFileSync(path.join(fullTargetDir, 'package.json')).toString()
         const packageInfo = JSON.parse(packageJSON)
-        packageInfo.name = packageName
-        fs.writeFileSync(path.join(cwd, targetDir, 'package.json'), JSON.stringify(packageInfo, null, 2))
+        packageInfo.name = packageName ?? targetDir
+        fs.writeFileSync(path.join(fullTargetDir, 'package.json'), JSON.stringify(packageInfo, null, 2))
       } catch (e) {
         console.error(e)
       }
+
       resolve(signal)
     })
   })
 }
 
+function isEmpty(path: string) {
+  const files = fs.readdirSync(path)
+  return files.length === 0 || (files.length === 1 && files[0] === '.git')
+}
+
+function emptyDir(dir: string) {
+  if (!fs.existsSync(dir)) {
+    return
+  }
+  for (const file of fs.readdirSync(dir)) {
+    if (file === '.git') {
+      continue
+    }
+    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true })
+  }
+}
+
 function isValidPackageName(projectName: string) {
   return /^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(projectName)
 }