@corva/create-app 0.39.0-0-test-commit-6f34b79 → 0.39.0-0-test-commit-54959eb

package/lib/constants/messages.js

@@ -8,7 +8,7 @@ const RELEASE = {
   createZipError: 'Could not create zip archive.',
   createZipSuccess: `Zip archive has been created ${SUCCESS_ICON}`,
   getAuthToken: 'Reading auth token...',
-  getAuthTokenError: `Could not find auth token or CORVA_API_KEY in .env file.\nFor UI app please run ${chalk.cyan`yarn start`} and login to Corva to fetch it or set CORVA_API_KEY in your .env file`,
+  getAuthTokenError: `Could not find auth token or API_KEY in .env file.\nFor UI app please run ${chalk.cyan`yarn start`} and login to Corva to fetch it or set API_KEY in your .env file`,
   getAppKey: 'Reading app key...',
   getAppKeyError: "Could not find app key. Please make sure it's defined in manifest.json",
   uploadApp: 'Uploading app...',

package/lib/flows/steps/release-get-config.js

@@ -1,19 +1,35 @@
 const { RELEASE } = require('../../constants/messages');
+const { promises: fs } = require('fs');
+const dotenv = require('dotenv');
+const { resolve } = require('path');
 const { StepError } = require('../lib/step-error');
 
+async function getVarsFromDotEnv({ dirName }) {
+  try {
+    const envFile = await fs.readFile(resolve(dirName, '.env'));
+    return dotenv.parse(envFile);
+  } catch (error) {
+    return {};
+  }
+}
+
 const GET_RELEASE_CONFIG_STEP = {
   message: RELEASE.getAuthToken,
-  fn: async () => {
-    const { CORVA_API_ENV, AUTH_TOKEN, CORVA_API_KEY } = process.env;
+  fn: async ({ dirName }) => {
+    const parsedEnv = await getVarsFromDotEnv({ dirName });
+
+    const CORVA_API_ENV = process.env.CORVA_API_ENV || parsedEnv.CORVA_API_ENV;
+    const AUTH_TOKEN = process.env.AUTH_TOKEN || parsedEnv.AUTH_TOKEN;
+    const API_KEY = process.env.API_KEY || parsedEnv.API_KEY;
 
-    if (!AUTH_TOKEN && !CORVA_API_KEY) {
+    if (!AUTH_TOKEN && !API_KEY) {
       throw new StepError(RELEASE.getAuthTokenError);
     }
 
     return {
       CORVA_API_ENV: CORVA_API_ENV || 'production',
       AUTH_TOKEN,
-      CORVA_API_KEY,
+      API_KEY,
     };
   },
 };

package/lib/flows/steps/release-upload-zip-to-corva.js

@@ -8,7 +8,7 @@ const { get } = require('lodash/fp');
 
 const UPLOAD_ZIP_TO_CORVA_STEP = {
   message: RELEASE.uploadApp,
-  fn: async ({ zipFileName, appKey, CORVA_API_ENV, AUTH_TOKEN, CORVA_API_KEY, dirName }) => {
+  fn: async ({ zipFileName, appKey, CORVA_API_ENV, AUTH_TOKEN, API_KEY, dirName }) => {
     const form = new FormData();
 
     form.append('package', createReadStream(resolve(dirName, zipFileName)), 'archive.zip');
@@ -22,7 +22,7 @@ const UPLOAD_ZIP_TO_CORVA_STEP = {
       .post(uploadURL, form, {
         headers: {
           ...form.getHeaders(),
-          Authorization: AUTH_TOKEN ? `Bearer ${AUTH_TOKEN}` : `API ${CORVA_API_KEY}`,
+          Authorization: AUTH_TOKEN ? `Bearer ${AUTH_TOKEN}` : `API ${API_KEY}`,
         },
       })
       .catch((e) => {

package/lib/index.js

@@ -10,7 +10,6 @@ const inquirer = require('inquirer');
 const os = require('os');
 const path = require('path');
 const semver = require('semver');
-require('dotenv').config();
 
 const {
   ensureLatestVersion,
@@ -56,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
@@ -86,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() {
@@ -108,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
     );
@@ -270,7 +268,7 @@ async function initPackage(projectName, opts) {
   const manifest = new Manifest(manifestHelpers.fillManifest(opts));
   const runtime = resolveAppRuntime(opts);
 
-  if (!(await runtime.isRuntimeAvailable())) {
+  if (!await runtime.isRuntimeAvailable()) {
     throw new Error(`Runtime "${opts.runtime}" is not available locally`);
   }
 
@@ -372,7 +370,7 @@ async function configureApp(root, manifest, runtime) {
 
 const addNvmRc = async (root, manifest, runtime) => {
   await fs.outputFile(path.join(root, '.nvmrc'), `${runtime.version}\n`);
-};
+}
 
 const addTsConfigs = (root, manifest, runtime) => {
   if (runtime.language !== 'typescript') {
@@ -447,7 +445,7 @@ function addPackageJSON(root, manifest, runtime) {
     scripts: defaults.scripts,
     dependencies: defaults.dependencies,
     devDependencies: defaults.devDependencies,
-    ...(defaults.jest && { jest: defaults.jest }),
+    ...(defaults.jest && { jest: defaults.jest })
   };
 
   return fs.writeJSON(path.join(root, 'package.json'), packageJson, writejsonOptions);
@@ -461,16 +459,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 };
+  const opts = { stdio: ['inherit', 'inherit', 'pipe'], cwd: root }
 
   console.log(chalk.yellow(`Installing template dependencies using ${runtime.packageManager}...`));
-  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);
+  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.39.0-0-test-commit-6f34b79",
+    "version": "0.39.0-0-test-commit-54959eb",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [