@corva/create-app 0.0.0-73c49372-test → 0.0.0-8bf627d

package/README.md

@@ -182,6 +182,7 @@ Options:
   --silent [boolean]           Only log result of the operation (default: false)
   --remove-on-success          App package (.zip) will not be deleted after upload (default: true)
   --remove-existing [boolean]  If package.json version is already taken - remove the previously published package and upload a new one (default: false)
+  --author [string]            Author name for the audit
 ```
 
 ### Examples
@@ -209,3 +210,9 @@ create-corva-app release test-app --bump-version=patch
 ```sh
 create-corva-app release test-app --bump-version=4.2.0
 ```
+
+#### Make a release with author option(by default it will use your GitHub username)
+
+```sh
+create-corva-app release test-app --author=MyName
+```

package/bin/create-corva-app.cjs

@@ -7,18 +7,13 @@ const originalCwd = process.cwd();
 
 process.chdir(__dirname);
 
-const preparedOriginalArgs = process.argv
-  .slice(2)
-  // after changing the cwd need to pass the original path
-  .concat(['--original-cwd', originalCwd])
-  // leave spaces in place for arguments
-  .map((a) => (a.includes(' ') ? `"${a}"` : a));
-
-const args = ['--no-warnings', '--experimental-json-modules', 'cca.js'].concat(preparedOriginalArgs);
+const args = ['--no-warnings', '--experimental-json-modules', 'cca.js']
+  .concat(process.argv.slice(2))
+  .concat(['--original-cwd', originalCwd]);
 
 const { signal, status, error } = spawnSync(cmd, args, {
   stdio: 'inherit',
-  shell: true,
+  shell: false,
 });
 
 if (signal) {

package/common/python/requirements.txt

@@ -1,2 +1,2 @@
-corva-sdk==1.8.1
+corva-sdk==1.14.0
 pytest==7.1.1

package/lib/commands/release.js

@@ -36,7 +36,13 @@ export const releaseCommand = new Command('release')
     ).default(false),
   )
   // .addOption(new Option('--zip-file-name [string]', 'Prebuilt zip file name in dir'))
+  .addOption(new Option('--author [string]', 'Author name for the audit'))
   .action(async (dirName, patterns, options) => {
+    // if author is present in CLI, save it to process.env
+    if (options.author) {
+      process.env.githubUsername = options.author;
+    }
+
     options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
     await runFlow(RELEASE_FLOW, {

package/lib/constants/cli.js

@@ -2,10 +2,17 @@ export const APP_RUNTIMES = {
   UI: 'ui',
   // NODE12: 'nodejs12.x',
   // NODE14: 'nodejs14.x',
-  NODE16: 'nodejs16.x',
+  // NODE16: 'nodejs16.x',
   NODE18: 'nodejs18.x',
-  PYTHON3_8: 'python3.8',
-  PYTHON3_9: 'python3.9',
+  NODE20: 'nodejs20.x',
+  NODE22: 'nodejs22.x',
+  NODE24: 'nodejs24.x',
+  // PYTHON3_8: 'python3.8',
+  // PYTHON3_9: 'python3.9',
+  // PYTHON3_10: 'python3.10',
+  PYTHON3_11: 'python3.11',
+  PYTHON3_12: 'python3.12',
+  PYTHON3_13: 'python3.13',
 };
 
 export const TEMPLATE_TYPES = {
@@ -22,3 +29,7 @@ export const APP_TYPES = {
   STREAM: 'stream',
   TASK: 'task',
 };
+
+export const APP_EXTENSIONS = {
+  CORVA: 'corva',
+};

package/lib/constants/manifest.js

@@ -20,7 +20,7 @@ export const defaultManifest = {
     summary: 'More information about this app goes here',
     category: '',
     website: 'https://www.oandgexample.com/my-app/',
-    segments: ['drilling', 'completion'],
+    segments: ['drilling', 'completion', 'intervention'],
   },
   settings: {
     entrypoint: {
@@ -38,6 +38,7 @@ export const defaultUIAppManifest = {
       initial_size: { w: 4, h: 10 },
       multi_rig: false,
       full_screen_report: false,
+      use_app_header_v3: true,
     },
   },
   settings: {
@@ -205,7 +206,7 @@ export const manifestOptions = (projectName = 'Corva Dev Center App') => [
     type: 'rawlist',
     name: 'segments',
     message: 'Choose segments',
-    choices: ['drilling', 'completion'],
+    choices: ['drilling', 'completion', 'intervention'],
     required: true,
   },
   {

package/lib/constants/package.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { APP_EXTENSIONS } from './cli.js';
 
 const uiDependencies = {
   '@corva/ui': 'latest',
@@ -9,7 +10,7 @@ const uiDependencies = {
   '@icon-park/react': '1.4.2',
   'classnames': '2.2.6',
   'corva-convert-units': '1.10.33',
-  'highcharts': '8.1.2',
+  'highcharts': '10.3.3',
   'highcharts-react-official': '2.2.2',
   'lodash': '^4.17.21',
   'mapbox.js': '3.2.1',
@@ -21,24 +22,30 @@ const uiDependencies = {
 
 const jsUiDevDependencies = {
   '@corva/dc-platform-shared': 'latest',
-  '@corva/eslint-config-browser': 'latest',
+  '@corva/eslint-config-browser': '0.2.2',
   '@testing-library/jest-dom': '^5.14.1',
   '@testing-library/react': '^12.1.5',
   '@testing-library/react-hooks': '^8.0.1',
   '@testing-library/user-event': '^13.2.1',
-  'jest-watch-typeahead': '^1.0.0',
-  'jest': '^27.4.3',
   'babel-jest': '^27.4.2',
   'babel-preset-react-app': '^10.0.1',
   'eslint': '7.32.0',
+  'identity-obj-proxy': '^3.0.0',
+  'jest': '^27.4.3',
+  'jest-watch-typeahead': '^1.0.0',
   'postcss-loader': '4.1.0',
+  'sass': '^1.89.2',
+  'sass-loader': '^16.0.5',
 };
 
 const tsUiDevDependencies = {
   ...jsUiDevDependencies,
   '@tsconfig/create-react-app': '1.0.2',
+  '@types/lodash': '4.17.5',
   '@types/material-ui': '0.21.9',
-  '@types/mime': '3',
+  '@types/minimatch': '3.0.5',
+  '@types/mime': '3.0.1',
+  '@types/node': '18.19.47',
   '@types/react': '^17.0.22',
   '@types/react-dom': '^17.0.9',
   '@types/jest': '^27.0.1',
@@ -52,11 +59,15 @@ const corvaUiExtension = {
   scripts: {
     prepare: 'husky install',
   },
+  dependencies: {
+    '@tanstack/react-query': '4.35.3',
+  },
   devDependencies: {
     '@commitlint/cli': '^17.0.0',
     '@commitlint/config-conventional': '^17.0.0',
     'husky': '^8.0.0',
     'lint-staged': '^13.0.0',
+    '@tanstack/eslint-plugin-query': '4.34.1',
   },
 };
 
@@ -67,7 +78,7 @@ function applyUiExtension(packageJson, extensionNames) {
 
   const extensions = extensionNames
     .map((extensionName) => {
-      if (extensionName === 'corva') {
+      if (extensionName === APP_EXTENSIONS.CORVA) {
         return corvaUiExtension;
       }
 
@@ -116,12 +127,12 @@ const uiPackage = {
     },
     transformIgnorePatterns: [
       '/node_modules/(?!.*@babel/runtime|@icon-park/react/es).+\\.(js|jsx|mjs|cjs|ts|tsx)$',
-      '^.+\\.module\\.(css|sass|scss)$',
+      '^.+\\.(css|sass|scss)$',
     ],
     modulePaths: [],
     moduleNameMapper: {
       '~(.*)': '<rootDir>/src/$1',
-      '^.+\\.module\\.(css|sass|scss)$': 'identity-obj-proxy',
+      '^.+\\.(css|sass|scss)$': 'identity-obj-proxy',
       '@corva/ui(.*)': '@corva/ui/cjs-bundle/$1',
     },
     watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
@@ -130,16 +141,24 @@ const uiPackage = {
   'lint-staged': {
     'src/**/*.{js,jsx,ts,tsx}': 'eslint --fix',
   },
+  'resolutions': {
+    '@noble/hashes': '1.8.0',
+  },
 };
 
 const tsUiPackage = {
   ...uiPackage,
   devDependencies: tsUiDevDependencies,
+  // todo: temporary solution, ref https://github.com/oppia/oppia/issues/22283#issuecomment-2756641371
+  resolutions: {
+    ...uiPackage.resolutions,
+    '@types/babel__traverse': '7.20.6',
+  },
 };
 
 const nodeNpmScripts = {
   'bundle': 'create-corva-app zip .',
-  'test': 'npm audit --production && npm run unit',
+  'test': 'npm run unit',
   'unit': 'jest',
   'lint': 'eslint --ext .js,.ts .',
   'lint:fix': 'eslint --ext .js,.ts --fix .',
@@ -151,22 +170,22 @@ const nodeDependencies = {
 
 const nodeDevDependencies = {
   '@corva/eslint-config-node': '^5.1.1',
-  'jest': '^27.5.1',
+  'jest': '^29.7.0',
   'dotenv': '^16.0.3',
   'eslint': '^8.2.0',
   'prettier': '^2.0.0',
-  'typescript': '^4.9.4',
+  'typescript': '^5.5.4',
 };
 
 const nodeTsDevDependencies = {
   ...nodeDevDependencies,
-  '@types/jest': '^27.4.1',
-  'ts-jest': '^27.1.4',
+  '@types/jest': '^29.5.12',
+  'ts-jest': '^29.2.4',
 };
 
 const nodeYarnScripts = {
   ...nodeNpmScripts,
-  test: 'yarn audit --groups dependencies && yarn unit',
+  test: 'yarn unit',
 };
 
 const commonTsScripts = {
@@ -226,7 +245,8 @@ const nodeTsYarnPackage = {
 
 const extendWithTsConfig = (packageJson, version) => {
   packageJson.devDependencies = {
-    [`@tsconfig/node${version}`]: `^${version === '12' ? '1.0.9' : '1.0.1'}`,
+    // New @tsconfig/nodeX package versioning: it starts with X major version
+    [`@tsconfig/node${version}`]: `^${version}`,
     ...packageJson.devDependencies,
   };
 

package/lib/flows/lib/api.js

@@ -42,21 +42,30 @@ export class Api {
    * @returns  {object}
    */
   async getAppByKey(appKey) {
-    const { data } = await this.#api
-      .get('v2/apps', {
-        searchParams: { per_page: 2, search: appKey },
-      })
-      .json();
-
-    const app = data.find((app) => app.attributes.app_key === appKey);
-
-    if (!app) {
-      throw new StepError(
-        `App with key - ${appKey}, does not exist.\nThe key search is case-sensitive. You might need to update the app key in your app to exactly match the key.`,
-      );
+    try {
+      const { data } = await this.#api.get(`v2/apps/${appKey}`).json();
+
+      if (!data) {
+        throw new StepError(
+          `App with key - ${appKey}, does not exist.\nThe key search is case-sensitive. You might need to update the app key in your app to exactly match the key.`,
+        );
+      }
+
+      return data;
+    } catch (error) {
+      if (error?.response?.statusCode === 404) {
+        throw new StepError(
+          `App with key - ${appKey}, does not exist.\nThe key search is case-sensitive. You might need to update the app key in your app to exactly match the key.`,
+          { cause: error },
+        );
+      }
+      // If error has a response, it's an API exception
+      else if (error?.response) {
+        throw new StepError(`getAppByKey request failed, code:${error?.response?.statusCode}`);
+      }
+
+      throw error;
     }
-
-    return app;
   }
 
   /**

package/lib/flows/lib/manifest.js

@@ -11,7 +11,7 @@ const SCHEDULER_MAPPING = [SCHEDULER_TYPE_DATA_TIME, SCHEDULER_TYPE_DEPTH, SCHED
   {},
 );
 
-const NODE_RUNTIMES = [APP_RUNTIMES.NODE16, APP_RUNTIMES.NODE18];
+const NODE_RUNTIMES = [APP_RUNTIMES.NODE18, APP_RUNTIMES.NODE20, APP_RUNTIMES.NODE22, APP_RUNTIMES.NODE24];
 
 export class Manifest {
   constructor(manifest) {

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

@@ -1,10 +1,12 @@
 import FormData from 'form-data';
 import chalk from 'chalk';
+import fs from 'fs';
 import { createReadStream } from 'node:fs';
 import { resolve } from 'node:path';
 import { RELEASE } from '../../../constants/messages.js';
 import { StepError } from '../../lib/step-error.js';
 import { logger } from '../../../helpers/logger.js';
+import { execSync } from 'node:child_process';
 
 async function deleteAppPackage({ api, appId, appPkgVersion }) {
   const appPackages = await api.getAppPackages(appId);
@@ -23,6 +25,70 @@ async function deleteAppPackage({ api, appId, appPkgVersion }) {
   }
 }
 
+function getRealAuthorFromGithubEvent() {
+  if (!process.env.GITHUB_EVENT_PATH) {
+    return null;
+  }
+
+  try {
+    const event = JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8'));
+
+    // For push-event
+    if (event?.pusher?.name) {
+      return event.pusher.name;
+    }
+
+    // For PR event
+    if (event?.pull_request?.user?.login) {
+      return event.pull_request.user.login;
+    }
+  } catch (error) {
+    // Catch error in case json file is invalid or absent
+    return null;
+  }
+
+  return null;
+}
+
+function getGithubUsernameActor() {
+  // If option passed --author – we firstly take it
+  if (process.env.githubUsername) {
+    return process.env.githubUsername;
+  }
+
+  // If no --author passed, try use GITHUB_ACTOR
+  const actor = process.env.GITHUB_ACTOR;
+
+  if (actor && actor !== 'github-actions[bot]') {
+    return actor;
+  }
+
+  // If actor == github-actions[bot], let's try to get a real user
+  const realAuthor = getRealAuthorFromGithubEvent();
+
+  if (realAuthor) {
+    return realAuthor;
+  }
+
+  return null;
+}
+
+function getGitConfigUsername() {
+  try {
+    let username = execSync('git config user.name').toString().trim();
+
+    if (!username) {
+      username = execSync('git config --global user.name').toString().trim();
+    }
+
+    return username || null;
+  } catch (error) {
+    logger.log('Unable to fetch git config username:', error.message);
+
+    return null;
+  }
+}
+
 export const UPLOAD_ZIP_TO_CORVA_STEP = {
   message: RELEASE.uploadApp,
   /**
@@ -36,6 +102,14 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
 
       form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
+      let githubUsername = getGithubUsernameActor();
+
+      if (!githubUsername) {
+        githubUsername = getGitConfigUsername();
+      }
+
+      form.append('github_username', githubUsername);
+
       const { id: packageId, isDeletedDueToLimit } = await api.uploadPackages(appKey, form);
 
       if (isDeletedDueToLimit) {

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

@@ -98,13 +98,12 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
 
   itemsToSave.push({
     name: tmpPackageForSourceName,
-    content: _.set(
-      'scripts',
-      {
-        build: 'webpack --config=./config-overrides.js --mode production',
+    content: {
+      ...pkg,
+      scripts: {
+        build: pkg.scripts?.build,
       },
-      pkg,
-    ),
+    },
   });
 
   const itemsToRemove = [tmpPackageForSourceName];
@@ -112,7 +111,11 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
   itemsToZip.push(
     'manifest.json',
     'config-overrides.js',
+    'eslint.config.js',
+    'eslint.config.mjs',
     'tsconfig.json',
+    'prettier.config.js',
+    '.prettierrc',
     '.npmrc',
     '.nvmrc',
     'yarn.lock',
@@ -121,6 +124,7 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
       name: 'package.json',
     },
     ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles)),
+    ...(await transformPatternsIntoFileNames(dirName, ['config/**/*'], options.ignoredFiles)),
   );
 
   if (options.appKey) {
@@ -183,7 +187,9 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
 
   itemsToZip.push('config', 'manifest.json', 'package.json', '.nvmrc', '.npmrc', '.eslintrc.js');
 
-  if (packageDirContent.includes('package-lock.json')) {
+  if (packageDirContent.includes('pnpm-lock.yaml')) {
+    itemsToZip.push('pnpm-lock.yaml');
+  } else if (packageDirContent.includes('package-lock.json')) {
     itemsToZip.push('package-lock.json');
 
     if (shouldUpdateVersion) {

package/lib/helpers/cli-version.js

@@ -4,9 +4,10 @@ import semver from 'semver';
 import inquirer from 'inquirer';
 import { join } from 'path';
 import * as url from 'url';
+import fs from 'fs-extra';
 
 import { logger } from './logger.js';
-import fs from 'fs-extra';
+import { StepError } from '../flows/lib/step-error.js';
 
 const npm = new NpmApi();
 
@@ -17,13 +18,41 @@ const asterisks = '*************************************************************
 
 const getCurrentVersion = async () =>
   (await fs.readJSON(join(url.fileURLToPath(new URL('.', import.meta.url)), '../../package.json'))).version;
-const getLatestVersion = async () => npm.repo('@corva/create-app').prop('version');
+
+const getLatestVersion = async () => {
+  try {
+    return await npm.repo('@corva/create-app').prop('version');
+  } catch (caughtError) {
+    if (caughtError.name === 'FetchError') {
+      throw new StepError(`The request to check the latest available version has failed due to the network error. Details:
+
+${caughtError}
+
+Please check your internet connection and that the above request is not blocked in your network 
+  `);
+    }
+
+    throw caughtError;
+  }
+};
+
+// Utility function to check if a version is a regular semver without prerelease identifiers
+const isRegularVersion = (version) => {
+  return semver.prerelease(version) === null;
+};
 
 // NOTE: Stop process and show error if version is outdated
 export async function ensureLatestVersion() {
   const currentVersion = await getCurrentVersion();
   const latestVersion = await getLatestVersion();
 
+  // Skip version check if current version is a prerelease (dev or next)
+  if (!isRegularVersion(currentVersion)) {
+    logger.write('Skipping version check for prerelease version.\n');
+
+    return;
+  }
+
   const isCurrentVersionOutdated = semver.gt(latestVersion, currentVersion);
 
   if (isCurrentVersionOutdated) {
@@ -37,7 +66,7 @@ export async function ensureLatestVersion() {
 
     `);
     console.log(error(asterisks));
