@corva/create-app 0.44.0-0 → 0.44.0-2

package/lib/main.js

@@ -1,44 +1,45 @@
+/* eslint-disable no-undef */
 import chalk from 'chalk';
-import figlet from 'figlet';
 import { Command, CommanderError, Option } from 'commander';
+import figlet from 'figlet';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
 import os from 'node:os';
 import path, { resolve } from 'node:path';
 import semver from 'semver';
 
-import { ensureLatestVersion, warnIfOutdated, ensureBumpVersion } from './scripts/utils/version.js';
-import * as utils from './helpers/utils.js';
 import * as manifestHelpers from './helpers/manifest.js';
+import * as utils from './helpers/utils.js';
 import * as versioning from './helpers/versioning.js';
+import { ensureBumpVersion, ensureLatestVersion, warnIfOutdated } from './scripts/utils/version.js';
 
-import { getDefaultsForPackageJson } from './constants/package.js';
 import * as manifestConstants from './constants/manifest.js';
+import { getDefaultsForPackageJson } from './constants/package.js';
 
-import packageJson from '../package.json' assert { type: 'json' };
-import { clear } from 'node:console';
 import spawn from 'cross-spawn';
-import { runFlow } from './flow.js';
-import { ERROR_ICON } from './constants/messages.js';
-import { StepError } from './flows/lib/step-error.js';
-import { RELEASE_FLOW } from './flows/release.js';
-import { RERUN_FLOW } from './flows/rerun.js';
-import { ATTACH_FLOW } from './flows/attach.js';
-import { ZIP_FLOW } from './flows/zip.js';
+import _ from 'lodash/fp.js';
+import { clear } from 'node:console';
+import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import packageJson from '../package.json' assert { type: 'json' };
 import {
-  bumpVersionOption,
   apiKeyOption,
-  envOption,
-  silentOption,
   appVersion,
+  bumpVersionOption,
+  envOption,
   originalCwdOption,
+  silentOption,
 } from './bump-version.option.js';
+import { ERROR_ICON } from './constants/messages.js';
+import { runFlow } from './flow.js';
+import { ATTACH_FLOW } from './flows/attach.js';
 import { Manifest } from './flows/lib/manifest.js';
-import { IS_WINDOWS, resolveAppRuntime } from './helpers/resolve-app-runtime.js';
-import { existsSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
+import { StepError } from './flows/lib/step-error.js';
+import { RELEASE_FLOW } from './flows/release.js';
+import { RERUN_FLOW } from './flows/rerun.js';
+import { ZIP_FLOW } from './flows/zip.js';
 import { logger } from './helpers/logger.js';
-import _ from 'lodash/fp.js';
+import { IS_WINDOWS, resolveAppRuntime } from './helpers/resolve-app-runtime.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -58,7 +59,7 @@ const silencer =
     }
   };
 
-  const getRealWorkingDir = (relativePath, options) => resolve(options.originalCwd, relativePath)
+const getRealWorkingDir = (relativePath, options) => resolve(options.originalCwd, relativePath);
 
 function startingMessage() {
   clear();
@@ -70,16 +71,19 @@ function checkNodeVersion() {
   logger.write('Checking node version...');
 
   const unsupportedNodeVersion = !semver.satisfies(process.version, '>=16');
+
   if (unsupportedNodeVersion) {
     logger.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
     return process.exit(1);
   }
+
   logger.write('  ✅  \n');
 }
 
@@ -101,10 +105,10 @@ function checkOptions(opts) {
   };
 }
 
