@corva/create-app 0.22.0-0 → 0.23.0-2

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.23.0-2](https://github.com/corva-ai/create-corva-app/compare/v0.23.0-1...v0.23.0-2) (2022-02-21)
+
+
+### Features
+
+* **DC-3051:** run release command for all app types ([5f7a2d8](https://github.com/corva-ai/create-corva-app/commit/5f7a2d850f29c903cf2c4cb6f83c63192519c192))
+
+## [0.23.0-1](https://github.com/corva-ai/create-corva-app/compare/v0.23.0-0...v0.23.0-1) (2022-02-17)
+
+
+### Features
+
+* **DC-2291:** add release script to FE dc apps ([fe1bda2](https://github.com/corva-ai/create-corva-app/commit/fe1bda29aa2b68d6912894353d731e73aadeb47b))
+
+## [0.23.0-0](https://github.com/corva-ai/create-corva-app/compare/v0.22.0-0...v0.23.0-0) (2022-02-15)
+
 ## [0.22.0-0](https://github.com/corva-ai/create-corva-app/compare/v0.21.0-2...v0.22.0-0) (2022-02-01)
 
 ## [0.21.0-2](https://github.com/corva-ai/create-corva-app/compare/v0.21.0-1...v0.21.0-2) (2022-01-25)

package/constants/package.js

@@ -40,6 +40,7 @@ const scripts = {
   start: 'webpack-dev-server --config=./config-overrides.js --open --mode development',
   zip: 'create-corva-app --zip ui',
   lint: 'eslint --cache ./src/',
+  release: 'create-corva-app --release',
 };
 
 module.exports = {

package/index.js

@@ -34,29 +34,30 @@ const shouldUseYarn = () => packageManager === YARN_EXECUTABLE;
 const getLockFileName = (manager) =>
   manager === YARN_EXECUTABLE ? 'yarn.lock' : 'package-lock.json';
 
-clear();
-
 let projectName;
 let program;
 
 function startingMessage() {
+  clear();
   console.log(chalk.green('   Welcome to apps generator for:'));
   console.log(chalk.cyan(figlet.textSync('CORVA.AI', { horizontalLayout: 'full' })));
 }
 
 function checkNodeVersion() {
-  console.log('Checking node version...');
+  process.stdout.write('Checking node version...');
+
   const unsupportedNodeVersion = !semver.satisfies(process.version, '>=10');
   if (unsupportedNodeVersion) {
     console.log(
       chalk.red(
-        `You are using Node ${process.version}.\n\n` +
-        `Please update to Node 10 or higher for a better, fully supported experience.\n`
+        `\nYou are using Node ${process.version}.\n\n` +
+          `Please update to Node 10 or higher for a better, fully supported experience.\n`
       )
     );
     // Fall back to latest supported react-scripts on Node 4
     return process.exit(1);
   }
+  process.stdout.write('  ✅  \n');
 }
 
 function checkOptions(opts) {
@@ -78,8 +79,6 @@ function checkOptions(opts) {
 }
 
 async function initialChecks() {
-  startingMessage();
-
   program = new commander.Command('corva-create-app')
     .version(packageJson.version)
     .argument('[project-directory]', 'project directory to work with')
@@ -88,6 +87,7 @@ async function initialChecks() {
       projectName = name;
     })
     .option('-z, --zip <type>', 'zip app source')
+    .option('--release', 'release app')
     .addOption(
       new commander.Option(`-p, --packageManager [string]`, 'package manager to use')
         .default(YARN_EXECUTABLE)
@@ -96,7 +96,11 @@ async function initialChecks() {
 
   manifestConstants.manifestOptions(projectName).forEach((value) => {
     const type = typeof value.default;
-    const option = new commander.Option(`${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${type !== 'undefined' && type || 'string'}]`, value.message);
+    const option = new commander.Option(
+      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${(type !== 'undefined' && type) ||
+        'string'}]`,
+      value.message
+    );
 
     if (value.choices) {
       if (typeof value.choices === 'function') {
@@ -109,7 +113,7 @@ async function initialChecks() {
     }
 
     if (type === 'number') {
-      option.argParser(Number)
+      option.argParser(Number);
     }
 
     program.addOption(option);
@@ -125,13 +129,16 @@ async function initialChecks() {
   useTypescript = opts.useTypescript || useTypescript;
 
   if (opts.zip) {
-    if (opts.zip === APP_RUNTIMES.UI) {
-      return uiScripts.zipAppSource(shouldUseYarn());
-    }
-
+    if (opts.zip === APP_RUNTIMES.UI) return uiScripts.zipAppSource();
+    process.exit(0);
+  }
+  if (opts.release) {
+    return uiScripts.releaseAppZip();
     process.exit(0);
   }
 
+  startingMessage();
+
   if (!projectName) {
     console.error('Please specify the project directory:');
     console.log(`  ${chalk.cyan(program.name())} ${chalk.green('<project-directory>')}`);
@@ -356,6 +363,9 @@ async function helpCommands() {
   console.log(chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}zip`));
   console.log('    Bundles the app into ZIP file in app root directory');
   console.log();
+  console.log(chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}release`));
+  console.log('    Uploads the app ZIP to Corva');
+  console.log();
 }
 
 initialChecks();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.22.0-0",
+    "version": "0.23.0-2",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [
@@ -33,12 +33,15 @@
     },
     "dependencies": {
         "archiver": "^5.3.0",
+        "axios": "^0.25.0",
         "chalk": "4.1.0",
         "commander": "^8.2.0",
         "conventional-changelog-cli": "^2.1.0",
         "cross-spawn": "7.0.3",
+        "dotenv": "^16.0.0",
         "envinfo": "7.5.1",
         "figlet": "^1.5.0",
+        "form-data": "^4.0.0",
         "fs-extra": "9.0.1",
         "hyperquest": "2.1.3",
         "inquirer": "7.3.2",

package/scripts/ui/index.js

@@ -1,5 +1,7 @@
 const zipAppSource = require('./zipAppSource');
+const releaseAppZip = require('./releaseAppZip');
 
 module.exports = {
   zipAppSource,
+  releaseAppZip,
 };

package/scripts/ui/releaseAppZip.js

@@ -0,0 +1,90 @@
+const fs = require('fs');
+const path = require('path');
+const axios = require('axios');
+const FormData = require('form-data');
+const chalk = require('chalk');
+const dotenv = require('dotenv');
+const get = require('lodash').get;
+const zipAppSource = require('./zipAppSource');
+
+const SUCCESS_ICON = '  ✅  \n';
+const ERROR_ICON = '  ❌  \n';
+
+const CONSOLE_MESSAGES = {
+  createZip: 'Creating zip archive...',
+  createZipError: 'Could not create zip archive.',
+  getAuthToken: 'Reading auth token...',
+  getAuthTokenError: `Could not find auth token. Please run ${chalk.cyan(
+    'yarn start'
+  )} and login to Corva`,
+  getAppKey: 'Reading app key...',
+  getAppKeyError: "Could not find app key. Please make sure it's defined in manifest.json",
+  uploadApp: 'Uploading app...',
+};
+
+function handleError(e, message) {
+  process.stdout.write(ERROR_ICON);
+  message && console.log(chalk.red(message));
+  console.error(chalk.red(e));
+  process.exit(1);
+}
+
+async function releaseAppZip() {
+  const dirname = process.cwd();
+
+  // Read auth token
+  let authToken;
+  let corvaAPIEnv = 'production';
+  try {
+    process.stdout.write(CONSOLE_MESSAGES.getAuthToken);
+    const env = await fs.promises.readFile(path.resolve(dirname, './.env'));
+    const config = dotenv.parse(env);
+    authToken = config.AUTH_TOKEN;
+    if (!authToken) throw new Error('No auth token.');
+    if (config.CORVA_API_ENV) corvaAPIEnv = config.CORVA_API_ENV;
+    process.stdout.write(SUCCESS_ICON);
+  } catch (e) {
+    handleError(e, CONSOLE_MESSAGES.getAuthTokenError);
+  }
+
+  // Read app key
+  let appKey;
+  try {
+    process.stdout.write(CONSOLE_MESSAGES.getAppKey);
+    const manifest = JSON.parse(
+      await fs.promises.readFile(path.resolve(dirname, './manifest.json'))
+    );
+    appKey = manifest.application.key;
+    if (!appKey) throw new Error('No app key.');
+    process.stdout.write(SUCCESS_ICON);
+  } catch (e) {
+    handleError(e, CONSOLE_MESSAGES.getAppKeyError);
+  }
+
+  // Zip archive
+  let zipPath;
+  try {
+    process.stdout.write(CONSOLE_MESSAGES.createZip);
+    zipPath = await zipAppSource({ silent: true });
+    process.stdout.write(SUCCESS_ICON);
+  } catch (e) {
+    handleError(e, CONSOLE_MESSAGES.createZipError);
+  }
+
+  let uploadURL;
+  try {
+    process.stdout.write(CONSOLE_MESSAGES.uploadApp);
+    const form = new FormData();
+    form.append('package', fs.createReadStream(zipPath), 'archive.zip');
+    const baseURL = `https://api${corvaAPIEnv === 'production' ? '' : `.${corvaAPIEnv}`}.corva.ai`;
+    uploadURL = `${baseURL}/v2/apps/${appKey}/packages/upload`;
+    await axios.post(uploadURL, form, {
+      headers: { ...form.getHeaders(), Authorization: `Bearer ${authToken}` },
+    });
+    process.stdout.write(SUCCESS_ICON);
+  } catch (e) {
+    handleError(e, `${get(e, 'response.data.message', '')} \nPOST: ${uploadURL} failed.`);
+  }
+}
+
+module.exports = releaseAppZip;

package/scripts/ui/zipAppSource.js

@@ -4,17 +4,18 @@ const archiver = require('archiver');
 const os = require('os');
 const chalk = require('chalk');
 const semverInc = require('semver/functions/inc');
+const noop = require('lodash').noop;
 
 const { warnIfOutdated } = require('../utils/version');
 
-async function compressAppToZip(useYarn) {
+async function compressAppToZip({ silent = false }={}) {
+  const log = silent ? noop : console.log;
   warnIfOutdated();
 
   const dirname = process.cwd();
 
   // Left only build script for package json;
   const packageJsonContent = fs.readFileSync(path.resolve(dirname, 'package.json'), 'utf-8');
-
   const packageJson = JSON.parse(packageJsonContent);
 
   const updatedVersion = semverInc(packageJson.version, 'patch');
@@ -27,7 +28,8 @@ async function compressAppToZip(useYarn) {
     },
   };
 
-  const zipPath = path.resolve(path.resolve(dirname, `${packageJson.name}-${updatedVersion}.zip`));
+  const zipFileName = `${packageJson.name}-${updatedVersion}.zip`;
+  const zipPath = path.resolve(path.resolve(dirname, zipFileName));
 
   var archive = archiver.create('zip', {});
   var output = fs.createWriteStream(zipPath);
@@ -35,8 +37,8 @@ async function compressAppToZip(useYarn) {
   // pipe archive data to the file
   archive.pipe(output);
 
-  output.on('close', function () {
-    console.log(`Created ${zipPath.replace(dirname + '/', '')}, ${archive.pointer()} bytes written\n`);
+  output.on('close', function() {
+    log(`Created ${zipPath.replace(dirname + '/', '')}, ${archive.pointer()} bytes written\n`);
 
     // clean up temp package.json file
     try {
@@ -47,19 +49,19 @@ async function compressAppToZip(useYarn) {
     }
   });
 
-  output.on('end', function () {
-    console.log('Data has been drained');
+  output.on('end', function() {
+    log('Data has been drained');
   });
 
-  archive.on('warning', function (err) {
+  archive.on('warning', function(err) {
     if (err.code === 'ENOENT') {
-      console.log(err.message);
+      log(err.message);
     } else {
       throw err;
     }
   });
 
-  archive.on('error', function (err) {
+  archive.on('error', function(err) {
     throw err;
   });
 
@@ -68,7 +70,7 @@ async function compressAppToZip(useYarn) {
     JSON.stringify({ ...packageJson, version: updatedVersion }, null, 2) + os.EOL
   );
 
-  console.log(
+  log(
     chalk(`
     NOTE: Version of your app was updated to ${updatedVersion} (package.json), please don't lower it.
   `)
@@ -83,26 +85,22 @@ async function compressAppToZip(useYarn) {
     name: 'package.json',
   });
 
-  [
-    'manifest.json',
-    'config-overrides.js',
-    'tsconfig.json',
-    '.npmrc',
-    useYarn ? 'yarn.lock' : 'package-lock.json',
-  ].forEach((name) => {
-    const file = path.resolve(dirname, name);
-
-    // not all app templates have the tsconfig, archive will raise an error with missing files, have to filter-out that
-    if (!fs.existsSync(file)) {
-      return;
-    }
+  ['manifest.json', 'config-overrides.js', 'tsconfig.json', '.npmrc', 'yarn.lock'].forEach(
+    (name) => {
+      const file = path.resolve(dirname, name);
 
-    archive.file(file, { name })
-  });
+      // not all app templates have the tsconfig, archive will raise an error with missing files, have to filter-out that
+      if (!fs.existsSync(file)) return;
+
+      archive.file(file, { name });
+    }
+  );
 
   archive.directory(path.resolve(dirname, 'src'), 'src');
 
-  archive.finalize();
+  await archive.finalize();
+  log(zipPath);
+  return zipPath;
 }
 
 module.exports = compressAppToZip;

package/template/ui/ts/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "noEmit": false,
     "strict": false
-  },
+  }
 }