@corva/create-app 0.0.0-73c49372 → 0.0.0-9a3cf8e

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/lib/commands/build-release.js

@@ -0,0 +1,60 @@
+import { Command, Option } from 'commander';
+import { bumpVersionOption } from '../options/bump-version.js';
+import { silentOption } from '../options/silent.js';
+import { envOption } from '../options/env.js';
+import { apiKeyOption } from '../options/api-key.js';
+import { appKeyOption } from '../options/app-key.js';
+import { originalCwdOption } from '../options/original-cwd.js';
+import { ensureBumpVersion } from '../helpers/cli-version.js';
+import { runFlow } from '../flow.js';
+import { getRealWorkingDir } from '../helpers/commands.js';
+import chalk from 'chalk';
+import { ERROR_ICON } from '../constants/messages.js';
+import { BUILD_RELEASE_PAAS_FLOW } from '../flows/build-release.js';
+
+export const buildReleasePaasCommand = new Command('build-release')
+  .description("Build & release app to environments that don't have a packager")
+  .argument('<project-directory>', 'Project directory to work with')
+  .argument(
+    '[environment-api-url]',
+    '(Optional) API URL for environment to upload to. You have to have the correct auth token for the given environment',
+  )
+  .addOption(bumpVersionOption)
+  .addOption(silentOption)
+  .addOption(envOption)
+  .addOption(apiKeyOption)
+  .addOption(appKeyOption)
+  .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(['DEV', '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),
+  )
+  .addOption(
+    new Option(
+      '--remove-existing [boolean]',
+      'If package version is already taken - remove the previously published package and upload a new one',
+    ).default(false),
+  )
+  .addOption(new Option('--author [string]', 'Author name for the audit'))
+  .action(async (dirName, envApiUrl, 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(BUILD_RELEASE_PAAS_FLOW, {
+      dirName: getRealWorkingDir(dirName, options),
+      patterns: [],
+      envApiUrl,
+      options,
+    });
+  })
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
+  });

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,16 @@ 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',
+  // 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 +28,7 @@ export const APP_TYPES = {
   STREAM: 'stream',
   TASK: 'task',
 };
+
+export const APP_EXTENSIONS = {
+  CORVA: 'corva',
+};

package/lib/constants/manifest.js

