@corva/create-app 0.34.0-1 → 0.34.0-4

package/common/python/Makefile

@@ -2,13 +2,14 @@
 .DEFAULT_GOAL := default
 
 default: install
-install: venv
+install: prepare-venv
 	@. venv/bin/activate && pip install -r requirements.txt
-venv:
-	@test -d venv || python -m venv venv
+prepare-venv:
+	@which python3 > /dev/null || (echo "python3 not found, please install it first" && exit 1;)
+	@test -d venv || python3 -m venv venv
 bundle:
 	@create-corva-app zip . --bump-version=skip
 release:
 	@create-corva-app release . --bump-version=skip
-test: venv
+test: prepare-venv
 	@. venv/bin/activate && pytest

package/lib/constants/cli.js

@@ -2,6 +2,7 @@ const APP_RUNTIMES = {
   UI: 'ui',
   NODE12: 'nodejs12.x',
   NODE14: 'nodejs14.x',
+  NODE16: 'nodejs16.x',
   PYTHON3: 'python3.8',
 };
 

package/lib/flows/lib/manifest.js

@@ -1,6 +1,6 @@
-const { APP_TYPES, APP_RUNTIMES, TEMPLATE_TYPES } = require('../../constants/cli');
+const { APP_TYPES, APP_RUNTIMES } = require('../../constants/cli');
 
-const NODE_RUNTIMES = [APP_RUNTIMES.NODE12, APP_RUNTIMES.NODE14];
+const NODE_RUNTIMES = [APP_RUNTIMES.NODE12, APP_RUNTIMES.NODE14, APP_RUNTIMES.NODE16];
 
 class Manifest {
   constructor(manifest) {

package/lib/flows/steps/zip-file-list-resolve.js

@@ -55,6 +55,7 @@ const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles =
     const files = await glob(pattern, {
       cwd: dirName,
       ignore: ['**/node_modules', ...ignoredFiles],
+      nodir: true,
     });
 
     filesFromPatterns.push(...files);
@@ -179,7 +180,7 @@ const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName,
   const zipFileName = `${manifest.manifest.application.name}.zip`;
 
   if (!itemsToZip.length) {
-    itemsToZip.push(...(await glob('**/*.py', { cwd: dirName, ignore: options.ignoredFiles })));
+    itemsToZip.push(...(await glob('**/*.py', { cwd: dirName, ignore: [...(options.ignoredFiles || []), 'venv/**/*'] })));
   }
 
   itemsToZip.push('manifest.json', 'requirements.txt');

package/lib/index.js

@@ -302,7 +302,7 @@ async function createApp(dirName, opts) {
 
   console.log('Please fill your app Metadata');
 
-  const answers = inquirer.prompt(manifestConstants.manifestOptions(dirName), opts);
+  const answers = await inquirer.prompt(manifestConstants.manifestOptions(dirName), opts);
 
   return initPackage(dirName, answers);
 }
@@ -454,9 +454,12 @@ function addPackageJSON(root, manifest, runtime) {
 async function installApp(root, manifest, runtime) {
   const command = manifest.isJs() ? runtime.packageManager : 'make';
   const args = ['install'];
+  const opts = { stdio: ['inherit', 'inherit', 'pipe'], cwd: root }
 
   console.log(chalk.yellow(`Installing template dependencies using ${runtime.packageManager}...`));
-  const proc = spawn.sync(command, args, { stdio: ['inherit', 'inherit', 'pipe'], cwd: root });
+  const proc = manifest.isJs() ?
+    spawn.sync(`\\. ~/.nvm/nvm.sh && nvm use && ${command} ${args.join(' ')}`, { shell: true, ...opts }) :
+    spawn.sync(command, args, opts);
 
   if (proc.stderr) {
     const error = proc.stderr

package/package.json

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