@corva/create-app 0.34.0-2 → 0.34.0-5

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/common/python/gitignore

@@ -158,3 +158,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+venv

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

@@ -34,6 +34,7 @@ const { ZIP_FLOW } = require('./flows/zip');
 const { bumpVersionOptionDeprecated, bumpVersionOption } = require('./bump-version.option');
 const { Manifest } = require('./flows/lib/manifest');
 const { resolveAppRuntime } = require('./helpers/resolve-app-runtime');
+const { existsSync } = require('fs');
 
 const writejsonOptions = {
   spaces: 2,
@@ -54,7 +55,7 @@ function checkNodeVersion() {
     console.log(
       chalk.red(
         `\nYou are using Node ${process.version}.\n\n` +
-          `Please update to Node 16 or higher for a better, fully supported experience.\n`
+        `Please update to Node 16 or higher for a better, fully supported experience.\n`
       )
     );
     // Fall back to latest supported react-scripts on Node 4
@@ -84,7 +85,7 @@ function checkOptions(opts) {
 const printDeprecationNotice = (param) =>
   console.warn(
     chalk.bgYellowBright`DEPRECATED OPTION: ${param}` +
-      ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`
+    ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`
   );
 
 async function initialChecks() {
@@ -106,8 +107,7 @@ async function initialChecks() {
   manifestConstants.manifestOptions().forEach((value) => {
     const type = typeof value.default;
     const option = new Option(
-      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${
-        (type !== 'undefined' && type) || 'string'
+      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${(type !== 'undefined' && type) || 'string'
       }]`,
       value.message
     );
@@ -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() && existsSync(`${os.homedir()}/.nvm/nvm.sh`) ?
+    spawn.sync(`\\. ${os.homedir()}/.nvm/nvm.sh && nvm i && ${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-2",
+    "version": "0.34.0-5",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [