@corva/create-app 0.53.0-rc.0 → 0.54.0-1

package/lib/commands/create.js

@@ -16,7 +16,7 @@ import { originalCwdOption } from '../options/original-cwd.js';
 import { ensureBumpVersion, ensureLatestVersion } from '../helpers/cli-version.js';
 import { logger } from '../helpers/logger.js';
 import { IS_WINDOWS, resolveAppRuntime } from '../helpers/resolve-app-runtime.js';
-import { initVersioning } from '../helpers/versioning.js';
+import { tryGitCommit, tryGitInit } from '../helpers/versioning.js';
 import { copyFolderRecursiveSync, putVariablesInEnvFile } from '../helpers/utils.js';
 import { getDefaultsForPackageJson } from '../constants/package.js';
 import { getRealWorkingDir } from '../helpers/commands.js';
@@ -44,7 +44,7 @@ export const createCommand = new Command('create')
   });
 
 manifestOptions().forEach((value) => {
-  const type = typeof value.default;
+  const type = value.commaSeparated ? 'string' : typeof value.default;
   const cliType = type === 'undefined' ? (value.choices ? ' [string]' : '') : ` [${type}]`;
   const alias = value.alias ? `-${value.alias}, ` : '';
   const optionString = `${alias}--${value.name}${cliType}`;
@@ -61,6 +61,8 @@ manifestOptions().forEach((value) => {
 
   if (type === 'number') {
     option.argParser(Number);
+  } else if (value.commaSeparated) {
+    option.argParser((str) => str.split(',').map((s) => s.trim()));
   }
 
   if (type !== 'undefined') {
@@ -145,12 +147,23 @@ async function initPackage(projectName, opts) {
 
   await fs.writeJSON(join(root, 'manifest.json'), manifest.manifest, WRITE_TO_JSON_OPTS);
 
-  await addTemplate(root, manifest, runtime);
-  await configureApp(root, manifest, runtime);
+  await addTemplate(root, manifest, runtime, opts);
+  await configureApp(root, manifest, runtime, opts);
+
+  if (opts.gitInit) {
+    if (!tryGitInit(root)) {
+      logger.log('Already in a git repository. Skipping git initialization.');
+    }
+  }
 
   opts.dependenciesInstall && (await installDependencies(root, manifest, runtime));
 
-  opts.gitInit && (await initVersioning(root, manifest, runtime));
+  if (opts.gitInit) {
+    if (tryGitCommit(root)) {
+      logger.log();
+      logger.log('Created git commit');
+    }
+  }
 
   logger.log();
   logger.log(`Success! Created ${chalk.green(manifest.name)} at ${chalk.yellow(root)}`);
@@ -183,8 +196,9 @@ async function createApp(dirName, opts) {
  * @param {string} root
  * @param {import('./flows/lib/manifest').Manifest} manifest
  * @param {*} runtime
+ * @param {*} opts
  */
-async function addTemplate(root, manifest, runtime) {
+async function addTemplate(root, manifest, runtime, opts) {
   logger.log(chalk.green('Copying app template...'));
   logger.log();
 
@@ -218,6 +232,23 @@ async function addTemplate(root, manifest, runtime) {
   }
 
   logger.log(chalk.green('Done: copying app template!'));
+
+  try {
+    if (Array.isArray(opts?.extensions) && opts.extensions.length) {
+      opts.extensions.forEach((extension) => {
+        const extPath = join(cliRoot, 'template_extensions', extension);
+
+        if (fs.existsSync(extPath)) {
+          copyFolderRecursiveSync(extPath, root);
+        }
+      });
+
+      logger.log(chalk.green('Done: applying app extensions!'));
+    }
+  } catch (e) {
+    logger.log(chalk.red('Error: applying app extensions!'));
+    logger.log(e);
+  }
 }
 
 /**
@@ -225,11 +256,12 @@ async function addTemplate(root, manifest, runtime) {
  * @param {string} root
  * @param {import('./flows/lib/manifest').Manifest} manifest
  * @param {*} runtime
+ * @param {*} opts
  */
-async function configureApp(root, manifest, runtime) {
+async function configureApp(root, manifest, runtime, opts) {
   if (manifest.isJs()) {
     await addNvmRc(root, manifest, runtime);
-    await addPackageJSON(root, manifest, runtime);
+    await addPackageJSON(root, manifest, runtime, opts);
   }
 
   if (manifest.isNode()) {
@@ -290,7 +322,7 @@ const addTsConfigs = (root, manifest, runtime) => {
  * @param {string} root
  * @param {import('./flows/lib/manifest').Manifest} manifest
  */
-function addPackageJSON(root, manifest, runtime) {
+function addPackageJSON(root, manifest, runtime, opts) {
   const {
     version,
     description,
@@ -301,7 +333,7 @@ function addPackageJSON(root, manifest, runtime) {
     license = 'UNLICENSED',
     private: isPrivate = true,
     ...rest
-  } = getDefaultsForPackageJson(manifest, runtime);
+  } = getDefaultsForPackageJson(manifest, runtime, opts);
 
   const packageJson = {
     name: manifest.unix_name,

package/lib/constants/manifest.js

@@ -252,4 +252,11 @@ export const manifestOptions = (projectName = 'Corva Dev Center App') => [
     name: 'no-git-init',
     message: 'Skip initializing git repository',
   },
+  {
+    name: 'extensions',
+    message: 'App template extensions',
+    default: [],
+    when: (answers) => answers.appType === APP_TYPES.UI,
+    commaSeparated: true,
+  },
 ];

package/lib/constants/package.js

@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 const uiDependencies = {
   '@corva/ui': 'latest',
   '@material-ui/core': '4.11.2',
@@ -44,6 +46,36 @@ const tsUiDevDependencies = {
   'typescript': '4.6.3',
 };
 
+const corvaUiExtension = {
+  scripts: {
+    prepare: 'husky install',
+  },
+  devDependencies: {
+    '@commitlint/cli': '^17.0.0',
+    '@commitlint/config-conventional': '^17.0.0',
+    'husky': '^8.0.0',
+    'lint-staged': '^13.0.0',
+  },
+};
+
+function applyUiExtension(packageJson, extensionNames) {
+  if (!Array.isArray(extensionNames) || extensionNames.length === 0) {
+    return packageJson;
+  }
+
+  const extensions = extensionNames
+    .map((extensionName) => {
+      if (extensionName === 'corva') {
+        return corvaUiExtension;
+      }
+
+      return null;
+    })
+    .filter(Boolean);
+
+  return _.merge({}, packageJson, ...extensions);
+}
+
 const uiScripts = {
   build: 'webpack --config=./config-overrides.js --mode production',
   start: 'webpack-dev-server --config=./config-overrides.js --open --mode development',
@@ -193,13 +225,13 @@ const extendWithTsConfig = (packageJson, version) => {
 const defaults = {
   javascript: {
     yarn: {
-      ui: () => uiPackage,
+      ui: (runtime, opts) => applyUiExtension(uiPackage, opts?.extensions),
       task: () => nodeYarnPackage,
       scheduler: () => nodeYarnPackage,
       stream: () => nodeYarnPackage,
     },
     npm: {
-      ui: () => uiPackage,
+      ui: (runtime, opts) => applyUiExtension(uiPackage, opts?.extensions),
       task: () => nodeNpmPackage,
       scheduler: () => nodeNpmPackage,
       stream: () => nodeNpmPackage,
@@ -207,13 +239,13 @@ const defaults = {
   },
   typescript: {
     yarn: {
-      ui: () => tsUiPackage,
+      ui: (runtime, opts) => applyUiExtension(tsUiPackage, opts?.extensions),
       task: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
       scheduler: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
       stream: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
     },
     npm: {
-      ui: () => tsUiPackage,
+      ui: (runtime, opts) => applyUiExtension(tsUiPackage, opts?.extensions),
       task: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
       scheduler: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
       stream: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
@@ -221,6 +253,6 @@ const defaults = {
   },
 };
 
-export const getDefaultsForPackageJson = (manifest, runtime) => {
-  return defaults[runtime.language][runtime.packageManager][manifest.type](runtime);
+export const getDefaultsForPackageJson = (manifest, runtime, opts) => {
+  return defaults[runtime.language][runtime.packageManager][manifest.type](runtime, opts);
 };

package/lib/helpers/utils.js

@@ -12,6 +12,10 @@ export function copyFileSync(source, target) {
   }
 
   fs.writeFileSync(targetFile, fs.readFileSync(source));
+
+  const targetMode = fs.lstatSync(source).mode;
+
+  fs.chmodSync(targetFile, targetMode);
 }
 
 export function copyFolderRecursiveSync(sourceFolder, targetFolder) {

package/lib/helpers/versioning.js

@@ -65,7 +65,7 @@ export function tryGitInit(appPath) {
 export function tryGitCommit(appPath) {
   try {
     execSync('git add -A', { stdio: 'ignore', cwd: appPath });
-    execSync('git commit -m "chore: initialize project using @corva/create-app"', {
+    execSync('git commit -m "chore: initialize project using @corva/create-app" -n', {
       stdio: 'ignore',
       cwd: appPath,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.53.0-rc.0",
+  "version": "0.54.0-1",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [