@corva/create-app 0.120.1 → 0.122.0

package/lib/commands/release.js

@@ -11,6 +11,8 @@ import { silentOption } from '../options/silent.js';
 import { ensureBumpVersion } from '../helpers/cli-version.js';
 import { ERROR_ICON } from '../constants/messages.js';
 import { appKeyOption } from '../options/app-key.js';
+import { zipFileNameOption } from '../options/zip-file-name.js';
+import { logger } from '../helpers/logger.js';
 
 export const releaseCommand = new Command('release')
   .description('Release app')
@@ -35,7 +37,7 @@ export const releaseCommand = new Command('release')
       'If package version is already taken - remove the previously published package and upload a new one',
     ).default(false),
   )
-  // .addOption(new Option('--zip-file-name [string]', 'Prebuilt zip file name in dir'))
+  .addOption(zipFileNameOption)
   .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
@@ -43,7 +45,20 @@ export const releaseCommand = new Command('release')
       process.env.githubUsername = options.author;
     }
 
-    options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
+    // Only the zip flow bumps the version, and a prebuilt archive skips it — nothing to prompt for.
+    if (options.zipFileName) {
+      if (options.bumpVersion && options.bumpVersion !== 'skip') {
+        logger.log(
+          `⚠️ ${chalk.yellow(
+            `--bump-version=${options.bumpVersion} is ignored with --zip-file-name: the version inside ${options.zipFileName} is used as is.`,
+          )}`,
+        );
+      }
+
+      options.bumpVersion = 'skip';
+    } else {
+      options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
+    }
 
     await runFlow(RELEASE_FLOW, {
       dirName: getRealWorkingDir(dirName, options),

package/lib/constants/package.js

@@ -12,8 +12,8 @@ const uiDependencies = {
   'corva-convert-units': '1.10.33',
   'highcharts': '10.3.3',
   'highcharts-react-official': '2.2.2',
-  'lodash': '^4.17.21',
-  'mapbox.js': '3.2.1',
+  'lodash': '^4.18.1',
+  'mapbox-gl': '3.16.0',
   'moment': '2.29.4',
   'moment-timezone': '0.5.43',
   'react': '17.0.1',
@@ -38,6 +38,7 @@ const jsUiDevDependencies = {
 const tsUiDevDependencies = {
   ...jsUiDevDependencies,
   '@tsconfig/create-react-app': '1.0.2',
+  // 4.17.7+ uses `infer X extends`, unparsable by this template's typescript 4.6.3
   '@types/lodash': '4.17.5',
   '@types/material-ui': '0.21.9',
   '@types/minimatch': '3.0.5',
@@ -130,6 +131,10 @@ const uiPackage = {
     moduleNameMapper: {
       '~(.*)': '<rootDir>/src/$1',
       '^.+\\.(css|sass|scss)$': 'identity-obj-proxy',
+      // @corva/ui's ImageViewer imports photoswipe (ESM-only); stub it so app
+      // tests can import @corva/ui without a module-resolution/ESM failure.
+      '^photoswipe/lightbox$': 'identity-obj-proxy',
+      '^photoswipe$': 'identity-obj-proxy',
       '@corva/ui(.*)': '@corva/ui/cjs-bundle/$1',
     },
     watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
@@ -140,6 +145,7 @@ const uiPackage = {
   },
   'resolutions': {
     '@noble/hashes': '1.8.0',
+    'lodash': '4.18.1',
   },
 };
 
@@ -250,11 +256,16 @@ const nodeNpmPackage = {
       },
     ],
   },
+  overrides: {
+    lodash: '4.18.1',
+  },
 };
 
 const nodeYarnPackage = {
   ...nodeNpmPackage,
   scripts: nodeYarnScripts,
+  overrides: undefined,
+  resolutions: nodeNpmPackage.overrides,
 };
 
 const nodeTsNpmPackage = {
@@ -271,6 +282,8 @@ const nodeTsNpmPackage = {
 const nodeTsYarnPackage = {
   ...nodeTsNpmPackage,
   scripts: nodeTsYarnScripts,
+  overrides: undefined,
+  resolutions: nodeNpmPackage.overrides,
 };
 
 const extendWithTsConfig = (packageJson, version) => {

package/lib/flow.js

@@ -29,6 +29,12 @@ export const runFlow = async (flow, context, indent = '') => {
 
 const runSteps = async (steps = [], context = {}, indent = '') => {
   for (const step of steps) {
+    if (typeof step.skip === 'function' && step.skip(context)) {
+      debug('Skipping %s', step.name || step.message);
+
+      continue;
+    }
+
     if (step.name) {
       const result = await runFlow(step, context, indent);
 

package/lib/flows/release.js

@@ -8,6 +8,7 @@ import { ADD_LABEL_STEP } from './steps/release/add-label.js';
 import { ADD_NOTES_STEP } from './steps/release/add-notes.js';
 import { PUBLISH_PACKAGE_STEP } from './steps/release/publish.js';
 import { RELEASE_PREPARE_DATA_STEP } from './steps/release/prepare-data.js';
+import { RESOLVE_PREBUILT_ZIP_STEP } from './steps/release/resolve-prebuilt-zip.js';
 
 export const RELEASE_FLOW = {
   name: 'release',
@@ -15,6 +16,9 @@ export const RELEASE_FLOW = {
     PREPARE_FLOW,
     SETUP_API_CLIENT_STEP,
     RELEASE_PREPARE_DATA_STEP,
+    // With --zip-file-name the archive already exists, so the zip flow is skipped entirely. That
+    // also lets runtimes the zip flow has no file list for (e.g. `provided.*`) be released.
+    RESOLVE_PREBUILT_ZIP_STEP,
     ZIP_SIMPLE_FLOW,
     UPLOAD_ZIP_TO_CORVA_STEP,
     WAIT_FOR_BUILD_FINISH_STEP,

package/lib/flows/steps/release/resolve-prebuilt-zip.js

@@ -0,0 +1,35 @@
+import { promises as fs } from 'node:fs';
+import { resolve } from 'node:path';
+
+import { StepError } from '../../lib/step-error.js';
+
+/**
+ * Handles `--zip-file-name`: the caller has already built the package archive, so this records it
+ * as the archive to upload and marks the zip flow as a no-op.
+ */
+export const RESOLVE_PREBUILT_ZIP_STEP = {
+  message: 'Resolving prebuilt archive...',
+  fn: async ({ dirName, options }) => {
+    const { zipFileName } = options;
+
+    if (!zipFileName) {
+      return {};
+    }
+
+    const zipPath = resolve(dirName, zipFileName);
+
+    try {
+      await fs.access(zipPath);
+    } catch {
+      throw new StepError(`Prebuilt archive ${zipFileName} not found in ${dirName}`);
+    }
+
+    return {
+      zipFileName,
+      skipZip: true,
+      // The archive belongs to the caller. Neither flag reaches the context today; this is defensive.
+      removeOnSuccess: false,
+      removeOnFail: false,
+    };
+  },
+};

package/lib/flows/zip-simple.js

@@ -2,5 +2,7 @@ import { ZIP_STEPS } from './steps/zip.js';
 
 export const ZIP_SIMPLE_FLOW = {
   name: 'zip (simple)',
+  // Set by RESOLVE_PREBUILT_ZIP_STEP when --zip-file-name names an existing archive.
+  skip: ({ skipZip }) => Boolean(skipZip),
   steps: ZIP_STEPS,
 };

package/lib/options/zip-file-name.js

@@ -0,0 +1,18 @@
+import { InvalidArgumentError, Option } from 'commander';
+
+const flags = '--zip-file-name <string>';
+const description =
+  'Upload an already-built .zip from the project directory instead of zipping it here. ' +
+  'The archive belongs to the caller and is never deleted after upload.';
+
+// An unset CI variable arrives as `--zip-file-name=`, and commander 9 takes the next token as the
+// value even when it is another flag — neither should pass for an archive name.
+function argParser(value) {
+  if (typeof value !== 'string' || !value.trim() || value.startsWith('-')) {
+    throw new InvalidArgumentError('Expected a file name, e.g. --zip-file-name=package.zip.');
+  }
+
+  return value;
+}
+
+export const zipFileNameOption = new Option(flags, description).argParser(argParser);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.120.1",
+  "version": "0.122.0",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -11,8 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/corva-ai/create-corva-app",
-    "directory": "@corva/create-app"
+    "url": "https://github.com/corva-ai/create-corva-app"
   },
   "license": "MIT",
   "type": "module",
@@ -42,6 +41,9 @@
   "lint-staged": {
     "*.js": "npm run lint:fix"
   },
+  "resolutions": {
+    "lodash": "4.18.1"
+  },
   "dependencies": {
     "archiver": "^5.3.0",
     "chalk": "^4.1.0",
@@ -78,10 +80,10 @@
     "@typescript-eslint/parser": "^8.58.1",
     "conventional-changelog-cli": "^2.1.0",
     "eslint": "^8.2.0",
-    "eslint-plugin-jest": "^27.1.5",
     "eslint-config-google": "^0.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^27.1.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.0",
@@ -96,9 +98,6 @@
     "zx": "^7.2.3"
   },
   "packageManager": "yarn@1.22.19+sha512.ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71",
-  "engines": {
-    "node": ">=24 <25"
-  },
   "standard-version": {
     "skip": {
       "tag": true

package/templates/ui/javascript/config/jest/setupTests.js

@@ -6,6 +6,9 @@
 // learn more: https://github.com/testing-library/jest-dom
 // eslint-disable-next-line
 import '@testing-library/jest-dom/extend-expect';
+import { TextEncoder, TextDecoder } from 'util';
+
+Object.assign(global, { TextDecoder, TextEncoder });
 
 // Set UTC timezone for tests to not use the environment timezone
 process.env.TZ = 'UTC';

package/templates/ui/typescript/config/jest/setupTests.js

@@ -6,6 +6,9 @@
 // learn more: https://github.com/testing-library/jest-dom
 // eslint-disable-next-line
 import '@testing-library/jest-dom/extend-expect';
+import { TextEncoder, TextDecoder } from 'util';
+
+Object.assign(global, { TextDecoder, TextEncoder });
 
 // Set UTC timezone for tests to not use the environment timezone
 process.env.TZ = 'UTC';