+// eslint-disable-next-line no-unused-vars
 const printDeprecationNotice = (param) =>
   console.warn(
-    chalk.bgYellowBright`DEPRECATED OPTION: ${param}` +
-      ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`
+    chalk.bgYellowBright`DEPRECATED OPTION: ${param}` + ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`,
   );
 
 export async function run() {
@@ -127,19 +131,15 @@ export async function run() {
   manifestConstants.manifestOptions().forEach((value) => {
     const type = typeof value.default;
     const option = new Option(
-      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${
-        (type !== 'undefined' && type) || 'string'
-      }]`,
-      value.message
+      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${(type !== 'undefined' && type) || 'string'}]`,
+      value.message,
     );
 
     if (value.choices) {
       if (typeof value.choices === 'function') {
         option.choices(value.choices());
       } else {
-        option.choices(
-          value.choices.map((choice) => `${typeof choice === 'object' ? choice.value : choice}`)
-        );
+        option.choices(value.choices.map((choice) => `${typeof choice === 'object' ? choice.value : choice}`));
       }
     }
 
@@ -180,10 +180,14 @@ export async function run() {
       silencer(async (dirName, patterns, options) => {
         options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-        console.log(getRealWorkingDir(dirName, options), options)
+        console.log(getRealWorkingDir(dirName, options), options);
 
-        return runFlow(ZIP_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options }).then(_.get('zipFileName'));
-      })
+        return runFlow(ZIP_FLOW, {
+          dirName: getRealWorkingDir(dirName, options),
+          patterns,
+          options,
+        }).then(_.get('zipFileName'));
+      }),
     );
 
   program
@@ -198,26 +202,20 @@ export async function run() {
     .addOption(apiKeyOption)
     .addOption(originalCwdOption)
     .addOption(new Option('--notes [string]', 'Add custom notes to published app'))
+    .addOption(new Option('--label [string]', 'Put a label on the release').choices(['BETA', 'PROD']))
+    .addOption(new Option('--remove-on-fail [boolean]', 'Remove release if it fails during deployment').default(false))
     .addOption(
-      new Option('--label [string]', 'Put a label on the release').choices(['BETA', 'PROD'])
-    )
-    .addOption(
-      new Option(
-        '--remove-on-fail [boolean]',
-        'Remove release if it fails during deployment'
-      ).default(false)
-    )
-    .addOption(
-      new Option(
-        '--remove-on-success [boolean]',
-        'App package (.zip) will not be deleted after upload'
-      ).default(true)
+      new Option('--remove-on-success [boolean]', 'App package (.zip) will not be deleted after upload').default(true),
     )
     // .addOption(new Option('--zip-file-name [string]', 'Prebuilt zip file name in dir'))
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-      await runFlow(RELEASE_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options });
+      await runFlow(RELEASE_FLOW, {
+        dirName: getRealWorkingDir(dirName, options),
+        patterns,
+        options,
+      });
     });
 
   program
@@ -285,16 +283,12 @@ const handleCommanderError = (e) => {
         const commandName = program.args[0] || program._defaultCommandName;
 
         console.error('Please specify the project directory:');
-        logger.log(
-          `  ${chalk.cyan(program.name())} ${commandName} ${chalk.green('<project-directory>')}`
-        );
+        logger.log(`  ${chalk.cyan(program.name())} ${commandName} ${chalk.green('<project-directory>')}`);
         logger.log();
         logger.log('For example:');
         logger.log(`  ${chalk.cyan(program.name())} ${commandName} ${chalk.green('my-react-app')}`);
         logger.log();
-        logger.log(
-          `Run ${chalk.cyan(`${program.name()} help ${commandName}`)} to see all options.`
-        );
+        logger.log(`Run ${chalk.cyan(`${program.name()} help ${commandName}`)} to see all options.`);
       } else {
         console.error('❌', e.message);
       }
