@akinon/projectzero 1.32.0 → 1.33.0

package/commands/create.ts

@@ -2,13 +2,9 @@ import path from 'path';
 import * as fs from 'fs';
 import * as readline from 'readline';
 import { slugify } from '../utils';
-import temp from 'temp';
 
-const exec = require('child_process').exec;
 const loadingSpinner = require('loading-spinner');
 
-temp.track();
-
 interface Question {
   text: string;
   optional: boolean;
@@ -20,8 +16,6 @@ interface Answers {
   [key: string]: string;
 }
 
-const repositorySlug = 'pz-next';
-const tempDirPath = temp.mkdirSync('pz-temp');
 const workingDir = path.resolve(process.cwd());
 const rl = readline.createInterface({
   input: process.stdin,
@@ -29,7 +23,6 @@ const rl = readline.createInterface({
 });
 
 const ANSWERS: Answers = {};
-
 const QUESTIONS: Array<Question> = [
   {
     text: 'Brand name',
@@ -82,99 +75,36 @@ const getAnswers = () => {
   });
 };
 
-const cloneRepository = () =>
-  new Promise<{ error?: Error }>((resolve) => {
-    exec(
-      `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) });
-        } else if (typeof stderr != 'string') {
-          resolve({ error: new Error(stderr) });
-        } else {
-          resolve({});
-        }
-      }
-    );
-  });
-
-const updatePackageJson = (brandName: string) => {
-  const packageJsonPath = path.resolve(
-    tempDirPath,
-    `./${repositorySlug}/apps/projectzeronext/package.json`
-  );
-
-  const packageJsonData = fs.readFileSync(packageJsonPath, {
-    encoding: 'utf8',
-    flag: 'r'
-  });
-
-  fs.writeFileSync(
-    packageJsonPath,
-    packageJsonData.replace(/"name": ".*"/, `"name": "${slugify(brandName)}"`)
-  );
-};
-
-const updateAkinonJson = (brandName: string, projectDescription: string) => {
-  const akinonJsonPath = path.resolve(
-    tempDirPath,
-    `./${repositorySlug}/apps/projectzeronext/akinon.json`
-  );
-
-  const akinonJsonData = fs.readFileSync(akinonJsonPath, {
-    encoding: 'utf8',
-    flag: 'r'
+const updateFileContents = (
+  filePath: string,
+  replacements: { [key: string]: string }
+): void => {
+  let content = fs.readFileSync(filePath, { encoding: 'utf8' });
+  Object.entries(replacements).forEach(([key, value]) => {
+    if (filePath.endsWith('.json')) {
+      content = content.replace(
+        new RegExp(`"${key}":\\s*".*?"`, 'g'),
+        `"${key}": "${value}"`
+      );
+    } else {
+      content = content.replace(
+        new RegExp(`^${key}=.*$`, 'gm'),
+        `${key}=${value}`
+      );
+    }
   });
-
-  let updatedData = akinonJsonData.replace(
-    /"name": ".*"/,
-    `"name": "${brandName}"`
-  );
-
-  if (projectDescription) {
-    updatedData = updatedData.replace(
-      /"description": ".*"/,
-      `"description": "${projectDescription}"`
-    );
-  }
-
-  fs.writeFileSync(akinonJsonPath, updatedData);
+  fs.writeFileSync(filePath, content, { encoding: 'utf8' });
 };
 
-const copyEnv = (commerceUrl: string) => {
-  const repositoryPath = path.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/`);
-
-  const envExamplePath = path.resolve(repositoryPath, `./.env.example`);
-  const envPath = path.resolve(repositoryPath, `./.env`);
+function updatePluginsFile(projectDir: string): void {
+  const pluginsFilePath = path.join(projectDir, 'src', 'plugins.js');
 
-  const envData = fs.readFileSync(envExamplePath, {
-    encoding: 'utf8',
-    flag: 'r'
-  });
-
-  if (commerceUrl) {
-    fs.writeFileSync(
-      envExamplePath,
-      envData.replace(
-        /SERVICE_BACKEND_URL=.*/,
-        `SERVICE_BACKEND_URL=${commerceUrl}`
-      )
-    );
-  }
-
-  fs.copyFileSync(envExamplePath, envPath);
-};
-
-const updatePlugins = () => {
-  const pluginsPath = path.resolve(
-    tempDirPath,
-    `./${repositorySlug}/apps/projectzeronext/src/plugins.js`
-  );
+  const content = 'module.exports = [];';
 
-  fs.writeFileSync(pluginsPath, 'module.exports = [];');
-};
+  fs.writeFileSync(pluginsFilePath, content, { encoding: 'utf8' });
+}
 
-export default async () => {
+export default async (): Promise<void> => {
   const minNodeVersion = 18;
   const currentNodeVersion = parseInt(
     process.version.replace('v', '').split('.')[0]
@@ -192,37 +122,38 @@ export default async () => {
   }
 
   const answers = await getAnswers();
-
   const brandName =
-    answers.brandName === '.'
-      ? path.basename(process.cwd())
-      : answers.brandName;
+    answers.brandName === '.' ? path.basename(workingDir) : answers.brandName;
+  const projectDir = path.resolve(workingDir, slugify(brandName));
 
-  loadingSpinner.start();
+  if (!fs.existsSync(projectDir)) {
+    fs.mkdirSync(projectDir, { recursive: true });
+  }
 
-  await cloneRepository();
-  updatePackageJson(brandName);
-  updateAkinonJson(brandName, answers.projectDescription);
-  copyEnv(answers.commerceUrl);
-  updatePlugins();
+  const templatesDir = path.resolve(
+    __dirname,
+    '../../../projectzero-cli/app-template'
+  );
 
-  const slugifiedBrandName = slugify(answers.brandName);
+  fs.cpSync(templatesDir, projectDir, { recursive: true });
 
-  fs.rmSync(path.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/.git`), {
-    recursive: true,
-    force: true
-  });
+  updatePluginsFile(projectDir);
 
-  fs.cpSync(
-    path.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/`),
-    path.resolve(workingDir, `./${slugifiedBrandName}`),
-    {
-      recursive: true,
-      force: true
-    }
-  );
+  if (answers.projectDescription) {
+    updateFileContents(path.join(projectDir, 'akinon.json'), {
+      description: answers.projectDescription
+    });
+  }
 
-  temp.cleanupSync();
+  if (answers.commerceUrl) {
+    updateFileContents(path.join(projectDir, '.env'), {
+      SERVICE_BACKEND_URL: answers.commerceUrl
+    });
+  }
+
+  updateFileContents(path.join(projectDir, 'package.json'), {
+    name: slugify(brandName)
+  });
 
   loadingSpinner.stop();
 

package/dist/commands/create.js

@@ -39,12 +39,7 @@ const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const utils_1 = require("../utils");
-const temp_1 = __importDefault(require("temp"));
-const exec = require('child_process').exec;
 const loadingSpinner = require('loading-spinner');
-temp_1.default.track();
-const repositorySlug = 'pz-next';
-const tempDirPath = temp_1.default.mkdirSync('pz-temp');
 const workingDir = path_1.default.resolve(process.cwd());
 const rl = readline.createInterface({
     input: process.stdin,
@@ -97,56 +92,23 @@ const getAnswers = () => {
         });
     });
 };
-const cloneRepository = () => new Promise((resolve) => {
-    exec(`cd ${tempDirPath} && git clone git@bitbucket.org:akinonteam/${repositorySlug}.git`, function (err, stdout, stderr) {
-        if (err != null) {
-            resolve({ error: new Error(err) });
-        }
-        else if (typeof stderr != 'string') {
-            resolve({ error: new Error(stderr) });
+const updateFileContents = (filePath, replacements) => {
+    let content = fs.readFileSync(filePath, { encoding: 'utf8' });
+    Object.entries(replacements).forEach(([key, value]) => {
+        if (filePath.endsWith('.json')) {
+            content = content.replace(new RegExp(`"${key}":\\s*".*?"`, 'g'), `"${key}": "${value}"`);
         }
         else {
-            resolve({});
+            content = content.replace(new RegExp(`^${key}=.*$`, 'gm'), `${key}=${value}`);
         }
     });
-});
-const updatePackageJson = (brandName) => {
-    const packageJsonPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/package.json`);
-    const packageJsonData = fs.readFileSync(packageJsonPath, {
-        encoding: 'utf8',
-        flag: 'r'
-    });
-    fs.writeFileSync(packageJsonPath, packageJsonData.replace(/"name": ".*"/, `"name": "${(0, utils_1.slugify)(brandName)}"`));
-};
-const updateAkinonJson = (brandName, projectDescription) => {
-    const akinonJsonPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/akinon.json`);
-    const akinonJsonData = fs.readFileSync(akinonJsonPath, {
-        encoding: 'utf8',
-        flag: 'r'
-    });
-    let updatedData = akinonJsonData.replace(/"name": ".*"/, `"name": "${brandName}"`);
-    if (projectDescription) {
-        updatedData = updatedData.replace(/"description": ".*"/, `"description": "${projectDescription}"`);
-    }
-    fs.writeFileSync(akinonJsonPath, updatedData);
-};
-const copyEnv = (commerceUrl) => {
-    const repositoryPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/`);
-    const envExamplePath = path_1.default.resolve(repositoryPath, `./.env.example`);
-    const envPath = path_1.default.resolve(repositoryPath, `./.env`);
-    const envData = fs.readFileSync(envExamplePath, {
-        encoding: 'utf8',
-        flag: 'r'
-    });
-    if (commerceUrl) {
-        fs.writeFileSync(envExamplePath, envData.replace(/SERVICE_BACKEND_URL=.*/, `SERVICE_BACKEND_URL=${commerceUrl}`));
-    }
-    fs.copyFileSync(envExamplePath, envPath);
-};
-const updatePlugins = () => {
-    const pluginsPath = path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/src/plugins.js`);
-    fs.writeFileSync(pluginsPath, 'module.exports = [];');
+    fs.writeFileSync(filePath, content, { encoding: 'utf8' });
 };
+function updatePluginsFile(projectDir) {
+    const pluginsFilePath = path_1.default.join(projectDir, 'src', 'plugins.js');
+    const content = 'module.exports = [];';
+    fs.writeFileSync(pluginsFilePath, content, { encoding: 'utf8' });
+}
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const minNodeVersion = 18;
     const currentNodeVersion = parseInt(process.version.replace('v', '').split('.')[0]);
@@ -155,25 +117,27 @@ 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(brandName);
-    updateAkinonJson(brandName, answers.projectDescription);
-    copyEnv(answers.commerceUrl);
-    updatePlugins();
-    const slugifiedBrandName = (0, utils_1.slugify)(answers.brandName);
-    fs.rmSync(path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/.git`), {
-        recursive: true,
-        force: true
-    });
-    fs.cpSync(path_1.default.resolve(tempDirPath, `./${repositorySlug}/apps/projectzeronext/`), path_1.default.resolve(workingDir, `./${slugifiedBrandName}`), {
-        recursive: true,
-        force: true
+    const brandName = answers.brandName === '.' ? path_1.default.basename(workingDir) : answers.brandName;
+    const projectDir = path_1.default.resolve(workingDir, (0, utils_1.slugify)(brandName));
+    if (!fs.existsSync(projectDir)) {
+        fs.mkdirSync(projectDir, { recursive: true });
+    }
+    const templatesDir = path_1.default.resolve(__dirname, '../../../projectzero-cli/app-template');
+    fs.cpSync(templatesDir, projectDir, { recursive: true });
+    updatePluginsFile(projectDir);
+    if (answers.projectDescription) {
+        updateFileContents(path_1.default.join(projectDir, 'akinon.json'), {
+            description: answers.projectDescription
+        });
+    }
+    if (answers.commerceUrl) {
+        updateFileContents(path_1.default.join(projectDir, '.env'), {
+            SERVICE_BACKEND_URL: answers.commerceUrl
+        });
+    }
+    updateFileContents(path_1.default.join(projectDir, 'package.json'), {
+        name: (0, utils_1.slugify)(brandName)
     });
-    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.32.0",
+  "version": "1.33.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -49,7 +49,7 @@
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
@@ -71,12 +71,12 @@
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
@@ -98,6 +98,7 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  },
+  "exclude": ["app-template"]
 }