Merge pull request #6908 from vuestorefront/fix/yarn-version-checker

fix: yarn version checker for windows fixed
vuestorefront · Apr 25, 2023 · dc4572d · dc4572d
2 parents 9bdc22e + b1300bd
commit dc4572d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/cli",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Vue Storefront's CLI.",
   "bin": "./bin/run",
   "homepage": "https://github.com/vuestorefront/vue-storefront",

diff --git a/packages/cli/src/domains/directory/handleProjectDiretoryExists.ts b/packages/cli/src/domains/directory/handleProjectDiretoryExists.ts
@@ -32,7 +32,7 @@ export const handleProjectDiretoryExists = async ({
       sp.start(
         picocolors.cyan(t('command.generate_store.progress.delete_start'))
       );
-      await fs.rmSync(projectDir, { recursive: true, force: true });
+      await fs.rmdirSync(projectDir, { recursive: true });
       await fs.mkdirSync(projectDir);
       sp.stop(
         picocolors.green(t('command.generate_store.progress.delete_end'))

diff --git a/packages/cli/src/domains/magento2/functions/checkYarn.ts b/packages/cli/src/domains/magento2/functions/checkYarn.ts
@@ -20,7 +20,10 @@ const checkYarnVersion = (yarnString: string): boolean => {
 const checkYarn = async (
   writeLog: (message: string) => void
 ): Promise<void> => {
-  const yarn = spawn('yarn', ['-v']);
+  const yarn =
+    process.platform === 'win32'
+      ? spawn('yarn.cmd', ['--version'])
+      : spawn('yarn', ['--version']);
 
   yarn.stdout.on('data', (data) => {
     if (!checkYarnVersion(data.toString())) {

diff --git a/packages/cli/src/domains/magento2/functions/copyEnv.ts b/packages/cli/src/domains/magento2/functions/copyEnv.ts
@@ -31,7 +31,7 @@ const copyEnv = async (vsfDirName: string, magentoDomain?: string) => {
     process.exit(1);
   }
 
-  fs.rmSync(path.join(vsfDirName, '.env.example'));
+  fs.rmdirSync(path.join(vsfDirName, '.env.example'));
 };
 
 export default copyEnv;
diff --git a/packages/cli/src/domains/magento2/prompts/confirmOverwrite.ts b/packages/cli/src/domains/magento2/prompts/confirmOverwrite.ts
@@ -34,7 +34,7 @@ const confirmOverwrite = async ({
     sp.start(
       picocolors.cyan(t('command.generate_store.progress.delete_start'))
     );
-    await fs.rmSync(magentoDirName, { recursive: true, force: true });
+    await fs.rmdirSync(magentoDirName, { recursive: true });
     await fs.mkdirSync(magentoDirName);
     sp.stop(picocolors.green(t('command.generate_store.progress.delete_end')));
     newMagentoDirName = magentoDirName;