@akinon/projectzero 1.9.0 → 1.11.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.11.0
+
+## 1.10.0
+
 ## 1.9.0
 
 ## 1.8.0

package/commands/create.ts

@@ -2,11 +2,13 @@ import path from 'path';
 import * as fs from 'fs';
 import * as readline from 'readline';
 import { slugify } from '../utils';
-import { execSync } from 'child_process';
+import temp from 'temp';
 
 const exec = require('child_process').exec;
 const loadingSpinner = require('loading-spinner');
 
+temp.track();
+
 interface Question {
   text: string;
   optional: boolean;
@@ -19,7 +21,7 @@ interface Answers {
 }
 
 const repositorySlug = 'projectzeropwa';
-const tempDirName = '.pz-temp';
+const tempDirPath = temp.mkdirSync('pz-temp');
 const workingDir = path.resolve(process.cwd());
 const rl = readline.createInterface({
   input: process.stdin,
@@ -82,10 +84,8 @@ const getAnswers = () => {
 
 const cloneRepository = () =>
   new Promise<{ error?: Error }>((resolve) => {
-    execSync(`mkdir ${tempDirName}`);
-
     exec(
-      `cd ${tempDirName} && git clone git@bitbucket.org:akinonteam/${repositorySlug}.git`,
+      `cd ${tempDirPath} && git clone git@bitbucket.org:akinonteam/${repositorySlug}.git`,
       function (err: any, stdout: any, stderr: any) {
         if (err != null) {
           resolve({ error: new Error(err) });
@@ -100,8 +100,8 @@ const cloneRepository = () =>
 
 const updatePackageJson = (brandName: string) => {
   const packageJsonPath = path.resolve(
-    workingDir,
-    `./${tempDirName}/${repositorySlug}/package.json`
+    tempDirPath,
+    `./${repositorySlug}/package.json`
   );
 
   const packageJsonData = fs.readFileSync(packageJsonPath, {
@@ -117,8 +117,8 @@ const updatePackageJson = (brandName: string) => {
 
 const updateAkinonJson = (brandName: string, projectDescription: string) => {
   const akinonJsonPath = path.resolve(
-    workingDir,
-    `./${tempDirName}/${repositorySlug}/akinon.json`
+    tempDirPath,
+    `./${repositorySlug}/akinon.json`
   );
 
   const akinonJsonData = fs.readFileSync(akinonJsonPath, {
@@ -142,10 +142,7 @@ const updateAkinonJson = (brandName: string, projectDescription: string) => {
 };
 
 const copyEnv = (commerceUrl: string) => {
-  const repositoryPath = path.resolve(
-    workingDir,
-    `./${tempDirName}/${repositorySlug}`
-  );
+  const repositoryPath = path.resolve(tempDirPath, `./${repositorySlug}`);
 
   const envExamplePath = path.resolve(repositoryPath, `./.env.example`);
   const envPath = path.resolve(repositoryPath, `./.env`);
@@ -170,8 +167,8 @@ const copyEnv = (commerceUrl: string) => {
 
 const updatePlugins = () => {
   const pluginsPath = path.resolve(
-    workingDir,
-    `./${tempDirName}/${repositorySlug}/src/plugins.js`
+    tempDirPath,
+    `./${repositorySlug}/src/plugins.js`
   );
 
   fs.writeFileSync(pluginsPath, 'module.exports = [];');
@@ -196,31 +193,28 @@ export default async () => {
 
   const answers = await getAnswers();
 
+  const brandName =
+    answers.brandName === '.'
+      ? path.basename(process.cwd())
+      : answers.brandName;
+
   loadingSpinner.start();
 
   await cloneRepository();
-  updatePackageJson(answers.brandName);
-  updateAkinonJson(answers.brandName, answers.projectDescription);
+  updatePackageJson(brandName);
+  updateAkinonJson(brandName, answers.projectDescription);
   copyEnv(answers.commerceUrl);
   updatePlugins();
 
   const slugifiedBrandName = slugify(answers.brandName);
 
-  fs.rmSync(
-    path.resolve(workingDir, `./${tempDirName}/${repositorySlug}/.git`),
-    {
-      recursive: true,
-      force: true
-    }
-  );
-
-  fs.renameSync(
-    path.resolve(workingDir, `./${tempDirName}/${repositorySlug}`),
-    path.resolve(workingDir, `./${tempDirName}/${slugifiedBrandName}`)
-  );
+  fs.rmSync(path.resolve(tempDirPath, `./${repositorySlug}/.git`), {
+    recursive: true,
+    force: true
+  });
 
   fs.cpSync(
-    path.resolve(workingDir, `./${tempDirName}/${slugifiedBrandName}`),
+    path.resolve(tempDirPath, `./${repositorySlug}`),
     path.resolve(workingDir, `./${slugifiedBrandName}`),
     {
       recursive: true,
@@ -228,10 +222,7 @@ export default async () => {
     }
   );
 
-  fs.rmSync(path.resolve(workingDir, `./${tempDirName}/`), {
-    recursive: true,
-    force: true
-  });
+  temp.cleanupSync();
 
   loadingSpinner.stop();
 

package/dist/commands/create.js

@@ -39,11 +39,12 @@ const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const utils_1 = require("../utils");
-const child_process_1 = require("child_process");
+const temp_1 = __importDefault(require("temp"));
 const exec = require('child_process').exec;
 const loadingSpinner = require('loading-spinner');
+temp_1.default.track();
 const repositorySlug = 'projectzeropwa';
-const tempDirName = '.pz-temp';
+const tempDirPath = temp_1.default.mkdirSync('pz-temp');
 const workingDir = path_1.default.resolve(process.cwd());
 const rl = readline.createInterface({
     input: process.stdin,
@@ -97,8 +98,7 @@ const getAnswers = () => {
     });
 };
 const cloneRepository = () => new Promise((resolve) => {
-    (0, child_process_1.execSync)(`mkdir ${tempDirName}`);
-    exec(`cd ${tempDirName} && git clone git@bitbucket.org:akinonteam/${repositorySlug}.git`, function (err, stdout, stderr) {
+    exec(`cd ${tempDirPath} && git clone git@bitbucket.org:akinonteam/${repositorySlug}.git`, function (err, stdout, stderr) {
         if (err != null) {
             resolve({ error: new Error(err) });
         }
@@ -111,7 +111,7 @@ const cloneRepository = () => new Promise((resolve) => {
     });
 });
 const updatePackageJson = (brandName) => {
-    const packageJsonPath = path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}/package.json`);
+    const packageJsonPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/package.json`);
     const packageJsonData = fs.readFileSync(packageJsonPath, {
         encoding: 'utf8',
         flag: 'r'
@@ -119,7 +119,7 @@ const updatePackageJson = (brandName) => {
     fs.writeFileSync(packageJsonPath, packageJsonData.replace(/"name": ".*"/, `"name": "${(0, utils_1.slugify)(brandName)}"`));
 };
 const updateAkinonJson = (brandName, projectDescription) => {
-    const akinonJsonPath = path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}/akinon.json`);
+    const akinonJsonPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/akinon.json`);
     const akinonJsonData = fs.readFileSync(akinonJsonPath, {
         encoding: 'utf8',
         flag: 'r'
@@ -131,7 +131,7 @@ const updateAkinonJson = (brandName, projectDescription) => {
     fs.writeFileSync(akinonJsonPath, updatedData);
 };
 const copyEnv = (commerceUrl) => {
-    const repositoryPath = path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}`);
+    const repositoryPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}`);
     const envExamplePath = path_1.default.resolve(repositoryPath, `./.env.example`);
     const envPath = path_1.default.resolve(repositoryPath, `./.env`);
     const envData = fs.readFileSync(envExamplePath, {
@@ -144,7 +144,7 @@ const copyEnv = (commerceUrl) => {
     fs.copyFileSync(envExamplePath, envPath);
 };
 const updatePlugins = () => {
-    const pluginsPath = path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}/src/plugins.js`);
+    const pluginsPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/src/plugins.js`);
     fs.writeFileSync(pluginsPath, 'module.exports = [];');
 };
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -155,26 +155,25 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         process.exit(1);
     }
     const answers = yield getAnswers();
+    const brandName = answers.brandName === '.'
+        ? path_1.default.basename(process.cwd())
+        : answers.brandName;
     loadingSpinner.start();
     yield cloneRepository();
-    updatePackageJson(answers.brandName);
-    updateAkinonJson(answers.brandName, answers.projectDescription);
+    updatePackageJson(brandName);
+    updateAkinonJson(brandName, answers.projectDescription);
     copyEnv(answers.commerceUrl);
     updatePlugins();
     const slugifiedBrandName = (0, utils_1.slugify)(answers.brandName);
-    fs.rmSync(path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}/.git`), {
+    fs.rmSync(path_1.default.resolve(tempDirPath, `./${repositorySlug}/.git`), {
         recursive: true,
         force: true
     });
-    fs.renameSync(path_1.default.resolve(workingDir, `./${tempDirName}/${repositorySlug}`), path_1.default.resolve(workingDir, `./${tempDirName}/${slugifiedBrandName}`));
-    fs.cpSync(path_1.default.resolve(workingDir, `./${tempDirName}/${slugifiedBrandName}`), path_1.default.resolve(workingDir, `./${slugifiedBrandName}`), {
-        recursive: true,
-        force: true
-    });
-    fs.rmSync(path_1.default.resolve(workingDir, `./${tempDirName}/`), {
+    fs.cpSync(path_1.default.resolve(tempDirPath, `./${repositorySlug}`), path_1.default.resolve(workingDir, `./${slugifiedBrandName}`), {
         recursive: true,
         force: true
     });
+    temp_1.default.cleanupSync();
     loadingSpinner.stop();
     console.log('\x1b[32m%s\x1b[0m', `\n ✓ ${answers.brandName} project is ready.\n`);
     console.log('\x1b[33m%s\x1b[0m', 'Project Zero - Akinon\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {
@@ -14,11 +14,13 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/node": "^18.8.0"
+    "@types/node": "^18.8.0",
+    "@types/temp": "0.9.4"
   },
   "dependencies": {
     "loading-spinner": "^1.2.1",
-    "yargs": "^17.6.0",
-    "prompt-checkbox": "2.2.0"
+    "prompt-checkbox": "2.2.0",
+    "temp": "0.9.4",
+    "yargs": "^17.6.0"
   }
 }