From 87a2fe6c56b602da89e6b56d11e584c614c75547 Mon Sep 17 00:00:00 2001 From: Alejandro Lembke Barrientos Date: Sun, 31 Jul 2022 00:11:13 +0000 Subject: [PATCH 1/2] PR-691975: Trying to fix Windows npx. --- bin/cli.js | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cli.js b/bin/cli.js index 3ae5c1d..84245a3 100644 --- a/bin/cli.js +++ b/bin/cli.js @@ -16,9 +16,9 @@ const repoName = process.argv[2]; const gitCheckoutCommand = `git clone --depth 1 https://github.com/aleleba/create-react-ssr ${repoName}`; const installDepsCommand = `cd ${repoName} && npm install`; const cleanGitHistoryCommand = `cd ${repoName} && rm -rf .git && git init && git add --all -- ':!.github' ':!bin' && git commit -m "Initial commit"` -const cleanGitHistoryCommandWindows = `cd ${repoName}; rm -r -Force .git; git init; git add --all -- ':!.github' ':!bin'; git commit -m "Initial commit"` +const cleanGitHistoryCommandWindows = `cd ${repoName} && rm -r -Force .git && git init && git add --all -- ':!.github' ':!bin' && git commit -m "Initial commit"` const deleteFoldersCommand = `cd ${repoName} && rm -rf .github && rm -rf bin` -const deleteFoldersCommandWindows = `cd ${repoName}; rm -r -Force .github; rm -r -Force bin` +const deleteFoldersCommandWindows = `cd ${repoName}; rm -r -Force .github && rm -r -Force bin` console.log(`Cloning the repository with name ${repoName}`); const checkedOut = runCommand(gitCheckoutCommand); @@ -28,7 +28,7 @@ console.log(`Installing dependencies for ${repoName}`); const installedDeps = runCommand(installDepsCommand); if(!installedDeps) process.exit(-1); -console.log(`Installing dependencies for ${repoName}`); +console.log(`Cleaning History of Git for ${repoName}`); const cleanGitHistory = isWin ? runCommand(cleanGitHistoryCommandWindows) : runCommand(cleanGitHistoryCommand); if(!cleanGitHistory) process.exit(-1); diff --git a/package.json b/package.json index b369f26..e8d4d5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aleleba/create-react-ssr", - "version": "3.0.9", + "version": "3.0.10", "description": "Starter Kit of server side render of react", "bin": "./bin/cli.js", "main": "src/server/index", From aa1d65ef91e4d63fc0cf6599e8147e51c4227d21 Mon Sep 17 00:00:00 2001 From: Alejandro Lembke Barrientos Date: Sun, 31 Jul 2022 00:12:22 +0000 Subject: [PATCH 2/2] PR-691975: adding missing && --- bin/cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cli.js b/bin/cli.js index 84245a3..ee98555 100644 --- a/bin/cli.js +++ b/bin/cli.js @@ -18,7 +18,7 @@ const installDepsCommand = `cd ${repoName} && npm install`; const cleanGitHistoryCommand = `cd ${repoName} && rm -rf .git && git init && git add --all -- ':!.github' ':!bin' && git commit -m "Initial commit"` const cleanGitHistoryCommandWindows = `cd ${repoName} && rm -r -Force .git && git init && git add --all -- ':!.github' ':!bin' && git commit -m "Initial commit"` const deleteFoldersCommand = `cd ${repoName} && rm -rf .github && rm -rf bin` -const deleteFoldersCommandWindows = `cd ${repoName}; rm -r -Force .github && rm -r -Force bin` +const deleteFoldersCommandWindows = `cd ${repoName} && rm -r -Force .github && rm -r -Force bin` console.log(`Cloning the repository with name ${repoName}`); const checkedOut = runCommand(gitCheckoutCommand);