@@ -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: {

package/lib/constants/package.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { APP_EXTENSIONS } from './cli.js';
 
 const uiDependencies = {
   '@corva/ui': 'latest',
@@ -37,8 +38,11 @@ const jsUiDevDependencies = {
 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 +56,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 +75,7 @@ function applyUiExtension(packageJson, extensionNames) {
 
   const extensions = extensionNames
     .map((extensionName) => {
-      if (extensionName === 'corva') {
+      if (extensionName === APP_EXTENSIONS.CORVA) {
         return corvaUiExtension;
       }
 
@@ -135,6 +143,10 @@ const uiPackage = {
 const tsUiPackage = {
   ...uiPackage,
   devDependencies: tsUiDevDependencies,
+  // todo: temporary solution, ref https://github.com/oppia/oppia/issues/22283#issuecomment-2756641371
+  resolutions: {
+    '@types/babel__traverse': '7.20.6',
+  },
 };
 
 const nodeNpmScripts = {
@@ -151,17 +163,17 @@ 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 = {

package/lib/flows/build-release.js

@@ -0,0 +1,31 @@
+import { PREPARE_FLOW } from './prepare.js';
+import { SETUP_API_CLIENT_STEP } from './steps/release/get-config.js';
+import { RELEASE_PREPARE_DATA_STEP } from './steps/release/prepare-data.js';
+import { PREPARE_FILES_BEFORE_ZIP_STEP } from './steps/zip-prepare.js';
+import { CREATE_ARCHIVE_STEP } from './steps/zip-create-archive.js';
+import { CLEANUP_STEP } from './steps/zip-cleanup.js';
+import { UPLOAD_ZIP_TO_CORVA_STEP } from './steps/release/upload-zip-to-corva.js';
+import { PUBLISH_PACKAGE_STEP } from './steps/release/publish.js';
+import { ADD_LABEL_STEP } from './steps/release/add-label.js';
+import { ADD_NOTES_STEP } from './steps/release/add-notes.js';
+import { BUILD_STEP } from './steps/build.js';
+import { RESOLVE_BUILT_FILES_FOR_ZIP_STEP } from './steps/resolve-built-files-for-zip.js';
+
+export const BUILD_RELEASE_PAAS_FLOW = {
+  name: 'build-release-paas',
+  steps: [
+    PREPARE_FLOW,
+    SETUP_API_CLIENT_STEP,
+    RELEASE_PREPARE_DATA_STEP,
+    BUILD_STEP,
+    RESOLVE_BUILT_FILES_FOR_ZIP_STEP,
+    PREPARE_FILES_BEFORE_ZIP_STEP,
+    CREATE_ARCHIVE_STEP,
+    CLEANUP_STEP,
+    // eslint-disable-next-line new-cap
+    UPLOAD_ZIP_TO_CORVA_STEP({ prebuilt: true }),
+    PUBLISH_PACKAGE_STEP,
+    ADD_LABEL_STEP,
+    ADD_NOTES_STEP,
+  ],
+};

package/lib/flows/lib/api.js

@@ -1,7 +1,7 @@
 import debugFn from 'debug';
 import got from 'got';
 import { StepError } from './step-error.js';
-import { OVERRIDE_CACHE_BEHAVIOR, DELETE_CACHE_BEHAVIOR } from './../../constants/cache.js';
+import { DELETE_CACHE_BEHAVIOR, OVERRIDE_CACHE_BEHAVIOR } from './../../constants/cache.js';
 
 const debug = debugFn('cca:api');
 
@@ -15,8 +15,8 @@ export class Api {
    */
   #api;
 
-  constructor(envName, apiKey, authToken = null) {
-    const prefixUrl = `https://api${envName === 'production' ? '' : `.${envName}`}.corva.ai`;
+  constructor(envName, apiKey, authToken = null, { envApiUrl } = {}) {
+    const prefixUrl = envApiUrl || `https://api${envName === 'production' ? '' : `.${envName}`}.corva.ai`;
 
     this.#api = got.extend({
       prefixUrl,
@@ -42,21 +42,15 @@ export class Api {
    * @returns  {object}
    */
   async getAppByKey(appKey) {
-    const { data } = await this.#api
-      .get('v2/apps', {
-        searchParams: { per_page: 2, search: appKey },
-      })
-      .json();
+    const { data } = await this.#api.get(`v2/apps/${appKey}`).json();
 
-    const app = data.find((app) => app.attributes.app_key === appKey);
-
-    if (!app) {
+    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 app;
+    return data;
   }
 
   /**

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];
 
 export class Manifest {
   constructor(manifest) {

package/lib/flows/release.js

@@ -16,7 +16,8 @@ export const RELEASE_FLOW = {
     SETUP_API_CLIENT_STEP,
     RELEASE_PREPARE_DATA_STEP,
     ZIP_SIMPLE_FLOW,
-    UPLOAD_ZIP_TO_CORVA_STEP,
+    // eslint-disable-next-line new-cap
+    UPLOAD_ZIP_TO_CORVA_STEP(),
     WAIT_FOR_BUILD_FINISH_STEP,
     REMOVE_FAILED_UPLOAD_STEP,
     PUBLISH_PACKAGE_STEP,

package/lib/flows/steps/build.js

@@ -0,0 +1,25 @@
+import { StepError } from '../lib/step-error.js';
+import util from 'util';
+import ChildProcess from 'child_process';
+import fs from 'fs';
+
+const exec = util.promisify(ChildProcess.exec);
+
+export const BUILD_STEP = {
+  message: 'Building...',
+  fn: async ({ dirName }) => {
+    const currentCWD = process.cwd();
+
+    try {
+      process.chdir(dirName);
+
+      const command = fs.existsSync('./yarn.lock') ? 'yarn' : 'npm';
+
+      await exec(`${command} webpack --config=./config-overrides.js --mode production`);
+    } catch (e) {
+      throw new StepError(`Application build failed! ${e.stderr || e.message || 'Unknown error'}`);
+    }
+
+    process.chdir(currentCWD);
+  },
+};

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

@@ -18,7 +18,7 @@ async function getVarsFromDotEnv({ dirName }) {
 
 export const SETUP_API_CLIENT_STEP = {
   message: RELEASE.getAuthToken,
-  fn: async ({ dirName, options: { apiKey, env } }) => {
+  fn: async ({ dirName, envApiUrl, options: { apiKey, env } }) => {
     const parsedEnv = await getVarsFromDotEnv({ dirName });
 
     const CORVA_API_ENV = env || parsedEnv.CORVA_API_ENV || process.env.CORVA_API_ENV || 'production';
@@ -29,7 +29,7 @@ export const SETUP_API_CLIENT_STEP = {
       throw new StepError(RELEASE.getAuthTokenError);
     }
 
-    const api = new Api(CORVA_API_ENV, API_KEY, AUTH_TOKEN);
+    const api = new Api(CORVA_API_ENV, API_KEY, AUTH_TOKEN, { envApiUrl });
     const notification = new Notification(CORVA_API_ENV);
 
     return {

package/lib/flows/steps/release/prepare-data.js

@@ -1,12 +1,21 @@
+import chalk from 'chalk';
+
 export const RELEASE_PREPARE_DATA_STEP = {
   message: 'Preparing data...',
   async fn({ api, manifest, options }) {
     const appKey = options.appKey || manifest.manifest.application.key;
-    const app = await api.getAppByKey(appKey);
 
-    return {
-      appId: app.id,
-      appKey,
-    };
+    try {
+      const app = await api.getAppByKey(appKey);
+
+      return {
+        appId: app.id,
+        appKey,
+      };
+    } catch (e) {
+      console.log(chalk.bold.red(`\n${e.message}`));
+
+      throw e;
+    }
   },
 };

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,7 +25,71 @@ async function deleteAppPackage({ api, appId, appPkgVersion }) {
   }
 }
 
-export const UPLOAD_ZIP_TO_CORVA_STEP = {
+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 = (uploadPackagesParams) => ({
   message: RELEASE.uploadApp,
   /**
    *
@@ -36,6 +102,18 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
 
       form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
+      if (uploadPackagesParams?.prebuilt) {
+        form.append('prebuilt', 'true');
+      }
+
+      let githubUsername = getGithubUsernameActor();
+
+      if (!githubUsername) {
+        githubUsername = getGitConfigUsername();
+      }
+
+      form.append('github_username', githubUsername);
+
       const { id: packageId, isDeletedDueToLimit } = await api.uploadPackages(appKey, form);
 
       if (isDeletedDueToLimit) {
@@ -59,4 +137,4 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
       throw error;
     }
   },
-};
+});

package/lib/flows/steps/resolve-built-files-for-zip.js

@@ -0,0 +1,35 @@
+import { prepareUiAppFilesForZip, transformPatternsIntoFileNames } from './zip-file-list-resolve.js';
+import path from 'node:path';
+import { StepError } from '../lib/step-error.js';
+
+export const RESOLVE_BUILT_FILES_FOR_ZIP_STEP = {
+  message: 'Resolving files list...',
+  fn: async (context) => {
+    const { manifest, dirName } = context;
+    const files = [];
+
+    if (manifest.isUi()) {
+      const data = await prepareUiAppFilesForZip(files, context);
+
+      const regex = new RegExp(`^dist${path.sep}`);
+
+      // Manifest is already accounted for (with possible changes) in prepareUiAppFilesForZip
+      const builtFiles = (await transformPatternsIntoFileNames(dirName, ['dist/**/*'], ['dist/manifest.json'])).map(
+        (filename) => ({
+          // Source file path
+          path: path.resolve(dirName, filename),
+          // Target file path
+          name: filename.replace(regex, ''),
+        }),
+      );
+
+      data.itemsToZip.push('yarn.lock', ...builtFiles);
+
+      return data;
+    }
+
+    throw new StepError(
+      `Unsupported runtime: ${manifest.runtime}. Currently, this command supports the following app types: "ui"`,
+    );
+  },
+};

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

@@ -9,11 +9,10 @@ import { getIncreasedVersion } from '../../helpers/cli-version.js';
 import { generateRandomString } from '../../helpers/utils.js';
 import { loadJson } from '../lib/json.js';
 import { StepError } from '../lib/step-error.js';
+import debugFn from 'debug';
 
 const glob = promisify(Glob);
 
-import debugFn from 'debug';
-
 const debug = debugFn('cca:flow:zip:resolve');
 
 const uniqueValues = (array) => Array.from(new Set(array));
@@ -40,7 +39,7 @@ export const FILE_LIST_RESOLVE_STEP = {
   },
 };
 
-const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles = []) => {
+export const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles = []) => {
   const filesFromPatterns = [];
 
   for (const pattern of patterns) {
@@ -68,14 +67,7 @@ const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles =
   return filesFromPatterns;
 };
 
-/**
- *
- * @param {string[]} itemsToZip
- * @param {object} param1
- * @param {import('../lib/manifest').Manifest} param1.manifest
- * @returns
- */
-const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, manifest, appKey }) => {
+export const prepareUiAppFilesForZip = async (itemsToZip, { options, pkg, dirName, manifest, appKey }) => {
   const version = await getIncreasedVersion(pkg.version, options);
   const randomSuffix = generateRandomString(); // Random suffix is needed to not cause a conflict when we call 2 parallel commands at the same time.
   const zipFileName = `${manifest.unix_name}-${version}-${randomSuffix}.zip`;
@@ -109,20 +101,6 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
 
   const itemsToRemove = [tmpPackageForSourceName];
 
-  itemsToZip.push(
-    'manifest.json',
-    'config-overrides.js',
-    'tsconfig.json',
-    '.npmrc',
-    '.nvmrc',
-    'yarn.lock',
-    {
-      path: resolve(dirName, tmpPackageForSourceName),
-      name: 'package.json',
-    },
-    ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles)),
-  );
-
   if (options.appKey) {
     /**
      * Both manifest.json appKey in zip and the provided
@@ -143,8 +121,50 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
       path: resolve(dirName, tmpManifestForSourceName),
       name: 'manifest.json',
     });
+  } else {
+    itemsToZip.push('manifest.json');
   }
 
+  return {
+    zipFileName,
+    itemsToZip: [
+      ...itemsToZip,
+      {
+        path: resolve(dirName, tmpPackageForSourceName),
+        name: 'package.json',
+      },
+    ],
+    itemsToSave,
+    itemsToRemove,
+  };
+};
+
+/**
+ *
+ * @param {string[]} itemsToZipBase
+ * @param {object} param1
+ * @param {import('../lib/manifest').Manifest} param1.manifest
+ * @returns
+ */
+const resolveDataToZipUiApp = async (itemsToZipBase = [], { options, pkg, dirName, manifest, appKey }) => {
+  const { zipFileName, itemsToZip, itemsToSave, itemsToRemove } = await prepareUiAppFilesForZip(itemsToZipBase, {
+    options,
+    pkg,
+    dirName,
+    manifest,
+    appKey,
+  });
+
+  itemsToZip.push(
+    'config-overrides.js',
+    'tsconfig.json',
+    '.npmrc',
+    '.nvmrc',
+    'yarn.lock',
+    ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles)),
+    ...(await transformPatternsIntoFileNames(dirName, ['config/**/*'], options.ignoredFiles)),
+  );
+
   return {
     zipFileName,
     itemsToZip,