-   //  process.exit(0);
+    process.exit(0);
   }
 }
 
@@ -48,6 +77,13 @@ export async function warnIfOutdated() {
   const currentVersion = await getCurrentVersion();
   const latestVersion = await getLatestVersion();
 
+  // Skip version check if current version is a prerelease (dev or next)
+  if (!isRegularVersion(currentVersion)) {
+    logger.write('  ⚠️  Skipping version check for prerelease version.\n');
+
+    return;
+  }
+
   const isCurrentVersionOutdated = semver.gt(latestVersion, currentVersion);
 
   if (isCurrentVersionOutdated) {

package/lib/helpers/manifest.js

@@ -1,4 +1,4 @@
-import { APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } from '../constants/cli.js';
+import { APP_EXTENSIONS, APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } from '../constants/cli.js';
 import * as manifestConstants from '../constants/manifest.js';
 
 export function fillManifest(answers) {
@@ -10,6 +10,13 @@ export function fillManifest(answers) {
     runtime,
   });
 
+  const enable_isolation =
+    answers.appType === APP_TYPES.UI &&
+    answers.runtime === APP_RUNTIMES.UI &&
+    answers.extensions.includes(APP_EXTENSIONS.CORVA)
+      ? false
+      : undefined;
+
   const manifest = {
     ...manifestConstants.defaultManifest,
     ...defaultManifestProperties,
@@ -35,6 +42,7 @@ export function fillManifest(answers) {
       ...defaultManifestProperties.settings,
       runtime,
       app: defaultAppSettings(answers),
+      enable_isolation,
     },
   };
 

package/lib/helpers/resolve-app-runtime.js

@@ -1,13 +1,12 @@
 import debugFn from 'debug';
 import { APP_TYPES } from '../constants/cli.js';
-
-const debug = debugFn('cca:resolve-app-runtime');
-
 import spawn from 'cross-spawn';
 import { promises as fs } from 'fs';
 import os from 'os';
 import semver from 'semver';
 
+const debug = debugFn('cca:resolve-app-runtime');
+
 /**
  *
  * @param {string} command
@@ -61,14 +60,16 @@ export const IS_WINDOWS = process.platform === 'win32';
 
 const semverVersionsMapping = {
   node: {
-    16: '16.19.0',
-    18: '18.13.0',
+    18: '18.14.0',
+    20: '20.16.0',
+    24: '24.14.0',
   },
   python: {
     '3.8': '3.8.16',
     '3.9': '3.9.16',
     '3.10': '3.10.9',
     '3.11': '3.11.1',
+    '3.13': '3.13.7',
   },
 };
 
@@ -82,7 +83,7 @@ const semverVersionsMapping = {
  */
 export const resolveAppRuntime = (opts) => {
   if (opts.appType === APP_TYPES.UI) {
-    const version = '18';
+    const version = '20';
 
     return {
       language: opts.useTypescript ? 'typescript' : 'javascript',

package/lib/helpers/utils.js

@@ -8,7 +8,13 @@ export const addUiAppFile = (templateFolder, root, runtime, manifest, opts) => {
     logger.log(chalk.green('adding app file'));
 
     const fileExtension = runtime.language === 'typescript' ? 'tsx' : 'js';
-    const segment = opts.segments === 'completion' ? 'completion' : 'drilling';
+
+    const segment =
+      {
+        drilling: 'drilling',
+        completion: 'completion',
+        intervention: 'drilling', // same as drilling for now
+      }[opts.segments] || 'drilling';
     const appFilePath = join(templateFolder, 'src', `App.${segment}.${fileExtension}`);
 
     copyFileSync(appFilePath, join(root, 'src', `App.${fileExtension}`));

package/lib/main.js

@@ -13,9 +13,6 @@ import { createCommand } from './commands/create.js';
 
 import { ERROR_ICON } from './constants/messages.js';
 import { StepError } from './flows/lib/step-error.js';
-import debugFn from 'debug';
-
-const debug = debugFn('cca:main');
 
 function checkNodeVersion() {
   logger.write('Checking node version...');
@@ -58,9 +55,8 @@ export async function run() {
     if (e instanceof StepError) {
       console.error(chalk.red(`${ERROR_ICON} ${e.message}`));
     } else {
-      debug(e);
-
       console.error(chalk.red(`${ERROR_ICON} Unknown error occured, please contact support`));
+      console.error(e);
     }
 
     process.exit(1);