@@ -339,8 +333,8 @@ async function initPackage(projectName, opts) {
   if (!(await runtime.isRuntimeAvailable())) {
     throw new Error(
       `Runtime "${opts.runtime}" is not available locally. Please proceed to ${chalk.green(
-        getEnvManagementLink(manifest)
-      )} to install it locally.`
+        getEnvManagementLink(manifest),
+      )} to install it locally.`,
     );
   }
 
@@ -355,6 +349,7 @@ async function initPackage(projectName, opts) {
   if (fs.existsSync(root)) {
     throw new Error(`Directory already exists: ${root}`);
   }
+
   await fs.mkdir(root);
   await fs.writeJSON(path.join(root, 'manifest.json'), manifest.manifest, writejsonOptions);
 
@@ -393,13 +388,7 @@ async function addTemplate(root, manifest, runtime) {
   logger.log(chalk.green('Copying app template...'));
   logger.log();
 
-  const templateFolder = path.resolve(
-    __dirname,
-    '..',
-    'templates',
-    runtime.language,
-    manifest.type
-  );
+  const templateFolder = path.resolve(__dirname, '..', 'templates', runtime.language, manifest.type);
 
   utils.copyFolderRecursiveSync(templateFolder, root);
 
@@ -462,7 +451,7 @@ const addTsConfigs = (root, manifest, runtime) => {
           inlineSourceMap: true,
         },
       },
-      writejsonOptions
+      writejsonOptions,
     ),
     fs.writeJson(
       path.resolve(root, 'tsconfig.build.json'),
@@ -471,7 +460,7 @@ const addTsConfigs = (root, manifest, runtime) => {
         include: ['lib/**/*.ts', 'index.ts'],
         exclude: ['node_modules', '**/*.spec.ts'],
       },
-      writejsonOptions
+      writejsonOptions,
     ),
   ]);
 };
@@ -483,13 +472,7 @@ function patchSchedulerForPython(root, manifest, runtime) {
     return;
   }
 
-  const templateFolder = path.resolve(
-    __dirname,
-    '..',
-    'templates',
-    runtime.language,
-    manifest.type
-  );
+  const templateFolder = path.resolve(__dirname, '..', 'templates', runtime.language, manifest.type);
   const originalType = 'ScheduledDataTimeEvent';
   const replacementType =
     schedulerType === manifestConstants.SCHEDULER_TYPE_DEPTH.value
@@ -544,6 +527,7 @@ async function installApp(root, manifest, runtime) {
     }
 
     logger.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(' ')}`, {
@@ -559,11 +543,13 @@ async function installApp(root, manifest, runtime) {
         // NOTE: filter out warnings caused by @corva/ui peer dependencies
         .filter((line) => !line.includes('@corva/ui'))
         .join('\n');
+
       console.log(error);
     }
 
     if (proc.status !== 0) {
       console.error(`\`${command} ${args.join(' ')}\` failed`);
+
       return;
     }
 

package/lib/scripts/utils/version.js

@@ -5,6 +5,7 @@ import inquirer from 'inquirer';
 
 import packageJson from '../../../package.json' assert { type: 'json' };
 import { logger } from '../../helpers/logger.js';
+
 const npm = new NpmApi();
 
 const error = chalk.bold.red;
@@ -21,6 +22,7 @@ export async function ensureLatestVersion() {
   const latestVersion = await getLatestVersion();
 
   const isCurrentVersionOutdated = semver.gt(latestVersion, currentVersion);
+
   if (isCurrentVersionOutdated) {
     console.log(error(asterisks));
     console.log(error`

package/package.json

@@ -1,71 +1,79 @@
 {
-    "name": "@corva/create-app",
-    "version": "0.44.0-0",
-    "private": false,
-    "description": "Create an app to use it in CORVA.AI",
-    "keywords": [
-        "react"
-    ],
-    "bugs": {
-        "url": "https://github.com/facebook/create-react-app/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/corva-ai/create-corva-app",
-        "directory": "@corva/create-app"
-    },
-    "license": "MIT",
-    "type": "module",
-    "bin": {
-        "create-corva-app": "./bin/create-corva-app.cjs"
-    },
-    "files": [
-        "bin/**/*.cjs",
-        "bin/**/*.js",
-        "lib/**/*.js",
-        "templates",
-        "common"
-    ],
-    "scripts": {
-        "lint": "prettier . --write",
-        "build": "echo \"build is not configured for package \\\"×\\\", skipping.\"",
-        "get-changelog": "conventional-changelog -r 2 -p angular",
-        "release": "git add -A && standard-version -a",
-        "release-rc": "npm run release -- --prerelease"
-    },
-    "dependencies": {
-        "archiver": "^5.3.0",
-        "chalk": "4.1.0",
-        "commander": "^9.1.0",
-        "cross-spawn": "^7.0.3",
-        "debug": "^4.3.4",
-        "dotenv": "^16.0.0",
-        "figlet": "^1.5.0",
-        "form-data": "^4.0.0",
-        "fs-extra": "9.0.1",
-        "glob": "^8.0.1",
-        "got": "^12.5.1",
-        "inquirer": "^8.2.3",
-        "is-glob": "^4.0.3",
-        "lodash": "^4.17.21",
-        "npm-api": "^1.0.0",
-        "semver": "7.3.2",
-        "terminal-link": "^3.0.0"
-    },
-    "devDependencies": {
-        "@corva/eslint-config-browser": "^0.0.4",
-        "@corva/eslint-config-node": "^4.2.0",
-        "@types/cross-spawn": "^6.0.2",
-        "conventional-changelog-cli": "^2.1.0",
-        "prettier": "^2.4.1",
-        "standard-version": "^9.0.0"
-    },
-    "engines": {
-        "node": ">=16"
-    },
-    "standard-version": {
-        "skip": {
-            "tag": true
-        }
+  "name": "@corva/create-app",
+  "version": "0.44.0-2",
+  "private": false,
+  "description": "Create an app to use it in CORVA.AI",
+  "keywords": [
+    "react"
+  ],
+  "bugs": {
+    "url": "https://github.com/facebook/create-react-app/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/corva-ai/create-corva-app",
+    "directory": "@corva/create-app"
+  },
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "create-corva-app": "./bin/create-corva-app.cjs"
+  },
+  "files": [
+    "bin/**/*.cjs",
+    "bin/**/*.js",
+    "lib/**/*.js",
+    "templates",
+    "common"
+  ],
+  "scripts": {
+    "build": "echo \"build is not configured for package \\\"×\\\", skipping.\"",
+    "get-changelog": "conventional-changelog -r 2 -p angular",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "git add -A && standard-version -a",
+    "release-rc": "npm run release -- --prerelease"
+  },
+  "lint-staged": {
+    "*.{js,json}": "npm run lint:fix"
+  },
+  "dependencies": {
+    "archiver": "^5.3.0",
+    "chalk": "4.1.0",
+    "commander": "^9.1.0",
+    "cross-spawn": "^7.0.3",
+    "debug": "^4.3.4",
+    "dotenv": "^16.0.0",
+    "figlet": "^1.5.0",
+    "form-data": "^4.0.0",
+    "fs-extra": "9.0.1",
+    "glob": "^8.0.1",
+    "got": "^12.5.1",
+    "inquirer": "^8.2.3",
+    "is-glob": "^4.0.3",
+    "lodash": "^4.17.21",
+    "npm-api": "^1.0.0",
+    "semver": "7.3.2",
+    "terminal-link": "^3.0.0"
+  },
+  "devDependencies": {
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-syntax-import-assertions": "^7.20.0",
+    "@commitlint/cli": "^17.3.0",
+    "@commitlint/config-conventional": "^17.3.0",
+    "@corva/eslint-config-browser": "^0.0.4",
+    "@corva/eslint-config-node": "^5.0.0",
+    "@types/cross-spawn": "^6.0.2",
+    "conventional-changelog-cli": "^2.1.0",
+    "husky": "^8.0.2",
+    "standard-version": "^9.0.0"
+  },
+  "engines": {
+    "node": ">=16"
+  },
+  "standard-version": {
+    "skip": {
+      "tag": true
     }
+  }
 }

package/templates/javascript/scheduler/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/scheduler/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/javascript/stream/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/stream/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/javascript/task/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/task/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/scheduler/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/stream/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/task/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"